Change default response

Author: aarondfrancis

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## 0.4.5 - 2021-07-18
+
+### Changed
+- The default response (used if a request fails) now includes the `<div class='line'>` wrappers.s
+
 ## 0.4.4 - 2021-06-16
 
 ### Fixed

src/Client.php

@@ -72,21 +72,13 @@ protected function request(Collection $blocks)
         $response = collect($response)->keyBy('id');
 
         $blocks->each(function (Block $block) use ($response) {
-            $blockFromResponse = Arr::get($response, "{$block->id()}", []);
+            $blockFromResponse = Arr::get($response, "{$block->id()}", $this->defaultResponse($block));
 
             foreach ($this->applyDirectlyFromResponse() as $key) {
                 if (Arr::has($blockFromResponse, $key)) {
                     $block->{$key} = $blockFromResponse[$key];
                 }
             }
-
-            if (!$block->wrapped) {
-                $block->wrapped = $this->defaultWrapped($block);
-            }
-
-            if (!$block->highlighted) {
-                $block->highlighted = $this->defaultHighlighted($block);
-            }
         });
 
         // Only store the ones we got back from the API.
@@ -221,21 +213,21 @@ protected function setBlocksFromCache(Collection $blocks)
      * In the case where nothing returns from the API, we have to show _something_.
      *
      * @param Block $block
-     * @return string
-     */
-    protected function defaultHighlighted(Block $block)
-    {
-        return htmlentities($block->code);
-    }
-
-    /**
-     * In the case where nothing returns from the API, we have to show _something_.
-     *
-     * @param Block $block
-     * @return string
+     * @return array
      */
-    protected function defaultWrapped(Block $block)
+    protected function defaultResponse(Block $block)
     {
-        return "<pre><code class='torchlight'>" . $this->defaultHighlighted($block) . '</code></pre>';
+        $lines = array_map(function ($line) {
+            return "<div class='line'>" . htmlentities($line) . "</div>";
+        }, explode("\n", $block->code));
+
+        $highlighted = implode('', $lines);
+
+        return [
+            'highlighted' => $highlighted,
+            'classes' => 'torchlight',
+            'styles' => '',
+            'wrapped' => "<pre><code class='torchlight'>{$highlighted}</code></pre>",
+        ];
     }
 }

tests/ClientTest.php

@@ -174,8 +174,8 @@ public function if_theres_no_response_then_it_sets_a_default()
 
         Torchlight::highlight($block);
 
-        $this->assertEquals('echo "hello world";', $block->highlighted);
-        $this->assertEquals('<pre><code class=\'torchlight\'>echo &quot;hello world&quot;;</code></pre>', $block->wrapped);
+        $this->assertEquals('<div class=\'line\'>echo &quot;hello world&quot;;</div>', $block->highlighted);
+        $this->assertEquals('<pre><code class=\'torchlight\'><div class=\'line\'>echo &quot;hello world&quot;;</div></code></pre>', $block->wrapped);
     }
 
     /** @test */
@@ -189,7 +189,7 @@ public function a_500_error_returns_a_default_in_production()
 
         Torchlight::highlight($block);
 
-        $this->assertEquals('echo &quot;hello world&quot;;', $block->highlighted);
-        $this->assertEquals('<pre><code class=\'torchlight\'>echo &quot;hello world&quot;;</code></pre>', $block->wrapped);
+        $this->assertEquals('<div class=\'line\'>echo &quot;hello world&quot;;</div>', $block->highlighted);
+        $this->assertEquals('<pre><code class=\'torchlight\'><div class=\'line\'>echo &quot;hello world&quot;;</div></code></pre>', $block->wrapped);
     }
 }

tests/MiddlewareAndComponentTest.php

@@ -38,7 +38,7 @@ public function it_sends_a_simple_request_with_no_response()
         $response = $this->getView('simple-php-hello-world.blade.php');
 
         $this->assertEquals(
-            '<pre><code class="" style="">echo &quot;hello world&quot;;</code></pre>',
+            '<pre><code class="torchlight" style=""><div class=\'line\'>echo &quot;hello world&quot;;</div></code></pre>',
             $response->content()
         );
 
@@ -157,6 +157,19 @@ public function code_contents_can_be_a_file()
         });
     }
 
+    /** @test */
+    public function code_contents_can_be_a_file_2()
+    {
+        $this->fakeNullResponse('component');
+
+        $this->getView('contents-via-file-2.blade.php');
+
+        Http::assertSent(function ($request) {
+            return $request['blocks'][0]['code'] === rtrim(file_get_contents(config_path('app.php'), '\n'));
+        });
+    }
+
+
     /** @test */
     public function two_components_work()
     {

tests/Support/contents-via-file-2.blade.php

@@ -0,0 +1 @@
+<x-torchlight-code torchlight-id='component' language='php' contents='{{ config_path("app.php") }}'/>