Merge pull request #430 from hydephp/organize-and-restructure-code

Merge single use trait HasTableOfContents into DocumentationPage class

Author: caendesilva

packages/framework/src/Concerns/HasTableOfContents.php

@@ -2,8 +2,8 @@
 
 namespace Hyde\Framework\Models\Pages;
 
+use Hyde\Framework\Actions\GeneratesSidebarTableOfContents;
 use Hyde\Framework\Concerns\FrontMatter\Schemas\DocumentationPageSchema;
-use Hyde\Framework\Concerns\HasTableOfContents;
 use Hyde\Framework\Contracts\AbstractMarkdownPage;
 use Hyde\Framework\Contracts\RouteContract;
 use Hyde\Framework\Models\FrontMatter;
@@ -13,7 +13,6 @@
 class DocumentationPage extends AbstractMarkdownPage
 {
     use DocumentationPageSchema;
-    use HasTableOfContents;
 
     public static string $sourceDirectory = '_docs';
     public static string $outputDirectory = 'docs';
@@ -52,4 +51,12 @@ public static function hasTableOfContents(): bool
     {
         return config('docs.table_of_contents.enabled', true);
     }
+
+    /**
+     * Generate Table of Contents as HTML from a Markdown document body.
+     */
+    public function getTableOfContents(): string
+    {
+        return (new GeneratesSidebarTableOfContents($this->markdown))->execute();
+    }
 }

packages/framework/src/Models/Pages/DocumentationPage.php

@@ -2,23 +2,24 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Concerns\HasTableOfContents;
+use Hyde\Framework\Models\Markdown;
+use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Testing\TestCase;
 
 /**
  * Class HasTableOfContentsTest.
  *
- * @covers \Hyde\Framework\Concerns\HasTableOfContents
+ * @covers \Hyde\Framework\Models\Pages\DocumentationPage
  *
  * @see \Hyde\Framework\Testing\Feature\Actions\GeneratesSidebarTableOfContentsTest
  */
 class HasTableOfContentsTest extends TestCase
 {
-    use HasTableOfContents;
-
     public function testConstructorCreatesTableOfContentsString()
     {
-        $this->markdown = '## Title';
-        $this->assertEquals('<ul class="table-of-contents"><li><a href="#title">Title</a></li></ul>', str_replace("\n", '', $this->getTableOfContents()));
+        $page = new DocumentationPage();
+
+        $page->markdown = new Markdown('## Title');
+        $this->assertEquals('<ul class="table-of-contents"><li><a href="#title">Title</a></li></ul>', str_replace("\n", '', $page->getTableOfContents()));
     }
 }