mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added use of AS::Notifications for tmail_compat.rb

This commit is contained in:
José Valim and Mikel Lindsaar 2010-01-22 12:49:13 +11:00
parent 12c001fec4
commit 77986f6bdb
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
actionmailer/lib/action_mailer/tmail_compat.rb
View File

@ -2,14 +2,16 @@ module Mail
class Message
def set_content_type(*args)
STDERR.puts("Message#set_content_type is deprecated, please just call Message#content_type with the same arguments.\n#{caller}")
ActiveSupport::Deprecation.warn('Message#set_content_type is deprecated, please just call ' <<
'Message#content_type with the same arguments.', caller[0,10])
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}")
ActiveSupport::Deprecation.warn('Message#transfer_encoding is deprecated, please call ' <<
'Message#content_transfer_encoding with the same arguments.', caller[0,10])
content_transfer_encoding(value)
else
old_transfer_encoding
@ -17,7 +19,8 @@ module Mail
end
def original_filename
STDERR.puts("Message#original_filename is deprecated, please call Message#filename.\n#{caller}")
ActiveSupport::Deprecation.warn('Message#original_filename is deprecated, ' <<
'please call Message#filename.', caller[0,10])
filename
end

2
actionmailer/test/tmail_compat_test.rb
View File

@ -4,7 +4,6 @@ class TmailCompatTest < Test::Unit::TestCase
def test_set_content_type_raises_deprecation_warning
mail = Mail.new
STDERR.expects(:puts) # Deprecation warning
assert_nothing_raised do
mail.set_content_type "text/plain"
end
@ -13,7 +12,6 @@ class TmailCompatTest < Test::Unit::TestCase
def test_transfer_encoding_raises_deprecation_warning
mail = Mail.new
STDERR.expects(:puts) # Deprecation warning
assert_nothing_raised do
mail.transfer_encoding "base64"
end