Merge pull request #36 from formapro/maxmind-binary-provide

[WIP][provider] add maxmind binary provider.

Author: willdurand

DependencyInjection/BazingaGeocoderExtension.php

@@ -151,6 +151,24 @@ public function load(array $configs, ContainerBuilder $container)
             $this->addProvider('maxmind', array($maxmindParams['api_key']));
         }
 
+        if (isset($config['providers']['maxmind_binary'])) {
+            $maxmindBinaryParams = $config['providers']['maxmind_binary'];
+            
+            $provider = new Definition(
+                '%bazinga_geocoder.geocoder.provider.maxmind_binary.class%',
+                array(
+                    $config['providers']['maxmind_binary']['binary_file'],
+                    $config['providers']['maxmind_binary']['open_flag'],
+                )
+            );
+
+            $provider
+                ->setPublic(false)
+                ->addTag('bazinga_geocoder.provider');
+
+            $this->container->setDefinition('bazinga_geocoder.provider.maxmind_binary', $provider);
+        }
+
         if (isset($config['providers']['cache'])) {
             $params = $config['providers']['cache'];
             $cache = new Reference($params['adapter']);

DependencyInjection/Configuration.php

@@ -138,6 +138,16 @@ public function getConfigTreeBuilder()
                         ->end()
                     ->end()
                 ->end()
+                ->arrayNode('maxmind_binary')
+                    ->children()
+                        ->scalarNode('binary_file')
+                            ->isRequired()->cannotBeEmpty()
+                        ->end()
+                        ->scalarNode('open_flag')
+                            ->defaultValue(null)
+                        ->end()
+                    ->end()
+                ->end()
                 ->arrayNode('chain')
                     ->fixXmlConfig('provider')
                     ->children()

Resources/config/services.xml

@@ -25,6 +25,7 @@
         <parameter key="bazinga_geocoder.geocoder.provider.geo_ips.class">Geocoder\Provider\GeoIPsProvider</parameter>
         <parameter key="bazinga_geocoder.geocoder.provider.geo_plugin.class">Geocoder\Provider\GeoPluginProvider</parameter>
         <parameter key="bazinga_geocoder.geocoder.provider.maxmind.class">Geocoder\Provider\MaxMindProvider</parameter>
+        <parameter key="bazinga_geocoder.geocoder.provider.maxmind_binary.class">Geocoder\Provider\MaxMindBinaryProvider</parameter>
         <parameter key="bazinga_geocoder.geocoder.provider.cache.class">Bazinga\Bundle\GeocoderBundle\Provider\CacheProvider</parameter>
         <parameter key="bazinga_geocoder.geocoder.provider.chain.class">Geocoder\Provider\ChainProvider</parameter>
 

Tests/DependencyInjection/Fixtures/config.yml

@@ -41,5 +41,7 @@ bazinga_geocoder:
         geo_plugin: ~
         maxmind:
             api_key: 123
+        maxmind_binary:
+            binary_file: /path/to/maxmind.dat
         chain:
             providers: [free_geo_ip, host_ip]