updated for laravel 5

Author: pulkitjalan

README.md

@@ -1,11 +1,11 @@
 GeoIP
 =============
 
-> Geoip Wrapper with Laravel Support
+> Geoip Wrapper with Laravel 4 & 5 Support
 
-[![Build Status](http://img.shields.io/travis/pulkitjalan/geoip/1.0.svg?style=flat-square)](https://travis-ci.org/pulkitjalan/geoip)
-[![Scrutinizer Code Quality](http://img.shields.io/scrutinizer/g/pulkitjalan/geoip/1.0.svg?style=flat-square)](https://scrutinizer-ci.com/g/pulkitjalan/geoip/)
-[![Coverage Status](https://img.shields.io/scrutinizer/coverage/g/pulkitjalan/geoip/1.0.svg?style=flat-square)](https://scrutinizer-ci.com/g/pulkitjalan/geoip/code-structure/1.0)
+[![Build Status](http://img.shields.io/travis/pulkitjalan/geoip/master.svg?style=flat-square)](https://travis-ci.org/pulkitjalan/geoip)
+[![Scrutinizer Code Quality](http://img.shields.io/scrutinizer/g/pulkitjalan/geoip/master.svg?style=flat-square)](https://scrutinizer-ci.com/g/pulkitjalan/geoip/)
+[![Coverage Status](https://img.shields.io/scrutinizer/coverage/g/pulkitjalan/geoip/master.svg?style=flat-square)](https://scrutinizer-ci.com/g/pulkitjalan/geoip/code-structure/master)
 [![License](http://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](http://www.opensource.org/licenses/MIT)
 [![Latest Version](http://img.shields.io/packagist/v/pulkitjalan/geoip.svg?style=flat-square)](https://packagist.org/packages/pulkitjalan/geoip)
 [![Total Downloads](https://img.shields.io/packagist/dt/pulkitjalan/geoip.svg?style=flat-square)](https://packagist.org/packages/pulkitjalan/geoip)
@@ -26,7 +26,7 @@ Install via composer - edit your `composer.json` to require the package.
 
 ```js
 "require": {
-    "pulkitjalan/geoip": "1.*"
+    "pulkitjalan/geoip": "2.*"
 }
 ```
 
@@ -48,11 +48,11 @@ Next add the following to the `aliases` array in your `config/app.php`
 'GeoIP' => 'PulkitJalan\GeoIP\Facades\GeoIP'
 ```
 
-Next run `php artisan config:publish pulkitjalan/geoip` 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 5 compatible version?
+#### Looking for a Laravel 4 compatible version?
 
-Checkout the [master branch](https://github.com/pulkitjalan/geoip/tree/master)
+Checkout the [1.0 branch](https://github.com/pulkitjalan/geoip/tree/1.0)
 
 ## Usage
 
@@ -130,7 +130,7 @@ $config = [
 
 ### Laravel
 
-To use this package in Laravel, simply update the config file in `config/packages/pulkitjalan/geoip/config.php` to get the same effect.
+To use this package in Laravel, simply update the config file in `config/geoip.php` to get the same effect. The driver can be set using the `GEOIP_DRIVER` env.
 
 ### Available Methods
 

composer.json

@@ -11,8 +11,8 @@
     ],
     "require": {
         "php": ">=5.4.0",
-        "illuminate/support": "~4",
-        "illuminate/console": "~4",
+        "illuminate/support": "~5",
+        "illuminate/console": "~5",
         "pulkitjalan/requester": "1.*",
         "geoip2/geoip2": "2.*"
     },
@@ -27,5 +27,10 @@
         "files": [
             "helpers.php"
         ]
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0.x-dev"
+        }
     }
 }

src/GeoIPServiceProvider.php

@@ -22,6 +22,10 @@ public function boot()
         $this->app['PulkitJalan\GeoIP\GeoIP'] = function ($app) {
             return $app['geoip'];
         };
+
+        $this->publishes([
+            __DIR__.'/config/config.php' => config_path('geoip.php'),
+        ], 'config');
     }
 
     /**
@@ -31,7 +35,7 @@ public function boot()
      */
     public function register()
     {
-        $this->app->config->package('pulkitjalan/geoip', realpath(__DIR__.'/config'), 'geoip');
+        $this->mergeConfigFrom(__DIR__.'/config/config.php', 'geoip');
 
         $this->registerGeoIP();
 
@@ -46,7 +50,7 @@ public function register()
     protected function registerGeoIP()
     {
         $this->app['geoip'] = $this->app->share(function ($app) {
-            return new GeoIP($app->config->get('geoip::config'));
+            return new GeoIP(config('geoip'));
         });
     }
 
@@ -58,7 +62,7 @@ protected function registerGeoIP()
     protected function registerUpdateCommand()
     {
         $this->app['command.geoip.update'] = $this->app->share(function ($app) {
-            return new UpdateCommand($app->config->get('geoip::config'));
+            return new UpdateCommand(config('geoip'));
         });
 
         $this->commands(['command.geoip.update']);

src/config/config.php

@@ -9,7 +9,7 @@
     | Supported: "ip-api", "telize", "maxmind"
     |
     */
-    'driver' => 'ip-api',
+    'driver' => env(GEOIP_DRIVER, 'ip-api'),
 
     /*
     |--------------------------------------------------------------------------