Merge pull request #30 from 8fold/rebuild

fix: Site to use HTTP Root
8fold · May 22, 2023 · 6794417 · 6794417
2 parents ad2a9ed + c028406
commit 6794417
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 23 deletions.
diff --git a/src/Site.php b/src/Site.php
@@ -5,16 +5,18 @@
 
 use Eightfold\Amos\SiteInterface;
 
-use Eightfold\Amos\FileSystem\Directories\Root;
+use Eightfold\Amos\FileSystem\Directories\Root as ContentRoot;
 use Eightfold\Amos\FileSystem\Directories\PublicRoot;
 
+use Eightfold\Amos\Http\Root as HttpRoot;
+
 use Eightfold\Amos\ObjectsFromJson\PublicMeta;
 use Eightfold\Amos\PlainText\PublicContent;
 use Eightfold\Amos\PlainText\PublicFile;
 
 class Site implements SiteInterface
 {
-    private Root $file_system_root;
+    private ContentRoot $file_system_root;
 
     private PublicRoot $file_system_public_root;
 
@@ -29,8 +31,8 @@ class Site implements SiteInterface
     private array $publicContents = [];
 
     public static function init(
-        Root $fileSystemRoot,
-        string $domain
+        ContentRoot $fileSystemRoot,
+        HttpRoot $domain
     ): self|false {
         if ($fileSystemRoot->notFound()) {
             return false;
@@ -39,17 +41,17 @@ public static function init(
     }
 
     final private function __construct(
-        private readonly Root $fileSystemRoot,
-        private readonly string $domain
+        private readonly ContentRoot $fileSystemRoot,
+        private readonly HttpRoot $domain
     ) {
     }
 
-    public function domain(): string
+    public function domain(): HttpRoot
     {
         return $this->domain;
     }
 
-    public function contentRoot(): Root
+    public function contentRoot(): ContentRoot
     {
         if (isset($this->file_system_root) === false) {
             $this->file_system_root = $this->fileSystemRoot;

diff --git a/src/SiteInterface.php b/src/SiteInterface.php
@@ -7,22 +7,24 @@
 
 use Psr\Http\Message\RequestInterface;
 
-use Eightfold\Amos\FileSystem\Directories\Root;
+use Eightfold\Amos\FileSystem\Directories\Root as ContentRoot;
 use Eightfold\Amos\FileSystem\Directories\PublicRoot;
 
+use Eightfold\Amos\Http\Root as HttpRoot;
+
 use Eightfold\Amos\ObjectsFromJson\PublicMeta;
 use Eightfold\Amos\PlainText\PublicContent;
 
 interface SiteInterface
 {
     public static function init(
-        Root $fileSystemRoot,
-        string $domain
+        ContentRoot $fileSystemRoot,
+        HttpRoot $domain
     ): self|false;
 
-    public function domain(): string;
+    public function domain(): HttpRoot;
 
-    public function contentRoot(): Root;
+    public function contentRoot(): ContentRoot;
 
     public function publicRoot(): PublicRoot;
 

diff --git a/tests/Http/RootTest.php b/tests/Http/RootTest.php
@@ -33,7 +33,7 @@ public function can_accept_valid_uri(): void
             parent::request()
         );
 
-        $expected = parent::domain();
+        $expected = parent::domain()->toString();
 
         $this->assertSame(
             $expected,

diff --git a/tests/SiteTest.php b/tests/SiteTest.php
@@ -68,9 +68,9 @@ public function has_public_meta(): void
      */
     public function has_expected_domain(): void
     {
-        $expected = $this->domain();
+        $expected = $this->domain()->toString();
 
-        $result = $this->site()->domain();
+        $result = $this->site()->domain()->toString();
 
         $this->assertSame(
             $expected,

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -11,9 +11,11 @@
 
 use Nyholm\Psr7\ServerRequest;
 
-use Eightfold\Amos\FileSystem\Directories\Root;
+use Eightfold\Amos\FileSystem\Directories\Root as ContentRoot;
 use Eightfold\Amos\FileSystem\Directories\PublicRoot;
 
+use Eightfold\Amos\Http\Root as HttpRoot;
+
 class TestCase extends BaseTestCase
 {
     protected const BASE = __DIR__ . '/test-content';
@@ -22,14 +24,14 @@ class TestCase extends BaseTestCase
 
     protected const PUBLIC_BASE = self::BASE . '/public';
 
-    protected function root(): Root
+    protected function root(): ContentRoot
     {
-        return Root::fromString(self::BASE);
+        return ContentRoot::fromString(self::BASE);
     }
 
-    protected function nonexistentRoot(): Root
+    protected function nonexistentRoot(): ContentRoot
     {
-        return Root::fromString(self::NONEXISTENT_BASE);
+        return ContentRoot::fromString(self::NONEXISTENT_BASE);
     }
 
     protected function publicRoot(): PublicRoot
@@ -50,8 +52,8 @@ protected function request(string $path = '/'): ServerRequest
         return new ServerRequest('get', $this->domain() . $path);
     }
 
-    protected function domain(): string
+    protected function domain(): HttpRoot
     {
-        return 'http://ex.ample';
+        return HttpRoot::fromString('http://ex.ample');
     }
 }