Merge pull request #6 from clue-labs/deps

Update dependencies in order to properly escape URIs

Author: clue

composer.json

@@ -13,7 +13,8 @@
     "require": {
         "php": ">=5.3",
         "knplabs/packagist-api": "~1.0",
-        "clue/buzz-react": "~0.1.0|~0.2.0"
+        "clue/buzz-react": "^0.5",
+        "rize/uri-template": "^0.3"
     },
     "autoload": {
         "psr-4": { "Clue\\React\\Packagist\\Api\\": "src/" }

src/Client.php

@@ -4,33 +4,47 @@
 
 use Packagist\Api\Result\Factory;
 use Clue\React\Buzz\Browser;
-use Clue\React\Buzz\Message\Response;
+use Psr\Http\Message\ResponseInterface;
+use Rize\UriTemplate;
 
 class Client
 {
     private $http;
     private $resultFactory;
+    private $uri;
 
-    public function __construct(Browser $http, Factory $resultFactory = null)
+    public function __construct(Browser $http, Factory $resultFactory = null, UriTemplate $uri = null)
     {
-        $this->http = $http;
+        $this->http = $http->withBase('https://packagist.org/');
 
         if (null === $resultFactory) {
             $resultFactory = new Factory();
         }
 
+        if (null === $uri) {
+            $uri = new UriTemplate();
+        }
+
         $this->resultFactory = $resultFactory;
+        $this->uri = $uri;
     }
 
     public function search($query, array $filters = array())
     {
-        $results = array();
         $filters['q'] = $query;
-        $url = $this->url('/search.json?' . http_build_query($filters));
+
+        $url = $this->uri->expand(
+            '/search.json{?filters*}',
+            array(
+                'filters' => $filters
+            )
+        );
+
+        $results = array();
         $that = $this;
 
         $fetch = function ($url) use (&$results, $that, &$fetch) {
-            return $that->request($url)->then(function (Response $response) use (&$results, $that, $fetch) {
+            return $that->request($url)->then(function (ResponseInterface $response) use (&$results, $that, $fetch) {
                 $parsed = $that->parse((string)$response->getBody());
                 $results = array_merge($results, $that->create($parsed));
 
@@ -47,30 +61,34 @@ public function search($query, array $filters = array())
 
     public function get($package)
     {
-        return $this->respond(sprintf($this->url('/packages/%s.json'), $package));
+        return $this->respond(
+            $this->uri->expand(
+                '/packages/{package}.json',
+                array(
+                    'package' => $package
+                )
+            )
+        );
     }
 
     public function all(array $filters = array())
     {
-        $url = '/packages/list.json';
-        if ($filters) {
-            $url .= '?'.http_build_query($filters);
-        }
-
-        return $this->respond($this->url($url));
-    }
-
-    protected function url($url)
-    {
-        return 'https://packagist.org'.$url;
+        return $this->respond(
+            $this->uri->expand(
+                '/packages/list.json{?filters*}',
+                array(
+                    'filters' => $filters
+                )
+            )
+        );
     }
 
     protected function respond($url)
     {
         $response = $this->request($url);
         $that     = $this;
 
-        return $response->then(function (Response $response) use ($that) {
+        return $response->then(function (ResponseInterface $response) use ($that) {
             return $that->create($that->parse((string)$response->getBody()));
         });
     }

tests/ClientTest.php

@@ -2,9 +2,8 @@
 
 use Clue\React\Packagist\Api\Client;
 use React\Promise\Deferred;
-use Clue\React\Buzz\Message\Response;
-use Clue\React\Buzz\Message\Headers;
-use Clue\React\Buzz\Message\Body;
+use RingCentral\Psr7\Response;
+use React\Promise;
 
 class ClientTest extends TestCase
 {
@@ -14,38 +13,46 @@ class ClientTest extends TestCase
     public function setUp()
     {
         $this->browser = $this->getMockBuilder('Clue\React\Buzz\Browser')->disableOriginalConstructor()->getMock();
+        $this->browser->expects($this->any())->method('withBase')->willReturn($this->browser);
 
         $this->client = new Client($this->browser);
     }
 
     public function testGet()
     {
-        $this->setupBrowser('packages/clue/zenity-react.json', $this->createResponsePromise('{"package":{"name":"clue\/zenity-react", "versions": {}}}'));
+        $this->setupBrowser('/packages/clue%2Fzenity-react.json', $this->createResponsePromise('{"package":{"name":"clue\/zenity-react", "versions": {}}}'));
 
         $this->expectPromiseResolve($this->client->get('clue/zenity-react'));
     }
 
     public function testAll()
     {
-        $this->setupBrowser('packages/list.json', $this->createResponsePromise('{"packageNames":["a/a", "b/b"]}'));
+        $this->setupBrowser('/packages/list.json', $this->createResponsePromise('{"packageNames":["a/a", "b/b"]}'));
 
         $this->expectPromiseResolve($this->client->all());
     }
 
     public function testAllVendor()
     {
-        $this->setupBrowser('packages/list.json?vendor=a', $this->createResponsePromise('{"packageNames":["a/a"]}'));
+        $this->setupBrowser('/packages/list.json?vendor=a', $this->createResponsePromise('{"packageNames":["a/a"]}'));
 
         $this->expectPromiseResolve($this->client->all(array('vendor' => 'a')));
     }
 
     public function testSearch()
     {
-        $this->setupBrowser('search.json?q=zenity', $this->createResponsePromise('{"results":[{"name":"clue\/zenity-react","description":"Build graphical desktop (GUI) applications in PHP","url":"https:\/\/packagist.org\/packages\/clue\/zenity-react","downloads":57,"favers":0,"repository":"https:\/\/github.com\/clue\/reactphp-zenity"}],"total":1}'));
+        $this->setupBrowser('/search.json?q=zenity', $this->createResponsePromise('{"results":[{"name":"clue\/zenity-react","description":"Build graphical desktop (GUI) applications in PHP","url":"https:\/\/packagist.org\/packages\/clue\/zenity-react","downloads":57,"favers":0,"repository":"https:\/\/github.com\/clue\/reactphp-zenity"}],"total":1}'));
 
         $this->expectPromiseResolve($this->client->search('zenity'));
     }
 
+    public function testSearchSpecialWithNoResults()
+    {
+        $this->setupBrowser('/search.json?q=%3C%C3%A4%3E', $this->createResponsePromise('{"results":[],"total":0}'));
+
+        $this->expectPromiseResolve($this->client->search('<ä>'));
+    }
+
     public function testSearchPagination()
     {
         $this->browser->expects($this->exactly(2))
@@ -60,7 +67,7 @@ public function testSearchPagination()
 
     public function testHttpError()
     {
-        $this->setupBrowser('packages/clue/invalid.json', $this->createRejectedPromise(new RuntimeException('error')));
+        $this->setupBrowser('/packages/clue%2Finvalid.json', $this->createRejectedPromise(new RuntimeException('error')));
 
         $this->expectPromiseReject($this->client->get('clue/invalid'));
     }
@@ -69,15 +76,16 @@ private function setupBrowser($expectedUrl, $promise)
     {
         $this->browser->expects($this->once())
              ->method('get')
-             ->with($this->equalTo('https://packagist.org/' . $expectedUrl), array())
+             ->with($this->equalTo($expectedUrl), array())
              ->will($this->returnValue($promise));
     }
 
     private function createResponsePromise($fakeResponseBody)
     {
-        $d = new Deferred();
-        $d->resolve(new Response('HTTP/1.0', 200, 'OK', new Headers(), new Body($fakeResponseBody)));
-        return $d->promise();
+        $response = $this->getMock('Psr\Http\Message\ResponseInterface');
+        $response->expects($this->once())->method('getBody')->willReturn($fakeResponseBody);
+
+        return Promise\resolve($response);
     }
 
     private function createRejectedPromise($reason)