Feature/structuredtext linkresolver

src/Prismic/Document.php

@@ -193,11 +193,7 @@ public function getHtml($field, $linkResolver = null)
     {
         $fragment = $this->get($field);
         if (isset($fragment) && method_exists($fragment, 'asHtml')) {
-            if ($fragment instanceof DocumentLink) {
-                return $fragment->asHtml($linkResolver);
-            } else {
-                return $fragment->asHtml();
-            }
+            return $fragment->asHtml($linkResolver);
         }
 
         return "";

src/Prismic/Fragment/Link/DocumentLink.php

@@ -30,7 +30,7 @@ public function __construct($id, $type, $tags, $slug, $isBroken)
 
     public function asHtml($linkResolver)
     {
-        return '<a href="' . $linkResolver->resolve($this) . '">' . $this->slug . '</a>';
+        return '<a href="' . $linkResolver($this) . '">' . $this->slug . '</a>';
     }
 
     public static function parse($json)

src/Prismic/LinkResolver.php

@@ -26,6 +26,11 @@ abstract class LinkResolver
      */
     abstract public function resolve($link);
 
+    public function __invoke($link)
+    {
+        return $this->resolve($link);
+    }
+
     /**
      * Returns the application-specific URL related to this Document
      *

tests/Prismic/FakeLinkResolver.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Prismic\Test;
+
+use Prismic\LinkResolver;
+
+class FakeLinkResolver extends LinkResolver
+{
+    public function resolve($link)
+    {
+        return "http://host/doc/".$link->getId();
+    }
+}

tests/Prismic/LinkResolverTest.php

@@ -5,15 +5,6 @@
 use Prismic\API;
 use Prismic\Document;
 use Prismic\Fragment\Link\DocumentLink;
-use Prismic\LinkResolver;
-
-class FakeLinkResolver extends LinkResolver
-{
-    public function resolve($link)
-    {
-        return "http://host/doc/".$link->getId();
-    }
-}
 
 class LinkResolverTest extends \PHPUnit_Framework_TestCase
 {
@@ -53,6 +44,13 @@ public function testResolve()
         $this->assertEquals($content, $this->linkResolver->resolve($this->link));
     }
 
+    public function testCall()
+    {
+        $content = 'http://host/doc/Ue0EDd_mqb8Dhk3j';
+        $linkResolver = $this->linkResolver;
+        $this->assertEquals($content, $linkResolver($this->link));
+    }
+
     public function testResolveDocument()
     {
         $content = "http://host/doc/Ue0EDd_mqb8Dhk3j";

tests/Prismic/StructuredTextTest.php

@@ -68,4 +68,37 @@ public function testPreformattedBlockEscapeRendering()
         $this->assertEquals($content, $structuredText->asHtml());
     }
 
+    public function testDocumentLinkRendering()
+    {
+        $linkResolver = new FakeLinkResolver();
+        $structuredText = $this->document->getStructuredText('product.listLinks');
+        $content = '<p><a href="http://host/doc/UjHkUrGIJ7cBlWAb">link1</a></p>';
+        $this->assertEquals($content, $structuredText->asHtml($linkResolver));
+    }
+
+    public function testNestedDocumentLinkRendering()
+    {
+        $linkResolver = new FakeLinkResolver();
+        $content = '<section data-field="product.listLinks"><p>' .
+                   '<a href="http://host/doc/UjHkUrGIJ7cBlWAb">link1</a></p></section>';
+        // There should be better way (.*? - (?!)) than this one but no one seems to work.
+        $notSection = '([^<]|<[^\/]|<\/[^s]|<\/s[^e]|<\/se[^c]|<\/sec[^t]|<\/sect[^i]|' .
+                      '<\/secti[^o]|<\/sectio[^n]|<\/section[^>])';
+        $html = preg_replace(
+            '/.*(<section data-field="product.listLinks">' . $notSection . '*<\/section>).*/',
+            '$1',
+            $this->document->asHtml($linkResolver)
+        );
+        $this->assertEquals($content, $html);
+    }
+
+    public function testDocumentLinkWithLamdaRendering()
+    {
+        $linkResolver = function ($link) {
+            return "http://host/document/".$link->getId();
+        };
+        $structuredText = $this->document->getStructuredText('product.listLinks');
+        $content = '<p><a href="http://host/document/UjHkUrGIJ7cBlWAb">link1</a></p>';
+        $this->assertEquals($content, $structuredText->asHtml($linkResolver));
+    }
 }

tests/bootstrap.php

@@ -5,3 +5,5 @@
 } elseif (file_exists($file = __DIR__.'/autoload.php.dist')) {
     require_once $file;
 }
+
+require_once 'Prismic/FakeLinkResolver.php';

tests/fixtures/search.json

@@ -300,6 +300,36 @@
                         }
                     }
                 ],
+                "listLinks": {
+                    "type": "StructuredText",
+                    "value": [
+                        {
+                            "type": "paragraph",
+                            "text": "link1",
+                            "spans": [
+                                {
+                                    "start": 0,
+                                    "end": 5,
+                                    "type": "hyperlink",
+                                    "data": {
+                                        "type": "Link.document",
+                                        "value": {
+                                            "document": {
+                                                "id": "UjHkUrGIJ7cBlWAb",
+                                                "type": "product",
+                                                "tags": [
+                                                    "Pie"
+                                                ],
+                                                "slug": "apricot-pie"
+                                            },
+                                            "isBroken": false
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    ]
+                },
                 "relatedImages": [
                     {
                         "type": "Image",