valodzka-tmail 1.2.3.2 → 1.2.3.3

data/lib/tmail/encode.rb

@@ -348,21 +348,22 @@ module TMail
     def scanadd( str, force = false )
       types = ''
       strs = []
-      if str.respond_to?(:encoding)
+      has_encoding = str.respond_to?(:encoding)
+      if has_encoding
         enc = str.encoding 
         str.force_encoding(Encoding::ASCII_8BIT)
       end
       until str.empty?
         if m = /\A[^\e\t\r\n ]+/.match(str)
           types << (force ? 'j' : 'a')
-          if str.respond_to?(:encoding)
+          if has_encoding
             strs.push m[0].force_encoding(enc)
           else
             strs.push m[0]
           end
         elsif m = /\A[\t\r\n ]+/.match(str)
           types << 's'
-          if str.respond_to?(:encoding)
+          if has_encoding
             strs.push m[0].force_encoding(enc)
           else
             strs.push m[0]
@@ -373,7 +374,7 @@ module TMail
           str = m.post_match
           if esc != "\e(B" and m = /\A[^\e]+/.match(str)
             types << 'j'
-            if str.respond_to?(:encoding)
+            if has_encoding
               strs.push m[0].force_encoding(enc)
             else
               strs.push m[0]

data/lib/tmail/mail.rb

@@ -414,6 +414,12 @@ module TMail
 
         when /^charset=.*/
 
+        when /\A<html/i
+          # simple heuristic for bad formed mails
+          #  - look like content start immediately after header
+          # without double new line
+          f.seek -line.size, IO::SEEK_CUR # not universal, but better then nothing
+          break
         else
           raise SyntaxError, "wrong mail header: '#{line.inspect}'"
         end
@@ -535,7 +541,10 @@ module TMail
 
     def skip_header( f )
       while line = f.gets
-        return if /\A[\r\n]*\z/ === line
+        if /(\A[\r\n]*\z)|(\A<html)/ === line
+          f.seek -line.size, IO::SEEK_CUR if $2
+          return
+        end
       end
     end
 

data/test/test_address.rb

@@ -170,11 +170,16 @@ class TestAddress < Test::Unit::TestCase
     # "\223\372\226{\214\352"
     # "\e$BF|K\\8l\e(B"
     # GyRCRnxLXDhsGyhC
+    force = if "".respond_to? :force_encoding
+              proc{|x,e| x.force_encoding e }
+            else
+              proc{|x,e| x }
+            end
 
     TMail.KCODE = 'NONE'
     validate_case__address\
     '=?iso-2022-jp?B?GyRCRnxLXDhsGyhC?= <aamine@loveruby.net>',
-        :display_name => "\e$BF|K\\8l\e(B",
+        :display_name => force["\e$BF|K\\8l\e(B", "ISO-2022-JP"],
         :address      => 'aamine@loveruby.net',
         :local        => 'aamine',
         :domain       => 'loveruby.net',
@@ -182,7 +187,7 @@ class TestAddress < Test::Unit::TestCase
 
     validate_case__address\
     '=?iso-2022-jp?Q?=1b=24=42=46=7c=4b=5c=38=6c=1b=28=42?= <aamine@loveruby.net>',
-        :display_name => "\e$BF|K\\8l\e(B",
+        :display_name => force["\e$BF|K\\8l\e(B", "iso-2022-jp"],
         :address      => 'aamine@loveruby.net',
         :local        => 'aamine',
         :domain       => 'loveruby.net',
@@ -209,7 +214,7 @@ class TestAddress < Test::Unit::TestCase
 
     TMail.KCODE = 'SJIS'
     expected = "\223\372\226{\214\352"
-    expected.force_encoding('Windows-31J') if expected.respond_to? :force_encoding
+    expected.force_encoding('SJIS') if expected.respond_to? :force_encoding
     validate_case__address\
     '=?iso-2022-jp?B?GyRCRnxLXDhsGyhC?= <aamine@loveruby.net>',
         :display_name => expected,

data/test/test_attachments.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'test_helper'
 require 'tmail'
 
@@ -42,7 +43,9 @@ HERE
     fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email8")
     mail = TMail::Mail.parse(fixture)
     attachment = mail.attachments.last
-    assert_equal "01 Quien Te Dij\212at. Pitbull.mp3", attachment.original_filename
+    expected = "01 Quien Te Dij\212at. Pitbull.mp3"
+    expected.force_encoding "BINARY" if expected.respond_to? :force_encoding
+    assert_equal expected, attachment.original_filename
   end
 
   def test_attachment_with_quoted_filename

data/test/test_header.rb

@@ -881,7 +881,7 @@ class ContentDispositionHeaderTester < Test::Unit::TestCase
     assert_equal 'attachment', h.disposition
     assert_equal 1, h.params.size
     expected = "\223\372\226{\214\352.doc"
-    expected.force_encoding 'Windows-31J' if expected.respond_to? :force_encoding
+    expected.force_encoding('Windows-31J').encode!("Shift_JIS") if expected.respond_to? :force_encoding
     assert_equal expected, h.params['filename']
 
     # raw SJIS string in value (quoted-string)
@@ -909,7 +909,7 @@ class ContentDispositionHeaderTester < Test::Unit::TestCase
     assert_equal 'attachment', h.disposition
     assert_equal 1, h.params.size
     expected = "\223\372\226{\214\352.doc"
-    expected.force_encoding 'Windows-31J' if expected.respond_to? :force_encoding
+    expected.force_encoding('Windows-31J').encode!("Shift_JIS") if expected.respond_to? :force_encoding
     assert_equal expected, h.params['filename']
   end
 

data/test/test_mail.rb

@@ -757,5 +757,12 @@ EOF
     end
   end
 
+  def test_html_body_start
+    assert_nothing_raised do
+      tmail = TMail::Mail.load("#{File.dirname(__FILE__)}/fixtures/raw_email_with_bad_body_start")
+      assert_equal 1, tmail.parts.size
+      assert_match /\A<html/, tmail.parts.first.body
+    end
+  end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: valodzka-tmail
 version: !ruby/object:Gem::Version 
-  version: 1.2.3.2
+  version: 1.2.3.3
 platform: ruby
 authors: 
 - Mikel Lindsaar <raasdnil AT gmail.com>