actionmailer 1.3.6 → 2.0.0

data/test/quoting_test.rb

@@ -3,6 +3,44 @@ require 'tmail'
 require 'tempfile'
 
 class QuotingTest < Test::Unit::TestCase
+  
+  # Move some tests from TMAIL here
+  def test_unquote_quoted_printable
+    a ="=?ISO-8859-1?Q?[166417]_Bekr=E6ftelse_fra_Rejsefeber?=" 
+    b = TMail::Unquoter.unquote_and_convert_to(a, 'utf-8')
+    assert_equal "[166417] Bekr\303\246ftelse fra Rejsefeber", b
+  end
+
+  def test_unquote_base64
+    a ="=?ISO-8859-1?B?WzE2NjQxN10gQmVrcuZmdGVsc2UgZnJhIFJlanNlZmViZXI=?="
+    b = TMail::Unquoter.unquote_and_convert_to(a, 'utf-8')
+    assert_equal "[166417] Bekr\303\246ftelse fra Rejsefeber", b
+  end
+
+  def test_unquote_without_charset
+    a ="[166417]_Bekr=E6ftelse_fra_Rejsefeber" 
+    b = TMail::Unquoter.unquote_and_convert_to(a, 'utf-8')
+    assert_equal "[166417]_Bekr=E6ftelse_fra_Rejsefeber", b
+  end  
+  
+  def test_unqoute_multiple
+    a ="=?utf-8?q?Re=3A_=5B12=5D_=23137=3A_Inkonsistente_verwendung_von_=22Hin?==?utf-8?b?enVmw7xnZW4i?=" 
+    b = TMail::Unquoter.unquote_and_convert_to(a, 'utf-8')
+    assert_equal "Re: [12] #137: Inkonsistente verwendung von \"Hinzuf\303\274gen\"", b
+  end
+  
+  def test_unqoute_in_the_middle
+    a ="Re: Photos =?ISO-8859-1?Q?Brosch=FCre_Rand?=" 
+    b = TMail::Unquoter.unquote_and_convert_to(a, 'utf-8')
+    assert_equal "Re: Photos Brosch\303\274re Rand", b
+  end
+  
+  def test_unqoute_iso
+    a ="=?ISO-8859-1?Q?Brosch=FCre_Rand?=" 
+    b = TMail::Unquoter.unquote_and_convert_to(a, 'iso-8859-1')
+    assert_equal "Brosch\374re Rand", b
+  end
+    
   def test_quote_multibyte_chars
     original = "\303\246 \303\270 and \303\245"
 
@@ -18,7 +56,8 @@ class QuotingTest < Test::Unit::TestCase
     unquoted = TMail::Unquoter.unquote_and_convert_to(result, nil)
     assert_equal unquoted, original
   end
-
+  
+  
   # test an email that has been created using \r\n newlines, instead of
   # \n newlines.
   def test_email_quoted_with_0d0a
@@ -30,9 +69,19 @@ class QuotingTest < Test::Unit::TestCase
     mail = TMail::Mail.parse(IO.read("#{File.dirname(__FILE__)}/fixtures/raw_email_with_partially_quoted_subject"))
     assert_equal "Re: Test: \"\346\274\242\345\255\227\" mid \"\346\274\242\345\255\227\" tail", mail.subject
   end
-
+  
+  def test_decode
+    encoded, decoded = expected_base64_strings
+    assert_equal decoded, TMail::Base64.decode(encoded)
+  end
+  
+  def test_encode
+    encoded, decoded = expected_base64_strings
+    assert_equal encoded.length, TMail::Base64.encode(decoded).length
+  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)
@@ -54,4 +103,9 @@ class QuotingTest < Test::Unit::TestCase
       File.delete(test_name) rescue nil
       File.delete(res_name) rescue nil
     end
+    
+    def expected_base64_strings
+      [ File.read("#{File.dirname(__FILE__)}/fixtures/raw_base64_encoded_string"), File.read("#{File.dirname(__FILE__)}/fixtures/raw_base64_decoded_string") ]
+    end
 end
+

data/test/test_helper_test.rb

