Update servive provider, config, and composer.json (end testing)

spinegar · spinegar · commit e88a41746e65 · 2013-09-17T16:49:38.000Z
diff --git a/composer.json b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name"        : "spinegar/geocoder-laravel",
+    "name"        : "toin0u/geocoder-laravel",
     "description" : "Geocoder Service provider for Laravel 4",
     "keywords"    : ["laravel", "geocoder", "geocoding"],
     "homepage"    : "http://geocoder-php.org/",
diff --git a/src/Toin0u/Geocoder/GeocoderServiceProvider.php b/src/Toin0u/Geocoder/GeocoderServiceProvider.php
@@ -12,7 +12,6 @@
 namespace Toin0u\Geocoder;
 
 use Geocoder\Geocoder;
-use Geocoder\HttpAdapter\CurlHttpAdapter;
 use Illuminate\Support\ServiceProvider;
 
 /**
@@ -35,7 +34,7 @@ class GeocoderServiceProvider extends ServiceProvider
      * @return void
      */
     public function boot() {
-        $this->package('willdurand/geocoder');
+        $this->package('toin0u/geocoder-laravel');
     }
 
     /**
@@ -48,13 +47,14 @@ public function register()
         $app = $this->app;
 
         $this->app['geocoder.adapter'] = $this->app->share(function() {
-            return new CurlHttpAdapter;
+            $adapter = \Config::get('geocoder-laravel::adapter');
+            $class = 'Geocoder\HttpAdapter\\' . $adapter;
+            return new $class;
         });
 
         $this->app['geocoder.provider'] = $this->app->share(function($app) {
-            //return new FreeGeoIpProvider($app['geocoder.adapter']);
-	    $definition = Config.get('geocoder.provider');
-            $class = '\\Geocoder\\Provider\\' . $definition;
+    $provider = \Config::get('geocoder-laravel::provider');
+            $class = '\Geocoder\Provider\\' . $provider;
             return new $class($app['geocoder.adapter']);
         });
 
diff --git a/src/config/config.php b/src/config/config.php
@@ -1,4 +1,6 @@
 <?php
-return array (
-    'provider' => 'FreeGeoIpProvider'
-);
+
+return array(
+    'provider' => 'GoogleMapsProvider',
+    'adapter' => 'CurlHttpAdapter'
+);

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name" : "spinegar/geocoder-laravel",`
	`2`	`+ "name" : "toin0u/geocoder-laravel",`
`3`	`3`	`"description" : "Geocoder Service provider for Laravel 4",`
`4`	`4`	`"keywords" : ["laravel", "geocoder", "geocoding"],`
`5`	`5`	`"homepage" : "http://geocoder-php.org/",`