mailparser 0.5.0.beta3 → 0.5.0.beta4

data/lib/mailparser/rfc2047.rb

@@ -23,8 +23,8 @@ module MailParser::RFC2047
     last_charset = nil
     words = []
     mime_word = false
-    str.split(/(\s+)/).each do |s|
-      s, cs, raw = decode_word(s)
+    str.gsub(/\r?\n/, '').split(/(\s+)/).each do |s|
+      s, cs, raw, pre, post = decode_word(s)
       if charset
         begin
           s = charset_converter.call(cs || charset, charset, s)
@@ -39,7 +39,9 @@ module MailParser::RFC2047
       elsif s !~ /\A\s*\z/
         mime_word = false
       end
+      words.push pre if pre
       words.push s
+      words.push post if post
     end
     begin
       ret = words.join
@@ -52,6 +54,7 @@ module MailParser::RFC2047
   def decode_word(str)
     charset = nil
     if str =~ /\=\?([^\(\)\<\>\@\,\;\:\"\/\[\]\?\.\=]+)\?([QB])\?([^\? ]+)\?\=/i
+      pre, post = $`, $'
       charset, encoding, enc_text = $1.downcase, $2.downcase, $3
       raw = str
       str = encoding == "q" ? q_decode(enc_text) : b_decode(enc_text)
@@ -63,7 +66,7 @@ module MailParser::RFC2047
         end
       end
     end
-    [str, charset, raw]
+    [str, charset, raw, pre, post]
   end
 
   def q_decode(str)

data/test/test_rfc2047.rb

@@ -144,4 +144,14 @@ class TC_RFC2047 < Test::Unit::TestCase
     assert_equal("hXge", s)
   end
 
+  def test_decode_with_crlf
+    s = MailParser::RFC2047.decode("abc\r\n def\r\n")
+    assert_equal "abc def", s
+  end
+
+  def test_decode_with_invalid_encoded
+    s = MailParser::RFC2047.decode("abc def=?us-ascii?q?ghi?=jkl mno")
+    assert_equal "abc def ghi jkl mno", s
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailparser
 version: !ruby/object:Gem::Version
-  version: 0.5.0.beta3
+  version: 0.5.0.beta4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-23 00:00:00.000000000 Z
+date: 2012-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mmapscanner
@@ -37,26 +37,26 @@ files:
 - lib/mailparser.rb
 - lib/mailparser/rfc2183/scanner.rb
 - lib/mailparser/rfc2183/parser.rb
+- lib/mailparser/conv_charset.rb
+- lib/mailparser/rfc2047.rb
 - lib/mailparser/error.rb
+- lib/mailparser/rfc2822.rb
 - lib/mailparser/rfc2045/scanner.rb
 - lib/mailparser/rfc2045/parser.rb
-- lib/mailparser/rfc2047.rb
-- lib/mailparser/conv_charset.rb
 - lib/mailparser/loose.rb
 - lib/mailparser/rfc2183.rb
-- lib/mailparser/rfc2045.rb
-- lib/mailparser/rfc2822.rb
 - lib/mailparser/rfc2822/scanner.rb
 - lib/mailparser/rfc2822/parser.rb
 - lib/mailparser/rfc2231.rb
+- lib/mailparser/rfc2045.rb
 - test.rb
+- test/test_rfc2183.rb
 - test/test_loose.rb
+- test/test_rfc2045.rb
 - test/test_rfc2231.rb
-- test/test_rfc2183.rb
+- test/test_mailparser.rb
 - test/test_rfc2047.rb
 - test/test_rfc2822.rb
-- test/test_mailparser.rb
-- test/test_rfc2045.rb
 homepage: http://github.com/tmtm/mailparser
 licenses:
 - Ruby's
@@ -84,11 +84,11 @@ specification_version: 3
 summary: Mail Parser
 test_files:
 - test.rb
+- test/test_rfc2183.rb
 - test/test_loose.rb
+- test/test_rfc2045.rb
 - test/test_rfc2231.rb
-- test/test_rfc2183.rb
+- test/test_mailparser.rb
 - test/test_rfc2047.rb
 - test/test_rfc2822.rb
-- test/test_mailparser.rb
-- test/test_rfc2045.rb
 has_rdoc: