tmail 1.2.0 → 1.2.1

data/test/fixtures/mailbox_without_from

@@ -0,0 +1,11 @@
+From mike@envelope_sender.com.au
+Received: from mikel091a by oaamta05sl.mx.bigpond.com with SMTP id 
+  <20071021093820.JFMT24025.oaamta05sl.mx.bigpond.com@mikel091a> for 
+  <mikel@nowhere.com.else>; Sun, 21 Oct 2007 19:38:20 +1000
+Date: Sun, 21 Oct 2007 19:38:13 +1000
+To: Mikel <mikel@somewhere.com>
+Message-Id: <009601c813c6$19df3510$0437d30a@mikel091a>
+Subject: Testing outlook
+
+Hello Mikel
+

data/test/fixtures/mailbox_without_return_path

@@ -0,0 +1,12 @@
+From mike@envelope_sender.com.au
+Received: from mikel091a by oaamta05sl.mx.bigpond.com with SMTP id 
+  <20071021093820.JFMT24025.oaamta05sl.mx.bigpond.com@mikel091a> for 
+  <mikel@nowhere.com.else>; Sun, 21 Oct 2007 19:38:20 +1000
+Date: Sun, 21 Oct 2007 19:38:13 +1000
+From: Mikel Lindsaar <mikel@from_address.com>
+To: Mikel <mikel@somewhere.com>
+Message-Id: <009601c813c6$19df3510$0437d30a@mikel091a>
+Subject: Testing outlook
+
+Hello Mikel
+

data/test/fixtures/raw_email11

@@ -1,10 +1,10 @@
 From xxx@xxxx.com Wed Apr 27 14:15:31 2005
 Mime-Version: 1.0 (Apple Message framework v619.2)
-To: xxxxx@xxxxx <matmail>
+To: "xxxxx@xxxxx" <matmail>
 Message-Id: <416eaebec6d333ec6939eaf8a7d80724@xxxxx>
 Content-Type: multipart/alternative;
         boundary=Apple-Mail-5-1037861608
-From: xxxxx@xxxxx <xxxxx@xxxxx>
+From: "xxxxx@xxxxx" <xxxxx@xxxxx>
 Subject: worse when you use them.
 Date: Wed, 27 Apr 2005 14:15:31 -0700
 

data/test/fixtures/raw_email_with_bad_date

@@ -27,13 +27,13 @@ X-MSMail-Priority: Normal
 X-Mailer: Microsoft Outlook, Build 10.0.3416
 Importance: Normal
 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.150
-X-CSI-MailScanner-Information: Please contact the ISP for more information
-X-CSI-MailScanner: Found to be clean
-X-CSI-MailScanner-SpamCheck: not spam, SpamAssassin (score=1.87, required 4,
+X-CSI-TMailScanner-Information: Please contact the ISP for more information
+X-CSI-TMailScanner: Found to be clean
+X-CSI-TMailScanner-SpamCheck: not spam, SpamAssassin (score=1.87, required 4,
         autolearn=disabled, INVALID_DATE 0.23, RAZOR2_CF_RANGE_51_100 1.49,
         RAZOR2_CHECK 0.15)
-X-CSI-MailScanner-SpamScore: s
-X-MailScanner-From: subventive@vodtravel.com
+X-CSI-TMailScanner-SpamScore: s
+X-TMailScanner-From: subventive@vodtravel.com
 Resent-Date: Mon, 05 Nov 2007 20:17:37 +1100 (EST)
 Resent-From: <mail_dump@ns1.xxxxxxxx.xxx.xx>
 Resent-To: <mikel@xxxxxxxx.xxx>

data/test/test_address.rb

@@ -1022,6 +1022,7 @@ class TestAddress < Test::Unit::TestCase
           :local        => %Q("#{ch}"),
           :format       => %Q("#{ch}" <"#{ch}"@test>)
     end
+    
     ['"', "\\"].each do |ch|
       validate_case__address\
       %Q("\\#{ch}" <"\\#{ch}"@test>),
@@ -1032,9 +1033,9 @@ class TestAddress < Test::Unit::TestCase
           :domain       => 'test',
           :local        => %Q("\\#{ch}"),
           :format       => %Q("\\#{ch}" <"\\#{ch}"@test>)
+
     end
 
-=begin  TMail does not have #comments in Address.
     (ctext - boring).each do |ch|
       validate_case__address\
       "bob@test (#{ch})",
@@ -1067,7 +1068,7 @@ class TestAddress < Test::Unit::TestCase
           :local        => 'bob',
           :format       => "bob@test (\\#{ch})"
     end
-=end
+
 
     (dtext - boring).each do |ch|
       validate_case__address\
@@ -1111,6 +1112,10 @@ class TestAddress < Test::Unit::TestCase
         :local        => 'test',
         :format       => 'Bob <test@[' + (dtext - boring).join('') + ']>'
 
+  end
+
+  def test_quoted_at_char_in_local()
+      
     validate_case__address\
     %Q("@" <"@"@test>),
         :name         => "@",
@@ -1120,7 +1125,32 @@ class TestAddress < Test::Unit::TestCase
         :domain       => 'test',
         :local        => %Q("@"),
         :format       => %Q("@" <"@"@test>)
+
+    validate_case__address\
+    %Q("@" <"me@me"@test>),
+        :name         => "@",
+        :display_name => "@",
+        :address      => %Q("me@me"@test),
+        :comments     => nil,
+        :domain       => 'test',
+        :local        => %Q("me@me"),
+        :format       => %Q("@" <"me@me"@test>)
+
+  end
+  
+  def test_full_stop_in_local()
   
+    validate_case__address\
+    %Q(Minero A. <aamine@loveruby.net>),
+        :name         => "Minero A.",
+        :display_name => "Minero A.",
+        :address      => %Q(aamine@loveruby.net),
+        :comments     => nil,
+        :domain       => 'loveruby.net',
+        :local        => %Q(aamine),
+        :format       => %Q("me@my_place" <aamine@loveruby.net>)
+
   end
+  
 
 end

data/test/test_attachments.rb

@@ -31,4 +31,19 @@ HERE
     assert_equal(true, mail.multipart?)
     assert_equal(1, mail.attachments.length)
   end
+  
+  def test_recursive_multipart_processing
+    fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email7")
+    mail = TMail::Mail.parse(fixture)
+    assert_equal "This is the first part.\n\nAttachment: test.rb\nAttachment: test.pdf\n\n\nAttachment: smime.p7s\n", mail.body
+  end
+
+  def test_decode_encoded_attachment_filename
+    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
+  end
+
+
 end

data/test/test_encode.rb

@@ -3,65 +3,67 @@ require 'tmail/port'
 require 'tmail/encode'
 require 'nkf'
 require 'test/unit'
+require 'rubygems'
+require 'ruby-debug'
 
 class TestEncode < Test::Unit::TestCase
 
   SRCS = [
-"a cde あいうえおあいうえおあいうえおあいうえおあいうえお",
-"a cde あいうえおあいうえおあいうえおあいうえおあいうえ",
-"a cde あいうえおあいうえおあいうえおあいうえおあいう",
-"a cde あいうえおあいうえおあいうえおあいうえおあい",
-"a cde あいうえおあいうえおあいうえおあいうえおあ",
-"a cde あいうえおあいうえおあいうえおあいうえお",  #
-"a cde あいうえおあいうえおあいうえおあいうえ", 
-"a cde あいうえおあいうえおあいうえおあいう",
-"a cde あいうえおあいうえおあいうえおあい",
-"a cde あいうえおあいうえおあいうえおあ",
-"a cde あいうえおあいうえおあいうえお",
-"a cde あいうえおあいうえおあいうえ",
-"a cde あいうえおあいうえおあいう",
-"a cde あいうえおあいうえおあい",
-"a cde あいうえおあいうえおあ",
-"a cde あいうえおあいうえお",
-"a cde あいうえおあいうえ",
-"a cde あいうえおあいう",
-"a cde あいうえおあい",
-"a cde あいうえおあ",
-"a cde あいうえお",
-"a cde あいうえ",
-"a cde あいう",
-"a cde あい",
-"a cde あ",
-"aあa aあa aあa aあa"
+"a cde あいうえおあいうえおあいうえおあいうえおあいうえお", #1
+"a cde あいうえおあいうえおあいうえおあいうえおあいうえ", #2
+"a cde あいうえおあいうえおあいうえおあいうえおあいう", #3
+"a cde あいうえおあいうえおあいうえおあいうえおあい", #4
+"a cde あいうえおあいうえおあいうえおあいうえおあ", #5
+"a cde あいうえおあいうえおあいうえおあいうえお", #6 #
+"a cde あいうえおあいうえおあいうえおあいうえ", #7
+"a cde あいうえおあいうえおあいうえおあいう", #8
+"a cde あいうえおあいうえおあいうえおあい", #9
+"a cde あいうえおあいうえおあいうえおあ", #10
+"a cde あいうえおあいうえおあいうえお", #11
+"a cde あいうえおあいうえおあいうえ", #12
+"a cde あいうえおあいうえおあいう", #13
+"a cde あいうえおあいうえおあい", #14
+"a cde あいうえおあいうえおあ", #15
+"a cde あいうえおあいうえお", #16
+"a cde あいうえおあいうえ", #17
+"a cde あいうえおあいう", #18
+"a cde あいうえおあい", #19
+"a cde あいうえおあ", #20
+"a cde あいうえお", #21
+"a cde あいうえ", #22
+"a cde あいう", #23
+"a cde あい", #24
+"a cde あ", #25
+"aあa aあa aあa aあa aあa aあa" #26
   ]
 
   OK = [
-  "a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJiQoJCokIiQkJCYbKEI=?=\n\t=?iso-2022-jp?B?GyRCJCgkKiQiJCQkJiQoJCokIiQkJCYkKCQqGyhC?=",
-  "a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJiQoJCokIiQkJCYbKEI=?=\n\t=?iso-2022-jp?B?GyRCJCgkKiQiJCQkJiQoJCokIiQkJCYkKBsoQg==?=",
-  "a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJiQoJCokIiQkJCYbKEI=?=\n\t=?iso-2022-jp?B?GyRCJCgkKiQiJCQkJiQoJCokIiQkJCYbKEI=?=",
- "a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJiQoJCokIiQkJCYbKEI=?=\n\t=?iso-2022-jp?B?GyRCJCgkKiQiJCQkJiQoJCokIiQkGyhC?=",
- "a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJiQoJCokIiQkJCYbKEI=?=\n\t=?iso-2022-jp?B?GyRCJCgkKiQiJCQkJiQoJCokIhsoQg==?=",
- "a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJiQoJCokIiQkJCYbKEI=?=\n\t=?iso-2022-jp?B?GyRCJCgkKiQiJCQkJiQoJCobKEI=?=",
- "a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJiQoJCokIiQkJCYbKEI=?=\n\t=?iso-2022-jp?B?GyRCJCgkKiQiJCQkJiQoGyhC?=",
- "a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJiQoJCokIiQkJCYbKEI=?=\n\t=?iso-2022-jp?B?GyRCJCgkKiQiJCQkJhsoQg==?=",
- "a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJiQoJCokIiQkJCYbKEI=?=\n\t=?iso-2022-jp?B?GyRCJCgkKiQiJCQbKEI=?=",
- "a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJiQoJCokIiQkJCYbKEI=?=\n\t=?iso-2022-jp?B?GyRCJCgkKiQiGyhC?=",
- "a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJiQoJCokIiQkJCYbKEI=?=\n\t=?iso-2022-jp?B?GyRCJCgkKhsoQg==?=",
- "a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJiQoJCokIiQkJCYbKEI=?=\n\t=?iso-2022-jp?B?GyRCJCgbKEI=?=",
- 'a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJiQoJCokIiQkJCYbKEI=?=',
- 'a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJiQoJCokIiQkGyhC?=',
- 'a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJiQoJCokIhsoQg==?=',
- 'a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJiQoJCobKEI=?=',
- 'a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJiQoGyhC?=',
- 'a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJhsoQg==?=',
- 'a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQbKEI=?=',
- 'a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiGyhC?=',
- 'a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKhsoQg==?=',
- 'a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgbKEI=?=',
- 'a cde =?iso-2022-jp?B?GyRCJCIkJCQmGyhC?=',
- 'a cde =?iso-2022-jp?B?GyRCJCIkJBsoQg==?=',
- 'a cde =?iso-2022-jp?B?GyRCJCIbKEI=?=',
- "=?iso-2022-jp?B?YRskQiQiGyhCYSBhGyRCJCIbKEJhIGEbJEIkIhsoQmEgYQ==?=\n\t=?iso-2022-jp?B?GyRCJCIbKEJh?="
+ "a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJiQoJCokIiQkJCYkKCQqJCIbKEI=?=\n\t=?iso-2022-jp?B?GyRCJCQkJiQoJCokIiQkJCYkKCQqGyhC?=", #1
+ "a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJiQoJCokIiQkJCYkKCQqJCIbKEI=?=\n\t=?iso-2022-jp?B?GyRCJCQkJiQoJCokIiQkJCYkKBsoQg==?=", #2
+ "a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJiQoJCokIiQkJCYkKCQqJCIbKEI=?=\n\t=?iso-2022-jp?B?GyRCJCQkJiQoJCokIiQkJCYbKEI=?=", #3
+ "a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJiQoJCokIiQkJCYkKCQqJCIbKEI=?=\n\t=?iso-2022-jp?B?GyRCJCQkJiQoJCokIiQkGyhC?=", #4
+ "a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJiQoJCokIiQkJCYkKCQqJCIbKEI=?=\n\t=?iso-2022-jp?B?GyRCJCQkJiQoJCokIhsoQg==?=", #5
+ "a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJiQoJCokIiQkJCYkKCQqJCIbKEI=?=\n\t=?iso-2022-jp?B?GyRCJCQkJiQoJCobKEI=?=", #6
+ "a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJiQoJCokIiQkJCYkKCQqJCIbKEI=?=\n\t=?iso-2022-jp?B?GyRCJCQkJiQoGyhC?=", #7
+ "a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJiQoJCokIiQkJCYkKCQqJCIbKEI=?=\n\t=?iso-2022-jp?B?GyRCJCQkJhsoQg==?=", #8
+ "a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJiQoJCokIiQkJCYkKCQqJCIbKEI=?=\n\t=?iso-2022-jp?B?GyRCJCQbKEI=?=", #9
+ "a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJiQoJCokIiQkJCYkKCQqJCIbKEI=?=", #10
+ "a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJiQoJCokIiQkJCYkKCQqGyhC?=", #11
+ "a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJiQoJCokIiQkJCYkKBsoQg==?=", #12
+ 'a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJiQoJCokIiQkJCYbKEI=?=', #13
+ 'a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJiQoJCokIiQkGyhC?=', #14
+ 'a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJiQoJCokIhsoQg==?=', #15
+ 'a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJiQoJCobKEI=?=', #16
+ 'a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJiQoGyhC?=', #17
+ 'a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQkJhsoQg==?=', #18
+ 'a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiJCQbKEI=?=', #19
+ 'a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKiQiGyhC?=', #20
+ 'a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgkKhsoQg==?=', #21
+ 'a cde =?iso-2022-jp?B?GyRCJCIkJCQmJCgbKEI=?=', #22
+ 'a cde =?iso-2022-jp?B?GyRCJCIkJCQmGyhC?=', #23
+ 'a cde =?iso-2022-jp?B?GyRCJCIkJBsoQg==?=', #24
+ 'a cde =?iso-2022-jp?B?GyRCJCIbKEI=?=', #25
+ "=?iso-2022-jp?B?YRskQiQiGyhCYSBhGyRCJCIbKEJhIGEbJEIkIhsoQmEgYRskQiQiGyhCYSBh?=\r\n\t=?iso-2022-jp?B?GyRCJCIbKEJhIGEbJEIkIhsoQmE=?=" #26
   ]
 
   def test_s_encode

data/test/test_header.rb

@@ -608,6 +608,14 @@ class ContentTypeHeaderTester < Test::Unit::TestCase
     assert_equal '----=_=NextPart_000_0093_01C81419.EB75E850', h.params['boundary']
   end
 
+  def test_multipart_with_extra_with_multiple_params
+    h = TMail::HeaderField.new('Content-Type', 'multipart/related;boundary=1_4626B816_9F1690;Type="application/smil";Start="<mms.smil.txt>"')
+    assert_equal 'multipart', h.main_type
+    assert_equal 'related', h.sub_type
+    assert_equal 3, h.params.size
+    assert_equal '1_4626B816_9F1690', h.params['boundary']
+  end
+
   def test_main_type=
     h = TMail::HeaderField.new('Content-Type', 'text/plain; charset=iso-2022-jp')
     assert_equal 'text', h.main_type
@@ -881,4 +889,53 @@ class ContentDispositionHeaderTester < Test::Unit::TestCase
     h.disposition = 'AtTaChMeNt'
     assert_equal 'attachment', h.disposition
   end
+  
+  def test_wrong_mail_header
+    fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email9")
+    assert_raise(TMail::SyntaxError) { TMail::Mail.parse(fixture) }
+  end
+
+  def test_decode_message_with_unknown_charset
+    fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email10")
+    mail = TMail::Mail.parse(fixture)
+    assert_nothing_raised { mail.body }
+  end
+
+  def test_decode_message_with_unquoted_atchar_in_header
+    fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email11")
+    mail = TMail::Mail.parse(fixture)
+    assert_not_nil mail.from
+  end
+
+  def test_new_from_port_should_produce_a_header_object_of_the_correct_class
+    p = TMail::FilePort.new("#{File.dirname(__FILE__)}/fixtures/mailbox")
+    h = TMail::HeaderField.new_from_port(p, 'Message-Id')
+    assert_equal(TMail::MessageIdHeader, h.class)
+  end
+
+  def test_should_return_the_evelope_sender_when_given_from_without_a_colon
+    p = TMail::FilePort.new("#{File.dirname(__FILE__)}/fixtures/mailbox")
+    h = TMail::HeaderField.new_from_port(p, 'EnvelopeSender')
+    assert_equal("mike@envelope_sender.com.au", h.addrs.to_s)
+  end
+  
+  def test_new_from_port_should_produce_a_header_object_that_contains_the_right_data
+    p = TMail::FilePort.new("#{File.dirname(__FILE__)}/fixtures/mailbox")
+    h = TMail::HeaderField.new_from_port(p, 'From')
+    assert_equal("Mikel Lindsaar <mikel@from_address.com>", h.addrs.to_s)
+  end
+
+  def test_unwrapping_a_long_header_field_using_new_from_port
+    p = TMail::FilePort.new("#{File.dirname(__FILE__)}/fixtures/mailbox")
+    h = TMail::HeaderField.new_from_port(p, 'Received')
+    line = "from mikel091a by oaamta05sl.mx.bigpond.com with SMTP id <20071021093820.JFMT24025.oaamta05sl.mx.bigpond.com@mikel091a> for <mikel@nowhere.com.else>; Sun, 21 Oct 2007 19:38:20 +1000"
+    assert_equal(h.to_s, line)
+  end
+  
+  def test_returning_nil_if_there_is_no_match
+    p = TMail::FilePort.new("#{File.dirname(__FILE__)}/fixtures/mailbox")
+    h = TMail::HeaderField.new_from_port(p, 'Received-Long-Header')
+    assert_equal(h, nil)
+  end
+
 end

data/test/test_helper.rb

@@ -1,5 +1,6 @@
 # Add in the local library for the load path so we get that before any possible
 # gem that is already installed.
+require 'stringio'
 $:.unshift File.dirname(__FILE__) + "/../lib"
 $:.unshift File.dirname(__FILE__) + "/../lib/tmail"
 require 'test/unit'

data/test/test_mail.rb

@@ -342,7 +342,9 @@ Content-Type: text/plain; charset=iso-8859-1
 The body
 EOF
     mail = TMail::Mail.parse(msg)
-    assert_equal "testing testing \326\244", mail.subject
+    expected = "testing testing \326\244" 
+    expected.force_encoding 'utf-8' if expected.respond_to? :force_encoding 
+    assert_equal expected, mail.subject
     assert_equal "=?utf-8?Q?testing_testing_=D6=A4?=", mail.quoted_subject
   end
 
@@ -604,11 +606,38 @@ EOF
     assert_equal 1026, attachment.read.length
   end
 
+  def test_attachment_using_content_location
+    fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email12")
+    mail = TMail::Mail.parse(fixture)
+    assert_equal 1, mail.attachments.length
+    assert_equal "Photo25.jpg", mail.attachments.first.original_filename
+  end
+
+  def test_attachment_with_text_type
+    fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email13")
+    mail = TMail::Mail.parse(fixture)
+    assert mail.has_attachments?
+    assert_equal 1, mail.attachments.length
+    assert_equal "hello.rb", mail.attachments.first.original_filename
+  end
+
+  def test_decode_part_without_content_type
+    fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email4")
+    mail = TMail::Mail.parse(fixture)
+    assert_nothing_raised { mail.body }
+  end
+
   def test_decode_message_without_content_type
     mail = TMail::Mail.load("#{File.dirname(__FILE__)}/fixtures/raw_email4")
     assert_nothing_raised { mail.body }
   end
 
+  def test_decode_message_with_incorrect_charset
+    fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email6")
+    mail = TMail::Mail.parse(fixture)
+    assert_nothing_raised { mail.body }
+  end
+
   def test_quoting_of_illegal_boundary_when_doing_mail_to_s
     mail = TMail::Mail.load("#{File.dirname(__FILE__)}/fixtures/raw_email_with_illegal_boundary")
     assert_equal(true, mail.multipart?)
@@ -648,5 +677,24 @@ EOF
     assert_equal(true, forward.multipart?)
     assert_equal(TMail::Mail, forward.class)
   end
+  
+  def test_body
+    m = TMail::Mail.new
+    expected = 'something_with_underscores'
+    m.encoding = 'quoted-printable'
+    quoted_body = [expected].pack('*M')
+    m.body = quoted_body
+    assert_equal "something_with_underscores=\n", m.quoted_body
+    assert_equal expected, m.body
+  end
+
+  def test_nested_attachments_are_recognized_correctly
+    fixture = File.read("#{File.dirname(__FILE__)}/fixtures/raw_email_with_nested_attachment")
+    mail = TMail::Mail.parse(fixture)
+    assert_equal 2, mail.attachments.length
+    assert_equal "image/png", mail.attachments.first.content_type
+    assert_equal 1902, mail.attachments.first.length
+    assert_equal "application/pkcs7-signature", mail.attachments.last.content_type
+  end
 
 end

data/test/test_mbox.rb

@@ -123,4 +123,25 @@ class MailboxTester < Test::Unit::TestCase
     end
     assert_equal 0, c
   end
+  
+  def test_unix_mbox_fromaddr_method
+    p = TMail::FilePort.new("#{File.dirname(__FILE__)}/fixtures/mailbox")
+    assert_equal(TMail::UNIXMbox.fromaddr(p), "mikel@return_path.com")
+  end
+  
+  def test_unix_mbox_fromaddr_method_missing_return_path
+    p = TMail::FilePort.new("#{File.dirname(__FILE__)}/fixtures/mailbox_without_return_path")
+    assert_equal(TMail::UNIXMbox.fromaddr(p), "mikel@from_address.com")
+  end
+  
+  def test_unix_mbox_fromaddr_method_missing_from_address
+    p = TMail::FilePort.new("#{File.dirname(__FILE__)}/fixtures/mailbox_without_from")
+    assert_equal(TMail::UNIXMbox.fromaddr(p), "mike@envelope_sender.com.au")
+  end
+  
+  def test_unix_mbox_from_addr_method_missing_all_from_fields_in_the_email
+    p = TMail::FilePort.new("#{File.dirname(__FILE__)}/fixtures/mailbox_without_any_from_or_sender")
+    assert_equal(TMail::UNIXMbox.fromaddr(p), "nobody")
+  end
+  
 end