@@ -0,0 +1,117 @@
+require File.dirname(__FILE__) + '/abstract_unit'
+
+class TestHelperMailer < ActionMailer::Base
+  def test
+    recipients "test@example.com"
+    from       "tester@example.com"
+    body       render(:inline => "Hello, <%= @world %>", :body => { :world => "Earth" })
+  end
+end
+
+class TestHelperMailerTest < ActionMailer::TestCase
+
+  def test_setup_sets_right_action_mailer_options
+    assert_equal :test, ActionMailer::Base.delivery_method
+    assert ActionMailer::Base.perform_deliveries
+    assert_equal [], ActionMailer::Base.deliveries
+  end
+
+  def test_setup_creates_the_expected_mailer
+    assert @expected.is_a?(TMail::Mail)
+    assert_equal "1.0", @expected.mime_version
+    assert_equal "text/plain", @expected.content_type
+  end
+
+  def test_mailer_class_is_correctly_inferred
+    assert_equal TestHelperMailer, self.class.mailer_class
+  end
+
+  def test_determine_default_mailer_raises_correct_error
+    assert_raises(ActionMailer::NonInferrableMailerError) do
+      self.class.determine_default_mailer("NotAMailerTest")
+    end
+  end
+  
+  def test_charset_is_utf_8
+    assert_equal "utf-8", charset
+  end
+
+  def test_encode
+    assert_equal "=?utf-8?Q?=0aasdf=0a?=", encode("\nasdf\n")
+  end
+
+  def test_assert_emails
+    assert_nothing_raised do
+      assert_emails 1 do
+        TestHelperMailer.deliver_test
+      end
+    end
+  end
+  
+  def test_repeated_assert_emails_calls
+    assert_nothing_raised do
+      assert_emails 1 do
+        TestHelperMailer.deliver_test
+      end
+    end
+    
+    assert_nothing_raised do
+      assert_emails 2 do
+        TestHelperMailer.deliver_test
+        TestHelperMailer.deliver_test
+      end
+    end
+  end
+  
+  def test_assert_emails_with_no_block
+    assert_nothing_raised do
+      TestHelperMailer.deliver_test
+      assert_emails 1
+    end
+    
+    assert_nothing_raised do
+      TestHelperMailer.deliver_test
+      TestHelperMailer.deliver_test
+      assert_emails 3
+    end
+  end
+  
+  def test_assert_no_emails
+    assert_nothing_raised do
+      assert_no_emails do
+        TestHelperMailer.create_test
+      end
+    end
+  end
+  
+  def test_assert_emails_too_few_sent
+    error = assert_raises Test::Unit::AssertionFailedError do
+      assert_emails 2 do
+        TestHelperMailer.deliver_test
+      end
+    end
+    
+    assert_match /2 .* but 1/, error.message
+  end
+  
+  def test_assert_emails_too_many_sent
+    error = assert_raises Test::Unit::AssertionFailedError do
+      assert_emails 1 do
+        TestHelperMailer.deliver_test
+        TestHelperMailer.deliver_test
+      end
+    end
+    
+    assert_match /1 .* but 2/, error.message
+  end
+  
+  def test_assert_no_emails_failure
+    error = assert_raises Test::Unit::AssertionFailedError do
+      assert_no_emails do
+        TestHelperMailer.deliver_test
+      end
+    end
+    
+    assert_match /0 .* but 1/, error.message
+  end
+end

data/test/tmail_test.rb

@@ -10,4 +10,13 @@ class TMailMailTest < Test::Unit::TestCase
     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/url_test.rb

@@ -1,6 +1,9 @@
 require "#{File.dirname(__FILE__)}/abstract_unit"
 
 class TestMailer < ActionMailer::Base
+  
+  default_url_options[:host] = 'www.basecamphq.com'
+  
   def signed_up_with_url(recipient)
     @recipients   = recipient
     @subject      = "[Signed up] Welcome #{recipient}"
@@ -37,22 +40,27 @@ class ActionMailerUrlTest < Test::Unit::TestCase
   end
 
   def setup
