diff options
author | José Valim <jose.valim@gmail.com> | 2010-01-26 16:00:57 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-01-26 16:00:57 +0100 |
commit | 1078677575b44ff2700cb6232b50d9c887e73c2b (patch) | |
tree | 47963e11e0eade3d92383b80b04783adae7d5275 /actionmailer/lib/action_mailer/deprecated_api.rb | |
parent | d7de1c76cad28f52fc62693d415a07abf6c86ef5 (diff) | |
parent | 05c4ad9d3f6ff8d0017f4bca9b52e552629c4813 (diff) | |
download | rails-1078677575b44ff2700cb6232b50d9c887e73c2b.tar.gz rails-1078677575b44ff2700cb6232b50d9c887e73c2b.tar.bz2 rails-1078677575b44ff2700cb6232b50d9c887e73c2b.zip |
Merge remote branch 'mikel/master'
Diffstat (limited to 'actionmailer/lib/action_mailer/deprecated_api.rb')
-rw-r--r-- | actionmailer/lib/action_mailer/deprecated_api.rb | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/deprecated_api.rb b/actionmailer/lib/action_mailer/deprecated_api.rb index 0eb8d85676..61101c26a1 100644 --- a/actionmailer/lib/action_mailer/deprecated_api.rb +++ b/actionmailer/lib/action_mailer/deprecated_api.rb @@ -5,8 +5,25 @@ module ActionMailer module DeprecatedApi #:nodoc: extend ActiveSupport::Concern - module ClassMethods + included do + [:charset, :content_type, :mime_version, :implicit_parts_order].each do |method| + class_eval <<-FILE, __FILE__, __LINE__ + 1 + def self.default_#{method} + @@default_#{method} + end + + def self.default_#{method}=(value) + ActiveSupport::Deprecation.warn "ActionMailer::Base.default_#{method}=value is deprecated, " << + "use defaults :#{method} => value instead" + @@default_#{method} = value + end + + @@default_#{method} = nil + FILE + end + end + module ClassMethods # Deliver the given mail object directly. This can be used to deliver # a preconstructed mail object, like: # @@ -99,7 +116,15 @@ module ActionMailer end private - + + def initialize_defaults(*) + @charset ||= self.class.default_charset.try(:dup) + @content_type ||= self.class.default_content_type.try(:dup) + @implicit_parts_order ||= self.class.default_implicit_parts_order.try(:dup) + @mime_version ||= self.class.default_mime_version.try(:dup) + super + end + def create_parts if @body.is_a?(Hash) && !@body.empty? ActiveSupport::Deprecation.warn "Giving a hash to body is deprecated, please use instance variables instead", caller[0,2] |