diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-12-31 17:15:06 -0800 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-12-31 17:15:06 -0800 |
commit | 6ce562c9fff4084e185c3c57cc609d3bf5ac0cfc (patch) | |
tree | 2719006c11a209156f787d3b18aad05c0f89f61c | |
parent | 58ad6567692ee44b91bd05833b6cb6c454481e19 (diff) | |
parent | 94838fbe392d2a4084c3a22d8df9eebb7674b3b1 (diff) | |
download | rails-6ce562c9fff4084e185c3c57cc609d3bf5ac0cfc.tar.gz rails-6ce562c9fff4084e185c3c57cc609d3bf5ac0cfc.tar.bz2 rails-6ce562c9fff4084e185c3c57cc609d3bf5ac0cfc.zip |
Merge commit 'mikel/master'
-rw-r--r-- | actionmailer/actionmailer.gemspec | 2 | ||||
-rw-r--r-- | actionmailer/lib/action_mailer.rb | 2 | ||||
-rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 3 | ||||
-rw-r--r-- | actionmailer/lib/action_mailer/test_case.rb | 2 | ||||
-rw-r--r-- | actionmailer/lib/action_mailer/tmail_compat.rb | 10 | ||||
-rw-r--r-- | actionmailer/test/tmail_compat_test.rb | 9 |
6 files changed, 23 insertions, 5 deletions
diff --git a/actionmailer/actionmailer.gemspec b/actionmailer/actionmailer.gemspec index 980de8ec70..201b56a739 100644 --- a/actionmailer/actionmailer.gemspec +++ b/actionmailer/actionmailer.gemspec @@ -11,7 +11,7 @@ Gem::Specification.new do |s| s.homepage = "http://www.rubyonrails.org" s.add_dependency('actionpack', '= 3.0.pre') - s.add_dependency('mail', '~> 1.4.2') + s.add_dependency('mail', '~> 1.4.3') s.files = Dir['CHANGELOG', 'README', 'MIT-LICENSE', 'lib/**/*'] s.has_rdoc = true diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index 039715c2f5..55ddbb24f4 100644 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -45,5 +45,3 @@ module Text autoload :Format, 'action_mailer/vendor/text_format' end - -require 'action_mailer/tmail_compat'
\ No newline at end of file diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index aea2498d4d..f34a9bae47 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -1,5 +1,6 @@ require 'active_support/core_ext/class' require 'mail' +require 'action_mailer/tmail_compat' module ActionMailer #:nodoc: # Action Mailer allows you to send email from your application using a mailer model and views. @@ -149,7 +150,7 @@ module ActionMailer #:nodoc: # # part "text/plain" do |p| # p.body = render_message("signup-as-plain", :account => recipient) - # p.transfer_encoding = "base64" + # p.content_transfer_encoding = "base64" # end # end # end diff --git a/actionmailer/lib/action_mailer/test_case.rb b/actionmailer/lib/action_mailer/test_case.rb index 445abd0b89..e8632d4559 100644 --- a/actionmailer/lib/action_mailer/test_case.rb +++ b/actionmailer/lib/action_mailer/test_case.rb @@ -1,5 +1,5 @@ require 'active_support/test_case' -require 'mail' +require 'action_mailer/base' module ActionMailer class NonInferrableMailerError < ::StandardError diff --git a/actionmailer/lib/action_mailer/tmail_compat.rb b/actionmailer/lib/action_mailer/tmail_compat.rb index cacd79be27..2fd25ff145 100644 --- a/actionmailer/lib/action_mailer/tmail_compat.rb +++ b/actionmailer/lib/action_mailer/tmail_compat.rb @@ -6,5 +6,15 @@ module Mail content_type(*args) end + alias :old_transfer_encoding :transfer_encoding + def transfer_encoding(value = nil) + if value + STDERR.puts("Message#transfer_encoding is deprecated, please call Message#content_transfer_encoding with the same arguments.\n#{caller}") + content_transfer_encoding(value) + else + old_transfer_encoding + end + end + end end
\ No newline at end of file diff --git a/actionmailer/test/tmail_compat_test.rb b/actionmailer/test/tmail_compat_test.rb index 9b0e91f5f8..faa267e3bf 100644 --- a/actionmailer/test/tmail_compat_test.rb +++ b/actionmailer/test/tmail_compat_test.rb @@ -10,5 +10,14 @@ class TmailCompatTest < Test::Unit::TestCase end assert_equal mail.content_type.string, "text/plain" end + + def test_transfer_encoding_raises_deprecation_warning + mail = Mail.new + STDERR.expects(:puts) # Deprecation warning + assert_nothing_raised do + mail.transfer_encoding "base64" + end + assert_equal mail.content_transfer_encoding.value, "base64" + end end |