updating View

- SfpStreamView is now has-a - TemplatePathReolver moved into View
sasezaki · Oct 30, 2015 · 0a755a0 · 0a755a0
1 parent 86e97ac
commit 0a755a0
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 28 deletions.
diff --git a/src/Backbeard/Dispatcher.php b/src/Backbeard/Dispatcher.php
@@ -24,11 +24,6 @@ class Dispatcher
      */
     private $router;
 
-    /**
-     * @var TemplatePathResolverInterface
-     */
-    private $templatePathResolver;
-
     public function __construct(Generator $routing, ViewInterface $view, RouterInterface $router)
     {
         $this->routing = $routing;
@@ -94,18 +89,6 @@ public function dispatch(Request $request, Response $response)
         return new DispatchResult(false);
     }
 
-    /**
-     * @return \Backbeard\TemplatePathResolverInterface
-     */
-    public function getTemplatePathResolver()
-    {
-        if (!$this->templatePathResolver) {
-            $this->templatePathResolver = new TemplatePathResolver();
-        }
-
-        return $this->templatePathResolver;
-    }
-
     /**
      * @return bool
      * @throws InvalidArgumentException
@@ -158,12 +141,9 @@ protected function handleActionResult(RouteMatch $routeMatch, $actionResult, Res
     {
         if (is_string($actionResult)) {
             $response->getBody()->write($actionResult);
-
             return $response;
         } elseif (is_array($actionResult)) {
-            $template = $this->getTemplatePathResolver()->resolve($routeMatch);
-
-            $model = new ViewModel($actionResult, $template);
+            $model = $this->view->factoryModel($actionResult, $routeMatch);
             return $this->view->marshalResponse($model, $response);
         } elseif ($actionResult instanceof Response) {
             return $actionResult;

diff --git a/src/Backbeard/View.php b/src/Backbeard/View.php
@@ -2,18 +2,48 @@
 
 namespace Backbeard;
 
-use SfpStreamView\View as BaseView;
+use SfpStreamView\View as StreamView;
 use Psr\Http\Message\ResponseInterface;
 
-class View extends BaseView implements ViewInterface
+class View implements ViewInterface
 {
+
+    /**
+     * @var TemplatePathResolverInterface
+     */
+    private $templatePathResolver;
+
+    public function __construct(StreamView $streamView)
+    {
+        $this->streamView = $streamView;
+    }
+
+    /**
+     * @return \Backbeard\TemplatePathResolverInterface
+     */
+    public function getTemplatePathResolver()
+    {
+        if (!$this->templatePathResolver) {
+            $this->templatePathResolver = new TemplatePathResolver();
+        }
+        return $this->templatePathResolver;
+    }
+
+    public function factoryModel($vars, RouteMatch $routeMatch)
+    {
+        $template = $this->getTemplatePathResolver()->resolve($routeMatch);
+        return new ViewModel($vars, $template);
+    }
+
     public function marshalResponse(ViewModelInterface $model, ResponseInterface $response)
     {
         $template = $model->getTemplate();
         $vars = $model->getVariables();
-
-        $this->assign($vars);
-        $this->renderResponse($template, $response);
+
+        $streamView = clone $this->streamView;
+
+        $streamView->assign($vars);
+        $streamView->renderResponse($template, $response);
 
         return $response;
     }

diff --git a/src/Backbeard/ViewInterface.php b/src/Backbeard/ViewInterface.php
@@ -5,6 +5,9 @@
 
 interface ViewInterface
 {
+
+    public function factoryModel($vars, RouteMatch $routeMatch);
+
     /**
      * @param ViewModelInterface $model
      * @param ResponseInterface $response

diff --git a/tests/DispatcherTest.php b/tests/DispatcherTest.php
@@ -7,12 +7,13 @@
 use Backbeard\ValidationError;
 use Backbeard\View;
 use Backbeard\Router;
+use Backbeard\RouteMatch;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Zend\Diactoros\ServerRequestFactory;
 use Zend\Diactoros\Response;
 use Zend\Diactoros\Uri;
-use Backbeard\RouteMatch;
+use SfpStreamView\View as StreamView;
 
 class DispatcherTest extends \PHPUnit_Framework_TestCase
 {
@@ -21,7 +22,7 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->view = new View(__DIR__.'/_files/views');
+        $this->view = new View(new StreamView(__DIR__.'/_files/views'));
         $this->router = new Router(new \FastRoute\RouteParser\Std());
     }