test(pages, posts): run converter from frontmatter in test

Author: mhanberg

lib/tableau/extensions/page_extension.ex

@@ -92,10 +92,18 @@ defmodule Tableau.PageExtension do
       config.dir
       |> Path.join("**/*.{#{exts}}")
       |> Common.paths()
-      |> Common.entries(fn pathmap ->
+      |> Common.entries(fn %{path: path, front_matter: front_matter, pre_convert_body: body, ext: ext} ->
         {
-          build(pathmap.path, pathmap.front_matter, pathmap.pre_convert_body, config),
-          fn assigns -> pick_module_and_convert(converters, pathmap, assigns) end
+          build(path, front_matter, body, config),
+          fn assigns ->
+            converter =
+              case front_matter[:converter] do
+                nil -> converters[ext]
+                converter -> Module.concat([converter])
+              end
+
+            converter.convert(path, front_matter, body, assigns)
+          end
         }
       end)
 
@@ -113,14 +121,6 @@ defmodule Tableau.PageExtension do
      |> Map.put(:graph, graph)}
   end
 
-  defp to_module(nil), do: nil
-  defp to_module(string) when is_binary(string), do: Module.concat(string, nil)
-
-  defp pick_module_and_convert(converters, pathmap, assigns) do
-    cnv_module = to_module(pathmap.front_matter[:converter]) || converters[pathmap.ext]
-    cnv_module.convert(pathmap.path, pathmap.front_matter, pathmap.pre_convert_body, assigns)
-  end
-
   defp build(filename, front_matter, body, pages_config) do
     front_matter
     |> Map.put(:__tableau_page_extension__, true)

lib/tableau/extensions/post_extension.ex

@@ -100,10 +100,18 @@ defmodule Tableau.PostExtension do
       config.dir
       |> Path.join("**/*.{#{exts}}")
       |> Common.paths()
-      |> Common.entries(fn pathmap ->
+      |> Common.entries(fn %{path: path, front_matter: front_matter, pre_convert_body: body, ext: ext} ->
         {
-          build(pathmap.path, pathmap.front_matter, pathmap.pre_convert_body, config),
-          fn assigns -> pick_module_and_convert(converters, pathmap, assigns) end
+          build(path, front_matter, body, config),
+          fn assigns ->
+            converter =
+              case front_matter[:converter] do
+                nil -> converters[ext]
+                converter -> Module.concat([converter])
+              end
+
+            converter.convert(path, front_matter, body, assigns)
+          end
         }
       end)
       |> Enum.sort_by(fn {post, _} -> post.date end, {:desc, DateTime})
@@ -129,14 +137,6 @@ defmodule Tableau.PostExtension do
      |> Map.put(:graph, graph)}
   end
 
-  defp to_module(nil), do: nil
-  defp to_module(string) when is_binary(string), do: Module.concat(string, nil)
-
-  defp pick_module_and_convert(converters, pathmap, assigns) do
-    cnv_module = to_module(pathmap.front_matter[:converter]) || converters[pathmap.ext]
-    cnv_module.convert(pathmap.path, pathmap.front_matter, pathmap.pre_convert_body, assigns)
-  end
-
   defp build(filename, attrs, body, posts_config) do
     Application.put_env(:date_time_parser, :include_zones_from, ~N[2010-01-01T00:00:00])
 

test/tableau/extensions/page_extension_test.exs

@@ -1,3 +1,21 @@
+defmodule Tableau.PageExtensionTest.Layout do
+  @moduledoc false
+  use Tableau.Layout
+
+  require EEx
+
+  EEx.function_from_string(
+    :def,
+    :template,
+    ~s'''
+    <div>
+      <%= render(@inner_content) %>
+    </div>
+    ''',
+    [:assigns]
+  )
+end
+
 defmodule Tableau.PageExtensionTest do
   use ExUnit.Case, async: true
 
