Change access of GeoIP2 database-reader, due to problems with JSON-encoded geodata.

Author: Jens Wiese

README.md

@@ -270,6 +270,14 @@ It requires the [database file](http://dev.maxmind.com/geoip/geoip2/geolite2/),
 
 This provider will only work with the corresponding `GeoIP2DatabaseAdapter`.
 
+**Usage:**
+
+    $adapter = new \Geocoder\HttpAdapter\GeoIP2DatabaseAdapter('/path/to/database');
+    $provider = new \Geocoder\Provider\GeoIP2DatabaseProvider($adapter);
+    $geocoder = new \Geocoder\Geocoder($provider);
+
+    $result = $geocoder->geocode('74.200.247.59');
+
 ### GeonamesProvider ###
 
 The `GeonamesProvider` named `geonames` is able to geocode and reverse geocode **places**.

src/Geocoder/HttpAdapter/GeoIP2DatabaseAdapter.php

@@ -131,7 +131,7 @@ public function getContent($url)
 
         switch ($this->dbType) {
             case self::GEOIP2_CITY:
-                $result = $this->getDbReader()->city($ipAddress);
+                $result = $this->getDbReader()->city($ipAddress)->jsonSerialize();
                 break;
             default:
                 throw new UnsupportedException(
@@ -165,4 +165,4 @@ protected function getDbReader()
 
         return $this->dbReader;
     }
-}
+}

tests/Geocoder/Tests/HttpAdapter/GeoIP2DatabaseAdapterTest.php

@@ -14,7 +14,6 @@
 use Geocoder\Tests\TestCase;
 use Geocoder\Exception\RuntimeException;
 use GeoIp2\Database\Reader;
-use GeoIp2\Model\City;
 use org\bovigo\vfs\vfsStream;
 use org\bovigo\vfs\vfsStreamFile;
 
@@ -94,12 +93,15 @@ public function testAddressPassedToReaderMustBeIpAddress()
 
     public function testIpAddressIsPassedCorrectToReader()
     {
-        $url = 'file://database?127.0.0.1 ';
         $dbReader = $this->getDbReaderMock();
-        $dbReader->expects($this->once())->method('city')->with('127.0.0.1');
+        $dbReader
+            ->expects($this->once())
+            ->method('city')->with('127.0.0.1')
+            ->will($this->returnValue($this->getCityModelMock()));
+
         $this->adapter->setDbReader($dbReader);
 
-        $this->adapter->getContent($url);
+        $this->adapter->getContent('file://database?127.0.0.1');
     }
 
     public function testSettingLocaleIsCorrect()
@@ -125,10 +127,14 @@ public function testUsingNonExistantDatabaseTypesLeadsToException()
 
     public function testReaderResponseIsJsonEncoded()
     {
-        $city = new City(array('city' => 'Hamburg'));
+        $cityModel = $this->getCityModelMock();
 
         $dbReader = $this->getDbReaderMock();
-        $dbReader->expects($this->once())->method('city')->will($this->returnValue($city));
+        $dbReader
+            ->expects($this->any())
+            ->method('city')
+            ->will($this->returnValue($cityModel));
+
         $this->adapter->setDbReader($dbReader);
 
         $result = $this->adapter->getContent('file://database?127.0.0.1');
@@ -148,6 +154,36 @@ protected function getDbReaderMock()
         return $mock;
     }
 
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected function getCityModelMock()
+    {
+        $mock = $this->getMockBuilder('\GeoIp2\Model\City')->disableOriginalConstructor()->getMock();
+        $mock
+            ->expects($this->any())
+            ->method('jsonSerialize')
+            ->will($this->returnValue(
+                array(
+                    'city' => array(
+                        'geoname_id' => 2911298,
+                        'names' => array(
+                              'de' => 'Hamburg',
+                              'en' => 'Hamburg',
+                              'es' => 'Hamburgo',
+                              'fr' => 'Hambourg',
+                              'ja' => 'ハンブルク',
+                              'pt-BR' => 'Hamburgo',
+                              'ru' => 'Гамбург',
+                              'zh-CN' => '汉堡市',
+                        )
+                    )
+                )
+            ));
+
+        return $mock;
+    }
+
     /**
      * Returns virtual db-file
      *