Exclude current page from the pages list

jakubthedeveloper · jakubthedeveloper · commit e05075721a65 · 2022-02-08T20:55:20.000+01:00
diff --git a/src/Generator/HtmlPageGenerator.php b/src/Generator/HtmlPageGenerator.php
@@ -46,7 +46,9 @@ private function replaceTags(string $template, string $pageHtml, PageConfigDto $
         );
 
         if (false !== stripos($html, '__PAGES_LIST__')) {
-            $pagesList = $this->pagesListGenerator->generate();
+            $pagesList = $this->pagesListGenerator->generate(
+                currentPage: $page
+            );
 
             $html = str_replace(
                 '__PAGES_LIST__',
@@ -57,7 +59,8 @@ private function replaceTags(string $template, string $pageHtml, PageConfigDto $
 
         if (false !== stripos($html, '__PAGES_LIST_SHORT__')) {
             $pagesList = $this->pagesListGenerator->generate(
-                $this->blogConfig->getShortPagesListItemsCount()
+                currentPage: $page,
+                limit: $this->blogConfig->getShortPagesListItemsCount()
             );
 
             $html = str_replace(
diff --git a/src/Generator/ListGeneratorInterface.php b/src/Generator/ListGeneratorInterface.php
@@ -2,9 +2,11 @@
 
 namespace MarkdownBlog\Generator;
 
+use MarkdownBlog\DTO\PageConfigDto;
+
 interface ListGeneratorInterface
 {
-    public function generateShort(int $limit): string;
+    public function generateShort(PageConfigDto $currentPage, int $limit): string;
 
-    public function generate(?int $limit = null): string;
+    public function generate(PageConfigDto $currentPage, int $limit = null): string;
 }
diff --git a/src/Generator/PagesListGenerator.php b/src/Generator/PagesListGenerator.php
@@ -13,12 +13,12 @@ public function __construct(
 
     }
 
-    public function generateShort(int $limit): string
+    public function generateShort(PageConfigDto $currentPage, int $limit): string
     {
-        return $this->generate($limit);
+        return $this->generate($currentPage, $limit);
     }
 
-    public function generate(?int $limit = null): string
+    public function generate(PageConfigDto $currentPage, ?int $limit = null): string
     {
         $result = '<ul class="pages-list">';
         $result .= "\n";
@@ -30,6 +30,10 @@ public function generate(?int $limit = null): string
                 break;
             }
 
+            if ($page->outputFile === $currentPage->outputFile) {
+                continue;
+            }
+
             $result .= sprintf(
                 '<li><a href="%s">%s</a></li>',
                 $page->outputFile,
diff --git a/tests/Generator/PagesListGeneratorTest.php b/tests/Generator/PagesListGeneratorTest.php
@@ -32,6 +32,13 @@ public function testPagesListHtml(): void
     {
         $collection = new PagesConfigCollection();
 
+        $currentPage = new PageConfigDto(
+            title: 'Current page',
+            markdownFile: 'test.md',
+            outputFile: 'current.html',
+            templateFile: 'testx.html'
+        );
+
         $collection->add(
             config: new PageConfigDto(
                 title: 'First page',
@@ -41,6 +48,8 @@ public function testPagesListHtml(): void
             )
         );
 
+        $collection->add($currentPage);
+
         $collection->add(
             config: new PageConfigDto(
                 title: 'Second page',
@@ -54,7 +63,9 @@ public function testPagesListHtml(): void
             ->method('getPagesConfig')
             ->willReturn($collection);
 
-        $actual = $this->pagesListGenerator->generate();
+        $actual = $this->pagesListGenerator->generate(
+            currentPage: $currentPage
+        );
 
         $expected = <<<HTML
                     <ul class="pages-list">
@@ -70,6 +81,13 @@ public function testPagesListHtml(): void
 
     public function testShortPagesListHtml(): void
     {
+        $currentPage = new PageConfigDto(
+            title: 'Current page',
+            markdownFile: 'current.md',
+            outputFile: 'current.html',
+            templateFile: 'test.html'
+        );
+
         $collection = new PagesConfigCollection();
 
         $collection->add(
@@ -81,6 +99,8 @@ public function testShortPagesListHtml(): void
             )
         );
 
+        $collection->add($currentPage);
+
         $collection->add(
             config: new PageConfigDto(
                 title: 'Second page',
@@ -103,7 +123,10 @@ public function testShortPagesListHtml(): void
             ->method('getPagesConfig')
             ->willReturn($collection);
 
-        $actual = $this->pagesListGenerator->generateShort(2);
+        $actual = $this->pagesListGenerator->generateShort(
+            currentPage: $currentPage,
+            limit: 2
+        );
 
         $expected = <<<HTML
                     <ul class="pages-list">

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,11 @@`
`2`	`2`
`3`	`3`	`namespace MarkdownBlog\Generator;`
`4`	`4`
	`5`	`+use MarkdownBlog\DTO\PageConfigDto;`
	`6`	`+`
`5`	`7`	`interface ListGeneratorInterface`
`6`	`8`	`{`
`7`		`- public function generateShort(int $limit): string;`
	`9`	`+ public function generateShort(PageConfigDto $currentPage, int $limit): string;`
`8`	`10`
`9`		`- public function generate(?int $limit = null): string;`
	`11`	`+ public function generate(PageConfigDto $currentPage, int $limit = null): string;`
`10`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,12 @@ public function __construct(`
`13`	`13`
`14`	`14`	`}`
`15`	`15`
`16`		`- public function generateShort(int $limit): string`
	`16`	`+ public function generateShort(PageConfigDto $currentPage, int $limit): string`
`17`	`17`	`{`
`18`		`- return $this->generate($limit);`
	`18`	`+ return $this->generate($currentPage, $limit);`
`19`	`19`	`}`
`20`	`20`
`21`		`- public function generate(?int $limit = null): string`
	`21`	`+ public function generate(PageConfigDto $currentPage, ?int $limit = null): string`
`22`	`22`	`{`
`23`	`23`	`$result = '<ul class="pages-list">';`
`24`	`24`	`$result .= "\n";`
`@@ -30,6 +30,10 @@ public function generate(?int $limit = null): string`
`30`	`30`	`break;`
`31`	`31`	`}`
`32`	`32`
	`33`	`+ if ($page->outputFile === $currentPage->outputFile) {`
	`34`	`+ continue;`
	`35`	`+ }`
	`36`	`+`
`33`	`37`	`$result .= sprintf(`
`34`	`38`	`'<li><a href="%s">%s</a></li>',`
`35`	`39`	`$page->outputFile,`