RubyGems - actionmailer - Versions diffs - 4.2.11 → 5.1.0 - Mend

actionmailer 4.2.11 → 5.1.0

Potentially problematic release.

This version of actionmailer might be problematic. Click here for more details.

Files changed (26) hide show

checksums.yaml +5 -5
data/CHANGELOG.md +19 -138
data/MIT-LICENSE +1 -1
data/README.rdoc +2 -3
data/lib/action_mailer.rb +11 -10
data/lib/action_mailer/base.rb +230 -195
data/lib/action_mailer/collector.rb +3 -3
data/lib/action_mailer/delivery_job.rb +24 -3
data/lib/action_mailer/delivery_methods.rb +11 -8
data/lib/action_mailer/gem_version.rb +4 -4
data/lib/action_mailer/inline_preview_interceptor.rb +8 -12
data/lib/action_mailer/log_subscriber.rb +7 -7
data/lib/action_mailer/mail_helper.rb +14 -2
data/lib/action_mailer/message_delivery.rb +51 -41
data/lib/action_mailer/parameterized.rb +152 -0
data/lib/action_mailer/preview.rb +20 -19
data/lib/action_mailer/railtie.rb +23 -13
data/lib/action_mailer/rescuable.rb +27 -0
data/lib/action_mailer/test_case.rb +26 -10
data/lib/action_mailer/test_helper.rb +53 -2
data/lib/action_mailer/version.rb +1 -1
data/lib/rails/generators/mailer/USAGE +3 -3
data/lib/rails/generators/mailer/mailer_generator.rb +21 -4
data/lib/rails/generators/mailer/templates/application_mailer.rb +3 -1
data/lib/rails/generators/mailer/templates/mailer.rb +2 -2
metadata +15 -19

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: b441b0885c1dd49404f23031657598065b2fa50b1150bf230f3322a29ce69b2e
-  data.tar.gz: ff7c3927b3a2dd42b3f75803e2b4e9964529d635cbb59190eab40e2ceb81bdc9
+SHA1:
+  metadata.gz: fa279066a475c28daeb75c73d61bc75b20d79dcd
+  data.tar.gz: d470281fac5bfd09afdb3fd6e53de8de5a454b40
 SHA512:
-  metadata.gz: 5b80b0a4613bef47583205737a9caf5eb37e49ca840f9df4b99df0304699011eb44cd23a2ca654023e0875c7014f89ab0f5b5576798dd16f2e9f87e8dcee7053
-  data.tar.gz: 4a089a463850903265e0fc8faaa729daafb3e26c8c9665a9802ba6343cabb944006717fb909b4cc59a934036d460d5a591e45593dee46cd27404976f81f903bb
+  metadata.gz: d1fa1024d0423ac5d26b0c6b28958ca059caac10d5efe7a017209a92414786f2ddab63dd06962dddee8e4c0e84151f395a7f740d51d0e59cdc8472cdc156efd1
+  data.tar.gz: 0b17b0eba794f38550fd074829ec7c7f64d8028ace9ccae242e88297c964ab36a111cd49f5e1bcc7f77c54f3f6e5961d73dcb56cdaec783256f7de34f52a5761

data/CHANGELOG.md CHANGED

@@ -1,152 +1,33 @@
-## Rails 4.2.11 (November 27, 2018) ##
+## Rails 5.1.0 (April 27, 2017) ##
-*   No changes.
-## Rails 4.2.10 (September 27, 2017) ##
-*   No changes.
-## Rails 4.2.9 (June 26, 2017) ##
-*   No changes.
-## Rails 4.2.8 (February 21, 2017) ##
-*   No changes.
-## Rails 4.2.7 (July 12, 2016) ##
-*   Removes `-t` from default Sendmail arguments to match the underlying
-    `Mail::Sendmail` setting.
-    *Clayton Liggitt*
-## Rails 4.2.6 (March 07, 2016) ##
-*   No changes.
-## Rails 4.2.5.2 (February 26, 2016) ##
-*   No changes.
-## Rails 4.2.5.1 (January 25, 2015) ##
-*   No changes.
-## Rails 4.2.5 (November 12, 2015) ##
-*   No changes.
-## Rails 4.2.4 (August 24, 2015) ##
-* No Changes *
-## Rails 4.2.3 (June 25, 2015) ##
-*   `assert_emails` in block form use the given number as expected value.
-    This makes the error message much easier to understand.
+*   Add `:args` to `process.action_mailer` event.
     *Yuji Yaginuma*
