Merge pull request #19 from clue-labs/deps

Update dependencies

Author: clue

composer.json

@@ -17,9 +17,10 @@
         "php": ">=5.3",
         "react/event-loop": "~0.4.0|~0.3.0",
         "react/promise": "~2.1|~1.1",
-        "clue/buzz-react": "~0.4.1",
+        "clue/buzz-react": "^0.5",
         "ext-simplexml": "*",
-        "neitanod/forceutf8": "~1.4"
+        "neitanod/forceutf8": "~1.4",
+        "rize/uri-template": "^0.3"
     },
     "require-dev": {
         "clue/block-react": "~0.3.0"

src/Client.php

@@ -7,23 +7,30 @@
 use SimpleXMLElement;
 use InvalidArgumentException;
 use Clue\React\Buzz\Browser;
-use Clue\React\Buzz\Message\Response;
+use Psr\Http\Message\ResponseInterface;
 use React\Promise;
 use Clue\React\ViewVcApi\Io\Parser;
 use Clue\React\ViewVcApi\Io\Loader;
+use Rize\UriTemplate;
 
 class Client
 {
     private $brower;
+    private $parser;
+    private $loader;
+    private $uri;
 
-    public function __construct(Browser $browser, Parser $parser = null, Loader $loader = null)
+    public function __construct(Browser $browser, Parser $parser = null, Loader $loader = null, UriTemplate $uri = null)
     {
         if ($parser === null) {
             $parser = new Parser();
         }
         if ($loader === null) {
             $loader = new Loader();
         }
+        if ($uri === null) {
+            $uri = new UriTemplate();
+        }
 
         // TODO: do not follow redirects
 //         $browser = $this->browser->withOptions(array(
@@ -33,6 +40,7 @@ public function __construct(Browser $browser, Parser $parser = null, Loader $loa
         $this->browser = $browser;
         $this->parser = $parser;
         $this->loader = $loader;
+        $this->uri = $uri;
     }
 
     public function fetchFile($path, $revision = null)
@@ -47,7 +55,7 @@ public function fetchFile($path, $revision = null)
         // TODO: reject all paths with trailing slashes
 
         return $this->fetch(
-            $this->browser->resolve(
+            $this->uri->expand(
                 '{+path}?view=co{&pathrev}',
                 array(
                     'path' => $path,
@@ -67,7 +75,7 @@ public function fetchDirectory($path, $revision = null, $showAttic = false)
         // TODO: accessing files will redirect to file with relative location URL (not supported by clue/buzz-react)
 
         return $this->fetchXml(
-            $this->browser->resolve(
+            $this->uri->expand(
                 '{+path}{?pathrev,hideattic}',
                 array(
                     'path' => $path,
@@ -86,7 +94,7 @@ public function fetchDirectory($path, $revision = null, $showAttic = false)
     public function fetchPatch($path, $r1, $r2)
     {
         return $this->fetch(
-            $this->browser->resolve(
+            $this->uri->expand(
                 '{+path}?view=patch{&r1,r2}',
                 array(
                     'path' => $path,
@@ -102,7 +110,7 @@ public function fetchLog($path, $revision = null)
         // TODO: invalid revision shows error page, but HTTP 200 OK
 
         return $this->fetchXml(
-            $this->browser->resolve(
+            $this->uri->expand(
                 '{+path}?view=log{&pathrev}',
                 array(
                     'path' => $path,
@@ -131,7 +139,7 @@ public function fetchAllPreviousRevisions($path)
     private function fetchLogXml($path)
     {
         return $this->fetchXml(
-            $this->browser->resolve(
+            $this->uri->expand(
                 '{+path}?view=log',
                 array(
                     'path' => $path
@@ -148,7 +156,7 @@ private function fetchXml($url)
     private function fetch($url)
     {
         return $this->browser->get($url)->then(
-            function (Response $response) {
+            function (ResponseInterface $response) {
                 return (string)$response->getBody();
             },
             function ($error) {

tests/ClientTest.php

@@ -1,11 +1,10 @@
 <?php
 
 use Clue\React\ViewVcApi\Client;
-use Clue\React\Buzz\Message\Response;
-use Clue\React\Buzz\Message\Body;
 use React\Promise;
 use Clue\React\Buzz\Browser;
-use Clue\React\Buzz\Message\Request;
+use Psr\Http\Message\RequestInterface;
+use RingCentral\Psr7\Response;
 
 class ClientTest extends TestCase
 {
@@ -36,7 +35,7 @@ public function testInvalidFile()
 
     public function testFetchFile()
     {
-        $response = new Response('HTTP/1.0', 200, 'OK', array(), new Body('# hello'));
+        $response = new Response(200, array(), '# hello', '1.0', 'OK');
 
         $this->expectRequest($this->uri . 'README.md?view=co')->will($this->returnValue(Promise\resolve($response)));
 
@@ -112,7 +111,7 @@ private function expectRequest($uri)
     {
         $that = $this;
 
-        return $this->sender->expects($this->once())->method('send')->with($this->callback(function (Request $request) use ($that, $uri) {
+        return $this->sender->expects($this->once())->method('send')->with($this->callback(function (RequestInterface $request) use ($that, $uri) {
             $that->assertEquals('GET', $request->getMethod());
             $that->assertEquals($uri, $request->getUri());
 

tests/FunctionalGentooClientTest.php

@@ -4,6 +4,7 @@
 use React\EventLoop\Factory as LoopFactory;
 use Clue\React\Buzz\Browser;
 use Clue\React\Block;
+use Clue\React\Buzz\Message\ResponseException;
 
 class FunctionalGentooClientTest extends TestCase
 {
@@ -22,18 +23,18 @@ public function setUp()
         $browser = new Browser($this->loop);
 
         // check connectivity to given URL only once
-        static $checked = null;
-        if ($checked === null) {
+        static $error = null;
+        if ($error === null) {
             try {
-                Block\await($browser->head($url), $this->loop);
-                $checked = true;
+                Block\await($browser->get($url), $this->loop);
+                $error = false;
             } catch (Exception $e) {
-                $checked = false;
+                $error = $e->getMessage();
             }
         }
 
-        if (!$checked) {
-            $this->markTestSkipped('Unable to reach Gentoo ViewVC');
+        if ($error !== false) {
+            $this->markTestSkipped('Unable to reach Gentoo ViewVC: ' . $error);
         }
 
         $this->viewvc = new Client($browser->withBase($url));