-    ActionMailer::Base.delivery_method = :test
+    set_delivery_method :test
     ActionMailer::Base.perform_deliveries = true
     ActionMailer::Base.deliveries = []
 
     @recipient = 'test@localhost'
   end
 
+  def teardown
+    restore_delivery_method
+  end
+
   def test_signed_up_with_url
     ActionController::Routing::Routes.draw do |map| 
       map.connect ':controller/:action/:id' 
+      map.welcome 'welcome', :controller=>"foo", :action=>"bar"
     end
 
     expected = new_mail
     expected.to      = @recipient
     expected.subject = "[Signed up] Welcome #{@recipient}"
-    expected.body    = "Hello there, \n\nMr. #{@recipient}. Please see our greeting at http://example.com/welcome/greeting"
+    expected.body    = "Hello there, \n\nMr. #{@recipient}. Please see our greeting at http://example.com/welcome/greeting http://www.basecamphq.com/welcome\n\n<img alt=\"Somelogo\" src=\"/images/somelogo.png\" />"
     expected.from    = "system@loudthinking.com"
     expected.date    = Time.local(2004, 12, 12)
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: actionmailer
 version: !ruby/object:Gem::Version 
-  version: 1.3.6
-date: 2007-11-24 00:00:00 +13:00
+  version: 2.0.0
+date: 2007-12-06 00:00:00 -06:00
 summary: Service layer for easy email delivery and testing.
 require_paths: 
 - lib
@@ -42,54 +42,74 @@ files:
 - lib/action_mailer/part.rb
 - lib/action_mailer/part_container.rb
 - lib/action_mailer/quoting.rb
+- lib/action_mailer/test_case.rb
+- lib/action_mailer/test_helper.rb
 - lib/action_mailer/utils.rb
 - lib/action_mailer/vendor
