kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Adding ability to pass proc's to the ActionMailer class default method

Browse source 
Signed-off-by: José Valim <jose.valim@gmail.com>
This commit is contained in:
Mikel Lindsaar 2010-05-02 11:30:10 +10:00 committed by José Valim
parent 256a15c235
commit 08b07b60b6
2 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
actionmailer/lib/action_mailer/base.rb
View file

@ -528,8 +528,13 @@ module ActionMailer #:nodoc:
content_type = headers[:content_type]
parts_order = headers[:parts_order]
# Call all the procs (if any)
default_values = self.class.default.merge(self.class.default) do |k,v|
v.respond_to?(:call) ? v.call : v
end
# Handle defaults
headers = headers.reverse_merge(self.class.default)
headers = headers.reverse_merge(default_values)
headers[:subject] ||= default_i18n_subject
# Apply charset at the beginning so all fields are properly quoted

17
actionmailer/test/base_test.rb
View file

@ -113,6 +113,15 @@ class BaseTest < ActiveSupport::TestCase
end
end
end
class ProcMailer < ActionMailer::Base
default :to => 'system@test.lindsaar.net',
'X-Proc-Method' => Proc.new { Time.now.to_i.to_s }
def welcome
mail
end
end
test "method call to mail does not raise error" do
assert_nothing_raised { BaseMailer.welcome }
@ -560,6 +569,14 @@ class BaseTest < ActiveSupport::TestCase
MyInterceptor.expects(:delivering_email).with(mail)
mail.deliver
end
test "being able to put proc's into the defaults hash and they get evaluated on mail sending" do
mail1 = ProcMailer.welcome
yesterday = 1.day.ago
Time.stubs(:now).returns(yesterday)
mail2 = ProcMailer.welcome
assert(mail1['X-Proc-Method'].to_s.to_i > mail2['X-Proc-Method'].to_s.to_i)
end
protected