Merge pull request #8 from anaxamaxan/master

toin0u · toin0u · commit 38ff08f3fdc3 · 2014-05-12T22:42:30.000+02:00
Change from single provider to chain provider
diff --git a/src/Toin0u/Geocoder/GeocoderServiceProvider.php b/src/Toin0u/Geocoder/GeocoderServiceProvider.php
@@ -12,6 +12,7 @@
 namespace Toin0u\Geocoder;
 
 use Geocoder\Geocoder;
+use Geocoder\Provider\ChainProvider;
 use Illuminate\Support\ServiceProvider;
 
 /**
@@ -52,9 +53,11 @@ public function register()
         });
 
         $this->app->singleton('geocoder.provider', function($app) {
-            $provider = $app['config']->get('geocoder-laravel::provider');
-
-            return new $provider($app['geocoder.adapter']);
+            $providers = $app['config']->get('geocoder-laravel::providers');
+            foreach($providers as &$provider) {
+                $provider = new $provider($app['geocoder.adapter']);
+            }
+            return new ChainProvider($providers);
         });
 
         $this->app['geocoder'] = $this->app->share(function($app) {
diff --git a/src/config/config.php b/src/config/config.php
@@ -10,6 +10,9 @@
  */
 
 return array(
-    'provider' => 'Geocoder\Provider\FreeGeoIpProvider',
+    /* Providers get called in the chain order given here. The first one to return a result will be used. */
+    'providers' => array(
+        'Geocoder\Provider\FreeGeoIpProvider'
+    ),
     'adapter'  => 'Geocoder\HttpAdapter\CurlHttpAdapter'
 );
diff --git a/tests/Geocoder/Tests/GeocoderFacadeTest.php b/tests/Geocoder/Tests/GeocoderFacadeTest.php
@@ -19,7 +19,7 @@ class GeocoderFacadeTest extends TestCase
     public function testGeocoderFacade()
     {
         $this->assertTrue(is_array($providers = \Geocoder::getProviders()));
-        $this->assertArrayHasKey('free_geo_ip', $providers);
-        $this->assertInstanceOf('Geocoder\\Provider\\FreeGeoipProvider', $providers['free_geo_ip']);
+        $this->assertArrayHasKey('chain', $providers);
+        $this->assertInstanceOf('Geocoder\\Provider\\ChainProvider', $providers['chain']);
     }
 }
diff --git a/tests/Geocoder/Tests/GeocoderServiceProviderTest.php b/tests/Geocoder/Tests/GeocoderServiceProviderTest.php
@@ -18,7 +18,7 @@ class GeocoderServiceProviderTest extends TestCase
 {
     public function testConfig()
     {
-        $this->assertSame('Geocoder\Provider\FreeGeoIpProvider', $this->app['config']->get('geocoder-laravel::provider'));
+        $this->assertContains('Geocoder\Provider\FreeGeoIpProvider', $this->app['config']->get('geocoder-laravel::providers'));
         $this->assertSame('Geocoder\HttpAdapter\CurlHttpAdapter', $this->app['config']->get('geocoder-laravel::adapter'));
     }
 
@@ -35,13 +35,30 @@ public function testGeocoderDefaultAdapter()
         $this->assertInstanceOf('Geocoder\\HttpAdapter\\CurlHttpAdapter', $this->app['geocoder.adapter']);
     }
 
+    public function testGeocoderChainProvider()
+    {
+        $this->assertInstanceOf('Geocoder\\Provider\\ChainProvider', $this->app['geocoder.provider']);
+    }
+
     public function testGeocoderDefaultProvider()
     {
-        $this->assertInstanceOf('Geocoder\\Provider\\FreeGeoIpProvider', $this->app['geocoder.provider']);
+        $providersArray = $this->getProtectedProperty($this->app['geocoder.provider'], 'providers');
+        $this->assertInstanceOf('Geocoder\\Provider\\FreeGeoIpProvider', $providersArray[0]);
+
     }
 
     public function testGeocoder()
     {
         $this->assertInstanceOf('Geocoder\\Geocoder', $this->app['geocoder']);
     }
+
+    protected function getProtectedProperty($testObj, $propertyName)
+    {
+        $reflection = new \ReflectionClass($testObj);
+        $property = $reflection->getProperty($propertyName);
+        $property->setAccessible(true);
+
+        return $property->getValue($testObj);
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class GeocoderFacadeTest extends TestCase`
`19`	`19`	`public function testGeocoderFacade()`
`20`	`20`	`{`
`21`	`21`	`$this->assertTrue(is_array($providers = \Geocoder::getProviders()));`
`22`		`- $this->assertArrayHasKey('free_geo_ip', $providers);`
`23`		`- $this->assertInstanceOf('Geocoder\\Provider\\FreeGeoipProvider', $providers['free_geo_ip']);`
	`22`	`+ $this->assertArrayHasKey('chain', $providers);`
	`23`	`+ $this->assertInstanceOf('Geocoder\\Provider\\ChainProvider', $providers['chain']);`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class GeocoderServiceProviderTest extends TestCase`
`18`	`18`	`{`
`19`	`19`	`public function testConfig()`
`20`	`20`	`{`
`21`		`- $this->assertSame('Geocoder\Provider\FreeGeoIpProvider', $this->app['config']->get('geocoder-laravel::provider'));`
	`21`	`+ $this->assertContains('Geocoder\Provider\FreeGeoIpProvider', $this->app['config']->get('geocoder-laravel::providers'));`
`22`	`22`	`$this->assertSame('Geocoder\HttpAdapter\CurlHttpAdapter', $this->app['config']->get('geocoder-laravel::adapter'));`
`23`	`23`	`}`
`24`	`24`
`@@ -35,13 +35,30 @@ public function testGeocoderDefaultAdapter()`
`35`	`35`	`$this->assertInstanceOf('Geocoder\\HttpAdapter\\CurlHttpAdapter', $this->app['geocoder.adapter']);`
`36`	`36`	`}`
`37`	`37`
	`38`	`+ public function testGeocoderChainProvider()`
	`39`	`+ {`
	`40`	`+ $this->assertInstanceOf('Geocoder\\Provider\\ChainProvider', $this->app['geocoder.provider']);`
	`41`	`+ }`
	`42`	`+`
`38`	`43`	`public function testGeocoderDefaultProvider()`
`39`	`44`	`{`
`40`		`- $this->assertInstanceOf('Geocoder\\Provider\\FreeGeoIpProvider', $this->app['geocoder.provider']);`
	`45`	`+ $providersArray = $this->getProtectedProperty($this->app['geocoder.provider'], 'providers');`
	`46`	`+ $this->assertInstanceOf('Geocoder\\Provider\\FreeGeoIpProvider', $providersArray[0]);`
	`47`	`+`
`41`	`48`	`}`
`42`	`49`
`43`	`50`	`public function testGeocoder()`
`44`	`51`	`{`
`45`	`52`	`$this->assertInstanceOf('Geocoder\\Geocoder', $this->app['geocoder']);`
`46`	`53`	`}`
	`54`	`+`
	`55`	`+ protected function getProtectedProperty($testObj, $propertyName)`
	`56`	`+ {`
	`57`	`+ $reflection = new \ReflectionClass($testObj);`
	`58`	`+ $property = $reflection->getProperty($propertyName);`
	`59`	`+ $property->setAccessible(true);`
	`60`	`+`
	`61`	`+ return $property->getValue($testObj);`
	`62`	`+ }`
	`63`	`+`
`47`	`64`	`}`