From 9cf56c709b6ec2ab0479f664761596f6c64f8887 Mon Sep 17 00:00:00 2001
From: Floris Huetink <floris@avocado.nl>
Date: Tue, 9 Aug 2011 15:48:34 +0200
Subject: Fixed typo (attachments method name was missing an s) in Action
 Mailer basics guide

---
 railties/guides/source/action_mailer_basics.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/guides/source/action_mailer_basics.textile')

diff --git a/railties/guides/source/action_mailer_basics.textile b/railties/guides/source/action_mailer_basics.textile
index f05d9dcf1c..5b2212d9cb 100644
--- a/railties/guides/source/action_mailer_basics.textile
+++ b/railties/guides/source/action_mailer_basics.textile
@@ -404,7 +404,7 @@ Will put the HTML part first, and the plain text part second.
 
 h4. Sending Emails with Attachments
 
-Attachments can be added by using the +attachment+ method:
+Attachments can be added by using the +attachments+ method:
 
 <ruby>
 class UserMailer < ActionMailer::Base
-- 
cgit v1.2.3


From 169a50930f330f94c189b5fcd665a3d209ccbcfa Mon Sep 17 00:00:00 2001
From: Raul Murciano <raul@murciano.net>
Date: Sun, 14 Aug 2011 10:13:23 -0700
Subject: Action Mailer guide update: the :to parameter now supports both
 String and Array values to indicate recipients.

---
 railties/guides/source/action_mailer_basics.textile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/guides/source/action_mailer_basics.textile')

diff --git a/railties/guides/source/action_mailer_basics.textile b/railties/guides/source/action_mailer_basics.textile
index 5b2212d9cb..4bf9161425 100644
--- a/railties/guides/source/action_mailer_basics.textile
+++ b/railties/guides/source/action_mailer_basics.textile
@@ -242,11 +242,11 @@ end
 
 h5. Sending Email To Multiple Recipients
 
-It is possible to send email to one or more recipients in one email (for e.g. informing all admins of a new signup) by setting the list of emails to the <tt>:to</tt> key. The <tt>to:</tt> key however expects a string so you have join the list of recipients using a comma.
+It is possible to send email to one or more recipients in one email (for e.g. informing all admins of a new signup) by setting the list of emails to the <tt>:to</tt> key. The list of emails can be an array of email addresses or a single string with the addresses separated with commas.
 
 <ruby>
   class AdminMailer < ActionMailer::Base
-    default :to => Admin.all.map(&:email).join(", "),
+    default :to => Admin.all.map(&:email),
             :from => "notification@example.com"
 
     def new_registration(user)
-- 
cgit v1.2.3


From 51b2502c5e059bb31ecb5881ec1b19279a49cadf Mon Sep 17 00:00:00 2001
From: Raul Murciano <raul@murciano.net>
Date: Sun, 14 Aug 2011 10:14:28 -0700
Subject: Action Mailer guide: mention how to use :cc and :bcc parameters.

---
 railties/guides/source/action_mailer_basics.textile | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'railties/guides/source/action_mailer_basics.textile')

