improved update command and removed helpers

Author: pulkitjalan

README.md

@@ -39,16 +39,16 @@ There is a Laravel service provider and facade available.
 Add the following to the `providers` array in your `config/app.php`
 
 ```php
-'PulkitJalan\GeoIP\GeoIPServiceProvider'
+PulkitJalan\GeoIP\GeoIPServiceProvider::class
 ```
 
 Next add the following to the `aliases` array in your `config/app.php`
 
 ```php
-'GeoIP' => 'PulkitJalan\GeoIP\Facades\GeoIP'
+'GeoIP' => PulkitJalan\GeoIP\Facades\GeoIP:class
 ```
 
-Next run `php artisan vendor:publish --provider="pulkitjalan\geoip\GeoIPServiceProvider"` to publish the config file.
+Next run `php artisan vendor:publish --provider="PulkitJalan\GeoIP\GeoIPServiceProvider" --tag="config"` to publish the config file.
 
 #### Looking for a Laravel 4 compatible version?
 

composer.json

@@ -23,10 +23,7 @@
     "autoload": {
         "psr-4": {
             "PulkitJalan\\GeoIP\\": "src"
-        },
-        "files": [
-            "helpers.php"
-        ]
+        }
     },
     "extra": {
         "branch-alias": {

helpers.php

@@ -4,6 +4,7 @@
 
 use GuzzleHttp\Client as GuzzleClient;
 use PulkitJalan\Requester\Requester;
+use Exception;
 
 class GeoIPUpdater
 {
@@ -52,10 +53,49 @@ protected function updateMaxmindDatabase()
 
         $database = array_get($this->config, 'maxmind.database', false);
 
+        if (!file_exists($dir = pathinfo($database, PATHINFO_DIRNAME))) {
+            mkdir($dir, 0777, true);
+        }
+
         $file = $this->requester->url($maxmindDatabaseUrl)->get()->getBody();
 
-        @file_put_contents($database, gzdecode($file));
+        try {
+            file_put_contents($database, $this->gzdecode($file));
+        } catch (Exception $e) {
+            return false;
+        }
 
         return $database;
     }
+
+    /**
+     * gzdecode function.
+     * 
+     * @param mixed $data
+     * @return mixed
+     */
+    protected function gzdecode($data)
+    {
+        do {
+            $tempName = uniqid('temp ');
+        } while (file_exists($tempName));
+
+        if (file_put_contents($tempName, $data)) {
+            try {
+                ob_start();
+                @readgzfile($tempName);
+                $uncompressed = ob_get_clean();
+            } catch (Exception $e) {
+                $ex = $e;
+            }
+
+            unlink($tempName);
+
+            if (isset($ex)) {
+                throw $ex;
+            }
+
+            return $uncompressed;
+        }
+    }
 }

src/GeoIPUpdater.php

@@ -40,7 +40,7 @@
         | Only applicable with the Pro service
         |
         */
-        'secure' => env('GEOIP_IPAPI_SECURE'),
+        'secure' => env('GEOIP_IPAPI_SECURE', true),
     ],
 
     /*
@@ -57,7 +57,7 @@
         | Use http or https
         |
         */
-        'secure' => env('GEOIP_TELIZE_SECURE'),
+        'secure' => env('GEOIP_TELIZE_SECURE', true),
     ],
 
     /*
@@ -74,7 +74,7 @@
         | Example: app_path().'/database/maxmind/GeoLite2-City.mmdb'
         |
         */
-        'database' => env('GEOIP_MAXMIND_DATABASE'),
+        'database' => base_path().'/'.env('GEOIP_MAXMIND_DATABASE', 'database/geoip/GeoLite2-City.mmdb'),
 
         /*
         |--------------------------------------------------------------------------