Merge branch 'master' of github.com:daveslutzkin/mail

yalab · Nov 10, 2013 · 148819f · 148819f
2 parents b6a1d60 + 1a27e0f
commit 148819f
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/lib/mail/utilities.rb b/lib/mail/utilities.rb
@@ -21,7 +21,9 @@ def quote_phrase( str )
         original_encoding = str.encoding
         str.force_encoding('ASCII-8BIT')
         if (PHRASE_UNSAFE === str)
-          dquote(str).force_encoding(original_encoding)
+          quoted_str = dquote(str).force_encoding(original_encoding)
+          str.force_encoding(original_encoding)
+          quoted_str
         else
           str.force_encoding(original_encoding)
         end

diff --git a/spec/mail/utilities_spec.rb b/spec/mail/utilities_spec.rb
@@ -83,6 +83,32 @@
 
   end
 
+  if RUBY_VERSION >= '1.9'
+    describe "quoting phrases" do
+      describe "given a non-unsafe string" do
+        it "should not change the encoding" do
+          input_str = "blargh"
+          input_str_encoding = input_str.encoding
+
+          quote_phrase(input_str)
+
+          input_str.encoding.should eq input_str_encoding
+        end
+      end
+
+      describe "given an unsafe string" do
+        it "should not change the encoding" do
+          input_str = "Bjørn"
+          input_str_encoding = input_str.encoding
+
+          quote_phrase(input_str)
+
+          input_str.encoding.should eq input_str_encoding
+        end
+      end
+    end
+  end
+
   describe "escaping parenthesies" do
     it "should escape parens" do
       test = 'This is not (escaped)'