actionmailer 1.0.1 → 1.1.1

data/test/mail_service_test.rb

@@ -94,6 +94,23 @@ class TestMailer < ActionMailer::Base
     @charset    = "utf-8"
   end
 
+  def multipart_with_mime_version(recipient)
+    recipients   recipient
+    subject      "multipart with mime_version"
+    from         "test@example.com"
+    sent_on      Time.local(2004, 12, 12)
+    mime_version "1.1"
+    content_type "multipart/alternative"
+
+    part "text/plain" do |p|
+      p.body = "blah"
+    end
+
+    part "text/html" do |p|
+      p.body = "<b>blah</b>"
+    end
+  end
+
   def explicitly_multipart_example(recipient, ct=nil)
     recipients   recipient
     subject      "multipart example"
@@ -111,13 +128,14 @@ class TestMailer < ActionMailer::Base
       :body => "123456789"
   end
 
-  def implicitly_multipart_example(recipient, order = nil)
+  def implicitly_multipart_example(recipient, cs = nil, order = nil)
     @recipients = recipient
     @subject    = "multipart example"
     @from       = "test@example.com"
     @sent_on    = Time.local 2004, 12, 12
     @body       = { "recipient" => recipient }
-    @implicit_parts_order = order unless order.nil?
+    @charset    = cs if cs
+    @implicit_parts_order = order if order
   end
 
   def html_mail(recipient)
@@ -128,6 +146,11 @@ class TestMailer < ActionMailer::Base
     content_type "text/html"
   end
 
+  def html_mail_with_underscores(recipient)
+    subject      "html mail with underscores"
+    body         %{<a href="http://google.com" target="_blank">_Google</a>}
+  end
+
   def custom_template(recipient)
     recipients recipient
     subject    "[Signed up] Welcome #{recipient}"
@@ -239,6 +262,7 @@ class ActionMailerTest < Test::Unit::TestCase
     expected.body    = "Hello there, \n\nMr. #{@recipient}"
     expected.from    = "system@loudthinking.com"
     expected.date    = Time.local(2004, 12, 12)
+    expected.mime_version = nil
 
     created = nil
     assert_nothing_raised { created = TestMailer.create_signed_up(@recipient) }
@@ -527,6 +551,13 @@ 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_decode_part_without_content_type
     fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email4")
     mail = TMail::Mail.parse(fixture)
@@ -545,6 +576,11 @@ EOF
     assert_nothing_raised { mail.body }
   end
 
+  def test_multipart_with_mime_version
+    mail = TestMailer.create_multipart_with_mime_version(@recipient)
+    assert_equal "1.1", mail.mime_version
+  end
+
   def test_explicitly_multipart_messages
     mail = TestMailer.create_explicitly_multipart_example(@recipient)
     assert_equal 3, mail.parts.length
@@ -563,8 +599,7 @@ EOF
   end
 
   def test_explicitly_multipart_with_content_type
-    mail = TestMailer.create_explicitly_multipart_example(@recipient,
-      "multipart/alternative")
+    mail = TestMailer.create_explicitly_multipart_example(@recipient, "multipart/alternative")
     assert_equal 3, mail.parts.length
     assert_equal "multipart/alternative", mail.content_type
   end
@@ -578,6 +613,7 @@ EOF
   def test_implicitly_multipart_messages
     mail = TestMailer.create_implicitly_multipart_example(@recipient)
     assert_equal 3, mail.parts.length
+    assert_equal "1.0", mail.mime_version
     assert_equal "multipart/alternative", mail.content_type
     assert_equal "text/yaml", mail.parts[0].content_type
     assert_equal "utf-8", mail.parts[0].sub_header("content-type", "charset")
@@ -588,18 +624,33 @@ EOF
   end
 
   def test_implicitly_multipart_messages_with_custom_order
-    mail = TestMailer.create_implicitly_multipart_example(@recipient, ["text/yaml", "text/plain"])
+    mail = TestMailer.create_implicitly_multipart_example(@recipient, nil, ["text/yaml", "text/plain"])
     assert_equal 3, mail.parts.length
     assert_equal "text/html", mail.parts[0].content_type
     assert_equal "text/plain", mail.parts[1].content_type
     assert_equal "text/yaml", mail.parts[2].content_type
   end
 
+  def test_implicitly_multipart_messages_with_charset
+    mail = TestMailer.create_implicitly_multipart_example(@recipient, 'iso-8859-1')
+
+    assert_equal "multipart/alternative", mail.header['content-type'].body
+    
+    assert_equal 'iso-8859-1', mail.parts[0].sub_header("content-type", "charset")
+    assert_equal 'iso-8859-1', mail.parts[1].sub_header("content-type", "charset")
+    assert_equal 'iso-8859-1', mail.parts[2].sub_header("content-type", "charset")
+  end
+
   def test_html_mail
     mail = TestMailer.create_html_mail(@recipient)
     assert_equal "text/html", mail.content_type
   end
 
