actionmailer 3.2.22.5 → 4.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30746cff9dd1453e3244ca12ccb38b9ae7f02751
-  data.tar.gz: 8d28c032225e1d67ef2c7ac40538dc973915632b
+  metadata.gz: d998e51a81263ea8d899918f19f535a7c53c9fcd
+  data.tar.gz: cae501c3d36339904aafde7187eb48ec9e7fd54b
 SHA512:
-  metadata.gz: 6cb184559d90e7c9634b16d3b659afa8278b3d1f67252859045da390cc13d5eafde31392fdb76ccc30b6c3e52e55d2caf843fdc985354900061528223635d81a
-  data.tar.gz: fd308dfe9d602e4650a1b348fcc7ea291520a18c1e031766c80c4851e9de8172705a3d8cd16ac62c825d1f0ea7e66b67b819f2c46e9b741b88e2028719601620
+  metadata.gz: 19b5d72a2aea5a58b284535609cec0c1834ee99238049ad57185cc4791dc6af3476ddd66324ddb9b4c4c9f695c7ea02ee797a284309c65c60e7a4b1634085dea
+  data.tar.gz: a0d0ada11072b71c20f91b79893d5929dda7283385b67faf8bbde4bb4a88240429fe32e3783f0a3cb7227107db8cff2d3dbde031ddf4bf670aebea0a0ae43321

data/CHANGELOG.md

@@ -1,128 +1,57 @@
-## Rails 3.2.22 (Jun 16, 2015) ##
+## Rails 4.0.0.beta1 (February 25, 2013) ##
 
-* No changes.
+*   Allow passing interpolations to `#default_i18n_subject`, e.g.:
 
+        # config/locales/en.yml
+        en:
+          user_mailer:
+            welcome:
+              subject: 'Hello, %{username}'
 
-## Rails 3.2.19 (Jul 2, 2014) ##
-
-* No changes.
-
-
-## Rails 3.2.18 (May 6, 2014) ##
-
-* No changes.
-
-
-## Rails 3.2.17 (Feb 18, 2014) ##
-
-* No changes.
-
-
-## Rails 3.2.16 (Dec 3, 2013) ##
-
-* No changes.
-
-
-## Rails 3.2.15 (Oct 16, 2013) ##
-
-*   No changes.
-
-## Rails 3.2.14 (Jul 22, 2013) ##
-
-*   No changes.
-
-
-## Rails 3.2.13 (Mar 18, 2013) ##
-
-*   No changes.
-
-
-## Rails 3.2.12 (Feb 11, 2013) ##
-
-*   No changes.
-
-
-## Rails 3.2.11 (Jan 8, 2013) ##
-
-*   No changes.
-
-
-## Rails 3.2.10 (Jan 2, 2013) ##
-
-*   No changes.
-
-
-## Rails 3.2.9 (Nov 12, 2012) ##
-
-*   The return value from mailer methods is no longer relevant. This fixes a bug,
-    which was introduced with 3.2.9.
-    Backport #8450
-    Fix #8448
-
-        class ExampleMailer < ActionMailer::Base
-          # in 3.2.9, returning a falsy value from a mailer action, prevented the email from beeing sent.
-          # With 3.2.10 the return value is no longer relevant. If you call mail() the email will be sent.
-          def nil_returning_mailer_action
-            mail()
-            nil
+        # app/mailers/user_mailer.rb
+        class UserMailer < ActionMailer::Base
+          def welcome(user)
+            mail(subject: default_i18n_subject(username: user.name))
           end
         end
 
-    *Yves Senn*
+    *Olek Janiszewski*
 
+*   Eager loading made to use relation's `in_clause_length` instead of host's one.
+    Fix #8474
 
-## Rails 3.2.9 (Nov 12, 2012) ##
+    *Boris Staal*
+
+*   Explicit multipart messages no longer set the order of the MIME parts.
+    *Nate Berkopec*
 
 *   Do not render views when mail() isn't called.
     Fix #7761
 
     *Yves Senn*
 
+*   Allow delivery method options to be set per mail instance *Aditya Sanghi*
 
-## Rails 3.2.8 (Aug 9, 2012) ##
-
-*   No changes.
-
-
-## Rails 3.2.7 (Jul 26, 2012) ##
-
-*   No changes.
-
-
-## Rails 3.2.6 (Jun 12, 2012) ##
-
-*   No changes.
-
-
-## Rails 3.2.5 (Jun 1, 2012) ##
+    If your smtp delivery settings are dynamic,
+    you can now override settings per mail instance for e.g.
 
