- Update to Laravel 5

- Support IPv6
- Log address not found exceptions
- Supports a custom default location

Author: Torann

README.md

@@ -1,26 +1,27 @@
-# GeoIP for Laravel 4
+# GeoIP for Laravel 5
 
 [![Latest Stable Version](https://poser.pugx.org/torann/geoip/v/stable.png)](https://packagist.org/packages/torann/geoip) [![Total Downloads](https://poser.pugx.org/torann/geoip/downloads.png)](https://packagist.org/packages/torann/geoip)
 
-Determine the geographical location of website visitors based on their IP addresses.
+Determine the geographical location of website visitors based on their IP addresses. [Homepage](http://lyften.com/projects/laravel-geoip/)
 
 ----------
 
 ## Installation
 
-- [GeoIP for Laravel 4 on Packagist](https://packagist.org/packages/torann/geoip)
-- [GeoIP for Laravel 4 on GitHub](https://github.com/torann/laravel-hashids)
+- [GeoIP for Laravel 5 on Packagist](https://packagist.org/packages/torann/geoip)
+- [GeoIP for Laravel 5 on GitHub](https://github.com/torann/laravel-hashids)
+- [Laravel 4 Installation](https://github.com/Torann/laravel-4-geoip/tree/0.1.1)
 
 
 To get the latest version of GeoIP simply require it in your `composer.json` file.
 
 ~~~
-"torann/geoip": "0.1.*@dev"
+"torann/geoip": "0.2.*@dev"
 ~~~
 
 You'll then need to run `composer install` to download it and have the autoloader updated.
 
-Once GeoIP is installed you need to register the service provider with the application. Open up `app/config/app.php` and find the `providers` key.
+Once GeoIP is installed you need to register the service provider with the application. Open up `config/app.php` and find the `providers` key.
 
 ~~~php
 'providers' => array(
@@ -30,7 +31,7 @@ Once GeoIP is installed you need to register the service provider with the appli
 )
 ~~~
 
-GeoIP also ships with a facade which provides the static syntax for creating collections. You can register the facade in the `aliases` key of your `app/config/app.php` file.
+GeoIP also ships with a facade which provides the static syntax for creating collections. You can register the facade in the `aliases` key of your `config/app.php` file.
 
 ~~~php
 'aliases' => array(
@@ -40,12 +41,17 @@ GeoIP also ships with a facade which provides the static syntax for creating col
 )
 ~~~
 
-Create configuration file using artisan
+### Publish the configurations
+
+Run this on the command line from the root of your project:
 
 ~~~
-$ php artisan config:publish torann/geoip
+$ php artisan vendor:publish
 ~~~
 
+A configuration file will be publish to `config/geoip.php`
+
+
 ## Usage
 
 Get the location data for a website visitor:
@@ -59,7 +65,7 @@ $location = GeoIP::getLocation();
 Getting the location data for a given IP:
 
 ```php
-$location = GeoIP::getLocation( '232.223.11.11' );
+$location = GeoIP::getLocation('232.223.11.11');
 ```
 
 ### Example Data
@@ -80,15 +86,22 @@ array (
 );
 ```
 
-#### Note
+#### Default Location
 
-In the case that a location is not found the fallback location will be returned with the `default` parameter set to `true`. In a future release I'll make the default location customizable. For not it is New Haven, CT.
+In the case that a location is not found the fallback location will be returned with the `default` parameter set to `true`. To set your own default change it in the configurations `config/geoip.php`
 
 ## Services
 
-
 ### [MaxMind](http://www.maxmind.com)
 
-- **Database Service**: To use the database version of MaxMind services download the `GeoLite2-City.mmdb` from [http://dev.maxmind.com/geoip/geoip2/geolite2/](http://dev.maxmind.com/geoip/geoip2/geolite2/) and extract it to `/app/database/maxmind/`. And that's it.
+- **Database Service**: To use the database version of MaxMind services download the `GeoLite2-City.mmdb` from [http://dev.maxmind.com/geoip/geoip2/geolite2/](http://dev.maxmind.com/geoip/geoip2/geolite2/) and extract it to `database/maxmind/`. And that's it.
+
+## Change Log
+
+#### v0.2.0
 
+- Update to Laravel 5
+- Support IPv6
+- Log address not found exceptions
+- Supports a custom default location
 

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "torann/geoip",
     "description": "Supports the two main GeoIP services (infoDB and Maxmind).",
-    "keywords": ["laravel", "laravel4", "geoip", "location", "geolocation"],
+    "keywords": ["laravel", "laravel 5", "geoip", "location", "geolocation"],
 	"license": "BSD 2-Clause",
     "authors": [
         {
@@ -11,18 +11,17 @@
     ],
     "require": {
         "php": ">=5.3.0",
-        "illuminate/support": "~4.1",
-		"geoip2/geoip2": "0.6.*"
+        "illuminate/support": "~5.0",
+		"geoip2/geoip2": "2.1.1"
     },
     "autoload": {
-        "psr-0": {
-            "Torann\\GeoIP": "src/"
+        "psr-4": {
+          "Torann\\GeoIP\\": "src/Torann/GeoIP"
         }
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.1-dev"
+            "dev-master": "0.2-dev"
         }
-    },
-    "minimum-stability": "dev"
+    }
 }

src/Torann/GeoIP/GeoIP.php

@@ -3,6 +3,9 @@
 use GeoIp2\Database\Reader;
 use GeoIp2\WebService\Client;
 
+use Monolog\Logger;
+use Monolog\Handler\StreamHandler;
+
 use GeoIp2\Exception\AddressNotFoundException;
 
 use Illuminate\Config\Repository;
@@ -84,6 +87,13 @@ public function __construct(Repository $config, SessionStore $session)
 		$this->config  = $config;
 		$this->session = $session;
 
+        // Set custom default location
+        $this->default_location = array_merge(
+            $this->default_location,
+            $this->config->get('geoip.default_location', array())
+        );
+
+        // Set IP
 		$this->remote_ip = $this->default_location['ip'] = $this->getClientIP();
 	}
 
@@ -121,6 +131,7 @@ function getLocation($ip = null )
 	 *
 	 * @param  string $ip Optional
 	 * @return array
+     * @throws \Exception
 	 */
 	private function find($ip = null)
 	{
@@ -136,10 +147,16 @@ private function find($ip = null)
 		}
 
 		// Check if the ip is not local or empty
-		if($this->checkIp($ip)) {
+		if($this->checkIp($ip))
+        {
+			// Get service name
+			$service = 'locate_'.$this->config->get('geoip.service');
 
-			// Call default service
-			$service = 'locate_'.$this->config->get('geoip::service');
+            // Check for valid service
+            if (! method_exists($this, $service))
+            {
+                throw new \Exception("GeoIP Service not support or setup.");
+            }
 
 			return $this->$service($ip);
 		}
@@ -155,41 +172,46 @@ private function find($ip = null)
 	 */
 	private function locate_maxmind($ip)
 	{
-		$settings = $this->config->get('geoip::maxmind');
+		$settings = $this->config->get('geoip.maxmind');
 
 		if($settings['type'] === 'web_service') {
 			$maxmind = new Client($settings['user_id'], $settings['license_key']);
 		}
 		else {
-			$maxmind = new Reader(app_path().'/database/maxmind/GeoLite2-City.mmdb');
-		}
-
-		// Attempt to get location
-		try {
-			$record = $maxmind->city($ip);
-		}
-		catch(AddressNotFoundException $e)
-		{
-			return $this->default_location;
+			$maxmind = new Reader(base_path().'/database/maxmind/GeoLite2-City.mmdb');
 		}
 
-		$location = array(
-			"ip"			=> $ip,
-			"isoCode" 		=> $record->country->isoCode,
-			"country" 		=> $record->country->name,
-			"city" 			=> $record->city->name,
-			"state" 		=> $record->mostSpecificSubdivision->isoCode,
-			"postal_code"   => $record->postal->code,
-			"lat" 			=> $record->location->latitude,
-			"lon" 			=> $record->location->longitude,
-			"timezone" 		=> $record->location->timeZone,
-			"continent"		=> $record->continent->code,
-			"default"       => false
-		);
-
-		unset($record);
-
-		return $location;
+        try {
+            $record = $maxmind->city($ip);
+
+            $location = array(
+                "ip"			=> $ip,
+                "isoCode" 		=> $record->country->isoCode,
+                "country" 		=> $record->country->name,
+                "city" 			=> $record->city->name,
+                "state" 		=> $record->mostSpecificSubdivision->isoCode,
+                "postal_code"   => $record->postal->code,
+                "lat" 			=> $record->location->latitude,
+                "lon" 			=> $record->location->longitude,
+                "timezone" 		=> $record->location->timeZone,
+                "continent"		=> $record->continent->code,
+                "default"       => false
+            );
+        }
+        catch (AddressNotFoundException $e)
+        {
+            $location = $this->default_location;
+
+            $logFile = 'geoip';
+
+            $log = new Logger($logFile);
+            $log->pushHandler(new StreamHandler(storage_path()."/logs/{$logFile}.log", Logger::ERROR));
+            $log->addError($e);
+        }
+
+        unset($record);
+
+        return $location;
 	}
 
 	/**
@@ -234,24 +256,33 @@ private function getClientIP()
 	 */
 	private function checkIp($ip)
 	{
-		$longip = ip2long($ip);
-
-		if (!empty($ip)) {
-
-			foreach ($this->reserved_ips as $r)
-			{
-				$min = ip2long($r[0]);
-				$max = ip2long($r[1]);
-
-				if ($longip >= $min && $longip <= $max) {
-					return false;
-				}
-			}
-
-			return true;
-		}
-
-		return false;
+        if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4))
+        {
+            $longip = ip2long($ip);
+
+            if (! empty($ip))
+            {
+                foreach ($this->reserved_ips as $r)
+                {
+                    $min = ip2long($r[0]);
+                    $max = ip2long($r[1]);
+
+                    if ($longip >= $min && $longip <= $max)
+                    {
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+        }
+
+        else if(filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))
+        {
+            return true;
+        }
+
+        return false;
 	}
 
 }

src/Torann/GeoIP/GeoIPServiceProvider.php

@@ -18,10 +18,9 @@ class GeoIPServiceProvider extends ServiceProvider {
 	 */
 	public function boot()
 	{
-		$this->package('torann/geoip');
-
-		// Temp to use in closure.
-		$app = $this->app;
+        $this->publishes([
+            __DIR__.'/../../config/geoip.php' => config_path('geoip.php'),
+        ]);
 	}
 
 	/**

src/config/config.php

@@ -0,0 +1,53 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Service
+    |--------------------------------------------------------------------------
+    |
+    | Current only supports 'maxmind'.
+    |
+    */
+
+    'service' => 'maxmind',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Services settings
+    |--------------------------------------------------------------------------
+    |
+    | Service specific settings.
+    |
+    */
+
+    'maxmind' => array(
+        'type'        => 'database', // database or web_service
+        'user_id'     => env('GEOIP_USER_ID'),
+        'license_key' => env('GEOIP_LICENSE_KEY')
+    ),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Location
+    |--------------------------------------------------------------------------
+    |
+    | Return when a location is not found.
+    |
+    */
+
+    'default_location' => array (
+        "ip"           => "127.0.0.0",
+        "isoCode"      => "US",
+        "country"      => "United States",
+        "city"         => "New Haven",
+        "state"        => "CT",
+        "postal_code"  => "06510",
+        "lat"          => 41.31,
+        "lon"          => -72.92,
+        "timezone"     => "America/New_York",
+        "continent"    => "NA"
+    ),
+
+);