unified exceptions

Author: pulkitjalan

README.md

@@ -44,7 +44,7 @@ Next run `php artisan config:publish pulkitjalan/geoip` to publish the config fi
 
 ## Usage
 
-Supported Drivers: [maxmind](https://www.maxmind.com/) and [ip-api](http://ip-api.com/)
+Supported Drivers: [ip-api](http://ip-api.com/) and [maxmind](https://www.maxmind.com/)
 
 The geoip class takes a config array as the first parameter or defaults to using the `ip-api` driver.
 
@@ -71,6 +71,7 @@ $config = [
     'driver' => 'ip-api',
     'ip-api' => [
         'key' => 'YOUR IP-API KEY',
+
         // optionally set secure (https) connection (default: false)
         'secure' => true
     ],
@@ -235,10 +236,10 @@ Once you have registered the service provider, you can use the command `php arta
 
 ## Services
 
-### Maxmind
+### IP-API
 
-You can use the free database from maxmind or their web api service. You can download the free database service [here](http://dev.maxmind.com/geoip/geoip2/geolite2/) or enter your `user id` and `license key` in the config.
+IP-API is a free (or paid) service that can also be used instead of the database file or the paid maxmind service. They do have some limitations on the free service so please have a look at the [docs](http://ip-api.com/docs/) first.
 
-### IP-API
+### Maxmind
 
-IP-API is a free service that can also be used instead of the database file or the paid maxmind service. They do have some limitations so please have a look at the [docs](http://ip-api.com/docs/) first.
+You can use the free database from maxmind or their web api service. You can download the free database service [here](http://dev.maxmind.com/geoip/geoip2/geolite2/) or enter your `user id` and `license key` in the config.

src/Drivers/MaxmindDriver.php

@@ -3,6 +3,7 @@
 namespace PulkitJalan\GeoIP\Drivers;
 
 use PulkitJalan\GeoIP\Exceptions\InvalidCredentialsException;
+use PulkitJalan\GeoIP\Exceptions\InvalidDatabaseException;
 use GeoIp2\Exception\AddressNotFoundException;
 use GeoIp2\WebService\Client;
 use GeoIp2\Database\Reader;
@@ -104,6 +105,10 @@ protected function createDatabase()
             throw new InvalidCredentialsException();
         }
 
-        return new Reader($database);
+        try {
+            return new Reader($database);
+        } catch (\MaxMind\Db\Reader\InvalidDatabaseException $e) {
+            throw new InvalidDatabaseException($e->getMessage());
+        }
     }
 }

src/Exceptions/InvalidDatabaseException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace PulkitJalan\GeoIP\Exceptions;
+
+class InvalidDatabaseException extends \Exception
+{
+}

src/GeoIPUpdater.php

@@ -50,7 +50,7 @@ protected function updateMaxmindDatabase()
     {
         $maxmindDatabaseUrl = 'http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz';
 
-        $database = array_get($this->config, 'maxmind.database', '/tmp/GeoLite2-City.mmdb');
+        $database = array_get($this->config, 'maxmind.database', false);
 
         $file = $this->requester->url($maxmindDatabaseUrl)->get()->getBody();
 

tests/GeoIPTest.php

@@ -61,7 +61,7 @@ public function testMaxmindInvalidDatabaseException()
             ],
         ];
 
-        $this->setExpectedException('MaxMind\Db\Reader\InvalidDatabaseException');
+        $this->setExpectedException('PulkitJalan\GeoIP\Exceptions\InvalidDatabaseException');
 
         $geoip = new \PulkitJalan\GeoIP\GeoIP($config);
     }