-*   No changes.
-
-
-## Rails 3.2.4 (May 31, 2012) ##
-
-*   No changes.
-
-
-## Rails 3.2.3 (March 30, 2012) ##
-
-*   Upgrade mail version to 2.4.3 *ML*
-
-
-## Rails 3.2.2 (March 1, 2012) ##
-
-*   No changes.
-
-
-## Rails 3.2.1 (January 26, 2012) ##
-
-*   No changes.
+        def my_mailer(user,company)
+          mail to: user.email, subject: "Welcome!",
+               delivery_method_options: { user_name: company.smtp_user,
+                                          password: company.smtp_password }
+        end
 
+    This will ensure that your default SMTP settings will be overridden
+    by the company specific ones. You only have to override the settings
+    that are dynamic and leave the static setting in your environment
+    configuration file (e.g. config/environments/production.rb)
 
-## Rails 3.2.0 (January 20, 2012) ##
+*   Allow to set default Action Mailer options via `config.action_mailer.default_options=` *Robert Pankowecki*
 
-*   Upgrade mail version to 2.4.0 *ML*
+*   Raise an `ActionView::MissingTemplate` exception when no implicit template could be found. *Damien Mathieu*
 
-*   Remove Old ActionMailer API *Josh Kalderimis*
+*   Allow callbacks to be defined in mailers similar to `ActionController::Base`. You can configure default
+    settings, headers, attachments, delivery settings or change delivery using
+    `before_filter`, `after_filter` etc. *Justin S. Leitgeb*
 