diff --git a/railties/guides/source/action_mailer_basics.textile b/railties/guides/source/action_mailer_basics.textile
index 4bf9161425..517a47d233 100644
--- a/railties/guides/source/action_mailer_basics.textile
+++ b/railties/guides/source/action_mailer_basics.textile
@@ -256,6 +256,8 @@ It is possible to send email to one or more recipients in one email (for e.g. in
   end
 </ruby>
 
+The same format can be used to set carbon copy (Cc:) and blind carbon copy (Bcc:) recipients, by using the <tt>:cc</tt> and <tt>:bcc</tt> keys respectively.
+
 h5. Sending Email With Name
 
 Sometimes you wish to show the name of the person instead of just their email address when they receive the email. The trick to doing that is
-- 
cgit v1.2.3


From 7712db4c82975403913e0395f860242ead322570 Mon Sep 17 00:00:00 2001
From: Raul Murciano <raul@murciano.net>
Date: Sun, 14 Aug 2011 10:24:48 -0700
Subject: Typo

---
 railties/guides/source/action_mailer_basics.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/guides/source/action_mailer_basics.textile')

diff --git a/railties/guides/source/action_mailer_basics.textile b/railties/guides/source/action_mailer_basics.textile
index 517a47d233..0941b06cfe 100644
--- a/railties/guides/source/action_mailer_basics.textile
+++ b/railties/guides/source/action_mailer_basics.textile
@@ -242,7 +242,7 @@ end
 
 h5. Sending Email To Multiple Recipients
 
-It is possible to send email to one or more recipients in one email (for e.g. informing all admins of a new signup) by setting the list of emails to the <tt>:to</tt> key. The list of emails can be an array of email addresses or a single string with the addresses separated with commas.
+It is possible to send email to one or more recipients in one email (for e.g. informing all admins of a new signup) by setting the list of emails to the <tt>:to</tt> key. The list of emails can be an array of email addresses or a single string with the addresses separated by commas.
 
 <ruby>
   class AdminMailer < ActionMailer::Base
-- 
cgit v1.2.3


From 129ad7226d32b19fac1aca2ebccd570b3382d6d5 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Sat, 20 Aug 2011 00:17:37 +0530
Subject: mailer guide: fixes indentation, and use fixed width fonts wherever
 necessary

---
 .../guides/source/action_mailer_basics.textile     | 57 ++++++++++------------
 1 file changed, 26 insertions(+), 31 deletions(-)

(limited to 'railties/guides/source/action_mailer_basics.textile')

diff --git a/railties/guides/source/action_mailer_basics.textile b/railties/guides/source/action_mailer_basics.textile
index 0941b06cfe..142b9dba7e 100644
--- a/railties/guides/source/action_mailer_basics.textile
+++ b/railties/guides/source/action_mailer_basics.textile
@@ -8,7 +8,7 @@ WARNING. This Guide is based on Rails 3.0. Some of the code shown here will not
 
 h3. Introduction
 
-Action Mailer allows you to send emails from your application using a mailer model and views. So, in Rails, emails are used by creating mailers that inherit from +ActionMailer::Base+ and live in  +app/mailers+. Those mailers have associated views that appear alongside controller views in +app/views+.
+Action Mailer allows you to send emails from your application using a mailer model and views. So, in Rails, emails are used by creating mailers that inherit from +ActionMailer::Base+ and live in +app/mailers+. Those mailers have associated views that appear alongside controller views in +app/views+.
 
 h3. Sending Emails
 
@@ -48,10 +48,8 @@ class UserMailer < ActionMailer::Base
   def welcome_email(user)
     @user = user
     @url  = "http://example.com/login"
-    mail(:to => user.email,
-         :subject => "Welcome to My Awesome Site")
+    mail(:to => user.email, :subject => "Welcome to My Awesome Site")
   end
-
 end
 </ruby>
 
@@ -142,17 +140,17 @@ end
 
 This provides a much simpler implementation that does not require the registering of observers and the like.
 
-The method +welcome_email+ returns a Mail::Message object which can then just be told +deliver+ to send itself out.
+The method +welcome_email+ returns a <tt>Mail::Message</tt> object which can then just be told +deliver+ to send itself out.
 
 NOTE: In previous versions of Rails, you would call +deliver_welcome_email+ or +create_welcome_email+. This has been deprecated in Rails 3.0 in favour of just calling the method name itself.
 
-WARNING: Sending out one email should only take a fraction of a second, if you are planning on sending out many emails, or you have a slow domain resolution service, you might want to investigate using a background process like delayed job.
+WARNING: Sending out an email should only take a fraction of a second, but if you are planning on sending out many emails, or you have a slow domain resolution service, you might want to investigate using a background process like Delayed Job.
 
 h4. Auto encoding header values
 
 Action Mailer now handles the auto encoding of multibyte characters inside of headers and bodies.
 
-If you are using UTF-8 as your character set, you do not have to do anything special, just go ahead and send in UTF-8 data to the address fields, subject, keywords, filenames or body of the email and ActionMailer will auto encode it into quoted printable for you in the case of a header field or Base64 encode any body parts that are non US-ASCII.
+If you are using UTF-8 as your character set, you do not have to do anything special, just go ahead and send in UTF-8 data to the address fields, subject, keywords, filenames or body of the email and Action Mailer will auto encode it into quoted printable for you in the case of a header field or Base64 encode any body parts that are non US-ASCII.
 
 For more complex examples such as defining alternate character sets or self encoding text first, please refer to the Mail library.
 
@@ -213,7 +211,7 @@ NOTE: If you specify an encoding, Mail will assume that your content is already
 
 h5. Making Inline Attachments
 
-ActionMailer 3.0 makes inline attachments, which involved a lot of hacking in pre 3.0 versions, much simpler and trivial as they should be.
+Action Mailer 3.0 makes inline attachments, which involved a lot of hacking in pre 3.0 versions, much simpler and trivial as they should be.
 
 * Firstly, to tell Mail to turn an attachment into an inline attachment, you just call <tt>#inline</tt> on the attachments method within your Mailer:
 
@@ -245,15 +243,15 @@ h5. Sending Email To Multiple Recipients
 It is possible to send email to one or more recipients in one email (for e.g. informing all admins of a new signup) by setting the list of emails to the <tt>:to</tt> key. The list of emails can be an array of email addresses or a single string with the addresses separated by commas.
 
 <ruby>
-  class AdminMailer < ActionMailer::Base
-    default :to => Admin.all.map(&:email),
-            :from => "notification@example.com"
+class AdminMailer < ActionMailer::Base
+  default :to => Admin.all.map(&:email),
+          :from => "notification@example.com"
 
-    def new_registration(user)
-      @user = user
-      mail(:subject => "New User Signup: #{@user.email}")
-    end
+  def new_registration(user)
+    @user = user
+    mail(:subject => "New User Signup: #{@user.email}")
   end
+end
 </ruby>
 
 The same format can be used to set carbon copy (Cc:) and blind carbon copy (Bcc:) recipients, by using the <tt>:cc</tt> and <tt>:bcc</tt> keys respectively.
@@ -264,12 +262,11 @@ Sometimes you wish to show the name of the person instead of just their email ad
 to format the email address in the format <tt>"Name &lt;email&gt;"</tt>.
 
 <ruby>
-  def welcome_email(user)
-    @user = user
-    email_with_name = "#{@user.name} <#{@user.email}>"
-    mail(:to => email_with_name,
-         :subject => "Welcome to My Awesome Site")
-  end
+def welcome_email(user)
+  @user = user
+  email_with_name = "#{@user.name} <#{@user.email}>"
+  mail(:to => email_with_name, :subject => "Welcome to My Awesome Site")
+end
 </ruby>
 
 h4. Mailer Views
@@ -289,9 +286,7 @@ class UserMailer < ActionMailer::Base
          :subject => "Welcome to My Awesome Site",
          :template_path => 'notifications',
          :template_name => 'another')
