Merge pull request #1 from clue-labs/uri

Simplify constructing URIs

Author: clue

composer.json

@@ -15,6 +15,6 @@
     },
     "require": {
         "php": ">=5.3",
-        "clue/buzz-react": "0.1.*"
+        "clue/buzz-react": "~0.4.1"
     }
 }

src/Client.php

@@ -7,17 +7,15 @@
 
 class Client
 {
-    private $url;
+    private $browser;
     private $key;
     private $hash;
-    private $browser;
 
-    public function __construct($url, $key, $hash, Browser $browser)
+    public function __construct(Browser $browser, $key, $hash)
     {
-        $this->url = $url;
+        $this->browser = $browser;
         $this->key = $key;
         $this->hash = $hash;
-        $this->browser = $browser;
     }
 
     public function reboot()
@@ -88,13 +86,17 @@ public function info($ipaddr = true, $hdd = true, $mem = true, $bw = true)
 
     private function request($action, array $args = array())
     {
-        $url = $this->url . '?' . http_build_query(array(
-            'key' => $this->key,
-            'hash' => $this->hash,
-            'action' => $action
-        ) + $args);
-
-        return $this->browser->get($url)->then(
+        return $this->browser->get(
+            $this->browser->resolve(
+                '{?key,hash,action,args*}',
+                array(
+                    'action' => $action,
+                    'args' => $args,
+                    'key' => $this->key,
+                    'hash' => $this->hash
+                )
+            )
+        )->then(
             function (Response $response) {
                 preg_match_all('/<(.*?)>([^<]+)<\/\\1>/i', (string)$response->getBody(), $match);
                 $result = array();

src/Factory.php

@@ -41,7 +41,7 @@ public function createClient($address)
             }
         }
 
-        if (!isset($parts['user'], $parts['user'])) {
+        if (!isset($parts['user'], $parts['pass'])) {
             throw new \InvalidArgumentException('Given API URL must include user (API hash) and pass (API key)');
         }
 
@@ -67,6 +67,6 @@ public function createClient($address)
         }
         $str .= $parts['path'];
 
-        return new Client($str, $parts['pass'], $parts['user'], $this->browser);
+        return new Client($this->browser->withBase($str), $parts['pass'], $parts['user']);
     }
 }

tests/ClientTest.php

@@ -13,9 +13,10 @@ class ClientTest extends TestCase
 
     public function setUp()
     {
-        $this->browser = $this->getMockBuilder('Clue\React\Buzz\Browser')->disableOriginalConstructor()->getMock();
+        $this->browser = $this->getMockBuilder('Clue\React\Buzz\Browser')->setConstructorArgs(array($this->getMock('React\EventLoop\LoopInterface')))->setMethods(array('get'))->getMock();
+        $this->browser = $this->browser->withBase('http://a/path');
 
-        $this->client = new Client('url', 'mykey', 'myhash', $this->browser);
+        $this->client = new Client($this->browser, 'mykey', 'myhash');
     }
 
     public function testReboot()
@@ -109,7 +110,7 @@ public function testHttpError()
 
         $this->browser->expects($this->once())
             ->method('get')
-            ->with($this->equalTo('url?key=mykey&hash=myhash&action=status'), array())
+            ->with($this->equalTo('http://a/path?key=mykey&hash=myhash&action=status'), array())
             ->will($this->returnValue($d->promise()));
 
         $this->expectPromiseReject($this->client->status());
@@ -122,7 +123,7 @@ private function setupBrowser($expectedUrl, $fakeResponseBody)
 
         $this->browser->expects($this->once())
             ->method('get')
-            ->with($this->equalTo('url?key=mykey&hash=myhash&' . $expectedUrl), array())
+            ->with($this->equalTo('http://a/path?key=mykey&hash=myhash&' . $expectedUrl), array())
             ->will($this->returnValue($d->promise()));
     }