add support of providers arguments + tests + doc - fix #5

Author: toin0u

README.md

@@ -73,20 +73,27 @@ $ php artisan config:publish toin0u/geocoder-laravel
 The service provider creates the following services:
 
 * `geocoder`: the Geocoder instance.
-* `geocoder.provider`: the provider used by Geocoder.
+* `geocoder.chain`: the chain provider used by Geocoder.
 * `geocoder.adapter`: the HTTP adapter used to get data from remotes APIs.
 
-By default, the `geocoder.provider` service uses FreeGeoIP and the `geocoder.adapter` service uses the cURL adapter.
-Override these services to use the adapter/provider you want by editing
-`app/config/packages/toin0u/geocoder-laravel/config.php`:
+By default, the `geocoder.chain` service contains `GoogleMapsProvider` and `FreeGeoIpProvider`.
+The `geocoder.adapter` service uses the cURL adapter. Override these services to use the
+adapter/providers you want by editing `app/config/packages/toin0u/geocoder-laravel/config.php`:
 
 ```php
 return array(
-    'provider' => 'Geocoder\Provider\GoogleMapsProvider',
+    'providers' => array(
+        'Geocoder\Provider\GoogleMapsProvider' => array('my-locale', 'my-region', $ssl = true),
+        'Geocoder\Provider\CloudMadeProvider'  => array('my-api-key'),
+        'Geocoder\Provider\FreeGeoIpProvider'  => null, // or array()
+        // ...
+    ),
     'adapter'  => 'Geocoder\HttpAdapter\CurlHttpAdapter'
 );
 ```
 
+NB: As you can see the array value of the provider is the constructor arguments.
+
 See [the Geocoder documentation](http://geocoder-php.org/Geocoder/) for a list of available adapters and providers.
 
 

src/Toin0u/Geocoder/GeocoderServiceProvider.php

@@ -52,19 +52,25 @@ public function register()
             return new $adapter;
         });
 
-        $this->app->singleton('geocoder.provider', function($app) {
-            $providers = $app['config']->get('geocoder-laravel::providers');
+        $this->app->singleton('geocoder.chain', function($app) {
+            $providers = array();
 
-            foreach($providers as &$provider) {
-                $provider = new $provider($app['geocoder.adapter']);
+            foreach($app['config']->get('geocoder-laravel::providers') as $provider => $arguments) {
+                if (0 !== count($arguments)) {
+                    $providers[] = new $provider($app['geocoder.adapter'], implode(',', $arguments));
+
+                    continue;
+                }
+
+                $providers[] = new $provider($app['geocoder.adapter']);
             }
 
             return new ChainProvider($providers);
         });
 
         $this->app['geocoder'] = $this->app->share(function($app) {
             $geocoder = new Geocoder;
-            $geocoder->registerProvider($app['geocoder.provider']);
+            $geocoder->registerProvider($app['geocoder.chain']);
 
             return $geocoder;
         });
@@ -77,6 +83,6 @@ public function register()
      */
     public function provides()
     {
-        return array('geocoder', 'geocoder.adapter', 'geocoder.provider');
+        return array('geocoder', 'geocoder.adapter', 'geocoder.chain');
     }
 }

src/config/config.php

@@ -13,8 +13,8 @@
     // Providers get called in the chain order given here.
     // The first one to return a result will be used.
     'providers' => array(
-        'Geocoder\Provider\GoogleMapsProvider',
-        'Geocoder\Provider\FreeGeoIpProvider',
+        'Geocoder\Provider\GoogleMapsProvider' => array('fr-FR', 'Île-de-France', true),
+        'Geocoder\Provider\FreeGeoIpProvider'  => null,
     ),
     'adapter'  => 'Geocoder\HttpAdapter\CurlHttpAdapter'
 );

tests/Geocoder/Tests/GeocoderServiceProviderTest.php

@@ -19,8 +19,9 @@ class GeocoderServiceProviderTest extends TestCase
     public function testConfig()
     {
         $this->assertTrue(is_array($providers = $this->app['config']->get('geocoder-laravel::providers')));
-        $this->assertContains('Geocoder\\Provider\\GoogleMapsProvider', $providers);
-        $this->assertContains('Geocoder\\Provider\\FreeGeoIpProvider', $providers);
+        $this->assertCount(2, $providers);
+        $this->assertArrayHasKey('Geocoder\\Provider\\GoogleMapsProvider', $providers);
+        $this->assertArrayHasKey('Geocoder\\Provider\\FreeGeoIpProvider', $providers);
         $this->assertSame('Geocoder\\HttpAdapter\\CurlHttpAdapter', $this->app['config']->get('geocoder-laravel::adapter'));
     }
 
@@ -39,14 +40,15 @@ public function testGeocoderDefaultAdapter()
 
     public function testGeocoderChainProvider()
     {
-        $this->assertInstanceOf('Geocoder\\Provider\\ChainProvider', $this->app['geocoder.provider']);
+        $this->assertInstanceOf('Geocoder\\Provider\\ChainProvider', $this->app['geocoder.chain']);
     }
 
     public function testGeocoderDefaultProvider()
     {
-        $providers = $this->getProtectedProperty($this->app['geocoder.provider'], 'providers');
+        $providers = $this->getProtectedProperty($this->app['geocoder.chain'], 'providers');
 
         $this->assertInstanceOf('Geocoder\\Provider\\GoogleMapsProvider', $providers[0]);
+        $this->assertInstanceOf('Geocoder\\Provider\\FreeGeoIpProvider', $providers[1]);
     }
 
     public function testGeocoder()