Set correct body field depending on template format (#154)

* Use correct body fields in Email struct

Use `:html_body` for `.htm`, `.html` and `.xml` template extensions, `:text_body` otherwise

* Add line about formats to render_body docs

* mix.format

* Add tests for body formats

Author: wmnnd

lib/phoenix_swoosh.ex

@@ -65,6 +65,7 @@ defmodule Phoenix.Swoosh do
 
   Once the template is rendered the resulting string is stored on the email fields `html_body` and `text_body` depending
   on the format of the template.
+  `.html`, `.htm`, and `.xml` are stored in `html_body`; all other extensions, (e.g. `.txt` and `.text`), in `text_body`.
 
   ## Arguments
 
@@ -157,9 +158,12 @@ defmodule Phoenix.Swoosh do
             raise "a view module was not specified, set one with put_view/2"
 
     content = Phoenix.View.render_to_string(view, template, Map.put(email.assigns, :email, email))
-    Map.put(email, :"#{format}_body", content)
+    Map.put(email, body_key(format), content)
   end
 
+  defp body_key(format) when format in ["html", "htm", "xml"], do: :html_body
+  defp body_key(_other), do: :text_body
+
   @doc """
   Stores the layout for rendering.
 
@@ -258,8 +262,6 @@ defmodule Phoenix.Swoosh do
     end
   end
 
-  defp template_name(name, format) when is_atom(name), do:
-    Atom.to_string(name) <> "." <> format
-  defp template_name(name, _format) when is_binary(name), do:
-    name
+  defp template_name(name, format) when is_atom(name), do: Atom.to_string(name) <> "." <> format
+  defp template_name(name, _format) when is_binary(name), do: name
 end

test/fixtures/templates/email/format_html.htm.eex

@@ -0,0 +1 @@
+This is an HTML template with the .htm extension.

test/fixtures/templates/email/format_html.html.eex

@@ -0,0 +1 @@
+This is an HTML template with the .html extension.

test/fixtures/templates/email/format_html.xml.eex

@@ -0,0 +1 @@
+This is an HTML template with the .xml extension.

test/fixtures/templates/email/format_text.text.eex

@@ -0,0 +1 @@
+This is a text template with the .text extension.

test/fixtures/templates/email/format_text.txt.eex

@@ -0,0 +1 @@
+This is a text template with the .txt extension.

test/fixtures/templates/email/format_text.unknown.eex

@@ -0,0 +1 @@
+This is a text template with an unknown extension.

test/phoenix_swoosh_test.exs

@@ -290,4 +290,24 @@ defmodule Phoenix.SwooshTest do
       end
     end
   end
+
+  test "body formats are set according to template file extension", %{email: email} do
+    assert email |> render_body("format_html.html", %{}) |> Map.fetch!(:html_body) =~
+             "This is an HTML template"
+
+    assert email |> render_body("format_html.htm", %{}) |> Map.fetch!(:html_body) =~
+             "This is an HTML template"
+
+    assert email |> render_body("format_html.xml", %{}) |> Map.fetch!(:html_body) =~
+             "This is an HTML template"
+
+    assert email |> render_body("format_text.txt", %{}) |> Map.fetch!(:text_body) =~
+             "This is a text template"
+
+    assert email |> render_body("format_text.text", %{}) |> Map.fetch!(:text_body) =~
+             "This is a text template"
+
+    assert email |> render_body("format_text.unknown", %{}) |> Map.fetch!(:text_body) =~
+             "This is a text template"
+  end
 end