Depend on rize/uri-template to expand all URIs

Author: clue

composer.json

@@ -19,7 +19,8 @@
         "react/promise": "~2.1|~1.1",
         "clue/buzz-react": "~0.4.1",
         "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

@@ -11,19 +11,26 @@
 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