-Please check [3-1-stable](https://github.com/rails/rails/blob/3-1-stable/actionmailer/CHANGELOG.md) for previous changes.
+Please check [3-2-stable](https://github.com/rails/rails/blob/3-2-stable/actionmailer/CHANGELOG.md) for previous changes.

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2011 David Heinemeier Hansson
+Copyright (c) 2004-2013 David Heinemeier Hansson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -22,12 +22,12 @@ the email.
 This can be as simple as:
 
   class Notifier < ActionMailer::Base
-    delivers_from 'system@loudthinking.com'
+    default from: 'system@loudthinking.com'
 
     def welcome(recipient)
       @recipient = recipient
-      mail(:to => recipient,
-           :subject => "[Signed up] Welcome #{recipient}")
+      mail(to: recipient,
+           subject: "[Signed up] Welcome #{recipient}")
     end
   end
 
@@ -42,7 +42,7 @@ So the corresponding body template for the method above could look like this:
 
   Thank you for signing up!
 
-And if the recipient was given as "david@loudthinking.com", the email
+If the recipient was given as "david@loudthinking.com", the email
 generated would look like this:
 
   Date: Mon, 25 Jan 2010 22:48:09 +1100
@@ -62,7 +62,7 @@ generated would look like this:
   Thank you for signing up!
 
 In previous version of Rails you would call <tt>create_method_name</tt> and
-<tt>deliver_method_name</tt>.  Rails 3.0 has a much simpler interface, you
+<tt>deliver_method_name</tt>.  Rails 3.0 has a much simpler interface - you
 simply call the method and optionally call +deliver+ on the return value.
 
 Calling the method returns a Mail Message object:
@@ -76,14 +76,14 @@ Or you can just chain the methods together like:
 
 == Setting defaults
 
-It is possible to set default values that will be used in every method in your Action Mailer class. To implement this functionality, you just call the public class method <tt>default</tt> which you get for free from ActionMailer::Base. This method accepts a Hash as the parameter. You can use any of the headers e-mail messages has, like <tt>:from</tt> as the key. You can also pass in a string as the key, like "Content-Type", but Action Mailer does this out of the box for you, so you won't need to worry about that. Finally it is also possible to pass in a Proc that will get evaluated when it is needed.
+It is possible to set default values that will be used in every method in your Action Mailer class. To implement this functionality, you just call the public class method <tt>default</tt> which you get for free from ActionMailer::Base. This method accepts a Hash as the parameter. You can use any of the headers e-mail messages has, like <tt>:from</tt> as the key. You can also pass in a string as the key, like "Content-Type", but Action Mailer does this out of the box for you, so you won't need to worry about that. Finally, it is also possible to pass in a Proc that will get evaluated when it is needed.
 
 Note that every value you set with this method will get over written if you use the same key in your mailer method.
 
 Example:
 
-  class Authenticationmailer < ActionMailer::Base
-    default :from => "awesome@application.com", :subject => Proc.new { "E-mail was generated at #{Time.now}" }
+  class AuthenticationMailer < ActionMailer::Base
+    default from: "awesome@application.com", subject: Proc.new { "E-mail was generated at #{Time.now}" }
     .....
   end
 
@@ -98,15 +98,15 @@ Example:
 
   class Mailman < ActionMailer::Base
     def receive(email)
-      page = Page.find_by_address(email.to.first)
+      page = Page.find_by(address: email.to.first)
       page.emails.create(
-        :subject => email.subject, :body => email.body
+        subject: email.subject, body: email.body
       )
 
       if email.has_attachments?
         email.attachments.each do |attachment| 
           page.attachments.create({
-            :file => attachment, :description => email.subject
+            file: attachment, description: email.subject
           })
         end
       end
@@ -127,11 +127,11 @@ a limited number of email.
 The Base class has the full list of configuration options. Here's an example:
 
   ActionMailer::Base.smtp_settings = {
-    :address        => 'smtp.yourserver.com', # default: localhost
-    :port           => '25',                  # default: 25
-    :user_name      => 'user',
-    :password       => 'pass',
-    :authentication => :plain                 # :plain, :login or :cram_md5
+    address:        'smtp.yourserver.com', # default: localhost
+    port:           '25',                  # default: 25
+    user_name:      'user',
+    password:       'pass',
+    authentication: :plain                 # :plain, :login or :cram_md5
   }
 
 
@@ -143,12 +143,14 @@ The latest version of Action Mailer can be installed with RubyGems:
 
 Source code can be downloaded as part of the Rails project on GitHub
 
-* https://github.com/rails/rails/tree/3-2-stable/actionmailer
+* https://github.com/rails/rails/tree/master/actionmailer
 
 
 == License
 
-Action Mailer is released under the MIT license.
+Action Mailer is released under the MIT license:
+
+* http://www.opensource.org/licenses/MIT
 
 
 == Support

data/lib/action_mailer.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2004-2011 David Heinemeier Hansson
+# Copyright (c) 2004-2013 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -21,26 +21,24 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-actionpack_path = File.expand_path('../../../actionpack/lib', __FILE__)
-$:.unshift(actionpack_path) if File.directory?(actionpack_path) && !$:.include?(actionpack_path)
-
 require 'abstract_controller'
 require 'action_view'
 require 'action_mailer/version'
 
 # Common Active Support usage in Action Mailer
+require 'active_support/rails'
 require 'active_support/core_ext/class'
-require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/array/uniq_by'
 require 'active_support/core_ext/module/attr_internal'
-require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/lazy_load_hooks'
 
 module ActionMailer
   extend ::ActiveSupport::Autoload
 
-  autoload :Collector
+  eager_autoload do
+    autoload :Collector
+  end
+
   autoload :Base
   autoload :DeliveryMethods
   autoload :MailHelper

data/lib/action_mailer/base.rb

@@ -1,14 +1,11 @@
 require 'mail'
 require 'action_mailer/collector'
-require 'active_support/core_ext/array/wrap'
-require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/proc'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/hash/except'
 require 'active_support/core_ext/module/anonymous'
 require 'action_mailer/log_subscriber'
 
-module ActionMailer #:nodoc:
+module ActionMailer
   # Action Mailer allows you to send email from your application using a mailer model and views.
   #
   # = Mailer Models
@@ -17,20 +14,18 @@ module ActionMailer #:nodoc:
   #
   #   $ rails generate mailer Notifier
   #
-  # The generated model inherits from <tt>ActionMailer::Base</tt>. Emails are defined by creating methods
-  # within the model which are then used to set variables to be used in the mail template, to
-  # change options on the mail, or to add attachments.
-  #
-  # Examples:
+  # The generated model inherits from <tt>ActionMailer::Base</tt>. A mailer model defines methods
+  # used to generate an email message. In these methods, you can setup variables to be used in
+  # the mailer views, options on the mail itself such as the <tt>:from</tt> address, and attachments.
   #
   #   class Notifier < ActionMailer::Base
-  #     default :from => 'no-reply@example.com',
-  #            :return_path => 'system@example.com'
+  #     default from: 'no-reply@example.com',
+  #             return_path: 'system@example.com'
   #
   #     def welcome(recipient)
   #       @account = recipient
-  #       mail(:to => recipient.email_address_with_name,
-  #            :bcc => ["bcc@example.com", "Order Watcher <watcher@example.com>"])
+  #       mail(to: recipient.email_address_with_name,
+  #            bcc: ["bcc@example.com", "Order Watcher <watcher@example.com>"])
   #     end
   #   end
   #
@@ -63,21 +58,21 @@ module ActionMailer #:nodoc:
   #
   # If you want to explicitly render only certain templates, pass a block:
   #
-  #   mail(:to => user.email) do |format|
+  #   mail(to: user.email) do |format|
   #     format.text
   #     format.html
   #   end
   #
   # The block syntax is also useful in providing information specific to a part:
   #
-  #   mail(:to => user.email) do |format|
-  #     format.text(:content_transfer_encoding => "base64")
+  #   mail(to: user.email) do |format|
+  #     format.text(content_transfer_encoding: "base64")
   #     format.html
   #   end
   #
   # Or even to render a special view:
   #
-  #   mail(:to => user.email) do |format|
+  #   mail(to: user.email) do |format|
   #     format.text
   #     format.html { render "some_other_template" }
   #   end
@@ -101,12 +96,12 @@ module ActionMailer #:nodoc:
   # You can even use Action Pack helpers in these views. For example:
   #
   #   You got a new note!
-  #   <%= truncate(@note.body, :length => 25) %>
+  #   <%= truncate(@note.body, length: 25) %>
   #
   # If you need to access the subject, from or the recipients in the view, you can do that through message object:
   #
   #   You got a new note from <%= message.from %>!
-  #   <%= truncate(@note.body, :length => 25) %>
+  #   <%= truncate(@note.body, length: 25) %>
   #
   #
   # = Generating URLs
@@ -117,11 +112,11 @@ module ActionMailer #:nodoc:
   #
   # When using <tt>url_for</tt> you'll need to provide the <tt>:host</tt>, <tt>:controller</tt>, and <tt>:action</tt>:
   #
-  #   <%= url_for(:host => "example.com", :controller => "welcome", :action => "greeting") %>
+  #   <%= url_for(host: "example.com", controller: "welcome", action: "greeting") %>
   #
   # When using named routes you only need to supply the <tt>:host</tt>:
   #
-  #   <%= users_url(:host => "example.com") %>
+  #   <%= users_url(host: "example.com") %>
   #
   # You should use the <tt>named_route_url</tt> style (which generates absolute URLs) and avoid using the
   # <tt>named_route_path</tt> style (which generates relative URLs), since clients reading the mail will
@@ -130,12 +125,12 @@ module ActionMailer #:nodoc:
   # 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>:
   #
-  #   config.action_mailer.default_url_options = { :host => "example.com" }
+  #   config.action_mailer.default_url_options = { host: "example.com" }
   #
   # When you decide to set a default <tt>:host</tt> for your mailers, then you need to make sure to use the
-  # <tt>:only_path => false</tt> option when using <tt>url_for</tt>. Since the <tt>url_for</tt> view helper
+  # <tt>only_path: false</tt> option when using <tt>url_for</tt>. Since the <tt>url_for</tt> view helper
   # will generate relative URLs by default when a <tt>:host</tt> option isn't explicitly provided, passing
-  # <tt>:only_path => false</tt> will ensure that absolute URLs are generated.
+  # <tt>only_path: false</tt> will ensure that absolute URLs are generated.
   #
   # = Sending mail
   #
@@ -176,7 +171,7 @@ module ActionMailer #:nodoc:
   #   class ApplicationMailer < ActionMailer::Base
   #     def welcome(recipient)
   #       attachments['free_book.pdf'] = File.read('path/to/file.pdf')
-  #       mail(:to => recipient, :subject => "New account information")
+  #       mail(to: recipient, subject: "New account information")
   #     end
   #   end
   #
@@ -186,6 +181,16 @@ module ActionMailer #:nodoc:
   # and the second being a <tt>application/pdf</tt> with a Base64 encoded copy of the file.pdf book
   # with the filename +free_book.pdf+.
   #
+  # If you need to send attachments with no content, you need to create an empty view for it,
+  # or add an empty body parameter like this:
+  #
+  #     class ApplicationMailer < ActionMailer::Base
+  #       def welcome(recipient)
+  #         attachments['free_book.pdf'] = File.read('path/to/file.pdf')
+  #         mail(to: recipient, subject: "New account information", body: "")
+  #       end
+  #     end
+  #
   # = Inline Attachments
   #
   # You can also specify that a file should be displayed inline with other HTML. This is useful
@@ -194,7 +199,7 @@ module ActionMailer #:nodoc:
   #   class ApplicationMailer < ActionMailer::Base
   #     def welcome(recipient)
   #       attachments.inline['photo.png'] = File.read('path/to/photo.png')
-  #       mail(:to => recipient, :subject => "Here is what we look like")
+  #       mail(to: recipient, subject: "Here is what we look like")
   #     end
   #   end
   #
@@ -210,7 +215,7 @@ module ActionMailer #:nodoc:
   #
   #   <h1>Please Don't Cringe</h1>
   #
-  #   <%= image_tag attachments['photo.png'].url, :alt => 'Our Photo', :class => 'photo' -%>
+  #   <%= image_tag attachments['photo.png'].url, alt: 'Our Photo', class: 'photo' -%>
   #
   # = Observing and Intercepting Mails
   #
@@ -231,16 +236,16 @@ module ActionMailer #:nodoc:
   # default method inside the class definition:
   #
   #   class Notifier < ActionMailer::Base
-  #     default :sender => 'system@example.com'
+  #     default sender: 'system@example.com'
   #   end
   #
   # You can pass in any header value that a <tt>Mail::Message</tt> accepts. Out of the box,
   # <tt>ActionMailer::Base</tt> sets the following:
   #
-  # * <tt>:mime_version => "1.0"</tt>
-  # * <tt>:charset      => "UTF-8",</tt>
-  # * <tt>:content_type => "text/plain",</tt>
-  # * <tt>:parts_order  => [ "text/plain", "text/enriched", "text/html" ]</tt>
+  # * <tt>mime_version: "1.0"</tt>
+  # * <tt>charset:      "UTF-8",</tt>
+  # * <tt>content_type: "text/plain",</tt>
+  # * <tt>parts_order:  [ "text/plain", "text/enriched", "text/html" ]</tt>
   #
   # <tt>parts_order</tt> and <tt>charset</tt> are not actually valid <tt>Mail::Message</tt> header fields,
   # but Action Mailer translates them appropriately and sets the correct values.
@@ -250,7 +255,7 @@ module ActionMailer #:nodoc:
   #
   #   class Notifier < ActionMailer::Base
   #     default 'Content-Transfer-Encoding' => '7bit',
-  #             :content_description => 'This is a description'
+  #             content_description: 'This is a description'
   #   end
   #
   # Finally, Action Mailer also supports passing <tt>Proc</tt> objects into the default hash, so you
@@ -270,12 +275,44 @@ module ActionMailer #:nodoc:
   # set something in the defaults using a proc, and then set the same thing inside of your
   # mailer method, it will get over written by the mailer method.
   #
+  # It is also possible to set these default options that will be used in all mailers through
+  # the <tt>default_options=</tt> configuration in <tt>config/application.rb</tt>:
+  #
+  #    config.action_mailer.default_options = { from: "no-reply@example.org" }
+  #
+  # = Callbacks
+  #
+  # You can specify callbacks using before_action and after_action for configuring your messages.
+  # This may be useful, for example, when you want to add default inline attachments for all
+  # messages sent out by a certain mailer class:
+  #
+  #   class Notifier < ActionMailer::Base
+  #     before_action :add_inline_attachment!
+  #
+  #     def welcome
+  #       mail
+  #     end
+  #
+  #     private
+  #
+  #       def add_inline_attachment!
+  #         attachments.inline["footer.jpg"] = File.read('/path/to/filename.jpg')
+  #       end
+  #   end
+  #
+  # Callbacks in ActionMailer are implemented using AbstractController::Callbacks, so you
+  # can define and configure callbacks in the same manner that you would use callbacks in
+  # classes that inherit from ActionController::Base.
+  #
+  # Note that unless you have a specific reason to do so, you should prefer using before_action
+  # rather than after_action in your ActionMailer classes so that headers are parsed properly.
+  #
   # = Configuration options
   #
   # These options are specified on the class level, like
   # <tt>ActionMailer::Base.raise_delivery_errors = true</tt>
   #
-  # * <tt>default</tt> - You can pass this in at a class level as well as within the class itself as
+  # * <tt>default_options</tt> - You can pass this in at a class level as well as within the class itself as
   #   per the above section.
   #
   # * <tt>logger</tt> - the logger is used for generating information on the mailing run if available.
@@ -313,7 +350,7 @@ module ActionMailer #:nodoc:
   #
   # * <tt>delivery_method</tt> - Defines a delivery method. Possible values are <tt>:smtp</tt> (default),
   #   <tt>:sendmail</tt>, <tt>:test</tt>, and <tt>:file</tt>. Or you may provide a custom delivery method
-  #   object eg. MyOwnDeliveryMethodClass.new. See the Mail gem documentation on the interface you need to
+  #   object e.g. MyOwnDeliveryMethodClass. See the Mail gem documentation on the interface you need to
   #   implement for a custom delivery agent.
   #
   # * <tt>perform_deliveries</tt> - Determines whether emails are actually sent from Action Mailer when you
@@ -322,7 +359,6 @@ module ActionMailer #:nodoc:
   #
   # * <tt>deliveries</tt> - Keeps an array of all the emails sent out through the Action Mailer with
   #   <tt>delivery_method :test</tt>. Most useful for unit and functional testing.
-  #
   class Base < AbstractController::Base
     include DeliveryMethods
     abstract!
@@ -333,19 +369,20 @@ module ActionMailer #:nodoc:
     include AbstractController::Helpers
     include AbstractController::Translation
     include AbstractController::AssetPaths
+    include AbstractController::Callbacks
 
-    self.protected_instance_variables = %w(@_action_has_layout)
+    self.protected_instance_variables = [:@_action_has_layout]
 
-    helper  ActionMailer::MailHelper
+    helper ActionMailer::MailHelper
 
     private_class_method :new #:nodoc:
 
     class_attribute :default_params
     self.default_params = {
-      :mime_version => "1.0",
-      :charset      => "UTF-8",
-      :content_type => "text/plain",
-      :parts_order  => [ "text/plain", "text/enriched", "text/html" ]
+      mime_version: "1.0",
+      charset:      "UTF-8",
+      content_type: "text/plain",
+      parts_order:  [ "text/plain", "text/enriched", "text/html" ]
     }.freeze
 
     class << self
@@ -385,6 +422,10 @@ module ActionMailer #:nodoc:
         self.default_params = default_params.merge(value).freeze if value
         default_params
       end
+      # Allows to set defaults through app configuration:
+      #
+      #    config.action_mailer.default_options = { from: "no-reply@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
@@ -411,7 +452,7 @@ module ActionMailer #:nodoc:
       # and passing a Mail::Message will do nothing except tell the logger you sent the email.
       def deliver_mail(mail) #:nodoc:
         ActiveSupport::Notifications.instrument("deliver.action_mailer") do |payload|
-          self.set_payload_for_mail(payload, mail)
+          set_payload_for_mail(payload, mail)
           yield # Let Mail do the delivery actions
         end
       end
@@ -434,9 +475,12 @@ module ActionMailer #:nodoc:
         payload[:mail]       = mail.encoded
       end
 
-      def method_missing(method, *args) #:nodoc:
-        return super unless respond_to?(method)
-        new(method, *args).message
+      def method_missing(method_name, *args)
+        if respond_to?(method_name)
+          new(method_name, *args).message
+        else
+          super
+        end
       end
     end
 
@@ -448,7 +492,7 @@ module ActionMailer #:nodoc:
     # method, for instance).
     def initialize(method_name=nil, *args)
       super()
-      @mail_was_called = false
+      @_mail_was_called = false
       @_message = Mail.new
       process(method_name, *args) if method_name
     end
@@ -457,7 +501,7 @@ module ActionMailer #:nodoc:
       lookup_context.skip_default_locale!
 
       super
-      @_message = NullMail.new unless @mail_was_called
+      @_message = NullMail.new unless @_mail_was_called
     end
 
     class NullMail #:nodoc:
@@ -472,7 +516,7 @@ module ActionMailer #:nodoc:
       self.class.mailer_name
     end
 
-    # Allows you to pass random and unusual headers to the new +Mail::Message+ object
+    # Allows you to pass random and unusual headers to the new <tt>Mail::Message</tt> object
     # which will add them to itself.
     #
     #   headers['X-Special-Domain-Specific-Header'] = "SecretValue"
@@ -483,10 +527,10 @@ module ActionMailer #:nodoc:
     #   headers 'X-Special-Domain-Specific-Header' => "SecretValue",
     #           'In-Reply-To' => incoming.message_id
     #
-    # The resulting Mail::Message will have the following in it's header:
+    # The resulting Mail::Message will have the following in its header:
     #
     #   X-Special-Domain-Specific-Header: SecretValue
-    def headers(args=nil)
+    def headers(args = nil)
       if args
         @_message.headers(args)
       else
@@ -504,17 +548,17 @@ module ActionMailer #:nodoc:
     #
     # You can also specify overrides if you want by passing a hash instead of a string:
     #
-    #  mail.attachments['filename.jpg'] = {:mime_type => 'application/x-gzip',
-    #                                      :content => File.read('/path/to/filename.jpg')}
+    #  mail.attachments['filename.jpg'] = {mime_type: 'application/x-gzip',
+    #                                      content: File.read('/path/to/filename.jpg')}
     #
     # If you want to use a different encoding than Base64, you can pass an encoding in,
     # but then it is up to you to pass in the content pre-encoded, and don't expect
     # Mail to know how to decode this data:
     #
     #  file_content = SpecialEncode(File.read('/path/to/filename.jpg'))
-    #  mail.attachments['filename.jpg'] = {:mime_type => 'application/x-gzip',
-    #                                      :encoding => 'SpecialEncoding',
-    #                                      :content => file_content }
+    #  mail.attachments['filename.jpg'] = {mime_type: 'application/x-gzip',
+    #                                      encoding: 'SpecialEncoding',
+    #                                      content: file_content }
     #
     # You can also search for specific attachments:
     #
@@ -552,9 +596,9 @@ module ActionMailer #:nodoc:
     # class method:
     #
     #  class Notifier < ActionMailer::Base
-    #    self.default :from => 'no-reply@test.lindsaar.net',
-    #                 :bcc => 'email_logger@test.lindsaar.net',
-    #                 :reply_to => 'bounces@test.lindsaar.net'
+    #    self.default from: 'no-reply@test.lindsaar.net',
+    #                 bcc: 'email_logger@test.lindsaar.net',
+    #                 reply_to: 'bounces@test.lindsaar.net'
     #  end
     #
     # If you need other headers not listed above, you can either pass them in
@@ -576,32 +620,34 @@ module ActionMailer #:nodoc:
     # For example:
     #
     #   class Notifier < ActionMailer::Base
-    #     default :from => 'no-reply@test.lindsaar.net',
+    #     default from: 'no-reply@test.lindsaar.net',
     #
     #     def welcome
-    #       mail(:to => 'mikel@test.lindsaar.net')
+    #       mail(to: 'mikel@test.lindsaar.net')
     #     end
     #   end
     #
-    # Will look for all templates at "app/views/notifier" with name "welcome". However, those
-    # can be customized:
+    # Will look for all templates at "app/views/notifier" with name "welcome".
+    # If no welcome template exists, it will raise an ActionView::MissingTemplate error.
+    #
+    # However, those can be customized:
     #
-    #   mail(:template_path => 'notifications', :template_name => 'another')
+    #   mail(template_path: 'notifications', template_name: 'another')
     #
     # And now it will look for all templates at "app/views/notifications" with name "another".
     #
     # If you do pass a block, you can render specific templates of your choice:
     #
-    #   mail(:to => 'mikel@test.lindsaar.net') do |format|
+    #   mail(to: 'mikel@test.lindsaar.net') do |format|
     #     format.text
     #     format.html
     #   end
     #
     # You can even render text directly without using a template:
     #
-    #   mail(:to => 'mikel@test.lindsaar.net') do |format|
-    #     format.text { render :text => "Hello Mikel!" }
-    #     format.html { render :text => "<h1>Hello Mikel!</h1>" }
+    #   mail(to: 'mikel@test.lindsaar.net') do |format|
+    #     format.text { render text: "Hello Mikel!" }
+    #     format.html { render text: "<h1>Hello Mikel!</h1>" }
     #   end
     #
     # Which will render a <tt>multipart/alternative</tt> email with <tt>text/plain</tt> and
@@ -609,25 +655,22 @@ module ActionMailer #:nodoc:
     #
     # The block syntax also allows you to customize the part headers if desired:
     #
-    #   mail(:to => 'mikel@test.lindsaar.net') do |format|
-    #     format.text(:content_transfer_encoding => "base64")
+    #   mail(to: 'mikel@test.lindsaar.net') do |format|
+    #     format.text(content_transfer_encoding: "base64")
     #     format.html
     #   end
     #
-    def mail(headers={}, &block)
-      # Guard flag to prevent both the old and the new API from firing.
-      # On master this flag was renamed to `@_mail_was_called`.
-      # On master there is only one API and this flag is no longer used as a guard.
-      @mail_was_called = true
+    def mail(headers = {}, &block)
+      @_mail_was_called = true
       m = @_message
 
-      # At the beginning, do not consider class default for parts order neither content_type
+      # At the beginning, do not consider class default for content_type
       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.bind(self).call : v
+      class_default = self.class.default
+      default_values = class_default.merge(class_default) do |k,v|
+        v.respond_to?(:to_proc) ? instance_eval(&v) : v
       end
 
       # Handle defaults
@@ -638,14 +681,14 @@ module ActionMailer #:nodoc:
       m.charset = charset = headers[:charset]
 
       # Set configure delivery behavior
-      wrap_delivery_behavior!(headers.delete(:delivery_method))
+      wrap_delivery_behavior!(headers.delete(:delivery_method),headers.delete(:delivery_method_options))
 
       # Assign all headers except parts_order, content_type and body
       assignable = headers.except(:parts_order, :content_type, :body, :template_name, :template_path)
       assignable.each { |k, v| m[k] = v }
 
       # Render the templates and blocks
-      responses, explicit_order = collect_responses_and_parts_order(headers, &block)
+      responses = collect_responses(headers, &block)
       create_parts_from_responses(m, responses)
 
       # Setup content type, reapply charset and handle parts order
@@ -653,8 +696,7 @@ module ActionMailer #:nodoc:
       m.charset      = charset
 
       if m.multipart?
-        parts_order ||= explicit_order || headers[:parts_order]
-        m.body.set_sort_order(parts_order)
+        m.body.set_sort_order(headers[:parts_order])
         m.body.sort_parts!
       end
 
@@ -681,47 +723,51 @@ module ActionMailer #:nodoc:
       end
     end
 
-    # Translates the +subject+ using Rails I18n class under <tt>[:actionmailer, mailer_scope, action_name]</tt> scope.
+    # Translates the +subject+ using Rails I18n class under <tt>[mailer_scope, action_name]</tt> scope.
     # If it does not find a translation for the +subject+ under the specified scope it will default to a
     # humanized version of the <tt>action_name</tt>.
-    def default_i18n_subject #:nodoc:
-      mailer_scope = self.class.mailer_name.gsub('/', '.')
-      I18n.t(:subject, :scope => [mailer_scope, action_name], :default => action_name.humanize)
+    # If the subject has interpolations, you can pass them through the +interpolations+ parameter.
+    def default_i18n_subject(interpolations = {})
+      mailer_scope = self.class.mailer_name.tr('/', '.')
+      I18n.t(:subject, interpolations.merge(scope: [mailer_scope, action_name], default: action_name.humanize))
     end
 
-    def collect_responses_and_parts_order(headers) #:nodoc:
-      responses, parts_order = [], nil
+    def collect_responses(headers) #:nodoc:
+      responses = []
 
       if block_given?
         collector = ActionMailer::Collector.new(lookup_context) { render(action_name) }
         yield(collector)
-        parts_order = collector.responses.map { |r| r[:content_type] }
-        responses  = collector.responses
+        responses = collector.responses
       elsif headers[:body]
         responses << {
-          :body => headers.delete(:body),
-          :content_type => self.class.default[:content_type] || "text/plain"
+          body: headers.delete(:body),
+          content_type: self.class.default[:content_type] || "text/plain"
         }
       else
         templates_path = headers.delete(:template_path) || self.class.mailer_name
         templates_name = headers.delete(:template_name) || action_name
 
-        each_template(templates_path, templates_name) do |template|
+        each_template(Array(templates_path), templates_name) do |template|
           self.formats = template.formats
 
           responses << {
-            :body => render(:template => template),
-            :content_type => template.mime_type.to_s
+            body: render(template: template),
+            content_type: template.type.to_s
           }
         end
       end
 
-      [responses, parts_order]
+      responses
     end
 
     def each_template(paths, name, &block) #:nodoc:
-      templates = lookup_context.find_all(name, Array.wrap(paths))
-      templates.uniq_by { |t| t.formats }.each(&block)
+      templates = lookup_context.find_all(name, paths)
+      if templates.empty?
+        raise ActionView::MissingTemplate.new(paths, name, paths, false, 'mailer')
+      else
+        templates.uniq { |t| t.formats }.each(&block)
+      end
     end
 
     def create_parts_from_responses(m, responses) #:nodoc:
@@ -746,4 +792,3 @@ module ActionMailer #:nodoc:
     ActiveSupport.run_load_hooks(:action_mailer, self)
   end
 end
-