-- lib/action_mailer/vendor/text
-- lib/action_mailer/vendor/text/format.rb
-- lib/action_mailer/vendor/tmail
-- lib/action_mailer/vendor/tmail/address.rb
-- lib/action_mailer/vendor/tmail/attachments.rb
-- lib/action_mailer/vendor/tmail/base64.rb
-- lib/action_mailer/vendor/tmail/config.rb
-- lib/action_mailer/vendor/tmail/encode.rb
-- lib/action_mailer/vendor/tmail/facade.rb
-- lib/action_mailer/vendor/tmail/header.rb
-- lib/action_mailer/vendor/tmail/info.rb
-- lib/action_mailer/vendor/tmail/loader.rb
-- lib/action_mailer/vendor/tmail/mail.rb
-- lib/action_mailer/vendor/tmail/mailbox.rb
-- lib/action_mailer/vendor/tmail/mbox.rb
-- lib/action_mailer/vendor/tmail/net.rb
-- lib/action_mailer/vendor/tmail/obsolete.rb
-- lib/action_mailer/vendor/tmail/parser.rb
-- lib/action_mailer/vendor/tmail/port.rb
-- lib/action_mailer/vendor/tmail/quoting.rb
-- lib/action_mailer/vendor/tmail/scanner.rb
-- lib/action_mailer/vendor/tmail/scanner_r.rb
-- lib/action_mailer/vendor/tmail/stringio.rb
-- lib/action_mailer/vendor/tmail/tmail.rb
-- lib/action_mailer/vendor/tmail/utils.rb
-- lib/action_mailer/vendor/tmail.rb
+- lib/action_mailer/vendor/text-format-0.6.3
+- lib/action_mailer/vendor/text-format-0.6.3/text
+- lib/action_mailer/vendor/text-format-0.6.3/text/format.rb
+- lib/action_mailer/vendor/tmail-1.1.0
+- lib/action_mailer/vendor/tmail-1.1.0/tmail
+- lib/action_mailer/vendor/tmail-1.1.0/tmail/address.rb
+- lib/action_mailer/vendor/tmail-1.1.0/tmail/attachments.rb
+- lib/action_mailer/vendor/tmail-1.1.0/tmail/base64.rb
+- lib/action_mailer/vendor/tmail-1.1.0/tmail/compat.rb
+- lib/action_mailer/vendor/tmail-1.1.0/tmail/config.rb
+- lib/action_mailer/vendor/tmail-1.1.0/tmail/core_extensions.rb
+- lib/action_mailer/vendor/tmail-1.1.0/tmail/encode.rb
+- lib/action_mailer/vendor/tmail-1.1.0/tmail/facade.rb
+- lib/action_mailer/vendor/tmail-1.1.0/tmail/header.rb
+- lib/action_mailer/vendor/tmail-1.1.0/tmail/info.rb
+- lib/action_mailer/vendor/tmail-1.1.0/tmail/interface.rb
+- lib/action_mailer/vendor/tmail-1.1.0/tmail/loader.rb
+- lib/action_mailer/vendor/tmail-1.1.0/tmail/mail.rb
+- lib/action_mailer/vendor/tmail-1.1.0/tmail/mailbox.rb
+- lib/action_mailer/vendor/tmail-1.1.0/tmail/Makefile
+- lib/action_mailer/vendor/tmail-1.1.0/tmail/mbox.rb
+- lib/action_mailer/vendor/tmail-1.1.0/tmail/net.rb
+- lib/action_mailer/vendor/tmail-1.1.0/tmail/obsolete.rb
+- lib/action_mailer/vendor/tmail-1.1.0/tmail/parser.rb
+- lib/action_mailer/vendor/tmail-1.1.0/tmail/parser.y
+- lib/action_mailer/vendor/tmail-1.1.0/tmail/port.rb
+- lib/action_mailer/vendor/tmail-1.1.0/tmail/quoting.rb
+- lib/action_mailer/vendor/tmail-1.1.0/tmail/scanner.rb
+- lib/action_mailer/vendor/tmail-1.1.0/tmail/scanner_r.rb
+- lib/action_mailer/vendor/tmail-1.1.0/tmail/stringio.rb
+- lib/action_mailer/vendor/tmail-1.1.0/tmail/tmail.rb
+- lib/action_mailer/vendor/tmail-1.1.0/tmail/utils.rb
+- lib/action_mailer/vendor/tmail-1.1.0/tmail/version.rb
+- lib/action_mailer/vendor/tmail-1.1.0/tmail.rb
+- lib/action_mailer/vendor.rb
 - lib/action_mailer/version.rb
 - lib/action_mailer.rb
+- lib/actionmailer.rb
 - test/abstract_unit.rb
+- test/delivery_method_test.rb
 - test/fixtures
 - test/fixtures/first_mailer
+- test/fixtures/first_mailer/share.erb
 - test/fixtures/first_mailer/share.rhtml
 - test/fixtures/helper_mailer
+- test/fixtures/helper_mailer/use_example_helper.erb
+- test/fixtures/helper_mailer/use_example_helper.rhtml
+- test/fixtures/helper_mailer/use_helper.erb
 - test/fixtures/helper_mailer/use_helper.rhtml
+- test/fixtures/helper_mailer/use_helper_method.erb
 - test/fixtures/helper_mailer/use_helper_method.rhtml
+- test/fixtures/helper_mailer/use_mail_helper.erb
 - test/fixtures/helper_mailer/use_mail_helper.rhtml
-- test/fixtures/helper_mailer/use_test_helper.rhtml
 - test/fixtures/helpers
-- test/fixtures/helpers/test_helper.rb
+- test/fixtures/helpers/example_helper.rb
 - test/fixtures/path.with.dots
 - test/fixtures/path.with.dots/funky_path_mailer
+- test/fixtures/path.with.dots/funky_path_mailer/multipart_with_template_path_with_dots.erb
 - test/fixtures/path.with.dots/funky_path_mailer/multipart_with_template_path_with_dots.rhtml
 - test/fixtures/path.with.dots/multipart_with_template_path_with_dots.rhtml
+- test/fixtures/raw_base64_decoded_string
+- test/fixtures/raw_base64_encoded_string
 - test/fixtures/raw_email
 - test/fixtures/raw_email10
-- test/fixtures/raw_email11
 - test/fixtures/raw_email12
 - test/fixtures/raw_email13
 - test/fixtures/raw_email2
