tmail 1.2.1 → 1.2.2

data/test/fixtures/raw_email_multiple_from

@@ -0,0 +1,30 @@
+Delivered-To: tim@powerupdev.com
+Return-Path: <www-data@mangaverde.net>
+To: tim@powerupdev.com concierge@powerupdev.com
+From: tim@powerupdev.com concierge@powerupdev.com
+Subject: /home/svn/public/minebox revision 214
+Reply-to: tim@powerupdev.com concierge@powerupdev.com
+Message-Id: <20071022234523.5BD8E86D2@mangaverde.net>
+Date: Mon, 22 Oct 2007 23:45:23 +0000 (UTC)
+
+<p><b>recordkick</b> 2007-10-22 23:45:23 +0000 (Mon, 22 Oct 2007)</p><p>test
+subversion<br>
+</p><hr noshade><pre><font color=\"gray\">Modified:
+trunk/README
+===================================================================
+--- trunk/README\t2007-10-22
+23:41:34 UTC (rev 213)
++++ trunk/README\t2007-10-22 23:45:23 UTC (rev 214)
+@@ -1,5 +1,5 @@
+ == Welcome
+to Rails
+-Test
++Tedst
+ Rails is a web-application and persistence framework that includes everything
+ needed
+to create database-backed web-applications according to the
+ Model-View-Control pattern of separation. This pattern
+splits the view (also
+
+</font>
+</pre>

data/test/kcode.rb

@@ -3,10 +3,10 @@ module Test
     class TestCase
       def kcode(code)
         begin
-          $KCODE = code
+          TMail.KCODE = code
           yield
         ensure
-          $KCODE = 'NONE'
+          TMail.KCODE = 'NONE'
         end
       end
     end

data/test/temp_test_one.rb

@@ -0,0 +1,46 @@
+$:.unshift File.dirname(__FILE__)
+require 'test_helper'
+require 'tmail'
+require 'kcode'
+require 'time'
+
+class TestMail < Test::Unit::TestCase
+  include TMail::TextUtils
+
+  def setup
+    @mail = TMail::Mail.new
+  end
+
+  def lf( str )
+    str.gsub(/\n|\r\n|\r/) { "\n" }
+  end
+
+  def crlf( str )
+    str.gsub(/\n|\r\n|\r/) { "\r\n" }
+  end
+
+  def test_MIME
+    # FIXME: test more.
+    
+    kcode('EUC') {
+      mail = TMail::Mail.parse('From: hoge@example.jp (=?iso-2022-jp?B?GyRCJUYlOSVIGyhC?=)')
+      assert_not_nil mail['From']
+      
+      expected = "\245\306\245\271\245\310"
+      if expected.respond_to? :force_encoding
+        expected.force_encoding(mail['From'].comments.first.encoding)
+      end
+      assert_equal [expected], mail['From'].comments
+
+      expected = "From: hoge@example.jp (\245\306\245\271\245\310)\n\n"
+      expected.force_encoding 'EUC-JP' if expected.respond_to? :force_encoding
+      assert_equal expected, mail.to_s
+      assert_equal expected, mail.decoded
+
+      expected = "From: hoge@example.jp (=?iso-2022-jp?B?GyRCJUYlOSVIGyhC?=)\r\n\r\n"
+      expected.force_encoding 'EUC-JP' if expected.respond_to? :force_encoding
+      assert_equal expected, mail.encoded
+    }
+  end
+
+end

data/test/test_address.rb

@@ -175,7 +175,7 @@ class TestAddress < Test::Unit::TestCase
     # "\e$BF|K\\8l\e(B"
     # GyRCRnxLXDhsGyhC
 
-    $KCODE = 'NONE'
+    TMail.KCODE = 'NONE'
     validate_case__address\
     '=?iso-2022-jp?B?GyRCRnxLXDhsGyhC?= <aamine@loveruby.net>',
         :display_name => "\e$BF|K\\8l\e(B",
@@ -192,10 +192,12 @@ class TestAddress < Test::Unit::TestCase
         :domain       => 'loveruby.net',
         :format       => '=?iso-2022-jp?B?GyRCRnxLXDhsGyhC?= <aamine@loveruby.net>'
 
-    $KCODE = 'EUC'
+    TMail.KCODE = 'EUC'
+    expected = "\306\374\313\334\270\354"
+    expected.force_encoding('EUC-JP') if expected.respond_to? :force_encoding
     validate_case__address\
     '=?iso-2022-jp?B?GyRCRnxLXDhsGyhC?= <aamine@loveruby.net>',
-        :display_name => "\306\374\313\334\270\354",
+        :display_name => expected,
         :address      => 'aamine@loveruby.net',
         :local        => 'aamine',
         :domain       => 'loveruby.net',
@@ -203,16 +205,18 @@ 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 => "\306\374\313\334\270\354",
+        :display_name => expected,
         :address      => 'aamine@loveruby.net',
         :local        => 'aamine',
         :domain       => 'loveruby.net',
         :format       => '=?iso-2022-jp?B?GyRCRnxLXDhsGyhC?= <aamine@loveruby.net>'
 
-    $KCODE = 'SJIS'
+    TMail.KCODE = 'SJIS'
+    expected = "\223\372\226{\214\352"
+    expected.force_encoding('SJIS') if expected.respond_to? :force_encoding
     validate_case__address\
     '=?iso-2022-jp?B?GyRCRnxLXDhsGyhC?= <aamine@loveruby.net>',
-        :display_name => "\223\372\226{\214\352",
+        :display_name => expected,
         :address      => 'aamine@loveruby.net',
         :local        => 'aamine',
         :domain       => 'loveruby.net',
@@ -220,7 +224,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 => "\223\372\226{\214\352",
+        :display_name => expected,
         :address      => 'aamine@loveruby.net',
         :local        => 'aamine',
         :domain       => 'loveruby.net',
@@ -229,11 +233,11 @@ class TestAddress < Test::Unit::TestCase
 
   def test_parse__rawjp
     begin
-      $KCODE = 'EUC'
+      TMail.KCODE = 'EUC'
       _test_parse__euc
       _test_parse__jis
     ensure
-      $KCODE = 'NONE'
+      TMail.KCODE = 'NONE'
     end
   end
 
@@ -253,7 +257,7 @@ class TestAddress < Test::Unit::TestCase
     # raw iso-2022-jp string in comment
     validate_case__address\
     "Minero Aoki (\e$B@DLZJvO:\e(B) <aamine@loveruby.net>",
-        :display_name => 'Minero Aoki',
+        :display_name => "Minero Aoki (\e$B@DLZJvO:\e(B)",
         :address      => 'aamine@loveruby.net',
         :local        => 'aamine',
         :domain       => 'loveruby.net',
@@ -691,7 +695,7 @@ class TestAddress < Test::Unit::TestCase
     validate_case__address\
     '(foo@bar.com (foobar), ned@foo.com (nedfoo) ) <kevin@goess.org>',
         :name         => 'foo@bar.com (foobar), ned@foo.com (nedfoo) ',
-        :display_name => nil,
+        :display_name => "(foo@bar.com (foobar), ned@foo.com (nedfoo) )",
         :address      => 'kevin@goess.org',
         :comments     => ['foo@bar.com (foobar), ned@foo.com (nedfoo) '],
         :domain       => 'goess.org',
@@ -886,32 +890,6 @@ class TestAddress < Test::Unit::TestCase
         :local        => 'bob',
         :format       => 'bob'
 
-=begin
-    validate_case__address\
-    ['bob,sally, sam',
-      [ { :name => nil,
-	  :display_name => nil,
-	  :address => 'bob',
-	  :comments => nil,
-	  :domain => nil,
-	  :local => 'bob',
-	  :format => 'bob' },
-	{ :name => nil,
-	  :display_name => nil,
-	  :address => 'sally',
-	  :comments => nil,
-	  :domain => nil,
-	  :local => 'sally',
-	  :format => 'sally' },
-	{ :name => nil,
-	  :display_name => nil,
-	  :address => 'sam',
-	  :comments => nil,
-	  :domain => nil,
-	  :local => 'sam',
-	  :format => 'sam' }] ]
-=end
-
     assert_raises(TMail::SyntaxError) {
       TMail::Address.parse 'Undisclosed <>'
     }
@@ -1138,7 +1116,7 @@ class TestAddress < Test::Unit::TestCase
 
   end
   
-  def test_full_stop_in_local()
+  def test_full_stop_as_last_char_in_display_name()
   
     validate_case__address\
     %Q(Minero A. <aamine@loveruby.net>),
@@ -1152,5 +1130,66 @@ class TestAddress < Test::Unit::TestCase
 
   end
   
+  def test_unquoted_at_char_in_name()
+  
+    validate_case__address\
+    %Q(mikel@me.com <lindsaar@you.net>),
+        :name         => "mikel@me.com",
+        :display_name => "mikel@me.com",
+        :address      => %Q(lindsaar@you.net),
+        :comments     => nil,
+        :domain       => 'you.net',
+        :local        => %Q(lindsaar),
+        :format       => %Q("mikel@me.com" <lindsaar@you.net>)
 
+  end
+  
+  def test_special_quote_quoting_at_char_in_string
+    string = 'mikel@me.com <mikel@me.com>'
+    result = '"mikel@me.com" <mikel@me.com>'
+    assert_equal(result, TMail::Address.special_quote_address(string))
+  end
+  
+  def test_special_quote_not_quoting_already_quoted_at_char_in_string
+    string = '"mikel@me.com" <mikel@me.com>'
+    result = '"mikel@me.com" <mikel@me.com>'
+    assert_equal(result, TMail::Address.special_quote_address(string))
+  end
+  
+  def test_special_quote_not_quoting_something_without_an_at_char_and_quoted
+    string = '"mikel" <mikel@me.com>'
+    result = '"mikel" <mikel@me.com>'
+    assert_equal(result, TMail::Address.special_quote_address(string))
+  end
+  
+  def test_special_quote_not_quoting_something_without_an_at_char_in_header
+    string = 'mikel <mikel@me.com>'
+    result = 'mikel <mikel@me.com>'
+    assert_equal(result, TMail::Address.special_quote_address(string))
+  end
+  
+  def test_special_quoting_a_trailing_dot
+    string = 'mikel. <mikel@me.com>'
+    result = '"mikel." <mikel@me.com>'
+    assert_equal(result, TMail::Address.special_quote_address(string))
+  end
+  
+  def test_special_quoting_a_trailing_dot_by_itself
+    string = 'mikel . <mikel@me.com>'
+    result = '"mikel ." <mikel@me.com>'
+    assert_equal(result, TMail::Address.special_quote_address(string))
+  end
+  
+  def test_special_quoting_a_trailing_dot_by_itself_already_quoted
+    string = '"mikel ." <mikel@me.com>'
+    result = '"mikel ." <mikel@me.com>'
+    assert_equal(result, TMail::Address.special_quote_address(string))
+  end
+  
+  def test_special_quoting_a_trailing_dot_by_itself_quoted
+    string = 'mikel "." <mikel@me.com>'
+    result = 'mikel "." <mikel@me.com>'
+    assert_equal(result, TMail::Address.special_quote_address(string))
+  end
+  
 end

data/test/test_encode.rb

@@ -3,8 +3,6 @@ require 'tmail/port'
 require 'tmail/encode'
 require 'nkf'
 require 'test/unit'
-require 'rubygems'
-require 'ruby-debug'
 
 class TestEncode < Test::Unit::TestCase
 

data/test/test_header.rb

@@ -95,7 +95,12 @@ class AddressHeaderTester < Test::Unit::TestCase
       assert_equal ok[:routes],   a.routes,    str.inspect + " (routes)\n"
       assert_equal ok[:spec],     a.spec,      str.inspect + " (spec)\n"
     end
+    if comments.first.respond_to? :force_encoding
+      encoding = h.comments.first.encoding
+      comments.each { |c| c.force_encoding encoding }
+    end
     assert_equal comments, h.comments,         str.inspect + " (comments)\n"
+    to_s.force_encoding(h.to_s.encoding) if to_s.respond_to? :force_encoding
     assert_equal to_s, h.to_s,                 str.inspect + " (to_s)\n" if to_s
     assert_equal to_s, h.decoded,              str.inspect + " (decoded)\n" if to_s
   end
@@ -753,12 +758,12 @@ class ContentDispositionHeaderTester < Test::Unit::TestCase
       _test_raw_sjis
       _test_code_conversion
     ensure
-      $KCODE = 'NONE'
+      TMail.KCODE = 'NONE'
     end
   end
 
   def _test_ATTRS
-    $KCODE = 'NONE'
+    TMail.KCODE = 'NONE'
 
     h = TMail::HeaderField.new('Content-Disposition',
                                'attachment; filename="README.txt.pif"')
@@ -787,17 +792,19 @@ class ContentDispositionHeaderTester < Test::Unit::TestCase
   end
 
   def _test_rfc2231_decode
-    $KCODE = 'EUC'
+    TMail.KCODE = 'EUC'
 
     h = TMail::HeaderField.new('Content-Disposition',
             "attachment; filename*=iso-2022-jp'ja'%1b$B$Q$i$`%1b%28B")
     assert_equal 'attachment', h.disposition
     assert_equal 1, h.params.size
-    assert_equal "\244\321\244\351\244\340", h.params['filename']
+    expected = "\244\321\244\351\244\340"
+    expected.force_encoding 'EUC-JP' if expected.respond_to? :force_encoding
+    assert_equal expected, h.params['filename']
   end
 
   def _test_rfc2231_encode
-    $KCODE = 'EUC'
+    TMail.KCODE = 'EUC'
 
     h = TMail::HeaderField.new('Content-Disposition', 'a; n=a')
     h['n'] = "\245\265\245\363\245\327\245\353.txt"
@@ -811,73 +818,85 @@ class ContentDispositionHeaderTester < Test::Unit::TestCase
   end
 
   def _test_raw_iso2022jp
-    $KCODE = 'EUC'
+    TMail.KCODE = 'EUC'
     # raw iso2022jp string in value (token)
     h = TMail::HeaderField.new('Content-Disposition',
             %Q<attachment; filename=\e$BF|K\\8l\e(B.doc>)
     assert_equal 'attachment', h.disposition
     assert_equal 1, h.params.size
     # assert_equal "\e$BF|K\\8l\e(B.doc", h.params['filename']
-    assert_equal "\306\374\313\334\270\354.doc", h.params['filename']
 
+    expected = "\306\374\313\334\270\354.doc"
+    expected.force_encoding 'EUC-JP' if expected.respond_to? :force_encoding
+    
+    assert_equal expected, h.params['filename']
+    
     # raw iso2022jp string in value (quoted string)
     h = TMail::HeaderField.new('Content-Disposition',
             %Q<attachment; filename="\e$BF|K\\8l\e(B.doc">)
     assert_equal 'attachment', h.disposition
     assert_equal 1, h.params.size
     # assert_equal "\e$BF|K\\8l\e(B.doc", h.params['filename']
-    assert_equal "\306\374\313\334\270\354.doc", h.params['filename']
+    assert_equal expected, h.params['filename']
   end
 
   def _test_raw_eucjp
-    $KCODE = 'EUC'
+    TMail.KCODE = 'EUC'
     # raw EUC-JP string in value (token)
     h = TMail::HeaderField.new('Content-Disposition',
             %Q<attachment; filename=\306\374\313\334\270\354.doc>)
     assert_equal 'attachment', h.disposition
     assert_equal 1, h.params.size
-    assert_equal "\306\374\313\334\270\354.doc", h.params['filename']
+    expected = "\306\374\313\334\270\354.doc"
+    expected.force_encoding 'EUC-JP' if expected.respond_to? :force_encoding
+    assert_equal expected, h.params['filename']
 
     # raw EUC-JP string in value (quoted-string)
     h = TMail::HeaderField.new('Content-Disposition',
             %Q<attachment; filename="\306\374\313\334\270\354.doc">)
     assert_equal 'attachment', h.disposition
     assert_equal 1, h.params.size
-    assert_equal "\306\374\313\334\270\354.doc", h.params['filename']
+    assert_equal expected, h.params['filename']
   end
 
   def _test_raw_sjis
-    $KCODE = 'SJIS'
+    TMail.KCODE = 'SJIS'
     # raw SJIS string in value (token)
     h = TMail::HeaderField.new('Content-Disposition',
             %Q<attachment; filename=\223\372\226{\214\352.doc>)
     assert_equal 'attachment', h.disposition
     assert_equal 1, h.params.size
-    assert_equal "\223\372\226{\214\352.doc", h.params['filename']
+    expected = "\223\372\226{\214\352.doc"
+    expected.force_encoding 'Shift_JIS' if expected.respond_to? :force_encoding
+    assert_equal expected, h.params['filename']
 
     # raw SJIS string in value (quoted-string)
     h = TMail::HeaderField.new('Content-Disposition',
             %Q<attachment; filename="\223\372\226{\214\352.doc">)
     assert_equal 'attachment', h.disposition
     assert_equal 1, h.params.size
-    assert_equal "\223\372\226{\214\352.doc", h.params['filename']
+    assert_equal expected, h.params['filename']
   end
 
   def _test_code_conversion
-    # JIS -> $KCODE auto conversion
-    $KCODE = 'EUC'
+    # JIS -> TMail.KCODE auto conversion
+    TMail.KCODE = 'EUC'
     h = TMail::HeaderField.new('Content-Disposition',
             %Q<attachment; filename=\e$BF|K\\8l\e(B.doc>)
     assert_equal 'attachment', h.disposition
     assert_equal 1, h.params.size
-    assert_equal "\306\374\313\334\270\354.doc", h.params['filename']
+    expected = "\306\374\313\334\270\354.doc"
+    expected.force_encoding 'EUC-JP' if expected.respond_to? :force_encoding
+    assert_equal expected, h.params['filename']
 
-    $KCODE = 'SJIS'
+    TMail.KCODE = 'SJIS'
     h = TMail::HeaderField.new('Content-Disposition',
             %Q<attachment; filename=\e$BF|K\\8l\e(B.doc>)
     assert_equal 'attachment', h.disposition
     assert_equal 1, h.params.size
-    assert_equal "\223\372\226{\214\352.doc", h.params['filename']
+    expected = "\223\372\226{\214\352.doc"
+    expected.force_encoding 'Shift_JIS' if expected.respond_to? :force_encoding
+    assert_equal expected, h.params['filename']
   end
 
   def test_disposition=
@@ -916,20 +935,24 @@ class ContentDispositionHeaderTester < Test::Unit::TestCase
   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)
+    assert_equal("mike@envelope_sender.com.au", h.addrs.join)
   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)
+    assert_equal("Mikel Lindsaar <mikel@from_address.com>", h.addrs.join)
   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)
+    h = TMail::HeaderField.new_from_port(p, 'Content-Type')
+    line = 'multipart/signed; protocol="application/pkcs7-signature"; boundary=Apple-Mail-42-587703407; micalg=sha1'
+    assert(line =~ /multipart\/signed/)
+    assert(line =~ /protocol="application\/pkcs7-signature"/)
+    assert(line =~ /boundary=Apple-Mail-42-587703407/)
+    assert(line =~ /micalg=sha1/)
+    assert_equal(line.length, 103)
   end
   
   def test_returning_nil_if_there_is_no_match