Merge commit 'rails/master'

6 files changed, 35 insertions, 17 deletions

diff --git a/actionmailer/actionmailer.gemspec b/actionmailer/actionmailer.gemspec
index a7a2599105..410df0e106 100644
--- a/actionmailer/actionmailer.gemspec
+++ b/actionmailer/actionmailer.gemspec
@@ -20,6 +20,6 @@ Gem::Specification.new do |s|
   s.has_rdoc = true
 
   s.add_dependency('actionpack',  version)
-  s.add_dependency('mail',        '~> 2.1.3')
+  s.add_dependency('mail',        '~> 2.1.5.3')
   s.add_dependency('text-format', '~> 1.0.0')
 end
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 0519783d02..af7255ae4f 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -2,6 +2,7 @@ require 'mail'
 require 'action_mailer/tmail_compat'
 require 'action_mailer/collector'
 require 'active_support/core_ext/array/wrap'
+require 'active_support/core_ext/object/blank'
 
 module ActionMailer #:nodoc:
   # Action Mailer allows you to send email from your application using a mailer model and views.
@@ -290,7 +291,7 @@ module ActionMailer #:nodoc:
       :parts_order  => [ "text/plain", "text/enriched", "text/html" ]
     }.freeze
 
-    ActionMailer.run_base_hooks(self)
+    ActiveSupport.run_load_hooks(:action_mailer, self)
 
     class << self
 
diff --git a/actionmailer/lib/action_mailer/old_api.rb b/actionmailer/lib/action_mailer/old_api.rb
index c7f341d46c..7c59a8ae50 100644
--- a/actionmailer/lib/action_mailer/old_api.rb
+++ b/actionmailer/lib/action_mailer/old_api.rb
@@ -1,4 +1,5 @@
 require 'active_support/core_ext/object/try'
+require 'active_support/core_ext/object/blank'
 
 module ActionMailer
   module OldApi #:nodoc:
diff --git a/actionmailer/lib/action_mailer/railtie.rb b/actionmailer/lib/action_mailer/railtie.rb
index 2703367fdb..882e078d1b 100644
--- a/actionmailer/lib/action_mailer/railtie.rb
+++ b/actionmailer/lib/action_mailer/railtie.rb
@@ -6,18 +6,18 @@ module ActionMailer
     config.action_mailer = ActiveSupport::OrderedOptions.new
 
     initializer "action_mailer.url_for", :before => :load_environment_config do |app|
-      ActionMailer.base_hook { include app.routes.url_helpers }
+      ActiveSupport.on_load(:action_mailer) { include app.routes.url_helpers }
     end
 
     require "action_mailer/railties/log_subscriber"
     log_subscriber :action_mailer, ActionMailer::Railties::LogSubscriber.new
 
     initializer "action_mailer.logger" do
-      ActionMailer.base_hook { self.logger ||= Rails.logger }
+      ActiveSupport.on_load(:action_mailer) { self.logger ||= Rails.logger }
     end
 
     initializer "action_mailer.set_configs" do |app|
-      ActionMailer.base_hook do
+      ActiveSupport.on_load(:action_mailer) do
         app.config.action_mailer.each do |k,v|
           send "#{k}=", v
         end
diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
index 6f274c11df..baeee542be 100644
--- a/actionmailer/test/base_test.rb
+++ b/actionmailer/test/base_test.rb
@@ -39,8 +39,15 @@ class BaseTest < ActiveSupport::TestCase
     end
 
     def attachment_with_hash
-      attachments['invoice.jpg'] = { :data => "you smiling", :mime_type => "image/x-jpg",
-        :transfer_encoding => "base64" }
+      attachments['invoice.jpg'] = { :data => "\312\213\254\232)b",
+                                     :mime_type => "image/x-jpg",
+                                     :transfer_encoding => "base64" }
+      mail
+    end
+
+    def attachment_with_hash_default_encoding
+      attachments['invoice.jpg'] = { :data => "\312\213\254\232)b",
+                                     :mime_type => "image/x-jpg" }
       mail
     end
 
@@ -135,13 +142,13 @@ class BaseTest < ActiveSupport::TestCase
                                :mime_version => '2.0',
                                :reply_to => 'reply-to@test.lindsaar.net',
                                :date => @time)
-    assert_equal(['bcc@test.lindsaar.net'],      email.bcc)
-    assert_equal(['cc@test.lindsaar.net'],       email.cc)
-    assert_equal('multipart/mixed',              email.content_type)
-    assert_equal('iso-8559-1',                   email.charset)
-    assert_equal('2.0',                          email.mime_version)
-    assert_equal(['reply-to@test.lindsaar.net'], email.reply_to)
-    assert_equal(@time,                          email.date)
+    assert_equal(['bcc@test.lindsaar.net'],             email.bcc)
+    assert_equal(['cc@test.lindsaar.net'],              email.cc)
+    assert_equal('multipart/mixed; charset=iso-8559-1', email.content_type)
+    assert_equal('iso-8559-1',                          email.charset)
+    assert_equal('2.0',                                 email.mime_version)
+    assert_equal(['reply-to@test.lindsaar.net'],        email.reply_to)
+    assert_equal(@time,                                 email.date)
   end
 
   test "mail() renders the template using the method being processed" do
@@ -206,6 +213,15 @@ class BaseTest < ActiveSupport::TestCase
     assert_equal expected, email.attachments['invoice.jpg'].decoded
   end
 
+  test "attachment with hash using default mail encoding" do
+    email = BaseMailer.attachment_with_hash_default_encoding
+    assert_equal(1, email.attachments.length)
+    assert_equal('invoice.jpg', email.attachments[0].filename)
+    expected = "\312\213\254\232)b"
+    expected.force_encoding(Encoding::BINARY) if '1.9'.respond_to?(:force_encoding)
+    assert_equal expected, email.attachments['invoice.jpg'].decoded
+  end
+
   test "sets mime type to multipart/mixed when attachment is included" do
     email = BaseMailer.attachment_with_content
     assert_equal(1, email.attachments.length)
diff --git a/actionmailer/test/old_base/mail_service_test.rb b/actionmailer/test/old_base/mail_service_test.rb
index e49307bfda..9eb067554f 100644
--- a/actionmailer/test/old_base/mail_service_test.rb
+++ b/actionmailer/test/old_base/mail_service_test.rb
@@ -784,7 +784,7 @@ EOF
     expected.date    = Time.local 2004, 12, 12
 
     created = TestMailer.utf8_body @recipient
-    assert_match(/åœö blah/, created.encoded)
+    assert_match(/åœö blah/, created.decoded)
   end
 
   def test_multiple_utf8_recipients
@@ -1019,8 +1019,8 @@ EOF
 
   def test_empty_header_values_omitted
     result = TestMailer.unnamed_attachment(@recipient).encoded
-    assert_match %r{Content-Type: application/octet-stream;}, result
-    assert_match %r{Content-Disposition: attachment;}, result
+    assert_match %r{Content-Type: application/octet-stream}, result
+    assert_match %r{Content-Disposition: attachment}, result
   end
 
   def test_headers_with_nonalpha_chars