Code refactors

packages/framework/src/Foundation/Concerns/ManagesViewData.php

@@ -11,6 +11,8 @@
 /**
  * @internal Single-use trait for the HydeKernel class.
  *
+ * @todo Consider if this logic is better suited for a "Render" class solely for handling data related to the current render.
+ *
  * @see \Hyde\Foundation\HydeKernel
  */
 trait ManagesViewData

packages/framework/src/Framework/Features/Metadata/GlobalMetadataBag.php

@@ -6,6 +6,7 @@
 
 use Hyde\Facades\Features;
 use Hyde\Facades\Meta;
+use Hyde\Framework\Features\Metadata\MetadataElementContract as Element;
 use Hyde\Framework\Features\XmlGenerators\RssFeedGenerator;
 use Hyde\Hyde;
 use Hyde\Pages\Concerns\HydePage;
@@ -18,38 +19,38 @@ class GlobalMetadataBag extends MetadataBag
 {
     public static function make(): static
     {
-        $metadataBag = new self();
+        $metadata = new self();
 
         foreach (config('hyde.meta', []) as $item) {
-            $metadataBag->add($item);
+            $metadata->add($item);
         }
 
         if (Features::sitemap()) {
-            $metadataBag->add(Meta::link('sitemap', Hyde::url('sitemap.xml'), [
+            $metadata->add(Meta::link('sitemap', Hyde::url('sitemap.xml'), [
                 'type' => 'application/xml', 'title' => 'Sitemap',
             ]));
         }
 
         if (Features::rss()) {
-            $metadataBag->add(Meta::link('alternate', Hyde::url(RssFeedGenerator::getFilename()), [
+            $metadata->add(Meta::link('alternate', Hyde::url(RssFeedGenerator::getFilename()), [
                 'type' => 'application/rss+xml', 'title' => RssFeedGenerator::getDescription(),
             ]));
         }
 
         if (Hyde::currentPage() !== null) {
-            static::filterDuplicateMetadata($metadataBag, View::shared('page'));
+            static::filterDuplicateMetadata($metadata, View::shared('page'));
         }
 
-        return $metadataBag;
+        return $metadata;
     }
 
     protected static function filterDuplicateMetadata(GlobalMetadataBag $global, HydePage $page): void
     {
         // Reject any metadata from the global metadata bag that is already present in the page metadata bag.
 
         foreach (['links', 'metadata', 'properties', 'generics'] as $type) {
-            $global->$type = array_filter($global->$type, fn ($meta) => ! in_array($meta->uniqueKey(),
-                array_map(fn ($meta) => $meta->uniqueKey(), $page->metadata->$type)
+            $global->$type = array_filter($global->$type, fn (Element $element): bool => ! in_array($element->uniqueKey(),
+                array_map(fn (Element $element): string => $element->uniqueKey(), $page->metadata->$type)
             ));
         }
     }

packages/framework/src/Framework/Features/Metadata/MetadataBag.php

@@ -12,6 +12,8 @@
 /**
  * Holds the metadata tags for a page or the site model.
  *
+ * @todo These properties should probably not be public
+ *
  * @see \Hyde\Framework\Testing\Feature\MetadataTest
  * @see \Hyde\Framework\Features\Metadata\PageMetadataBag
  * @see \Hyde\Framework\Features\Metadata\GlobalMetadataBag

packages/framework/src/Framework/Features/XmlGenerators/BaseXmlGenerator.php

@@ -46,4 +46,9 @@ protected function escape(string $string): string
     {
         return htmlspecialchars($string, ENT_XML1 | ENT_COMPAT, 'UTF-8');
     }
+
+    protected function addChild(SimpleXMLElement $element, string $name, string $value): SimpleXMLElement
+    {
+        return $element->addChild($name, $this->escape($value));
+    }
 }

packages/framework/src/Framework/Features/XmlGenerators/RssFeedGenerator.php

@@ -42,29 +42,29 @@ protected function constructBaseElement(): void
     protected function addItem(MarkdownPost $post): void
     {
         $item = $this->xmlElement->channel->addChild('item');
-        $item->addChild('title', $post->title);
-        $item->addChild('description', $post->description);
+        $this->addChild($item, 'title', $post->title);
+        $this->addChild($item, 'description', $post->description);
 
         $this->addDynamicItemData($item, $post);
     }
 
     protected function addDynamicItemData(SimpleXMLElement $item, MarkdownPost $post): void
     {
         if (isset($post->canonicalUrl)) {
-            $item->addChild('link', $post->canonicalUrl);
-            $item->addChild('guid', $post->canonicalUrl);
+            $this->addChild($item, 'link', $post->canonicalUrl);
+            $this->addChild($item, 'guid', $post->canonicalUrl);
         }
 
         if (isset($post->date)) {
-            $item->addChild('pubDate', $post->date->dateTimeObject->format(DATE_RSS));
+            $this->addChild($item, 'pubDate', $post->date->dateTimeObject->format(DATE_RSS));
         }
 
         if (isset($post->author)) {
             $item->addChild('dc:creator', $post->author->getName(), 'http://purl.org/dc/elements/1.1/');
         }
 
         if (isset($post->category)) {
-            $item->addChild('category', $post->category);
+            $this->addChild($item, 'category', $post->category);
         }
 
         if (isset($post->image)) {
@@ -79,12 +79,12 @@ protected function addBaseChannelItems(): void
     {
         $channel = $this->xmlElement->channel;
 
-        $channel->addChild('title', $this->escape(Site::name()));
-        $channel->addChild('link', $this->escape(Site::url()));
-        $channel->addChild('description', $this->escape($this->getDescription()));
-        $channel->addChild('language', config('site.language', 'en'));
-        $channel->addChild('generator', 'HydePHP '.Hyde::version());
-        $channel->addChild('lastBuildDate', date(DATE_RSS));
+        $this->addChild($channel, 'title', Site::name());
+        $this->addChild($channel, 'link', Site::url());
+        $this->addChild($channel, 'description', $this->getDescription());
+        $this->addChild($channel, 'language', config('site.language', 'en'));
+        $this->addChild($channel, 'generator', 'HydePHP '.Hyde::version());
+        $this->addChild($channel, 'lastBuildDate', date(DATE_RSS));
     }
 
     protected function addAtomLinkItem(): void

packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php

@@ -56,12 +56,12 @@ protected function addRoute(Route $route): void
     {
         $urlItem = $this->xmlElement->addChild('url');
 
-        $urlItem->addChild('loc', $this->escape(Hyde::url($route->getOutputPath())));
-        $urlItem->addChild('lastmod', $this->escape($this->getLastModDate($route->getSourcePath())));
-        $urlItem->addChild('changefreq', 'daily');
+        $this->addChild($urlItem, 'loc', Hyde::url($route->getOutputPath()));
+        $this->addChild($urlItem, 'lastmod', $this->getLastModDate($route->getSourcePath()));
+        $this->addChild($urlItem, 'changefreq', 'daily');
 
         if (config('hyde.sitemap.dynamic_priority', true)) {
-            $urlItem->addChild('priority', $this->getPriority(
+            $this->addChild($urlItem, 'priority', $this->getPriority(
                 $route->getPageClass(), $route->getPage()->getIdentifier()
             ));
         }

packages/framework/tests/Feature/BuildOutputDirectoryCanBeChangedTest.php → packages/framework/tests/Unit/BuildOutputDirectoryCanBeChangedTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Testing\Feature;
+namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Facades\Site;
 use Hyde\Framework\HydeServiceProvider;
@@ -13,12 +13,24 @@
 
 /**
  * Class BuildOutputDirectoryCanBeChangedTest.
- *
- * @todo add test for the Rebuild Service
- * @todo this unit test should be moved to the unit test suite
  */
 class BuildOutputDirectoryCanBeChangedTest extends TestCase
 {
+    public function test_site_output_directory_can_be_changed_for_site_builds()
+    {
+        $this->file('_posts/test-post.md');
+
+        Site::$outputPath = ('_site/build');
+
+        $this->artisan('build');
+
+        $this->assertFileExists(Hyde::path('_site/build/posts/test-post.html'));
+        $this->assertFileExists(Hyde::path('_site/build/media/app.css'));
+        $this->assertFileExists(Hyde::path('_site/build/index.html'));
+
+        File::deleteDirectory(Hyde::path('_site/build'));
+    }
+
     public function test_site_output_directory_can_be_changed_in_static_page_builder()
     {
         $this->file('_posts/test-post.md');