Fix Specs (#1)

* Fixes specs as the current approach was breaking things * Adds a Head option to concat to root HTML content head tag.
filipecabaco · May 6, 2024 · 7ade5e5 · 7ade5e5
1 parent 8109908
commit 7ade5e5
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 31 deletions.
diff --git a/lib/francis_htmx.ex b/lib/francis_htmx.ex
@@ -39,10 +39,27 @@ defmodule FrancisHtmx do
   @doc """
   Renders htmx content by loading htmx.js and rendering binary content.
   """
+  @spec htmx((Plug.Conn.t() -> binary()), Keyword.t()) :: Macro.t()
   defmacro htmx(content, opts \\ []) do
+    title = Keyword.get(opts, :title, "")
+    head = Keyword.get(opts, :head, "")
+
     quote location: :keep do
       get("/", fn conn ->
-        root(unquote(content).(conn), unquote(opts))
+        """
+        <!DOCTYPE html>
+        <html>
+          <head>
+            #{unquote(head)}
+
+            <script src="https://unpkg.com/htmx.org/dist/htmx.js"></script>
+            <title>#{unquote(title)}</title>
+          </head>
+          <body>
+            #{unquote(content).(conn)}
+          </body>
+        </html>
+        """
       end)
     end
   end
@@ -52,35 +69,19 @@ defmodule FrancisHtmx do
 
   Requires a variable named "assigns" to exist and be set to a map.
   """
+  @spec sigil_E(String.t(), Keyword.t()) :: Macro.t()
   defmacro sigil_E(content, _opts \\ []) do
     unless Macro.Env.has_var?(__CALLER__, {:assigns, nil}) do
       raise "~E requires a variable named \"assigns\" to exist and be set to a map"
     end
 
     quote location: :keep do
-      unquote(content)
-      |> EEx.eval_string([assigns: var!(assigns)], engine: Phoenix.HTML.Engine)
-      |> then(fn {:safe, content} -> Enum.join(content) end)
-    end
-  end
+      content =
+        EEx.eval_string(unquote(content), [assigns: var!(assigns)], engine: Phoenix.HTML.Engine)
 
-  @doc """
-  Renders the root content with htmx.js loaded required for the htmx/1 macro.
-  """
-  def root(content, opts) when is_binary(content) do
-    title = Keyword.get(opts, :title, "")
-
-    """
-    <!DOCTYPE html>
-    <html>
-      <head>
-        <title>#{title}</title>
-        <script src="https://unpkg.com/htmx.org/dist/htmx.js"></script>
-      </head>
-      <body>
-        #{content}
-      </body>
-    </html>
-    """
+      content
+      |> Phoenix.HTML.html_escape()
+      |> Phoenix.HTML.safe_to_string()
+    end
   end
 end
diff --git a/mix.exs b/mix.exs
@@ -1,6 +1,6 @@
 defmodule FrancisHtmx.MixProject do
   use Mix.Project
-  @version "0.1.0"
+  @version "0.1.1"
   def project do
     [
       name: "Francis HTMX",

diff --git a/test/francis_htmx_test.exs b/test/francis_htmx_test.exs
@@ -9,7 +9,18 @@ defmodule FrancisHtmxTest do
 
       assert html
              |> Floki.find("script")
-             |> Floki.attribute("src") == ["https://unpkg.com/htmx.org/dist/htmx.js"]
+             |> Floki.attribute("src") == [
+               "https://cdn.tailwindcss.com",
+               "https://unpkg.com/htmx.org/dist/htmx.js"
+             ]
+
+      assert html
+             |> Floki.find("link")
+             |> Floki.attribute("href") == ["/app.css"]
+
+      assert html
+             |> Floki.find("title")
+             |> Floki.text() == "Testing HTMX"
 
       assert html
              |> Floki.find("body")
@@ -23,11 +34,18 @@ defmodule FrancisHtmxTestHandler do
   use Francis
   import FrancisHtmx
 
-  htmx(fn _ ->
-    assigns = %{title: "test"}
+  htmx(
+    fn _ ->
+      assigns = %{title: "test"}
 
-    ~E"""
-    <div><%= @title %></div>
+      ~E"""
+      <div><%= @title %></div>
+      """
+    end,
+    title: "Testing HTMX",
+    head: """
+    <script src="https://cdn.tailwindcss.com"></script>
+    <link href="/app.css" rel="stylesheet">
     """
-  end)
+  )
 end