Changeset 7819

Timestamp:

10/09/07 13:34:51 (1 year ago)

Author:

xal

Message:

Set default charset of MTAs to ISO instead of us-ascii (unless reported otherwise)

Files:

• trunk/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb (modified) (1 diff)
• trunk/actionmailer/test/quoting_test.rb (modified) (4 diffs)

trunk/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb

@@ -9 +9 @@
-      case (content_transfer_encoding || "7bit").downcase
-        when "quoted-printable"
+          # the default charset is set to iso-8859-1 instead of 'us-ascii'. 
+          # This is needed as many mailer do not set the charset but send in ISO. This is only used if no charset is set.
+          if !from_charset.blank? && from_charset.downcase == 'us-ascii'
+            from_charset = 'iso-8859-1'
+          end
+          
-          Unquoter.unquote_quoted_printable_and_convert_to(quoted_body,
-            to_charset, from_charset, true)

trunk/actionmailer/test/quoting_test.rb

@@ -4 +4 @@
-
-class QuotingTest < Test::Unit::TestCase
+  
+  # Move some tests from TMAIL here
+  def test_unquote_quoted_printable
+    a ="=?ISO-8859-1?Q?[166417]_Bekr=E6ftelse_fra_Rejsefeber?=" 
+    b = TMail::Unquoter.unquote_and_convert_to(a, 'utf-8')
+    assert_equal "[166417] Bekr\303\246ftelse fra Rejsefeber", b
+  end
+
+  def test_unquote_base64
+    a ="=?ISO-8859-1?B?WzE2NjQxN10gQmVrcuZmdGVsc2UgZnJhIFJlanNlZmViZXI=?="
+    b = TMail::Unquoter.unquote_and_convert_to(a, 'utf-8')
+    assert_equal "[166417] Bekr\303\246ftelse fra Rejsefeber", b
+  end
+
+  def test_unquote_without_charset
+    a ="[166417]_Bekr=E6ftelse_fra_Rejsefeber" 
+    b = TMail::Unquoter.unquote_and_convert_to(a, 'utf-8')
+    assert_equal "[166417]_Bekr=E6ftelse_fra_Rejsefeber", b
+  end  
+  
+  def test_unqoute_multiple
+    a ="=?utf-8?q?Re=3A_=5B12=5D_=23137=3A_Inkonsistente_verwendung_von_=22Hin?==?utf-8?b?enVmw7xnZW4i?=" 
+    b = TMail::Unquoter.unquote_and_convert_to(a, 'utf-8')
+    assert_equal "Re: [12] #137: Inkonsistente verwendung von \"Hinzuf\303\274gen\"", b
+  end
+  
+  def test_unqoute_in_the_middle
+    a ="Re: Photos =?ISO-8859-1?Q?Brosch=FCre_Rand?=" 
+    b = TMail::Unquoter.unquote_and_convert_to(a, 'utf-8')
+    assert_equal "Re: Photos Brosch\303\274re Rand", b
+  end
+  
+  def test_unqoute_iso
+    a ="=?ISO-8859-1?Q?Brosch=FCre_Rand?=" 
+    b = TMail::Unquoter.unquote_and_convert_to(a, 'iso-8859-1')
+    assert_equal "Brosch\374re Rand", b
+  end
+    
-  def test_quote_multibyte_chars
-    original = "\303\246 \303\270 and \303\245"
@@ -19 +57 @@
-    assert_equal unquoted, original
-  end
-
+
+
-  # test an email that has been created using \r\n newlines, instead of
-  # \n newlines.
@@ -63 +102 @@
-    end
-  end
-
+
-  private
-    
@@ -92 +131 @@
-    end
-end
+