@@ -101,23 +121,40 @@ files:
 - test/fixtures/raw_email8
 - test/fixtures/raw_email9
 - test/fixtures/raw_email_quoted_with_0d0a
+- test/fixtures/raw_email_with_invalid_characters_in_content_type
+- test/fixtures/raw_email_with_nested_attachment
 - test/fixtures/raw_email_with_partially_quoted_subject
 - test/fixtures/second_mailer
+- test/fixtures/second_mailer/share.erb
 - test/fixtures/second_mailer/share.rhtml
 - test/fixtures/templates
+- test/fixtures/templates/signed_up.erb
 - test/fixtures/templates/signed_up.rhtml
 - test/fixtures/test_mailer
+- test/fixtures/test_mailer/_subtemplate.text.plain.erb
+- test/fixtures/test_mailer/custom_templating_extension.text.html.haml
+- test/fixtures/test_mailer/custom_templating_extension.text.plain.haml
+- test/fixtures/test_mailer/implicitly_multipart_example.ignored.erb
 - test/fixtures/test_mailer/implicitly_multipart_example.ignored.rhtml
 - test/fixtures/test_mailer/implicitly_multipart_example.rhtml.bak
+- test/fixtures/test_mailer/implicitly_multipart_example.text.html.erb
 - test/fixtures/test_mailer/implicitly_multipart_example.text.html.rhtml
+- test/fixtures/test_mailer/implicitly_multipart_example.text.plain.erb
 - test/fixtures/test_mailer/implicitly_multipart_example.text.plain.rhtml
+- test/fixtures/test_mailer/implicitly_multipart_example.text.yaml.erb
 - test/fixtures/test_mailer/implicitly_multipart_example.text.yaml.rhtml
+- test/fixtures/test_mailer/included_subtemplate.text.plain.erb
+- test/fixtures/test_mailer/rxml_template.builder
+- test/fixtures/test_mailer/rxml_template.rxml
+- test/fixtures/test_mailer/signed_up.erb
 - test/fixtures/test_mailer/signed_up.rhtml
+- test/fixtures/test_mailer/signed_up_with_url.erb
 - test/fixtures/test_mailer/signed_up_with_url.rhtml
 - test/mail_helper_test.rb
 - test/mail_render_test.rb
 - test/mail_service_test.rb
 - test/quoting_test.rb
+- test/test_helper_test.rb
 - test/tmail_test.rb
 - test/url_test.rb
 test_files: []
@@ -140,5 +177,5 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.13.6
+        version: 2.0.0
     version: 

data/lib/action_mailer/vendor/tmail.rb

@@ -1,3 +0,0 @@
-require 'tmail/info'
-require 'tmail/mail'
-require 'tmail/mailbox'

data/test/fixtures/helper_mailer/use_test_helper.rhtml

@@ -1 +0,0 @@
-So, <%= test_format(@text) %>

data/test/fixtures/raw_email11

@@ -1,34 +0,0 @@
-From xxx@xxxx.com Wed Apr 27 14:15:31 2005
-Mime-Version: 1.0 (Apple Message framework v619.2)
-To: xxxxx@xxxxx <matmail>
-Message-Id: <416eaebec6d333ec6939eaf8a7d80724@xxxxx>
-Content-Type: multipart/alternative;
-        boundary=Apple-Mail-5-1037861608
-From: xxxxx@xxxxx <xxxxx@xxxxx>
-Subject: worse when you use them.
-Date: Wed, 27 Apr 2005 14:15:31 -0700
-
-
-
-
---Apple-Mail-5-1037861608
-Content-Transfer-Encoding: 7bit
-Content-Type: text/plain;
-        charset=US-ASCII;
-        format=flowed
-
-
-XXXXX Xxxxx
-
---Apple-Mail-5-1037861608
-Content-Transfer-Encoding: 7bit
-Content-Type: text/enriched;
-        charset=US-ASCII
-
-
-
-<bold>XXXXX Xxxxx</bold>
-
-
---Apple-Mail-5-1037861608--
-