@@ -232,10 +250,11 @@ defmodule Tableau.PageExtensionTest do
     test "renders with a custom converter in frontmatter", %{tmp_dir: dir, token: token} do
       File.write(Path.join(dir, "a-page.md"), """
       ---
-      title: missing layout key
+      title: custom converter
       type: articles
+      layout: Tableau.PageExtensionTest.Layout
       permalink: /:type/:title
-      converter: "Tableau.MDExConverter"
+      converter: Tableau.PageExtensionTest
       ---
 
       A great page
@@ -244,18 +263,27 @@ defmodule Tableau.PageExtensionTest do
       assert {:ok, token} = PageExtension.run(token)
 
       assert %{
-               pages: [
-                 %{
-                   __tableau_page_extension__: true,
-                   body: "\nA great page\n",
-                   file: ^dir <> "/a-page.md",
-                   layout: Blog.DefaultPageLayout,
-                   permalink: "/articles/missing-layout-key",
-                   title: "missing layout key",
-                   type: "articles"
-                 }
-               ]
+               pages: [%{body: "\nA great page\n", converter: "Tableau.PageExtensionTest"}],
+               graph: graph
              } = token
+
+      page =
+        graph
+        |> Graph.vertices()
+        |> Enum.find(fn p ->
+          case p do
+            %Tableau.Page{permalink: "/articles/custom-converter"} -> true
+            _ -> false
+          end
+        end)
+
+      graph = Tableau.Graph.insert(graph, [Tableau.PageExtensionTest.Layout])
+
+      content = Tableau.Document.render(graph, page, %{}, %{})
+
+      assert content =~ "A GREAT PAGE"
     end
   end
+
+  def convert(_, _, body, _), do: String.upcase(body)
 end

test/tableau/extensions/post_extension_test.exs

@@ -1,3 +1,21 @@
+defmodule Tableau.PostExtensionTest.Layout do
+  @moduledoc false
+  use Tableau.Layout
+
+  require EEx
+
+  EEx.function_from_string(
+    :def,
+    :template,
+    ~s'''
+    <div>
+      <%= render(@inner_content) %>
+    </div>
+    ''',
+    [:assigns]
+  )
+end
+
 defmodule Tableau.PostExtensionTest do
   use ExUnit.Case, async: true
 
@@ -297,31 +315,36 @@ defmodule Tableau.PostExtensionTest do
       ---
       title: foo man chu_foo.js
       type: articles
-      layout: Some.Layout
+      layout: Tableau.PostExtensionTest.Layout
       date: 2023-02-01 00:01:00
       permalink: /:type/:year/:month/:day/:title
-      converter: "Tableau.MDExConverter"
+      converter: Tableau.PostExtensionTest
       ---
 
       A great post
       """)
 
       assert {:ok, token} = PostExtension.run(token)
 
-      assert %{
-               posts: [
-                 %{
-                   __tableau_post_extension__: true,
-                   body: "\nA great post\n",
-                   date: ~U[2023-02-01 00:01:00Z],
-                   file: ^dir <> "/a-post.md",
-                   layout: Some.Layout,
-                   permalink: "/articles/2023/02/01/foo-man-chu-foo.js",
-                   title: "foo man chu_foo.js",
-                   type: "articles"
-                 }
-               ]
-             } = token
+      assert %{posts: [%{converter: "Tableau.PostExtensionTest"}], graph: graph} = token
+
+      page =
+        graph
+        |> Graph.vertices()
+        |> Enum.find(fn p ->
+          case p do
+            %Tableau.Page{permalink: "/articles/2023/02/01/foo-man-chu-foo.js"} -> true
+            _ -> false
+          end
+        end)
+
+      graph = Tableau.Graph.insert(graph, [Tableau.PostExtensionTest.Layout])
+
+      content = Tableau.Document.render(graph, page, %{}, %{})
+
+      assert content =~ "A GREAT POST"
     end
   end
+
+  def convert(_, _, body, _), do: String.upcase(body)
 end