-    end
   end
-
 end
 </ruby>
 
@@ -461,14 +456,14 @@ h3. Action Mailer Configuration
 
 The following configuration options are best made in one of the environment files (environment.rb, production.rb, etc...)
 
-|template_root|Determines the base from which template references will be made.|
-|logger|Generates information on the mailing run if available. Can be set to nil for no logging. Compatible with both Ruby's own Logger and Log4r loggers.|
-|smtp_settings|Allows detailed configuration for :smtp delivery method:<ul><li>:address - Allows you to use a remote mail server. Just change it from its default "localhost" setting.</li><li>:port  - On the off chance that your mail server doesn't run on port 25, you can change it.</li><li>:domain - If you need to specify a HELO domain, you can do it here.</li><li>:user_name - If your mail server requires authentication, set the username in this setting.</li><li>:password - If your mail server requires authentication, set the password in this setting.</li><li>:authentication - If your mail server requires authentication, you need to specify the authentication type here. This is a symbol and one of :plain, :login, :cram_md5.</li></ul>|
-|sendmail_settings|Allows you to override options for the :sendmail delivery method.<ul><li>:location - The location of the sendmail executable. Defaults to /usr/sbin/sendmail.</li><li>:arguments - The command line arguments to be passed to sendmail. Defaults to -i -t.</li></ul>|
-|raise_delivery_errors|Whether or not errors should be raised if the email fails to be delivered.|
-|delivery_method|Defines a delivery method. Possible values are :smtp (default), :sendmail, :file and :test.|
-|perform_deliveries|Determines whether deliveries are actually carried out when the +deliver+ method is invoked on the Mail message. By default they are, but this can be turned off to help functional testing.|
-|deliveries|Keeps an array of all the emails sent out through the Action Mailer with delivery_method :test. Most useful for unit and functional testing.|
+|+template_root+|Determines the base from which template references will be made.|
+|+logger+|Generates information on the mailing run if available. Can be set to +nil+ for no logging. Compatible with both Ruby's own +Logger+ and +Log4r+ loggers.|
+|+smtp_settings+|Allows detailed configuration for <tt>:smtp</tt> delivery method:<ul><li><tt>:address</tt> - Allows you to use a remote mail server. Just change it from its default "localhost" setting.</li><li><tt>:port</tt>  - On the off chance that your mail server doesn't run on port 25, you can change it.</li><li><tt>:domain</tt> - If you need to specify a HELO domain, you can do it here.</li><li><tt>:user_name</tt> - If your mail server requires authentication, set the username in this setting.</li><li><tt>:password</tt> - If your mail server requires authentication, set the password in this setting.</li><li><tt>:authentication</tt> - If your mail server requires authentication, you need to specify the authentication type here. This is a symbol and one of <tt>:plain</tt>, <tt>:login</tt>, <tt>:cram_md5</tt>.</li></ul>|
+|+sendmail_settings+|Allows you to override options for the <tt>:sendmail</tt> delivery method.<ul><li><tt>:location</tt> - The location of the sendmail executable. Defaults to <tt>/usr/sbin/sendmail</tt>.</li><li><tt>:arguments</tt> - The command line arguments to be passed to sendmail. Defaults to <tt>-i -t</tt>.</li></ul>|
+|+raise_delivery_errors+|Whether or not errors should be raised if the email fails to be delivered.|
+|+delivery_method+|Defines a delivery method. Possible values are <tt>:smtp</tt> (default), <tt>:sendmail</tt>, <tt>:file</tt> and <tt>:test</tt>.|
+|+perform_deliveries+|Determines whether deliveries are actually carried out when the +deliver+ method is invoked on the Mail message. By default they are, but this can be turned off to help functional testing.|
+|+deliveries+|Keeps an array of all the emails sent out through the Action Mailer with delivery_method :test. Most useful for unit and functional testing.|
 
 h4. Example Action Mailer Configuration
 
-- 
cgit v1.2.3


From 8e900f1e38166ea906967eb8ede9bd14e78eb417 Mon Sep 17 00:00:00 2001
From: Andy Leeper <leepfrog@mochaleaf.com>
Date: Thu, 1 Sep 2011 10:42:28 -0700
Subject: Modified ActionMailer Basics doc with the following change: * Changed
 the lines that said <tt>config/environments/env.rb</tt> to
 <tt>config/environments/$RAILS_ENV.rb</tt>.  People were mis-interpreting the
 filename to literally be env.rb.

---
 railties/guides/source/action_mailer_basics.textile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'railties/guides/source/action_mailer_basics.textile')

diff --git a/railties/guides/source/action_mailer_basics.textile b/railties/guides/source/action_mailer_basics.textile
index 142b9dba7e..351a4498b1 100644
--- a/railties/guides/source/action_mailer_basics.textile
+++ b/railties/guides/source/action_mailer_basics.textile
@@ -467,7 +467,7 @@ The following configuration options are best made in one of the environment file
 
 h4. Example Action Mailer Configuration
 
-An example would be adding the following to your appropriate <tt>config/environments/env.rb</tt> file:
+An example would be adding the following to your appropriate <tt>config/environments/$RAILS_ENV.rb</tt> file:
 
 <ruby>
 config.action_mailer.delivery_method = :sendmail
@@ -482,7 +482,7 @@ config.action_mailer.raise_delivery_errors = true
 
 h4. Action Mailer Configuration for GMail
 
-As Action Mailer now uses the Mail gem, this becomes as simple as adding to your <tt>config/environments/env.rb</tt> file:
+As Action Mailer now uses the Mail gem, this becomes as simple as adding to your <tt>config/environments/$RAILS_ENV.rb</tt> file:
 
 <ruby>
 config.action_mailer.delivery_method = :smtp
@@ -524,4 +524,5 @@ In the test we send the email and store the returned object in the +email+ varia
 
 h3. Changelog
 
+* September 1, 2011: Changed the lines that said <tt>config/environments/env.rb</tt> to <tt>config/environments/$RAILS_ENV.rb</tt>.  People were mis-interpreting the filename to literally be env.rb.  "Andy Leeper":http://mochaleaf.com
 * September 30, 2010: Fixed typos and reformatted Action Mailer configuration table for better understanding. "Jaime Iniesta":http://jaimeiniesta.com
-- 
cgit v1.2.3


From a6c60222c580e4002152b1ac1857673038b1fd42 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arun@fromjaipur.com>
Date: Sun, 4 Sep 2011 08:24:02 +0530
Subject: Modified content in guides and comments for "assert /" warnings.
 Removed because if somebody will use this code they will get warnings!

---
 railties/guides/source/action_mailer_basics.textile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/guides/source/action_mailer_basics.textile')

