Use render function

Author: aarondfrancis

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.4.1 - 2021-08-02
+
+### Changed
+- Use a render function instead of the deprecated `wrapped` response from the API.
+
 ## 0.4.0 - 2021-07-31
 
 ### Changed

src/TorchlightExtension.php

@@ -68,11 +68,9 @@ public function render(AbstractBlock $block, ElementRendererInterface $htmlRende
         $hash = $this->makeTorchlightBlock($block)->hash();
 
         if (array_key_exists($hash, static::$torchlightBlocks)) {
-            if ($this->customBlockRenderer) {
-                return call_user_func($this->customBlockRenderer, static::$torchlightBlocks[$hash]);
-            }
+            $renderer = $this->customBlockRenderer ?? $this->defaultBlockRenderer();
 
-            return static::$torchlightBlocks[$hash]->wrapped;
+            return call_user_func($renderer, static::$torchlightBlocks[$hash]);
         }
     }
 
@@ -83,6 +81,13 @@ public function useCustomBlockRenderer($callback)
         return $this;
     }
 
+    public function defaultBlockRenderer()
+    {
+        return function (Block $block) {
+            return "<pre><code class='{$block->classes}' style='{$block->styles}'>{$block->highlighted}</code></pre>";
+        };
+    }
+
     protected function makeTorchlightBlock($node)
     {
         return Block::make()

tests/CodeRendererTest.php

@@ -55,7 +55,9 @@ public function it_highlights_code_blocks()
         $response = [
             'blocks' => [[
                 'id' => 'block_id_1',
-                'wrapped' => '<pre><code>highlighted</code></pre>',
+                'classes' => 'torchlight',
+                'styles' => 'color: red;',
+                'highlighted' => 'highlighted',
             ]]
         ];
 
@@ -67,7 +69,7 @@ public function it_highlights_code_blocks()
 
         $expected = <<<EOT
 <p>before</p>
-<pre><code>highlighted</code></pre>
+<pre><code class='torchlight' style='color: red;'>highlighted</code></pre>
 <p>after</p>
 
 EOT;
@@ -187,13 +189,13 @@ public function it_sends_one_request_only_and_matches_by_id()
         $response = [
             'blocks' => [[
                 'id' => 'block_id_3',
-                'wrapped' => 'some js',
+                'highlighted' => 'some js',
             ], [
                 'id' => 'block_id_1',
-                'wrapped' => 'some php',
+                'highlighted' => 'some php',
             ], [
                 'id' => 'block_id_2',
-                'wrapped' => 'some ruby',
+                'highlighted' => 'some ruby',
             ]]
         ];
 
@@ -207,9 +209,9 @@ public function it_sends_one_request_only_and_matches_by_id()
 
         $expected = <<<EOT
 <p>before</p>
-some php
-some ruby
-some js
+<pre><code class='' style=''>some php</code></pre>
+<pre><code class='' style=''>some ruby</code></pre>
+<pre><code class='' style=''>some js</code></pre>
 <p>after</p>
 
 EOT;