Update OAuth1 keys to correct defect

Author: stevenmaguire

CHANGELOG.md

@@ -1,6 +1,23 @@
 # Changelog
 All Notable changes to `yelp-php` will be documented in this file
 
+## 1.4.2 - 2015-11-23
+
+### Added
+- Nothing
+
+### Deprecated
+- Nothing
+
+### Fixed
+- OAuth1 subscriber configuration issue. (https://github.com/stevenmaguire/yelp-php/issues/9)
+
+### Removed
+- Nothing
+
+### Security
+- Nothing
+
 ## 1.4.1 - 2015-11-17
 
 ### Added

README.md

@@ -23,11 +23,11 @@ $ composer require stevenmaguire/yelp-php
 
 ```php
     $client = new Stevenmaguire\Yelp\Client(array(
-        'consumer_key' => 'YOUR COSUMER KEY',
-        'consumer_secret' => 'YOUR CONSUMER SECRET',
+        'consumerKey' => 'YOUR COSUMER KEY',
+        'consumerSecret' => 'YOUR CONSUMER SECRET',
         'token' => 'YOUR TOKEN',
-        'token_secret' => 'YOUR TOKEN SECRET',
-        'api_host' => 'api.yelp.com' // Optional, default 'api.yelp.com'
+        'tokenSecret' => 'YOUR TOKEN SECRET',
+        'apiHost' => 'api.yelp.com' // Optional, default 'api.yelp.com'
     ));
 ```
 

src/Client.php

@@ -98,14 +98,8 @@ class Client
      */
     public function __construct($configuration = [])
     {
-        $this->parseConfiguration($configuration);
-
-        $this->consumerKey = $configuration['consumerKey'];
-        $this->consumerSecret = $configuration['consumerSecret'];
-        $this->token = $configuration['token'];
-        $this->tokenSecret = $configuration['tokenSecret'];
-        $this->apiHost = $configuration['apiHost'];
-        $this->createHttpClient();
+        $this->parseConfiguration($configuration)
+            ->createHttpClient();
     }
 
     /**
@@ -150,10 +144,10 @@ protected function createHttpClient()
         $stack = HandlerStack::create();
 
         $middleware = new Oauth1([
-            'consumerKey'    => $this->consumerKey,
-            'consumerSecret' => $this->consumerSecret,
+            'consumer_key'    => $this->consumerKey,
+            'consumer_secret' => $this->consumerSecret,
             'token'           => $this->token,
-            'tokenSecret'    => $this->tokenSecret
+            'token_secret'    => $this->tokenSecret
         ]);
 
         $stack->push($middleware);
@@ -179,14 +173,31 @@ public function getBusiness($businessId)
         return $this->request($businessPath);
     }
 
+    /**
+     * Maps legacy configuration keys to updated keys.
+     *
+     * @param  array   $configuration
+     *
+     * @return array
+     */
+    protected function mapConfiguration(array $configuration)
+    {
+        array_walk($configuration, function ($value, $key) use (&$configuration) {
+            $newKey = lcfirst(str_replace(' ', '', ucwords(str_replace('_', ' ', $key))));
+            $configuration[$newKey] = $value;
+        });
+
+        return $configuration;
+    }
+
     /**
      * Parse configuration using defaults
      *
      * @param  array $configuration
      *
-     * @return array $configuration
+     * @return client
      */
-    protected function parseConfiguration(&$configuration = [])
+    protected function parseConfiguration($configuration = [])
     {
         $defaults = array(
             'consumerKey' => null,
@@ -196,7 +207,11 @@ protected function parseConfiguration(&$configuration = [])
             'apiHost' => 'api.yelp.com'
         );
 
-        $configuration = array_merge($defaults, $configuration);
+        $configuration = array_merge($defaults, $this->mapConfiguration($configuration));
+
+        array_walk($configuration, [$this, 'setConfig']);
+
+        return $this;
     }
 
     /**
@@ -253,6 +268,23 @@ public function searchByPhone($attributes = [])
         return $this->request($searchPath);
     }
 
+    /**
+     * Attempts to set a given value.
+     *
+     * @param mixed   $value
+     * @param string  $key
+     *
+     * @return Client
+     */
+    protected function setConfig($value, $key)
+    {
+        if (property_exists($this, $key)) {
+            $this->$key = $value;
+        }
+
+        return $this;
+    }
+
     /**
      * Set default location
      *
@@ -307,4 +339,20 @@ public function setSearchLimit($limit)
         }
         return $this;
     }
+
+    /**
+     * Retrives the value of a given property from the client.
+     *
+     * @param  string  $property
+     *
+     * @return mixed|null
+     */
+    public function __get($property)
+    {
+        if (property_exists($this, $property)) {
+            return $this->$property;
+        }
+
+        return null;
+    }
 }

tests/YelpTest.php

@@ -15,11 +15,11 @@ class YelpTest extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
         $this->client = new Yelp([
-            'consumer_key' =>       getenv('YELP_CONSUMER_KEY'),
-            'consumer_secret' =>    getenv('YELP_CONSUMER_SECRET'),
+            'consumerKey' =>       getenv('YELP_CONSUMER_KEY'),
+            'consumerSecret' =>    getenv('YELP_CONSUMER_SECRET'),
             'token' =>              getenv('YELP_ACCESS_TOKEN'),
-            'token_secret' =>       getenv('YELP_ACCESS_TOKEN_SECRET'),
-            'api_host' =>           'api.yelp.com'
+            'tokenSecret' =>       getenv('YELP_ACCESS_TOKEN_SECRET'),
+            'apiHost' =>           'api.yelp.com'
         ]);
     }
 
@@ -50,6 +50,26 @@ protected function getHttpClient($path, $status = 200, $payload = null)
         return $client;
     }
 
+    public function testConfigurationMapper()
+    {
+        $config = [
+            'consumer_key' =>       uniqid(),
+            'consumer_secret' =>    uniqid(),
+            'token' =>              uniqid(),
+            'token_secret' =>       uniqid(),
+            'api_host' =>           uniqid()
+        ];
+
+        $client = new Yelp($config);
+
+        $this->assertEquals($config['consumer_key'], $client->consumerKey);
+        $this->assertEquals($config['consumer_secret'], $client->consumerSecret);
+        $this->assertEquals($config['token'], $client->token);
+        $this->assertEquals($config['token_secret'], $client->tokenSecret);
+        $this->assertEquals($config['api_host'], $client->apiHost);
+        $this->assertNull($client->{uniqid()});
+    }
+
     /**
      * @expectedException Stevenmaguire\Yelp\Exception
      */