diff --git a/railties/guides/source/action_mailer_basics.textile b/railties/guides/source/action_mailer_basics.textile
index 351a4498b1..67761645fa 100644
--- a/railties/guides/source/action_mailer_basics.textile
+++ b/railties/guides/source/action_mailer_basics.textile
@@ -514,8 +514,8 @@ class UserMailerTest < ActionMailer::TestCase
     # Test the body of the sent email contains what we expect it to
     assert_equal [user.email], email.to
     assert_equal "Welcome to My Awesome Site", email.subject
-    assert_match /<h1>Welcome to example.com, #{user.name}<\/h1>/, email.encoded
-    assert_match /Welcome to example.com, #{user.name}/, email.encoded
+    assert_match(/<h1>Welcome to example.com, #{user.name}<\/h1>/, email.encoded)
+    assert_match(/Welcome to example.com, #{user.name}/, email.encoded)
   end
 end
 </ruby>
-- 
cgit v1.2.3


From 9980f46ca2d250d1d3e2fac84c5dc9ca6cbab1ea Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Thu, 15 Sep 2011 00:13:29 +0530
Subject: No more changelogs inside guides

---
 railties/guides/source/action_mailer_basics.textile | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'railties/guides/source/action_mailer_basics.textile')

diff --git a/railties/guides/source/action_mailer_basics.textile b/railties/guides/source/action_mailer_basics.textile
index 67761645fa..ad5b848d2c 100644
--- a/railties/guides/source/action_mailer_basics.textile
+++ b/railties/guides/source/action_mailer_basics.textile
@@ -521,8 +521,3 @@ end
 </ruby>
 
 In the test we send the email and store the returned object in the +email+ variable. We then ensure that it was sent (the first assert), then, in the second batch of assertions, we ensure that the email does indeed contain what we expect.
-
-h3. Changelog
-
-* September 1, 2011: Changed the lines that said <tt>config/environments/env.rb</tt> to <tt>config/environments/$RAILS_ENV.rb</tt>.  People were mis-interpreting the filename to literally be env.rb.  "Andy Leeper":http://mochaleaf.com
-* September 30, 2010: Fixed typos and reformatted Action Mailer configuration table for better understanding. "Jaime Iniesta":http://jaimeiniesta.com
-- 
cgit v1.2.3


From dda6787f44a4e9a90cc28b3efee5b63c7d8cd023 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Sat, 19 Nov 2011 00:07:50 +0530
Subject: mailer guide - update info about using default host. Fixes #3642

---
 railties/guides/source/action_mailer_basics.textile | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'railties/guides/source/action_mailer_basics.textile')

diff --git a/railties/guides/source/action_mailer_basics.textile b/railties/guides/source/action_mailer_basics.textile
index ad5b848d2c..26c95be031 100644
--- a/railties/guides/source/action_mailer_basics.textile
+++ b/railties/guides/source/action_mailer_basics.textile
@@ -362,21 +362,14 @@ When using named routes you only need to supply the +:host+:
 
 Email clients have no web context and so paths have no base URL to form complete web addresses. Thus, when using named routes only the "_url" variant makes sense.
 
-It is also possible to set a default host that will be used in all mailers by setting the +:host+ option in the +ActionMailer::Base.default_url_options+ hash as follows:
+It is also possible to set a default host that will be used in all mailers by setting the <tt>:host</tt> option as a configuration option in <tt>config/application.rb</tt>:
 
 <ruby>
-class UserMailer < ActionMailer::Base
-  default_url_options[:host] = "example.com"
-
-  def welcome_email(user)
-    @user = user
-    @url  = user_url(@user)
-    mail(:to => user.email,
-         :subject => "Welcome to My Awesome Site")
-  end
-end
+config.action_mailer.default_url_options = { :host => "example.com" }
 </ruby>
 
+If you use this setting, you should pass the <tt>:only_path => false</tt> option when using +url_for+. This will ensure that absolute URLs are generated because the +url_for+ view helper will, by default, generate relative URLs when a <tt>:host</tt> option isn't explicitly provided.
+
 h4. Sending Multipart Emails
 
 Action Mailer will automatically send multipart emails if you have different templates for the same action. So, for our UserMailer example, if you have +welcome_email.text.erb+ and +welcome_email.html.erb+ in +app/views/user_mailer+, Action Mailer will automatically send a multipart email with the HTML and text versions setup as different parts.
-- 
cgit v1.2.3

