rubygems
/
mail
1
0
Fork 0
Code Packages Releases Activity

Merge pull request #974 from twalpole/quote_phrase 

Don't mutate string in quote_phrase
This commit is contained in:
Jeremy Daer 2016-03-08 13:25:51 -07:00
parent 6343e70be5 bd0fb6a7ed
commit df48a05a7f
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/mail/utilities.rb
View File

@ -24,13 +24,11 @@ module Mail
def quote_phrase( str )
if RUBY_VERSION >= '1.9'
original_encoding = str.encoding
str.force_encoding('ASCII-8BIT')
if (PHRASE_UNSAFE === str)
quoted_str = dquote(str).force_encoding(original_encoding)
str.force_encoding(original_encoding)
quoted_str
ascii_str = str.dup.force_encoding('ASCII-8BIT')
if (PHRASE_UNSAFE === ascii_str)
dquote(ascii_str).force_encoding(original_encoding)
else
str.force_encoding(original_encoding)
str
end
else
(PHRASE_UNSAFE === str) ? dquote(str) : str

21
spec/mail/utilities_spec.rb
View File

@ -84,27 +84,32 @@ describe "Utilities Module" do
end
if RUBY_VERSION >= '1.9'
describe "quoting phrases" do
describe "quoting phrases" do
it "doesn't mutate original string" do
input_str = "blargh".freeze
expect { quote_phrase(input_str) }.not_to raise_error
end
if RUBY_VERSION >= '1.9'
describe "given a non-unsafe string" do
it "should not change the encoding" do
input_str = String.new("blargh")
input_str = "blargh"
input_str_encoding = input_str.encoding
quote_phrase(input_str)
result = quote_phrase(input_str)
expect(input_str.encoding).to eq input_str_encoding
expect(result.encoding).to eq input_str_encoding
end
end
describe "given an unsafe string" do
it "should not change the encoding" do
input_str = String.new("Bjørn")
input_str = "Bjørn"
input_str_encoding = input_str.encoding
quote_phrase(input_str)
result = quote_phrase(input_str)
expect(input_str.encoding).to eq input_str_encoding
expect(result.encoding).to eq input_str_encoding
end
end
end