bump version and added integration tests, also fixed error in bulkPost method

Author: davidstanley01

.gitignore

@@ -1,2 +1,3 @@
 vendor
-composer.lock
+composer.lock
+apiKey.php

HISTORY.md

@@ -1,6 +1,10 @@
 History
 =======
 
+1.0.6 (2014-01-26)
+------------------
+* Added integration tests and fixed issue where post data was being encoded twice.
+
 1.0.5 (2014-01-23)
 ------------------
 * Specified minimum version of Guzzle at >=3.7.0

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "stanley/geocodio-php",
     "description": "Thin wrapper for the Geocodio API",
-    "version": "1.0.5",
+    "version": "1.0.6",
     "authors": [
         {
             "name": "David Stanley",

phpunit.xml.dist

@@ -15,5 +15,8 @@
         <testsuite name="unit">
             <directory>./tests/unit/</directory>
         </testsuite>
+        <testsuite name="integration">
+            <directory>./tests/integration/</directory>
+        </testsuite>
     </testsuites>
 </phpunit>

src/Stanley/Geocodio/Client.php

@@ -77,7 +77,7 @@ public function get($data, $key = null, $verb = 'geocode')
     public function post($data, $key = null)
     {
         if ($key) $this->apiKey = $key;
-        $request = $this->bulkPost(json_encode($data));
+        $request = $this->bulkPost($data);
         return $this->newDataObject($request->getBody());
     }
 
@@ -103,15 +103,14 @@ public function parse($data, $key = null)
     protected function getRequest($data, $verb)
     {
         $params = [
-            'q' => $data,
+            'q' => str_replace(' ', '+', $data),
             'api_key' => $this->apiKey
         ];
-
+        $address = urlencode(str_replace(' ', '+', $data));
         $request = $this->client->get(self::BASE_URL . $verb, [], [
             'query' => $params
         ]);
-
-        $response = $this->client->send($request);
+        $response = $request->send();
         return $this->checkResponse($response);
     }
 
@@ -125,12 +124,11 @@ protected function getRequest($data, $verb)
     protected function bulkPost($data, $verb = 'geocode')
     {
         $url = self::BASE_URL . $verb . "?api_key=" . $this->apiKey;
-        $headers = [ 'content-type' => 'application\json' ];
+        $headers = [ 'Content-Type' => 'application/json' ];
         $payload = json_encode($data);
 
         $request = $this->client->post($url, $headers, $payload, []);
-        $response = $this->client->send($request);
-
+        $response = $request->send();
         return $this->checkResponse($response);
     }
 

tests/integration/ApiTest.php

@@ -0,0 +1,52 @@
+<?php
+
+class ApiTest extends BaseTest
+{
+    protected $apiKey;
+
+    /**
+     * Class constructor
+     */
+    public function __construct()
+    {
+        // I put my real key in this file within an array.  These tests won't run without it.
+        $key = require __DIR__ .'/../../apiKey.php';
+        $this->apiKey = $key['apiKey'];
+    }
+
+    /**
+     * @test
+     */
+    public function testSingleGoodAddress()
+    {
+        $goodAddress = '42370 Bob Hope Drive, Rancho Mirage, CA 22334';
+        $client = new Stanley\Geocodio\Client($this->apiKey);
+        $result = $client->geocode($goodAddress);
+        $this->assertInstanceOf('Stanley\Geocodio\Data', $result);
+    }
+
+    /**
+     * @test
+     */
+    public function testParseAddress()
+    {
+        $badAddress = '123 Anywhere St Anytown, CA 12345';
+        $client = new Stanley\Geocodio\Client($this->apiKey);
+        $result = $client->parse($badAddress);
+        $this->assertInstanceOf('Stanley\Geocodio\Data', $result);
+    }
+
+    /**
+     * @test
+     */
+    public function testPostMultipleAddresses()
+    {
+        $multipleAddresses = [
+            '42370 Bob Hope Drive, Rancho Mirage CA',
+            '1290 Northbrook Court Mall, Northbrook IL'
+        ];
+        $client = new Stanley\Geocodio\Client($this->apiKey);
+        $result = $client->post($multipleAddresses);
+        $this->assertInstanceOf('Stanley\Geocodio\Data', $result);
+    }
+}