Began refactoring ViewFile for #320

tapestry-cloud · Aug 18, 2018 · 2924d1d · 2924d1d
1 parent cccefdf
commit 2924d1d
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 30 deletions.
diff --git a/src/Entities/ViewFile.php b/src/Entities/ViewFile.php
@@ -1,7 +1,8 @@
 <?php
 
 namespace Tapestry\Entities;
-use Tapestry\Modules\Source\AbstractSource;
+
+use Tapestry\Modules\Source\SourceInterface;
 
 /**
  * Class ViewFile.
@@ -15,43 +16,25 @@ class ViewFile
     use ViewFileTrait;
 
     /**
-     * @var Project
-     * @deprecated
-     */
-    private $project;
-
-    /**
-     * @var string
+     * @var SourceInterface
      */
-    private $fileUid;
-
-    /**
-     * @var AbstractSource
-     */
-    private $file;
+    private $source;
 
     /**
      * ViewFile constructor.
      *
-     * @todo remove dependence on Project and only pass in AbstractSource
-     * @param Project $project
-     * @param $fileUid
+     * @param SourceInterface $source
      */
-    public function __construct(Project $project, $fileUid)
+    public function __construct(SourceInterface $source)
     {
-        $this->project = $project;
-        $this->fileUid = $fileUid;
+        $this->source = $source;
     }
 
     /**
-     * @return AbstractSource
+     * @return SourceInterface
      */
-    public function getSource(): AbstractSource
+    public function getSource(): SourceInterface
     {
-        if (is_null($this->file)) {
-            $this->file = $this->project->get('compiled.'.$this->fileUid);
-        }
-
-        return $this->file;
+        return $this->source;
     }
 }
diff --git a/src/Entities/ViewFileTrait.php b/src/Entities/ViewFileTrait.php
@@ -27,7 +27,7 @@ abstract public function getSource();
      */
     public function getData($key, $default = null)
     {
-        return $this->getFile()->getData($key, $default);
+        return $this->getSource()->getData($key, $default);
     }
 
     /**
@@ -38,7 +38,7 @@ public function getData($key, $default = null)
      */
     public function getPermalink()
     {
-        return $this->getFile()->getCompiledPermalink();
+        return $this->getSource()->getCompiledPermalink();
     }
 
     /**
@@ -83,7 +83,7 @@ public function getContent()
             return $content;
         }
 
-        return $this->getFile()->getContent();
+        return $this->getSource()->getContent();
     }
 
     /**

diff --git a/tests/Unit/ViewFileNTest.php b/tests/Unit/ViewFileNTest.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Tapestry\Tests\Unit;
+
+use Tapestry\Entities\ViewFile;
+use Tapestry\Modules\Source\MemorySource;
+use Tapestry\Tests\TestCase;
+
+class ViewFileNTest extends TestCase
+{
+
+    public function testViewFile()
+    {
+
+        try{
+            $memory = new MemorySource('template', '', 'template.phtml', 'phtml', '/', '/template.phtml');
+
+            $viewFile = new ViewFile($memory);
+            $this->assertSame($memory, $viewFile->getSource());
+            $this->assertSame($memory->getData('uid'), $viewFile->getData('uid'));
+            $this->assertSame($memory->getCompiledPermalink(), $viewFile->getPermalink());
+
+            // @todo complete this for #320
+            //$this->assertSame(url($memory->getPermalink()), $viewFile->getUrl());
+            //$this->assertSame($memory->getData('date'), $viewFile->getDate());
+            //$this->assertSame($memory->getData('categories', []), $viewFile->taxonomyList('categories'));
+
+        } catch (\Exception $e) {
+            $this->fail($e);
+        }
+
+    }
+
+}