diff options
| -rw-r--r-- | actionmailer/CHANGELOG.md | 2 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 5 | ||||
| -rw-r--r-- | actionmailer/test/base_test.rb | 13 | ||||
| -rw-r--r-- | guides/source/configuring.textile | 4 |
4 files changed, 21 insertions, 3 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md index 4d8f739403..177dc8109f 100644 --- a/actionmailer/CHANGELOG.md +++ b/actionmailer/CHANGELOG.md @@ -4,6 +4,8 @@ * Asynchronously send messages via the Rails Queue *Brian Cardarella* +* Set default Action Mailer options via config.action_mailer.default_options= *Robert Pankowecki* + ## Rails 3.2.5 (Jun 1, 2012) ## * No changes. diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index f31e1e007b..ea9a08102f 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -421,6 +421,9 @@ module ActionMailer #:nodoc: self.default_params = default_params.merge(value).freeze if value default_params end + #Alias so that we can use it in config/application.rb which requires setters + #: config.action_mailer.default_options = {from: "no-replay@example.org"} + alias :default_options= :default # Receives a raw email, parses it into an email object, decodes it, # instantiates a new mailer, and passes the email object to the mailer @@ -786,4 +789,4 @@ module ActionMailer #:nodoc: ActiveSupport.run_load_hooks(:action_mailer, self) end -end
\ No newline at end of file +end diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb index 144a6bfe39..9d1b1fda33 100644 --- a/actionmailer/test/base_test.rb +++ b/actionmailer/test/base_test.rb @@ -653,6 +653,19 @@ class BaseTest < ActiveSupport::TestCase assert_equal "Anonymous mailer body", mailer.welcome.body.encoded.strip end + test "default_from can be set" do + class DefaultFromMailer < ActionMailer::Base + default :to => 'system@test.lindsaar.net' + self.default_options = {from: "robert.pankowecki@gmail.com"} + + def welcome + mail(subject: "subject") + end + end + + assert_equal ["robert.pankowecki@gmail.com"], DefaultFromMailer.welcome.from + end + protected # Execute the block setting the given values and restoring old values after diff --git a/guides/source/configuring.textile b/guides/source/configuring.textile index af46538bf5..d69235a9ab 100644 --- a/guides/source/configuring.textile +++ b/guides/source/configuring.textile @@ -424,12 +424,12 @@ There are a number of settings available on +config.action_mailer+: * +config.action_mailer.perform_deliveries+ specifies whether mail will actually be delivered and is true by default. It can be convenient to set it to false for testing. -* +config.action_mailer.default+ configures Action Mailer defaults. These default to: +* +config.action_mailer.default_options+ configures Action Mailer defaults. Use to set options like `from` or `replay_to` for every mailer. These default to: <ruby> :mime_version => "1.0", :charset => "UTF-8", :content_type => "text/plain", -:parts_order => [ "text/plain", "text/enriched", "text/html" ] +:parts_order => [ "text/plain", "text/enriched", "text/html" ], </ruby> * +config.action_mailer.observers+ registers observers which will be notified when mail is delivered. |