-*   Mailer preview now uses `url_for` to fix links to emails for apps running on
-    a subdirectory.
-    *Remo Mueller*
-*   Mailer previews no longer crash when the `mail` method wasn't called
-    (`NullMail`).
-    Fixes #19849.
-    *Yves Senn*
-*   Make sure labels and values line up in mailer previews.
-    *Yves Senn*
-## Rails 4.2.2 (June 16, 2015) ##
-* No Changes *
-## Rails 4.2.1 (March 19, 2015) ##
-* No Changes *
-## Rails 4.2.0 (December 20, 2014) ##
-*   `MailerGenerator` now generates layouts by default. The HTML mailer layout
-    now includes `<html>` and `<body>` tags which improve the spam rating in
-    some spam detection engines. Mailers now inherit from `ApplicationMailer`
-    which sets the default layout.
-    *Andy Jeffries*
-*   `link_to` and `url_for` now generate URLs by default in templates.
-    Passing `only_path: false` is no longer needed.
-    Fixes #16497 and #16589.
-    *Xavier Noria*, *Richard Schneeman*
-*   Attachments can now be added while rendering the mail template.
-    Fixes #16974.
-    *Christian Felder*
-*   Add `#deliver_later` and `#deliver_now` methods and deprecate `#deliver` in
-    favor of `#deliver_now`. `#deliver_later` will enqueue a job to render and
-    deliver the mail instead of delivering it immediately. The job is enqueued
-    using the new Active Job framework in Rails and will use the queue that you
-    have configured in Rails.
-    *DHH*, *Abdelkader Boudih*, *Cristian Bica*
-*   `ActionMailer::Previews` are now class methods instead of instance methods.
-    *Cristian Bica*
-*   Deprecate `*_path` helpers in email views. They generated broken links in
-    email views and were not the intention of most developers. The `*_url`
-    helper is recommended instead.
-    *Richard Schneeman*
-*   Raise an exception when attachments are added after `mail` is called.
-    This is a safeguard to prevent invalid emails.
+*   Add parameterized invocation of mailers as a way to share before filters and defaults between actions.
+    See `ActionMailer::Parameterized` for a full example of the benefit.
-    Fixes #16163.
+    *DHH*
-    *Yves Senn*
+*   Allow lambdas to be used as lazy defaults in addition to procs.
-*   Add `config.action_mailer.show_previews` configuration option.
+    *DHH*
-    This configuration option can be used to enable the mail preview in
-    environments other than development (such as staging).
+*   Mime type: allow to custom content type when setting body in headers
+    and attachments.
-    Defaults to `true` in development and `false` elsewhere.
+    Example:
-    *Leonard Garvey*
+        def test_emails
+          attachments["invoice.pdf"] = "This is test File content"
+          mail(body: "Hello there", content_type: "text/html")
+        end
-*   Allow preview interceptors to be registered through
-    `config.action_mailer.preview_interceptors`.
+    *Minh Quy*
-    See #15739.
+*   Exception handling: use `rescue_from` to handle exceptions raised by
+    mailer actions, by message delivery, and by deferred delivery jobs.
-    *Yves Senn*
+    *Jeremy Daer*
-Please check [4-1-stable](https://github.com/rails/rails/blob/4-1-stable/actionmailer/CHANGELOG.md)
-for previous changes.
+Please check [5-0-stable](https://github.com/rails/rails/blob/5-0-stable/actionmailer/CHANGELOG.md) for previous changes.

data/MIT-LICENSE CHANGED

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2014 David Heinemeier Hansson
+Copyright (c) 2004-2017 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 CHANGED

@@ -146,11 +146,11 @@ The Base class has the full list of configuration options. Here's an example:
 The latest version of Action Mailer can be installed with RubyGems:
-  % [sudo] gem install actionmailer
+  $ gem install actionmailer
 Source code can be downloaded as part of the Rails project on GitHub
-* https://github.com/rails/rails/tree/4-2-stable/actionmailer
+* https://github.com/rails/rails/tree/master/actionmailer
 == License
@@ -173,4 +173,3 @@ Bug reports can be filed for the Ruby on Rails project here:
 Feature requests should be discussed on the rails-core mailing list here:
 * https://groups.google.com/forum/?fromgroups#!forum/rubyonrails-core

data/lib/action_mailer.rb CHANGED

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2004-2014 David Heinemeier Hansson
+# Copyright (c) 2004-2017 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,15 +21,15 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
-require 'abstract_controller'
-require 'action_mailer/version'
+require "abstract_controller"
+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/module/attr_internal'
-require 'active_support/core_ext/string/inflections'
-require 'active_support/lazy_load_hooks'
+require "active_support/rails"
+require "active_support/core_ext/class"
+require "active_support/core_ext/module/attr_internal"
+require "active_support/core_ext/string/inflections"
+require "active_support/lazy_load_hooks"
 module ActionMailer
   extend ::ActiveSupport::Autoload
@@ -42,15 +42,16 @@ module ActionMailer
   autoload :DeliveryMethods
   autoload :InlinePreviewInterceptor
   autoload :MailHelper
+  autoload :Parameterized
   autoload :Preview
-  autoload :Previews, 'action_mailer/preview'
+  autoload :Previews, "action_mailer/preview"
   autoload :TestCase
   autoload :TestHelper
   autoload :MessageDelivery
   autoload :DeliveryJob
 end
-autoload :Mime, 'action_dispatch/http/mime_type'
+autoload :Mime, "action_dispatch/http/mime_type"
 ActiveSupport.on_load(:action_view) do
   ActionView::Base.default_formats ||= Mime::SET.symbols

data/lib/action_mailer/base.rb CHANGED

@@ -1,10 +1,11 @@
-require 'mail'
-require 'action_mailer/collector'
-require 'active_support/core_ext/string/inflections'
-require 'active_support/core_ext/hash/except'
-require 'active_support/core_ext/module/anonymous'
+require "mail"
+require "action_mailer/collector"
+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'
+require "action_mailer/log_subscriber"
+require "action_mailer/rescuable"
 module ActionMailer
   # Action Mailer allows you to send email from your application using a mailer model and views.
@@ -21,11 +22,11 @@ module ActionMailer
   # the mailer views, options on the mail itself such as the <tt>:from</tt> address, and attachments.
   #
   #   class ApplicationMailer < ActionMailer::Base
-  #     default from: 'from@exmaple.com'
+  #     default from: 'from@example.com'
   #     layout 'mailer'
   #   end
   #
-  #   class Notifier < ApplicationMailer
+  #   class NotifierMailer < ApplicationMailer
   #     default from: 'no-reply@example.com',
   #             return_path: 'system@example.com'
   #
@@ -86,9 +87,9 @@ module ActionMailer
   # Like Action Controller, each mailer class has a corresponding view directory in which each
   # method of the class looks for a template with its name.
   #
-  # To define a template to be used with a mailing, create an <tt>.erb</tt> file with the same
+  # To define a template to be used with a mailer, create an <tt>.erb</tt> file with the same
   # name as the method in your mailer model. For example, in the mailer defined above, the template at
-  # <tt>app/views/notifier/welcome.text.erb</tt> would be used to generate the email.
+  # <tt>app/views/notifier_mailer/welcome.text.erb</tt> would be used to generate the email.
   #
   # Variables defined in the methods of your mailer model are accessible as instance variables in their
   # corresponding view.
@@ -132,38 +133,41 @@ module ActionMailer
   #
   #   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
-  # 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.
+  # You can also define a <tt>default_url_options</tt> method on individual mailers to override these
+  # default settings per-mailer.
+  #
+  # By default when <tt>config.force_ssl</tt> is true, URLs generated for hosts will use the HTTPS protocol.
   #
   # = Sending mail
   #
-  # Once a mailer action and template are defined, you can deliver your message or create it and save it
-  # for delivery later:
+  # Once a mailer action and template are defined, you can deliver your message or defer its creation and
+  # delivery for later:
+  #
+  #   NotifierMailer.welcome(User.first).deliver_now # sends the email
+  #   mail = NotifierMailer.welcome(User.first)      # => an ActionMailer::MessageDelivery object
+  #   mail.deliver_now                               # generates and sends the email now
   #
-  #   Notifier.welcome(User.first).deliver_now # sends the email
-  #   mail = Notifier.welcome(User.first)      # => an ActionMailer::MessageDelivery object
-  #   mail.deliver_now                    # sends the email
+  # The <tt>ActionMailer::MessageDelivery</tt> class is a wrapper around a delegate that will call
+  # your method to generate the mail. If you want direct access to the delegator, or <tt>Mail::Message</tt>,
+  # you can call the <tt>message</tt> method on the <tt>ActionMailer::MessageDelivery</tt> object.
   #
-  # The <tt>ActionMailer::MessageDelivery</tt> class is a wrapper around a <tt>Mail::Message</tt> object. If
-  # you want direct access to the <tt>Mail::Message</tt> object you can call the <tt>message</tt> method on
-  # the <tt>ActionMailer::MessageDelivery</tt> object.
+  #   NotifierMailer.welcome(User.first).message     # => a Mail::Message object
   #
-  #   Notifier.welcome(User.first).message     # => a Mail::Message object
+  # Action Mailer is nicely integrated with Active Job so you can generate and send emails in the background
+  # (example: outside of the request-response cycle, so the user doesn't have to wait on it):
   #
-  # Action Mailer is nicely integrated with Active Job so you can send emails in the background (example: outside
-  # of the request-response cycle, so the user doesn't have to wait on it):
+  #   NotifierMailer.welcome(User.first).deliver_later # enqueue the email sending to Active Job
   #
-  #   Notifier.welcome(User.first).deliver_later # enqueue the email sending to Active Job
+  # Note that <tt>deliver_later</tt> will execute your method from the background job.
   #
   # You never instantiate your mailer class. Rather, you just call the method you defined on the class itself.
+  # All instance methods are expected to return a message object to be sent.
   #
   # = Multipart Emails
   #
   # Multipart messages can also be used implicitly because Action Mailer will automatically detect and use
   # multipart templates, where each template is named after the name of the action, followed by the content
-  # type. Each such detected template will be added as a separate part to the message.
+  # type. Each such detected template will be added to the message, as a separate part.
   #
   # For example, if the following templates exist:
   # * signup_notification.text.erb
@@ -184,7 +188,7 @@ module ActionMailer
   #
   # Sending attachment in emails is easy:
   #
-  #   class Notifier < ApplicationMailer
+  #   class NotifierMailer < ApplicationMailer
   #     def welcome(recipient)
   #       attachments['free_book.pdf'] = File.read('path/to/file.pdf')
   #       mail(to: recipient, subject: "New account information")
@@ -200,19 +204,32 @@ module ActionMailer
   # 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 Notifier < ApplicationMailer
+  #     class NotifierMailer < ApplicationMailer
   #       def welcome(recipient)
   #         attachments['free_book.pdf'] = File.read('path/to/file.pdf')
   #         mail(to: recipient, subject: "New account information", body: "")
   #       end
   #     end
   #
+  # You can also send attachments with html template, in this case you need to add body, attachments,
+  # and custom content type like this:
+  #
+  #     class NotifierMailer < ApplicationMailer
+  #       def welcome(recipient)
+  #         attachments["free_book.pdf"] = File.read("path/to/file.pdf")
+  #         mail(to: recipient,
+  #              subject: "New account information",
+  #              content_type: "text/html",
+  #              body: "<html><body>Hello there</body></html>")
+  #       end
+  #     end
+  #
   # = Inline Attachments
   #
   # You can also specify that a file should be displayed inline with other HTML. This is useful
   # if you want to display a corporate logo or a photo.
   #
-  #   class Notifier < ApplicationMailer
+  #   class NotifierMailer < ApplicationMailer
   #     def welcome(recipient)
   #       attachments.inline['photo.png'] = File.read('path/to/photo.png')
   #       mail(to: recipient, subject: "Here is what we look like")
@@ -251,7 +268,7 @@ module ActionMailer
   # Action Mailer provides some intelligent defaults for your emails, these are usually specified in a
   # default method inside the class definition:
   #
-  #   class Notifier < ApplicationMailer
+  #   class NotifierMailer < ApplicationMailer
   #     default sender: 'system@example.com'
   #   end
   #
@@ -259,8 +276,8 @@ module ActionMailer
   # <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>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,
@@ -269,27 +286,26 @@ module ActionMailer
   # As you can pass in any header, you need to either quote the header as a string, or pass it in as
   # an underscored symbol, so the following will work:
   #
-  #   class Notifier < ApplicationMailer
+  #   class NotifierMailer < ApplicationMailer
   #     default 'Content-Transfer-Encoding' => '7bit',
   #             content_description: 'This is a description'
   #   end
   #
-  # Finally, Action Mailer also supports passing <tt>Proc</tt> objects into the default hash, so you
-  # can define methods that evaluate as the message is being generated:
+  # Finally, Action Mailer also supports passing <tt>Proc</tt> and <tt>Lambda</tt> objects into the default hash,
+  # so you can define methods that evaluate as the message is being generated:
   #
-  #   class Notifier < ApplicationMailer
-  #     default 'X-Special-Header' => Proc.new { my_method }
+  #   class NotifierMailer < ApplicationMailer
+  #     default 'X-Special-Header' => Proc.new { my_method }, to: -> { @inviter.email_address }
   #
   #     private
-  #
   #       def my_method
   #         'some complex call'
   #       end
   #   end
   #
-  # Note that the proc is evaluated right at the start of the mail message generation, so if you
-  # 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.
+  # Note that the proc/lambda is evaluated right at the start of the mail message generation, so if you
+  # set something in the default hash using a proc, and then set the same thing inside of your
+  # mailer method, it will get overwritten 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>:
@@ -302,7 +318,7 @@ module ActionMailer
   # 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 < ApplicationMailer
+  #   class NotifierMailer < ApplicationMailer
   #     before_action :add_inline_attachment!
   #
   #     def welcome
@@ -310,7 +326,6 @@ module ActionMailer
   #     end
   #
   #     private
-  #
   #       def add_inline_attachment!
   #         attachments.inline["footer.jpg"] = File.read('/path/to/filename.jpg')
   #       end
@@ -321,8 +336,9 @@ module ActionMailer
   # callbacks in the same manner that you would use callbacks in classes that
   # inherit from <tt>ActionController::Base</tt>.
   #
-  # Note that unless you have a specific reason to do so, you should prefer using before_action
-  # rather than after_action in your Action Mailer classes so that headers are parsed properly.
+  # Note that unless you have a specific reason to do so, you should prefer
+  # using <tt>before_action</tt> rather than <tt>after_action</tt> in your
+  # Action Mailer classes so that headers are parsed properly.
   #
   # = Previewing emails
   #
@@ -330,9 +346,9 @@ module ActionMailer
   # <tt>ActionMailer::Base.preview_path</tt>. Since most emails do something interesting
   # with database data, you'll need to write some scenarios to load messages with fake data:
   #
-  #   class NotifierPreview < ActionMailer::Preview
+  #   class NotifierMailerPreview < ActionMailer::Preview
   #     def welcome
-  #       Notifier.welcome(User.first)
+  #       NotifierMailer.welcome(User.first)
   #     end
   #   end
   #
@@ -388,13 +404,13 @@ module ActionMailer
   #     to use it. Defaults to <tt>true</tt>.
   #   * <tt>:openssl_verify_mode</tt> - When using TLS, you can set how OpenSSL checks the certificate. This is
   #     really useful if you need to validate a self-signed and/or a wildcard certificate. You can use the name
-  #     of an OpenSSL verify constant (<tt>'none'</tt>, <tt>'peer'</tt>, <tt>'client_once'</tt>,
-  #     <tt>'fail_if_no_peer_cert'</tt>) or directly the constant (<tt>OpenSSL::SSL::VERIFY_NONE</tt>,
-  #     <tt>OpenSSL::SSL::VERIFY_PEER</tt>, ...).
+  #     of an OpenSSL verify constant (<tt>'none'</tt> or <tt>'peer'</tt>) or directly the constant
+  #     (<tt>OpenSSL::SSL::VERIFY_NONE</tt> or <tt>OpenSSL::SSL::VERIFY_PEER</tt>).
+  #     <tt>:ssl/:tls</tt> Enables the SMTP connection to use SMTP/TLS (SMTPS: SMTP over direct TLS connection)
   #
   # * <tt>sendmail_settings</tt> - Allows you to override options for the <tt>:sendmail</tt> delivery method.
   #   * <tt>:location</tt> - The location of the sendmail executable. Defaults to <tt>/usr/sbin/sendmail</tt>.
-  #   * <tt>:arguments</tt> - The command line arguments. Defaults to <tt>-i -t</tt> with <tt>-f sender@address</tt>
+  #   * <tt>:arguments</tt> - The command line arguments. Defaults to <tt>-i</tt> with <tt>-f sender@address</tt>
   #     added automatically before the message is sent.
   #
   # * <tt>file_settings</tt> - Allows you to override options for the <tt>:file</tt> delivery method.
@@ -414,8 +430,12 @@ module ActionMailer
   #
   # * <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.
+  #
+  # * <tt>deliver_later_queue_name</tt> - The name of the queue used with <tt>deliver_later</tt>. Defaults to +mailers+.
   class Base < AbstractController::Base
     include DeliveryMethods
+    include Rescuable
+    include Parameterized
     include Previews
     abstract!
@@ -427,6 +447,7 @@ module ActionMailer
     include AbstractController::Translation
     include AbstractController::AssetPaths
     include AbstractController::Callbacks
+    include AbstractController::Caching
     include ActionView::Layouts
@@ -438,8 +459,6 @@ module ActionMailer
     helper ActionMailer::MailHelper
-    private_class_method :new #:nodoc:
     class_attribute :default_params
     self.default_params = {
       mime_version: "1.0",
@@ -463,31 +482,27 @@ module ActionMailer
       # Either a class, string or symbol can be passed in as the Observer.
       # If a string or symbol is passed in it will be camelized and constantized.
       def register_observer(observer)
-        delivery_observer = case observer
-          when String, Symbol
-            observer.to_s.camelize.constantize
-          else
-            observer
-          end
-        Mail.register_observer(delivery_observer)
+        Mail.register_observer(observer_class_for(observer))
       end
       # Register an Interceptor which will be called before mail is sent.
       # Either a class, string or symbol can be passed in as the Interceptor.
       # If a string or symbol is passed in it will be camelized and constantized.
       def register_interceptor(interceptor)
-        delivery_interceptor = case interceptor
-          when String, Symbol
-            interceptor.to_s.camelize.constantize
-          else
-            interceptor
-          end
+        Mail.register_interceptor(observer_class_for(interceptor))
+      end
-        Mail.register_interceptor(delivery_interceptor)
+      def observer_class_for(value) # :nodoc:
+        case value
+        when String, Symbol
+          value.to_s.camelize.constantize
+        else
+          value
+        end
       end
+      private :observer_class_for
-      # Returns the name of current mailer. This method is also being used as a path for a view lookup.
+      # Returns the name of the current mailer. This method is also being used as a path for a view lookup.
       # If this is an anonymous mailer, this method will return +anonymous+ instead.
       def mailer_name
         @mailer_name ||= anonymous? ? "anonymous" : name.underscore
@@ -544,13 +559,9 @@ module ActionMailer
         end
       end
-      def respond_to?(method, include_private = false) #:nodoc:
-        super || action_methods.include?(method.to_s)
-      end
-    protected
+    private
-      def set_payload_for_mail(payload, mail) #:nodoc:
+      def set_payload_for_mail(payload, mail)
         payload[:mailer]     = name
         payload[:message_id] = mail.message_id
         payload[:subject]    = mail.subject
@@ -562,13 +573,17 @@ module ActionMailer
         payload[:mail]       = mail.encoded
       end
-      def method_missing(method_name, *args) # :nodoc:
+      def method_missing(method_name, *args)
         if action_methods.include?(method_name.to_s)
           MessageDelivery.new(self, method_name, *args)
         else
           super
         end
       end
+      def respond_to_missing?(method, include_all = false)
+        action_methods.include?(method.to_s) || super
+      end
     end
     attr_internal :message
@@ -577,32 +592,30 @@ module ActionMailer
     # will be initialized according to the named method. If not, the mailer will
     # remain uninitialized (useful when you only need to invoke the "receive"
     # method, for instance).
-    def initialize(method_name=nil, *args)
+    def initialize
       super()
       @_mail_was_called = false
       @_message = Mail.new
-      process(method_name, *args) if method_name
     end
     def process(method_name, *args) #:nodoc:
       payload = {
         mailer: self.class.name,
-        action: method_name
+        action: method_name,
+        args: args
       }
       ActiveSupport::Notifications.instrument("process.action_mailer", payload) do
-        lookup_context.skip_default_locale!
         super
         @_message = NullMail.new unless @_mail_was_called
       end
     end
     class NullMail #:nodoc:
-      def body; '' end
+      def body; "" end
       def header; {} end
-      def respond_to?(string, include_all=false)
+      def respond_to?(string, include_all = false)
         true
       end
@@ -662,21 +675,21 @@ module ActionMailer
     #
     #  mail.attachments['filename.jpg'] = File.read('/path/to/filename.jpg')
     #
-    # If you do this, then Mail will take the file name and work out the mime type
-    # set the Content-Type, Content-Disposition, Content-Transfer-Encoding and
-    # base64 encode the contents of the attachment all for you.
+    # If you do this, then Mail will take the file name and work out the mime type.
+    # It will also set the Content-Type, Content-Disposition, Content-Transfer-Encoding
+    # and encode the contents of the attachment in Base64.
     #
     # 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',
+    #  mail.attachments['filename.jpg'] = {mime_type: 'application/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:
+    # If you want to use encoding other than Base64 then you will need to pass encoding
+    # type along with the pre-encoded content as Mail doesn't know how to decode the
+    # data:
     #
     #  file_content = SpecialEncode(File.read('/path/to/filename.jpg'))
-    #  mail.attachments['filename.jpg'] = {mime_type: 'application/x-gzip',
+    #  mail.attachments['filename.jpg'] = {mime_type: 'application/gzip',
     #                                      encoding: 'SpecialEncoding',
     #                                      content: file_content }
     #
@@ -798,151 +811,173 @@ module ActionMailer
     #   end
     #
     def mail(headers = {}, &block)
-      return @_message if @_mail_was_called && headers.blank? && !block
-      m = @_message
+      return message if @_mail_was_called && headers.blank? && !block
       # At the beginning, do not consider class default for content_type
       content_type = headers[:content_type]
-      # Call all the procs (if any)
-      default_values = {}
-      self.class.default.each do |k,v|
-        default_values[k] = v.is_a?(Proc) ? instance_eval(&v) : v
-      end
-      # Handle defaults
-      headers = headers.reverse_merge(default_values)
-      headers[:subject] ||= default_i18n_subject
+      headers = apply_defaults(headers)
       # Apply charset at the beginning so all fields are properly quoted
-      m.charset = charset = headers[:charset]
+      message.charset = charset = headers[:charset]
       # Set configure delivery behavior
-      wrap_delivery_behavior!(headers.delete(:delivery_method), headers.delete(:delivery_method_options))
+      wrap_delivery_behavior!(headers[:delivery_method], headers[: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 }
+      assign_headers_to_message(message, headers)
       # Render the templates and blocks
       responses = collect_responses(headers, &block)
       @_mail_was_called = true
-      create_parts_from_responses(m, responses)
+      create_parts_from_responses(message, responses)
       # Setup content type, reapply charset and handle parts order
-      m.content_type = set_content_type(m, content_type, headers[:content_type])
-      m.charset      = charset
+      message.content_type = set_content_type(message, content_type, headers[:content_type])
+      message.charset      = charset
-      if m.multipart?
-        m.body.set_sort_order(headers[:parts_order])
-        m.body.sort_parts!
+      if message.multipart?
+        message.body.set_sort_order(headers[:parts_order])
+        message.body.sort_parts!
       end
-      m
+      message
     end
-  protected
-    # Used by #mail to set the content type of the message.
-    #
-    # It will use the given +user_content_type+, or multipart if the mail
-    # message has any attachments. If the attachments are inline, the content
-    # type will be "multipart/related", otherwise "multipart/mixed".
-    #
-    # If there is no content type passed in via headers, and there are no
-    # attachments, or the message is multipart, then the default content type is
-    # used.
-    def set_content_type(m, user_content_type, class_default)
-      params = m.content_type_parameters || {}
-      case
-      when user_content_type.present?
-        user_content_type
-      when m.has_attachments?
-        if m.attachments.detect { |a| a.inline? }
-          ["multipart", "related", params]
+    private
+      # Used by #mail to set the content type of the message.
+      #
+      # It will use the given +user_content_type+, or multipart if the mail
+      # message has any attachments. If the attachments are inline, the content
+      # type will be "multipart/related", otherwise "multipart/mixed".
+      #
+      # If there is no content type passed in via headers, and there are no
+      # attachments, or the message is multipart, then the default content type is
+      # used.
+      def set_content_type(m, user_content_type, class_default) # :doc:
+        params = m.content_type_parameters || {}
+        case
+        when user_content_type.present?
+          user_content_type
+        when m.has_attachments?
+          if m.attachments.detect(&:inline?)
+            ["multipart", "related", params]
+          else
+            ["multipart", "mixed", params]
+          end
+        when m.multipart?
+          ["multipart", "alternative", params]
         else
-          ["multipart", "mixed", params]
+          m.content_type || class_default
         end
-      when m.multipart?
-        ["multipart", "alternative", params]
-      else
-        m.content_type || class_default
       end
-    end
-    # 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>.
-    # 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
+      # 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>.
+      # If the subject has interpolations, you can pass them through the +interpolations+ parameter.
+      def default_i18n_subject(interpolations = {}) # :doc:
+        mailer_scope = self.class.mailer_name.tr("/", ".")
+        I18n.t(:subject, interpolations.merge(scope: [mailer_scope, action_name], default: action_name.humanize))
+      end
+      # Emails do not support relative path links.
+      def self.supports_path? # :doc:
+        false
+      end
+      def apply_defaults(headers)
+        default_values = self.class.default.map do |key, value|
+          [
+            key,
+            value.is_a?(Proc) ? instance_exec(&value) : value
+          ]
+        end.to_h
+        headers_with_defaults = headers.reverse_merge(default_values)
+        headers_with_defaults[:subject] ||= default_i18n_subject
+        headers_with_defaults
+      end
+      def assign_headers_to_message(message, headers)
+        assignable = headers.except(:parts_order, :content_type, :body, :template_name,
+                                    :template_path, :delivery_method, :delivery_method_options)
+        assignable.each { |k, v| message[k] = v }
+      end
-    def collect_responses(headers) #:nodoc:
-      responses = []
+      def collect_responses(headers)
+        if block_given?
+          collector = ActionMailer::Collector.new(lookup_context) { render(action_name) }
+          yield(collector)
+          collector.responses
+        elsif headers[:body]
+          collect_responses_from_text(headers)
+        else
+          collect_responses_from_templates(headers)
+        end
+      end
-      if block_given?
-        collector = ActionMailer::Collector.new(lookup_context) { render(action_name) }
-        yield(collector)
-        responses = collector.responses
-      elsif headers[:body]
-        responses << {
+      def collect_responses_from_text(headers)
+        [{
           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
+          content_type: headers[:content_type] || "text/plain"
+        }]
+      end
-        each_template(Array(templates_path), templates_name) do |template|
-          self.formats = template.formats
+      def collect_responses_from_templates(headers)
+        templates_path = headers[:template_path] || self.class.mailer_name
+        templates_name = headers[:template_name] || action_name
-          responses << {
+        each_template(Array(templates_path), templates_name).map do |template|
+          self.formats = template.formats
+          {
             body: render(template: template),
             content_type: template.type.to_s
           }
         end
       end
-      responses
-    end
+      def each_template(paths, name, &block)
+        templates = lookup_context.find_all(name, paths)
+        if templates.empty?
+          raise ActionView::MissingTemplate.new(paths, name, paths, false, "mailer")
+        else
+          templates.uniq(&:formats).each(&block)
+        end
+      end
-    def each_template(paths, name, &block) #:nodoc:
-      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)
+      def create_parts_from_responses(m, responses)
+        if responses.size == 1 && !m.has_attachments?
+          responses[0].each { |k, v| m[k] = v }
+        elsif responses.size > 1 && m.has_attachments?
+          container = Mail::Part.new
+          container.content_type = "multipart/alternative"
+          responses.each { |r| insert_part(container, r, m.charset) }
+          m.add_part(container)
+        else
+          responses.each { |r| insert_part(m, r, m.charset) }
+        end
       end
-    end
-    def create_parts_from_responses(m, responses) #:nodoc:
-      if responses.size == 1 && !m.has_attachments?
-        responses[0].each { |k,v| m[k] = v }
-      elsif responses.size > 1 && m.has_attachments?
-        container = Mail::Part.new
-        container.content_type = "multipart/alternative"
-        responses.each { |r| insert_part(container, r, m.charset) }
-        m.add_part(container)
-      else
-        responses.each { |r| insert_part(m, r, m.charset) }
+      def insert_part(container, response, charset)
+        response[:charset] ||= charset
+        part = Mail::Part.new(response)
+        container.add_part(part)
       end
-    end
-    def insert_part(container, response, charset) #:nodoc:
-      response[:charset] ||= charset
-      part = Mail::Part.new(response)
-      container.add_part(part)
-    end
+      # This and #instrument_name is for caching instrument
+      def instrument_payload(key)
+        {
+          mailer: mailer_name,
+          key: key
+        }
+      end
-    # Emails do not support relative path links.
-    def self.supports_path?
-      false
-    end
+      def instrument_name
+        "action_mailer".freeze
+      end
-    ActiveSupport.run_load_hooks(:action_mailer, self)
+      ActiveSupport.run_load_hooks(:action_mailer, self)
   end
 end