add PermaLink view helper for tag

mamuz · Aug 30, 2014 · 9e7e4e6 · 9e7e4e6
1 parent 6a9fe3e
commit 9e7e4e6
Show file tree

Hide file tree

Showing 10 changed files with 89 additions and 20 deletions.
diff --git a/config/module.config.php b/config/module.config.php
@@ -23,7 +23,7 @@
                 'options' => array(
                     'route'       => '/blog/post[/:id][/:title]',
                     'constraints' => array(
-                        'id' => '[a-zA-Z0-9]+',
+                        'id'    => '[a-zA-Z0-9]+',
                         'title' => '[a-zA-Z0-9_+%-]+',
                     ),
                     'defaults'    => array(
@@ -77,7 +77,8 @@
             'panel'          => 'MamuzBlog\View\Helper\Panel',
             'tag'            => 'MamuzBlog\View\Helper\Tag',
             'tagAnchor'      => 'MamuzBlog\View\Helper\TagAnchor',
-            'permaLink'      => 'MamuzBlog\View\Helper\PermaLink',
+            'permaLinkPost'  => 'MamuzBlog\View\Helper\PermaLinkPost',
+            'permaLinkTag'   => 'MamuzBlog\View\Helper\PermaLinkTag',
             'postMeta'       => 'MamuzBlog\View\Helper\PostMeta',
             'postPanel'      => 'MamuzBlog\View\Helper\PostPanel',
             'postPanelShort' => 'MamuzBlog\View\Helper\PostPanelShort',

diff --git a/src/MamuzBlog/View/Helper/PermaLink.php → src/MamuzBlog/View/Helper/PermaLinkPost.php b/src/MamuzBlog/View/Helper/PermaLink.php → src/MamuzBlog/View/Helper/PermaLinkPost.php
@@ -4,7 +4,7 @@
 
 use MamuzBlog\Entity\Post as PostEntity;
 
-class PermaLink extends AbstractHelper
+class PermaLinkPost extends AbstractHelper
 {
     /**
      * {@link render()}

diff --git a/src/MamuzBlog/View/Helper/PermaLinkTag.php b/src/MamuzBlog/View/Helper/PermaLinkTag.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace MamuzBlog\View\Helper;
+
+class PermaLinkTag extends AbstractHelper
+{
+    /**
+     * {@link render()}
+     */
+    public function __invoke($tagName)
+    {
+        return $this->render($tagName);
+    }
+
+    /**
+     * @param string $tagName
+     * @return string
+     */
+    public function render($tagName)
+    {
+        $serverUrl = $this->getRenderer()->serverUrl();
+
+        $url = $this->getRenderer()->url(
+            'blogPublishedPosts',
+            array('tag' => $tagName)
+        );
+
+        return $serverUrl . $url;
+    }
+}
diff --git a/src/MamuzBlog/View/Helper/PostPanelShort.php b/src/MamuzBlog/View/Helper/PostPanelShort.php
@@ -17,7 +17,7 @@ private function getUrl()
 
     private function createUrl()
     {
-        $this->url = $this->getRenderer()->permaLink($this->entity);
+        $this->url = $this->getRenderer()->permaLinkPost($this->entity);
     }
 
     /**

diff --git a/src/MamuzBlog/View/Helper/TagAnchor.php b/src/MamuzBlog/View/Helper/TagAnchor.php
@@ -19,13 +19,8 @@ public function __invoke($tagName, $content)
      */
     public function render($tagName, $content)
     {
-        $serverUrl = $this->getRenderer()->serverUrl();
+        $url = $this->getRenderer()->permaLinkTag($tagName);
 
-        $url = $this->getRenderer()->url(
-            'blogPublishedPosts',
-            array('tag' => $tagName)
-        );
-
-        return $this->getRenderer()->anchorBookmark($serverUrl . $url, 'Go to specific list', $content);
+        return $this->getRenderer()->anchorBookmark($url, 'Go to specific list', $content);
     }
 }
diff --git a/src/MamuzBlog/View/Renderer/PhpRenderer.php b/src/MamuzBlog/View/Renderer/PhpRenderer.php
@@ -12,7 +12,8 @@
  * @method string slugify($value)
  * @method string panel($header, $content, $footer)
  * @method string postMeta(\MamuzBlog\Entity\Post $entity)
- * @method string permaLink(\MamuzBlog\Entity\Post $entity)
+ * @method string permaLinkPost(\MamuzBlog\Entity\Post $entity)
+ * @method string permaLinkTag($tagName)
  * @method string tag(\MamuzBlog\Entity\Tag $entity)
  * @method string tagList()
  * @method string tagAnchor($tagName, $content)

diff --git a/...muzBlogTest/View/Helper/PermaLinkTest.php → ...logTest/View/Helper/PermaLinkPostTest.php b/...muzBlogTest/View/Helper/PermaLinkTest.php → ...logTest/View/Helper/PermaLinkPostTest.php
@@ -2,11 +2,11 @@
 
 namespace MamuzBlogTest\View\Helper;
 
-use MamuzBlog\View\Helper\PermaLink;
+use MamuzBlog\View\Helper\PermaLinkPost;
 
-class PermaLinkTest extends \PHPUnit_Framework_TestCase
+class PermaLinkPostTest extends \PHPUnit_Framework_TestCase
 {
-    /** @var PermaLink */
+    /** @var PermaLinkPost */
     protected $fixture;
 
     /** @var \MamuzBlog\Entity\Post | \Mockery\MockInterface */
@@ -30,7 +30,7 @@ protected function setUp()
             array('title' => '_title_', 'id' => '_hashId_')
         )->andReturn('url');
 
-        $this->fixture = new PermaLink;
+        $this->fixture = new PermaLinkPost;
         $this->fixture->setView($this->renderer);
     }
 

