beam-community · jsegal205 · Oct 25, 2024 · Oct 25, 2024 · Oct 25, 2024
diff --git a/config/config.exs b/config/config.exs
@@ -0,0 +1,3 @@
+import Config
+
+config :phoenix, :json_library, Jason
diff --git a/lib/bamboo_phoenix.ex b/lib/bamboo_phoenix.ex
@@ -120,7 +120,7 @@ defmodule Bamboo.Phoenix do
           <link rel="stylesheet" href="<%= static_url(MyApp.Endpoint, "/css/email.css") %>">
         </head>
         <body>
-          <%= render @view_module, @view_template, assigns %>
+          <%= @inner_content %>
         </body>
       </html>
 
@@ -295,9 +295,7 @@ defmodule Bamboo.Phoenix do
 
       true ->
         raise ArgumentError, """
-        Template name must end in either ".html" or ".text". Template name was #{
-          inspect(template)
-        }
+        Template name must end in either ".html" or ".text". Template name was #{inspect(template)}
 
         If you would like to render both and html and text template,
         use an atom without an extension instead.

diff --git a/mix.exs b/mix.exs
@@ -38,6 +38,7 @@ defmodule BambooPhoenix.MixProject do
   defp deps do
     [
       {:bamboo, ">= 2.0.0"},
+      {:jason, "~> 1.4"},
       {:phoenix, ">= 1.3.0"},
       {:phoenix_html, "~> 2.2", only: :test},
       {:ex_doc, ">= 0.0.0", only: :dev, runtime: false}

diff --git a/mix.lock b/mix.lock
@@ -5,6 +5,7 @@
   "ex_doc": {:hex, :ex_doc, "0.23.0", "a069bc9b0bf8efe323ecde8c0d62afc13d308b1fa3d228b65bca5cf8703a529d", [:mix], [{:earmark_parser, "~> 1.4.0", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm", "f5e2c4702468b2fd11b10d39416ddadd2fcdd173ba2a0285ebd92c39827a5a16"},
   "hackney": {:hex, :hackney, "1.17.0", "717ea195fd2f898d9fe9f1ce0afcc2621a41ecfe137fae57e7fe6e9484b9aa99", [:rebar3], [{:certifi, "~>2.5", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~>6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~>1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "~>3.3", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~>1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "64c22225f1ea8855f584720c0e5b3cd14095703af1c9fbc845ba042811dc671c"},
   "idna": {:hex, :idna, "6.1.1", "8a63070e9f7d0c62eb9d9fcb360a7de382448200fbbd1b106cc96d3d8099df8d", [:rebar3], [{:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"},
+  "jason": {:hex, :jason, "1.4.4", "b9226785a9aa77b6857ca22832cffa5d5011a667207eb2a0ad56adb5db443b8a", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "c5eb0cab91f094599f94d55bc63409236a8ec69a21a67814529e8d5f6cc90b3b"},
   "makeup": {:hex, :makeup, "1.0.5", "d5a830bc42c9800ce07dd97fa94669dfb93d3bf5fcf6ea7a0c67b2e0e4a7f26c", [:mix], [{:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "cfa158c02d3f5c0c665d0af11512fed3fba0144cf1aadee0f2ce17747fba2ca9"},
   "makeup_elixir": {:hex, :makeup_elixir, "0.15.1", "b5888c880d17d1cc3e598f05cdb5b5a91b7b17ac4eaf5f297cb697663a1094dd", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.1", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "db68c173234b07ab2a07f645a5acdc117b9f99d69ebf521821d89690ae6c6ec8"},
   "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm", "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"},

diff --git a/test/support/templates/phoenix_layout/app.html.eex b/test/support/templates/phoenix_layout/app.html.eex
@@ -1,2 +1,2 @@
 HTML layout
-<%= render @view_module, @view_template, assigns %>
+<%= @inner_content %>
diff --git a/test/support/templates/phoenix_layout/app.text.eex b/test/support/templates/phoenix_layout/app.text.eex
@@ -1,2 +1,2 @@
 TEXT layout
-<%= render @view_module, @view_template, assigns %>
+<%= @inner_content %>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import Config

		config :phoenix, :json_library, Jason