feat(Config): configure http client through dsn string for eased env …

…var usage (#109)
worldia · Mar 16, 2018 · 6492edc · 6492edc
1 parent bd248b8
commit 6492edc
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 35 deletions.
diff --git a/composer.json b/composer.json
@@ -33,7 +33,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.7.x-dev"
+            "dev-master": "1.0.x-dev"
         }
     }
 }
diff --git a/lib/Textmaster/HttpClient/HttpClient.php b/lib/Textmaster/HttpClient/HttpClient.php
@@ -38,8 +38,9 @@ class HttpClient implements HttpClientInterface
      * @var array
      */
     protected $options = [
-        'base_uri' => 'http://api.textmaster.com/%s',
-        'api_version' => 'v1',
+        'key' => null,
+        'secret' => null,
+        'base_uri' => 'http://api.textmaster.com/v1',
         'user_agent' => 'textmaster-api (http://github.com/worldia/textmaster-api)',
     ];
 
@@ -56,29 +57,28 @@ class HttpClient implements HttpClientInterface
     /**
      * HttpClient constructor.
      *
-     * @param string $key
-     * @param string $secret
-     * @param array  $options
+     * @param string $dsn
      */
-    public function __construct($key, $secret, array $options = [])
+    public function __construct($dsn)
     {
-        $options = array_merge($this->options, $options);
+        $this->parseDsn($dsn);
+
+        $options = $this->options;
 
         $stack = new HandlerStack();
         $stack->setHandler(new CurlHandler());
-        $stack->push(Middleware::mapRequest(function (RequestInterface $request) use ($key, $secret, $options) {
+        $stack->push(Middleware::mapRequest(function (RequestInterface $request) use ($options) {
             $date = new \DateTime('now', new \DateTimeZone('UTC'));
 
             return $request
                 ->withHeader('User-Agent', $options['user_agent'])
-                ->withHeader('Apikey', $key)
+                ->withHeader('Apikey', $options['key'])
                 ->withHeader('Date', $date->format('Y-m-d H:i:s'))
-                ->withHeader('Signature', sha1($secret.$date->format('Y-m-d H:i:s')))
+                ->withHeader('Signature', sha1($options['secret'].$date->format('Y-m-d H:i:s')))
             ;
         }));
 
-        $this->options = array_merge($this->options, $options, ['handler' => $stack]);
-        $this->options['base_uri'] = sprintf($this->options['base_uri'], $this->options['api_version']);
+        $this->options = array_merge($options, ['handler' => $stack]);
 
         $this->client = new Client($this->options);
     }
@@ -193,4 +193,22 @@ protected function getFinalPath($path)
     {
         return $this->client->getConfig('base_uri')->getPath().'/'.$path;
     }
+
+    /**
+     * @param string $dsn
+     */
+    private function parseDsn($dsn)
+    {
+        $scheme = parse_url($dsn, PHP_URL_SCHEME);
+        $host = parse_url($dsn, PHP_URL_HOST);
+        $path = parse_url($dsn, PHP_URL_PATH);
+
+        parse_str(parse_url($dsn, PHP_URL_QUERY), $options);
+
+        $this->options = array_merge($this->options, $options);
+
+        $this->options['base_uri'] = sprintf('%s://%s%s', $scheme, $host, $path);
+        $this->options['key'] = urldecode(parse_url($dsn, PHP_URL_USER));
+        $this->options['secret'] = urldecode(parse_url($dsn, PHP_URL_PASS));
+    }
 }
diff --git a/test/Textmaster/Functional/Api/AuthorTest.php b/test/Textmaster/Functional/Api/AuthorTest.php
@@ -36,11 +36,7 @@ public function setUp()
     {
         parent::setUp();
 
-        $httpClient = new HttpClient(
-            'GFHunwb2DHw',
-            'gqvE7aZS_JM',
-            ['base_uri' => 'http://api.sandbox.textmaster.com/%s']
-        );
+        $httpClient = new HttpClient('http://GFHunwb2DHw:[email protected]/v1');
         $client = new Client($httpClient);
         $this->api = $client->author();
     }

diff --git a/test/Textmaster/Functional/Api/ProjectTest.php b/test/Textmaster/Functional/Api/ProjectTest.php
@@ -53,11 +53,7 @@ public function setUp()
     {
         parent::setUp();
 
-        $httpClient = new HttpClient(
-            'GFHunwb2DHw',
-            'gqvE7aZS_JM',
-            ['base_uri' => 'http://api.sandbox.textmaster.com/%s']
-        );
+        $httpClient = new HttpClient('http://GFHunwb2DHw:[email protected]/v1');
         $client = new Client($httpClient);
         $this->api = $client->project();
     }
@@ -69,11 +65,7 @@ public static function tearDownAfterClass()
     {
         sleep(self::WAIT_TIME);
 
-        $httpClient = new HttpClient(
-            'GFHunwb2DHw',
-            'gqvE7aZS_JM',
-            ['base_uri' => 'http://api.sandbox.textmaster.com/%s']
-        );
+        $httpClient = new HttpClient('http://GFHunwb2DHw:[email protected]/v1');
         $client = new Client($httpClient);
         $api = $client->project();
 

diff --git a/test/Textmaster/Functional/ManagerTest.php b/test/Textmaster/Functional/ManagerTest.php
@@ -29,7 +29,7 @@ public function setUp()
     {
         parent::setUp();
 
-        $httpClient = new HttpClient('GFHunwb2DHw', 'gqvE7aZS_JM', ['base_uri' => 'http://api.sandbox.textmaster.com/%s']);
+        $httpClient = new HttpClient('http://GFHunwb2DHw:gqvE7aZS_JM@api.sandbox.textmaster.com/v1');
         $this->client = new Client($httpClient);
     }
 

diff --git a/test/Textmaster/Unit/HttpClient/HttpClientTest.php b/test/Textmaster/Unit/HttpClient/HttpClientTest.php
@@ -24,7 +24,7 @@ public function shouldDoGETRequest()
         $parameters = ['a' => 'b'];
         $headers = ['c' => 'd'];
 
-        $httpClient = new HttpClient('key', 'secret', []);
+        $httpClient = new HttpClient('http://key:secret@api.sandbox.textmaster.com/v1');
         $response = $httpClient->get($path, $parameters, $headers);
 
         $this->assertTrue(in_array('Psr\Http\Message\ResponseInterface', class_implements($response), true));
@@ -39,7 +39,7 @@ public function shouldDoPOSTRequest()
         $body = ['a' => 'b'];
         $headers = ['c' => 'd'];
 
-        $httpClient = new HttpClient('key', 'secret', []);
+        $httpClient = new HttpClient('http://key:secret@api.sandbox.textmaster.com/v1');
         $response = $httpClient->post($path, $body, $headers);
 
         $this->assertTrue(in_array('Psr\Http\Message\ResponseInterface', class_implements($response), true));
@@ -52,7 +52,7 @@ public function shouldDoPOSTRequestWithoutContent()
     {
         $path = '/some/path';
 
-        $httpClient = new HttpClient('key', 'secret', []);
+        $httpClient = new HttpClient('http://key:secret@api.sandbox.textmaster.com/v1');
         $response = $httpClient->post($path);
 
         $this->assertTrue(in_array('Psr\Http\Message\ResponseInterface', class_implements($response), true));
@@ -67,7 +67,7 @@ public function shouldDoPATCHRequest()
         $body = ['a' => 'b'];
         $headers = ['c' => 'd'];
 
-        $httpClient = new HttpClient('key', 'secret', []);
+        $httpClient = new HttpClient('http://key:secret@api.sandbox.textmaster.com/v1');
         $response = $httpClient->patch($path, $body, $headers);
 
         $this->assertTrue(in_array('Psr\Http\Message\ResponseInterface', class_implements($response), true));
@@ -82,7 +82,7 @@ public function shouldDoDELETERequest()
         $body = ['a' => 'b'];
         $headers = ['c' => 'd'];
 
-        $httpClient = new HttpClient('key', 'secret', []);
+        $httpClient = new HttpClient('http://key:secret@api.sandbox.textmaster.com/v1');
         $response = $httpClient->delete($path, $body, $headers);
 
         $this->assertTrue(in_array('Psr\Http\Message\ResponseInterface', class_implements($response), true));
@@ -96,7 +96,7 @@ public function shouldDoPUTRequest()
         $path = '/some/path';
         $headers = ['c' => 'd'];
 
-        $httpClient = new HttpClient('key', 'secret', []);
+        $httpClient = new HttpClient('http://key:secret@api.sandbox.textmaster.com/v1');
         $response = $httpClient->put($path, $headers);
 
         $this->assertTrue(in_array('Psr\Http\Message\ResponseInterface', class_implements($response), true));