+  def test_html_mail_with_underscores
+    mail = TestMailer.create_html_mail_with_underscores(@recipient)
+    assert_equal %{<a href="http://google.com" target="_blank">_Google</a>}, mail.body
+  end
+
   def test_various_newlines
     mail = TestMailer.create_various_newlines(@recipient)
     assert_equal("line #1\nline #2\nline #3\nline #4\n\n" +
@@ -668,5 +719,11 @@ EOF
     assert_match(/:/, mail.cc_addrs.to_s)
     assert_match(/:/, mail.bcc_addrs.to_s)
   end
+
+  def test_deliver_with_mail_object
+    mail = TestMailer::create_headers_with_nonalpha_chars(@recipient)
+    assert_nothing_raised { TestMailer.deliver(mail) }
+    assert_equal 1, TestMailer.deliveries.length
+  end
 end
 

data/test/quoting_test.rb

@@ -0,0 +1,48 @@
+$:.unshift(File.dirname(__FILE__) + "/../lib/")
+$:.unshift(File.dirname(__FILE__) + "/../lib/action_mailer/vendor")
+
+require 'test/unit'
+require 'tmail'
+require 'tempfile'
+
+class QuotingTest < Test::Unit::TestCase
+  def test_quote_multibyte_chars
+    original = "\303\246 \303\270 and \303\245"
+
+    result = execute_in_sandbox(<<-CODE)
+      $:.unshift(File.dirname(__FILE__) + "/../lib/")
+      $KCODE = 'u'
+      require 'jcode'
+      require 'action_mailer/quoting'
+      include ActionMailer::Quoting
+      quoted_printable(#{original.inspect}, "UTF-8")
+    CODE
+
+    unquoted = TMail::Unquoter.unquote_and_convert_to(result, nil)
+    assert_equal unquoted, original
+  end
+
+  private
+
+    # This whole thing *could* be much simpler, but I don't think Tempfile,
+    # popen and others exist on all platforms (like Windows).
+    def execute_in_sandbox(code)
+      test_name = "#{File.dirname(__FILE__)}/am-quoting-test.#{$$}.rb"
+      res_name = "#{File.dirname(__FILE__)}/am-quoting-test.#{$$}.out"
+
+      File.open(test_name, "w+") do |file|
+        file.write(<<-CODE)
+          block = Proc.new do
+            #{code}
+          end
+          puts block.call
+        CODE
+      end
+
+      system("ruby #{test_name} > #{res_name}") or raise "could not run test in sandbox"
+      File.read(res_name)
+    ensure
+      File.delete(test_name) rescue nil
+      File.delete(res_name) rescue nil
+    end
+end

data/test/tmail_test.rb

@@ -0,0 +1,17 @@
+$:.unshift(File.dirname(__FILE__) + "/../lib/")
+$:.unshift File.dirname(__FILE__) + "/fixtures/helpers"
+
+require 'test/unit'
+require 'action_mailer'
+
+class TMailMailTest < Test::Unit::TestCase
+  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
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: actionmailer
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
-date: 2005-07-11
+  version: 1.1.1
+date: 2005-10-19
 summary: Service layer for easy email delivery and testing.
 require_paths: 
   - lib
@@ -43,6 +43,7 @@ files:
   - lib/action_mailer/quoting.rb
   - lib/action_mailer/utils.rb
   - lib/action_mailer/vendor
+  - lib/action_mailer/version.rb
   - lib/action_mailer/vendor/text
   - lib/action_mailer/vendor/tmail
   - lib/action_mailer/vendor/tmail.rb
@@ -71,12 +72,16 @@ files:
   - lib/action_mailer/vendor/tmail/utils.rb
   - test/fixtures
   - test/mail_helper_test.rb
+  - test/mail_render_test.rb
   - test/mail_service_test.rb
+  - test/quoting_test.rb
+  - test/tmail_test.rb
   - test/fixtures/helper_mailer
   - test/fixtures/helpers
   - test/fixtures/raw_email
   - test/fixtures/raw_email10
   - test/fixtures/raw_email11
+  - test/fixtures/raw_email12
   - test/fixtures/raw_email2
   - test/fixtures/raw_email3
   - test/fixtures/raw_email4
@@ -113,5 +118,5 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 1.9.1
+            version: 1.10.1
       version: