fixups

Author: mhanberg

lib/tableau/extensions/page_extension.ex

@@ -8,7 +8,6 @@ defmodule Tableau.PageExtension do
 
   Frontmatter is compiled with `yaml_elixir` and all keys are converted to atoms.
 
-  * `:id` - An Elixir module to be used when compiling the backing `Tableau.Page`. A leaking implementation detail that should be fixed eventually.
   * `:title` - The title of the page
   * `:permalink` - The permalink of the page.
   * `:layout` - A string representation of a Tableau layout module.
@@ -74,11 +73,19 @@ defmodule Tableau.PageExtension do
           Macro.Env.location(__ENV__)
         )
 
+        for {mod, _, _} <- :code.all_available(),
+            mod = Module.concat([to_string(mod)]),
+            Tableau.Graph.Node.type(mod) == :page,
+            mod.__tableau_opts__()[:__tableau_page_extension__] do
+          :code.purge(mod)
+          :code.delete(mod)
+        end
+
         pages =
           for page <- apply(Tableau.PageExtension.Pages, :pages, []) do
             {:module, _module, _binary, _term} =
               Module.create(
-                Module.concat([page.id]),
+                :"#{System.unique_integer()}",
                 quote do
                   use Tableau.Page, unquote(Macro.escape(Keyword.new(page)))
 

lib/tableau/extensions/page_extension/pages/page.ex

@@ -5,6 +5,8 @@ defmodule Tableau.PageExtension.Pages.Page do
       Tableau.PageExtension.Config.new(Map.new(Application.get_env(:tableau, Tableau.PageExtension, %{})))
 
     attrs
+    |> Map.put(:__tableau_page_extension__, true)
+    |> Map.put(:module, :"#{System.unique_integer()}")
     |> Map.put(:body, body)
     |> Map.put(:file, filename)
     |> Map.put(:layout, Module.concat([attrs.layout || page_config.layout]))

lib/tableau/extensions/post_extension.ex

@@ -8,7 +8,6 @@ defmodule Tableau.PostExtension do
 
   Frontmatter is compiled with `yaml_elixir` and all keys are converted to atoms.
 
-  * `:id` - An Elixir module to be used when compiling the backing `Tableau.Page`. Optional.
   * `:title` - The title of the post. Falls back to the first `<h1>` tag if present in the body.
   * `:permalink` - The permalink of the post. `:title` will be replaced with the posts title and non alphanumeric characters removed. Optional.
   * `:date` - A string representation of an Elixir `NaiveDateTime`, often presented as a `sigil_N`. This will be converted to your configured timezone.
@@ -88,11 +87,19 @@ defmodule Tableau.PostExtension do
           Macro.Env.location(__ENV__)
         )
 
+        for {mod, _, _} <- :code.all_available(),
+            mod = Module.concat([to_string(mod)]),
+            Tableau.Graph.Node.type(mod) == :page,
+            mod.__tableau_opts__()[:__tableau_post_extension__] do
+          :code.purge(mod)
+          :code.delete(mod)
+        end
+
         posts =
           for post <- apply(Tableau.PostExtension.Posts, :posts, []) do
             {:module, _module, _binary, _term} =
               Module.create(
-                Module.concat([post.id]),
+                :"#{System.unique_integer()}",
                 quote do
                   use Tableau.Page, unquote(Macro.escape(Keyword.new(post)))
 
@@ -107,25 +114,6 @@ defmodule Tableau.PostExtension do
             post
           end
 
-        generated_posts = Enum.map(posts, & &1.id)
-
-        loaded_posts =
-          Enum.reduce(:code.all_loaded(), [], fn {mod, _}, acc ->
-            mod
-            |> to_string()
-            |> String.split(".")
-            |> then(fn
-              [_, "AutogenPostID" | _] -> mod |> Macro.to_string() |> then(&[&1 | acc])
-              _ -> acc
-            end)
-          end)
-
-        for post <- loaded_posts, post not in generated_posts do
-          post = Module.concat([post])
-          :code.purge(post)
-          :code.delete(post)
-        end
-
         {:ok, Map.put(token, :posts, posts)}
       end,
       [Node.self()],

lib/tableau/extensions/post_extension/posts/post.ex

@@ -7,6 +7,7 @@ defmodule Tableau.PostExtension.Posts.Post do
       Tableau.PostExtension.Config.new(Map.new(Application.get_env(:tableau, Tableau.PostExtension, %{})))
 
     attrs
+    |> Map.put(:__tableau_post_extension__, true)
     |> Map.put(:body, body)
     |> Map.put(:file, filename)
     |> Map.put(:layout, Module.concat([attrs[:layout] || post_config.layout]))
@@ -18,7 +19,6 @@ defmodule Tableau.PostExtension.Posts.Post do
         _ -> nil
       end
     end)
-    |> maybe_calculate_id()
     |> Map.put(
       :date,
       DateTime.from_naive!(
@@ -68,15 +68,4 @@ defmodule Tableau.PostExtension.Posts.Post do
     |> String.replace(~r/[^[:alnum:]\/\-]/, "")
     |> String.downcase()
   end
-
-  defp maybe_calculate_id(%{id: _} = attrs), do: attrs
-
-  defp maybe_calculate_id(attrs) do
-    attrs.title
-    |> String.downcase()
-    |> String.replace(~r/[^[:alnum:]]+/u, "_")
-    |> Macro.camelize()
-    |> then(&"AutogenPostID.#{&1}")
-    |> then(&Map.put(attrs, :id, &1))
-  end
 end