Default to UTF-8 (DockYard#127)

Audian · Feb 4, 2024 · d83c47f · d83c47f
1 parent c728ffc
commit d83c47f
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 24 deletions.
diff --git a/lib/mail.ex b/lib/mail.ex
@@ -70,7 +70,7 @@ defmodule Mail do
           ["text/plain", {"charset", charset}]
 
         _else ->
-          "text/plain"
+          ["text/plain", {"charset", default_charset()}]
       end
 
     Mail.Message.put_body(message, body)
@@ -132,7 +132,7 @@ defmodule Mail do
           ["text/html", {"charset", charset}]
 
         _else ->
-          "text/html"
+          ["text/html", {"charset", default_charset()}]
       end
 
     Mail.Message.put_body(message, body)
@@ -162,6 +162,10 @@ defmodule Mail do
 
   def get_html(%Mail.Message{}), do: nil
 
+  defp default_charset do
+    "UTF-8"
+  end
+
   @doc """
   Add an attachment part to the message
 

diff --git a/lib/mail/message.ex b/lib/mail/message.ex
@@ -203,7 +203,7 @@ defmodule Mail.Message do
           ["text/plain", {"charset", charset}]
 
         _else ->
-          "text/plain"
+          ["text/plain", {"charset", default_charset()}]
       end
 
     put_content_type(%Mail.Message{}, content_type)
@@ -231,14 +231,18 @@ defmodule Mail.Message do
           ["text/html", {"charset", charset}]
 
         _else ->
-          "text/html"
+          ["text/html", {"charset", default_charset()}]
       end
 
     put_content_type(%Mail.Message{}, content_type)
     |> put_header(:content_transfer_encoding, :quoted_printable)
     |> put_body(body)
   end
 
+  defp default_charset do
+    "UTF-8"
+  end
+
   @doc """
   Add attachment meta data to a `Mail.Message`
 

diff --git a/test/fixtures/multipart-jpeg-attachment-rendering.eml b/test/fixtures/multipart-jpeg-attachment-rendering.eml
@@ -8,13 +8,13 @@ Content-Type: multipart/mixed; boundary="2753118483D4F18DC5FD1F1A"
 Content-Type: multipart/alternative; boundary="DB28EC13A6576C8F20B92FD0"
 
 --DB28EC13A6576C8F20B92FD0
-Content-Type: text/plain
+Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: quoted-printable
 
 Some text
 
 --DB28EC13A6576C8F20B92FD0
-Content-Type: text/html
+Content-Type: text/html; charset=UTF-8
 Content-Transfer-Encoding: quoted-printable
 
 <h1>Some HTML</h1>
@@ -28,4 +28,4 @@ Content-Disposition: attachment; filename=tiny_jpeg.jpg
 /9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8Q
 EBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=
 
---2753118483D4F18DC5FD1F1A--
+--2753118483D4F18DC5FD1F1A--
diff --git a/test/fixtures/recursive-part-rendering.eml b/test/fixtures/recursive-part-rendering.eml
@@ -1,13 +1,13 @@
 Content-Type: multipart/alternative; boundary="foobar"
 
 --foobar
-Content-Type: text/plain
+Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: quoted-printable
 
 Hello there! 1 + 1 =3D 2
 
 --foobar
-Content-Type: text/html
+Content-Type: text/html; charset=UTF-8
 Content-Transfer-Encoding: quoted-printable
 
 <a href=3D"/">Hello there! 1 + 1 =3D 2</a>

diff --git a/test/fixtures/simple-multipart-rendering.eml b/test/fixtures/simple-multipart-rendering.eml
@@ -6,13 +6,13 @@ Mime-Version: 1.0
 Content-Type: multipart/alternative; boundary="foobar"
 
 --foobar
-Content-Type: text/plain
+Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: quoted-printable
 
 Some text
 
 --foobar
-Content-Type: text/html
+Content-Type: text/html; charset=UTF-8
 Content-Transfer-Encoding: quoted-printable
 
 <h1>Some HTML</h1>

diff --git a/test/fixtures/simple-plain-rendering.eml b/test/fixtures/simple-plain-rendering.eml
@@ -1,6 +1,6 @@
 To: [email protected]
 Subject: Test email
-Content-Type: text/plain
+Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: quoted-printable
 
 Some text
diff --git a/test/mail/message_test.exs b/test/mail/message_test.exs
@@ -108,28 +108,28 @@ defmodule Mail.MessageTest do
 
   test "build_text" do
     message = Mail.Message.build_text("Some text")
-    assert Mail.Message.get_content_type(message) == ["text/plain"]
+    assert Mail.Message.get_content_type(message) == ["text/plain", {"charset", "UTF-8"}]
     assert Mail.Message.get_header(message, :content_transfer_encoding) == :quoted_printable
     assert message.body == "Some text"
   end
 
   test "build_text when given charset" do
-    message = Mail.Message.build_text("Some text", charset: "UTF-8")
-    assert Mail.Message.get_content_type(message) == ["text/plain", {"charset", "UTF-8"}]
+    message = Mail.Message.build_text("Some text", charset: "US-ASCII")
+    assert Mail.Message.get_content_type(message) == ["text/plain", {"charset", "US-ASCII"}]
     assert Mail.Message.get_header(message, :content_transfer_encoding) == :quoted_printable
     assert message.body == "Some text"
   end
 
   test "build_html" do
     message = Mail.Message.build_html("<h1>Some HTML</h1>")
-    assert Mail.Message.get_content_type(message) == ["text/html"]
+    assert Mail.Message.get_content_type(message) == ["text/html", {"charset", "UTF-8"}]
     assert Mail.Message.get_header(message, :content_transfer_encoding) == :quoted_printable
     assert message.body == "<h1>Some HTML</h1>"
   end
 
   test "build_html when given charset" do
-    message = Mail.Message.build_html("<h1>Some HTML</h1>", charset: "UTF-8")
-    assert Mail.Message.get_content_type(message) == ["text/html", {"charset", "UTF-8"}]
+    message = Mail.Message.build_html("<h1>Some HTML</h1>", charset: "US-ASCII")
+    assert Mail.Message.get_content_type(message) == ["text/html", {"charset", "US-ASCII"}]
     assert Mail.Message.get_header(message, :content_transfer_encoding) == :quoted_printable
     assert message.body == "<h1>Some HTML</h1>"
   end

diff --git a/test/mail_test.exs b/test/mail_test.exs
@@ -137,7 +137,7 @@ defmodule MailTest do
 
     assert length(mail.parts) == 0
     assert mail.body == "Some text"
-    assert Mail.Message.get_content_type(mail) == ["text/plain"]
+    assert Mail.Message.get_content_type(mail) == ["text/plain", {"charset", "UTF-8"}]
   end
 
   test "put_text with a multipart" do
@@ -147,7 +147,7 @@ defmodule MailTest do
     part = List.first(mail.parts)
 
     assert part.body == "Some text"
-    assert Mail.Message.get_content_type(part) == ["text/plain"]
+    assert Mail.Message.get_content_type(part) == ["text/plain", {"charset", "UTF-8"}]
   end
 
   test "put_text replaces existing text part in multipart" do
@@ -159,7 +159,7 @@ defmodule MailTest do
     part = List.first(mail.parts)
 
     assert part.body == "Some other text"
-    assert Mail.Message.get_content_type(part) == ["text/plain"]
+    assert Mail.Message.get_content_type(part) == ["text/plain", {"charset", "UTF-8"}]
   end
 
   test "get_text with singlepart" do
@@ -237,7 +237,7 @@ defmodule MailTest do
 
     assert length(mail.parts) == 0
     assert mail.body == "<h1>Some HTML</h1>"
-    assert Mail.Message.get_content_type(mail) == ["text/html"]
+    assert Mail.Message.get_content_type(mail) == ["text/html", {"charset", "UTF-8"}]
   end
 
   test "put_html with a multipart" do
@@ -247,7 +247,7 @@ defmodule MailTest do
     part = List.first(mail.parts)
 
     assert part.body == "<h1>Some HTML</h1>"
-    assert Mail.Message.get_content_type(part) == ["text/html"]
+    assert Mail.Message.get_content_type(part) == ["text/html", {"charset", "UTF-8"}]
   end
 
   test "put_html replaces existing html part in multipart" do
@@ -259,7 +259,7 @@ defmodule MailTest do
     part = List.first(mail.parts)
 
     assert part.body == "<h1>Some other html</h1>"
-    assert Mail.Message.get_content_type(part) == ["text/html"]
+    assert Mail.Message.get_content_type(part) == ["text/html", {"charset", "UTF-8"}]
   end
 
   test "get_html with singlepart" do