feat: pass values from page through to layouts

Author: mhanberg

lib/tableau/document.ex

@@ -6,16 +6,11 @@ defmodule Tableau.Document do
 
     Please see the `Tableau.Layout` docs for more info.
     """
-    defmacro render(inner_content, extra_assigns \\ Macro.escape(%{})) do
+    defmacro render(inner_content) do
       quote do
         case unquote(inner_content) do
-          [module | rest] ->
-            module.template(
-              Map.merge(Map.new(unquote(extra_assigns)), %{
-                site: Access.fetch!(var!(assigns), :site),
-                inner_content: rest
-              })
-            )
+          [{module, page_assigns} | rest] ->
+            module.template(Map.merge(page_assigns, %{inner_content: rest}))
 
           [] ->
             nil
@@ -36,6 +31,10 @@ defmodule Tableau.Document do
           raise "Failed to find layout path for #{inspect(module)}"
       end
 
-    root.template(Map.merge(assigns, %{inner_content: mods}))
+    page_assigns = Map.new(module.__tableau_extra__() || [])
+    mods = for mod <- mods, do: {mod, page_assigns}
+    new_assigns = Map.merge(page_assigns, %{inner_content: mods})
+
+    root.template(Map.merge(assigns, new_assigns))
   end
 end

lib/tableau/page.ex

@@ -32,28 +32,15 @@ defmodule Tableau.Page do
   @callback template(assigns()) :: template()
 
   defmacro __using__(opts) do
-    opts = Keyword.validate!(opts, [:layout, :permalink])
+    opts = Keyword.validate!(opts, [:layout, :permalink, extra: []])
 
-    page =
-      quote do
-        def __tableau_type__, do: :page
-      end
+    quote do
+      @behaviour unquote(__MODULE__)
 
-    parent =
-      quote do
-        def __tableau_parent__, do: unquote(opts[:layout])
-      end
-
-    permalink =
-      quote do
-        def __tableau_permalink__, do: unquote(opts[:permalink])
-      end
-
-    postlude =
-      quote do
-        @behaviour unquote(__MODULE__)
-      end
-
-    [page, parent, permalink, postlude]
+      def __tableau_type__, do: :page
+      def __tableau_parent__, do: unquote(opts[:layout])
+      def __tableau_permalink__, do: unquote(opts[:permalink])
+      def __tableau_extra__, do: unquote(opts[:extra])
+    end
   end
 end

test/mix/tasks/tableau.build_test.exs

@@ -24,16 +24,17 @@ defmodule Mix.Tasks.Tableau.BuildTest.About do
   def __tableau_type__, do: :page
   def __tableau_parent__, do: InnerLayout
   def __tableau_permalink__, do: "/about"
+  def __tableau_extra__, do: []
 
   EEx.function_from_string(
     :def,
     :template,
     ~g'''
-    <div class="<%= @class %>">
+    <div>
       hi
     </div>
     '''html,
-    [:assigns]
+    [:_assigns]
   )
 end
 
@@ -45,6 +46,7 @@ defmodule Mix.Tasks.Tableau.BuildTest.Index do
   def __tableau_type__, do: :page
   def __tableau_parent__, do: InnerLayout
   def __tableau_permalink__, do: "/"
+  def __tableau_extra__, do: []
 
   EEx.function_from_string(
     :def,
@@ -60,7 +62,7 @@ end
 
 defmodule Mix.Tasks.Tableau.BuildTest.InnerLayout do
   import Tableau.Strung
-  import Tableau.Document.Helper, only: [render: 2]
+  import Tableau.Document.Helper, only: [render: 1]
   require EEx
   alias Mix.Tasks.Tableau.BuildTest.RootLayout
 
@@ -72,7 +74,7 @@ defmodule Mix.Tasks.Tableau.BuildTest.InnerLayout do
     :template,
     ~g'''
     <div id="inner-layout">
-      <%= render(@inner_content, class: "text-red") %>
+      <%= render(@inner_content) %>
     </div>
     '''html,
     [:assigns]

test/tableau/document_test.exs

@@ -6,12 +6,13 @@ defmodule Tableau.DocumentTest.About do
   def __tableau_type__, do: :page
   def __tableau_parent__, do: InnerLayout
   def __tableau_permalink__, do: "/about"
+  def __tableau_extra__, do: [yo: "lo"]
 
   EEx.function_from_string(
     :def,
     :template,
     ~g'''
-    <div class="<%= @class %>">
+    <div id="<%= @yo %>">
       hi
     </div>
     '''html,
@@ -27,6 +28,7 @@ defmodule Tableau.DocumentTest.Index do
   def __tableau_type__, do: :page
   def __tableau_parent__, do: InnerLayout
   def __tableau_permalink__, do: "/"
+  def __tableau_extra__, do: []
 
   EEx.function_from_string(
     :def,
@@ -42,7 +44,7 @@ end
 
 defmodule Tableau.DocumentTest.InnerLayout do
   import Tableau.Strung
-  import Tableau.Document.Helper, only: [render: 2]
+  import Tableau.Document.Helper, only: [render: 1]
   require EEx
   alias Tableau.DocumentTest.RootLayout
 
@@ -54,7 +56,7 @@ defmodule Tableau.DocumentTest.InnerLayout do
     :template,
     ~g'''
     <div id="inner-layout">
-      <%= render(@inner_content, class: "text-red") %>
+      <%= render(@inner_content) %>
     </div>
     '''html,
     [:assigns]
@@ -98,8 +100,7 @@ defmodule Tableau.DocumentTest do
                   {"head", [], []},
                   {"body", [],
                    [
-                     {"div", [{"id", "inner-layout"}],
-                      [{"div", [{"class", "text-red"}], ["\n  hi\n"]}]}
+                     {"div", [{"id", "inner-layout"}], [{"div", [{"id", "lo"}], ["\n  hi\n"]}]}
                    ]}
                 ]}
              ]

test/tableau/graph/node_test.exs

@@ -9,6 +9,7 @@ defmodule Tableau.Graph.NodeTest do
     def __tableau_type__, do: :page
     def __tableau_parent__, do: Layout
     def __tableau_permalink__, do: "/about"
+    def __tableau_extra__, do: []
 
     def template(_) do
       ""

test/tableau/graph_test.exs

@@ -7,6 +7,7 @@ defmodule Tableau.GraphTest do
     def __tableau_type__, do: :page
     def __tableau_parent__, do: InnerLayout
     def __tableau_permalink__, do: "/about"
+    def __tableau_extra__, do: []
 
     def template(_), do: ""
   end
@@ -17,6 +18,7 @@ defmodule Tableau.GraphTest do
     def __tableau_type__, do: :page
     def __tableau_parent__, do: RootLayout
     def __tableau_permalink__, do: "/about"
+    def __tableau_extra__, do: []
     def template(_), do: ""
   end