diff --git a/tests/MamuzBlogTest/View/Helper/PermaLinkTagTest.php b/tests/MamuzBlogTest/View/Helper/PermaLinkTagTest.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace MamuzBlogTest\View\Helper;
+
+use MamuzBlog\View\Helper\PermaLinkTag;
+
+class PermaLinkTagTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var PermaLinkTag */
+    protected $fixture;
+
+    /** @var \Zend\View\Renderer\RendererInterface | \Mockery\MockInterface */
+    protected $renderer;
+
+    protected function setUp()
+    {
+        $this->renderer = \Mockery::mock('Zend\View\Renderer\RendererInterface');
+        $this->renderer->shouldReceive('serverUrl')->andReturn('server_');
+        $this->renderer->shouldReceive('url')->with(
+            'blogPublishedPosts',
+            array('tag' => 'tagname')
+        )->andReturn('url');
+
+        $this->fixture = new PermaLinkTag;
+        $this->fixture->setView($this->renderer);
+    }
+
+    public function testExtendingAbstractHelper()
+    {
+        $this->assertInstanceOf('MamuzBlog\View\Helper\AbstractHelper', $this->fixture);
+    }
+
+    public function testRender()
+    {
+        $permaLink = $this->fixture->render('tagname');
+
+        $this->assertSame('server_url', $permaLink);
+
+        $invoke = $this->fixture;
+        $permaLink = $invoke('tagname');
+        $this->assertSame('server_url', $permaLink);
+    }
+}
diff --git a/tests/MamuzBlogTest/View/Helper/PostPanelShortTest.php b/tests/MamuzBlogTest/View/Helper/PostPanelShortTest.php
@@ -26,7 +26,7 @@ protected function setUp()
         $this->renderer->shouldReceive('markdown')->with('desc')->andReturn('_content_');
         $this->renderer->shouldReceive('hashId')->with(12)->andReturn('_hashId_');
         $this->renderer->shouldReceive('slugify')->with('title')->andReturn('_title_');
-        $this->renderer->shouldReceive('permaLink')->with($this->post)->andReturn('url');
+        $this->renderer->shouldReceive('permaLinkPost')->with($this->post)->andReturn('url');
         $this->renderer->shouldReceive('anchorBookmark')->with('url', 'Go to post', 'title')->andReturn('anchor1');
         $this->renderer->shouldReceive('anchorBookmark')->with('url', 'Go to post', 'Read more')->andReturn('anchor2');
         $this->renderer->shouldReceive('postMeta')->with($this->post)->andReturn('_meta_');

diff --git a/tests/MamuzBlogTest/View/Helper/TagAnchorTest.php b/tests/MamuzBlogTest/View/Helper/TagAnchorTest.php
@@ -15,11 +15,10 @@ class TagAnchorTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->renderer = \Mockery::mock('Zend\View\Renderer\RendererInterface');
-        $this->renderer->shouldReceive('serverUrl')->andReturn('server_');
-        $this->renderer->shouldReceive('url')->with('blogPublishedPosts', array('tag' => 'tagname'))->andReturn('url');
+        $this->renderer->shouldReceive('permaLinkTag')->with('tagname')->andReturn('url');
         $this->renderer
             ->shouldReceive('anchorBookmark')
-            ->with('server_url', 'Go to specific list', 'content')->andReturn('anchor');
+            ->with('url', 'Go to specific list', 'content')->andReturn('anchor');
 
         $this->fixture = new TagAnchor;
         $this->fixture->setView($this->renderer);