diff options
author | José Valim <jose.valim@gmail.com> | 2009-12-25 21:35:40 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2009-12-25 21:35:40 +0100 |
commit | ee70d1b6ad9b79d2c3d284e78af4e20416575ea8 (patch) | |
tree | 41b15c70dd3611417d4081725fdf738c530bd36b /actionmailer/lib/action_mailer/adv_attr_accessor.rb | |
parent | 135d32c8bd91608c12a394ca5dbd65f358bbce42 (diff) | |
download | rails-ee70d1b6ad9b79d2c3d284e78af4e20416575ea8.tar.gz rails-ee70d1b6ad9b79d2c3d284e78af4e20416575ea8.tar.bz2 rails-ee70d1b6ad9b79d2c3d284e78af4e20416575ea8.zip |
adv_attr_accessors in ActionMailer are not sent to the views, use the mailer object if you need to access the subject, recipients, from, etc.
Diffstat (limited to 'actionmailer/lib/action_mailer/adv_attr_accessor.rb')
-rw-r--r-- | actionmailer/lib/action_mailer/adv_attr_accessor.rb | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/actionmailer/lib/action_mailer/adv_attr_accessor.rb b/actionmailer/lib/action_mailer/adv_attr_accessor.rb index e77029afdd..be6b1feca9 100644 --- a/actionmailer/lib/action_mailer/adv_attr_accessor.rb +++ b/actionmailer/lib/action_mailer/adv_attr_accessor.rb @@ -1,29 +1,25 @@ module ActionMailer module AdvAttrAccessor #:nodoc: - def self.included(base) - base.extend(ClassMethods) - end - - module ClassMethods #:nodoc: - def adv_attr_accessor(*names) - names.each do |name| - ivar = "@#{name}" + def adv_attr_accessor(*names) + names.each do |name| + ivar = "@#{name}" - define_method("#{name}=") do |value| - instance_variable_set(ivar, value) + class_eval <<-ACCESSORS, __FILE__, __LINE__ + 1 + def #{name}=(value) + #{ivar} = value end - define_method(name) do |*parameters| - raise ArgumentError, "expected 0 or 1 parameters" unless parameters.length <= 1 - if parameters.empty? - if instance_variable_names.include?(ivar) - instance_variable_get(ivar) - end + def #{name}(*args) + raise ArgumentError, "expected 0 or 1 parameters" unless args.length <= 1 + if args.empty? + #{ivar} if instance_variable_names.include?(#{ivar.inspect}) else - instance_variable_set(ivar, parameters.first) + #{ivar} = args.first end end - end + ACCESSORS + + self.protected_instance_variables << ivar if self.respond_to?(:protected_instance_variables) end end end |