RubyGems - actionmailer - Versions diffs - 4.2.11.3 → 5.0.0.beta1 - Mend

actionmailer 4.2.11.3 → 5.0.0.beta1

Potentially problematic release.

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

Files changed (22) hide show

checksums.yaml +5 -5
data/CHANGELOG.md +48 -118
data/MIT-LICENSE +1 -1
data/README.rdoc +2 -3
data/lib/action_mailer.rb +1 -1
data/lib/action_mailer/base.rb +120 -116
data/lib/action_mailer/delivery_job.rb +2 -2
data/lib/action_mailer/delivery_methods.rb +4 -1
data/lib/action_mailer/gem_version.rb +5 -5
data/lib/action_mailer/inline_preview_interceptor.rb +3 -3
data/lib/action_mailer/log_subscriber.rb +5 -5
data/lib/action_mailer/mail_helper.rb +13 -1
data/lib/action_mailer/message_delivery.rb +8 -25
data/lib/action_mailer/preview.rb +7 -7
data/lib/action_mailer/railtie.rb +6 -1
data/lib/action_mailer/test_case.rb +6 -7
data/lib/action_mailer/test_helper.rb +53 -2
data/lib/rails/generators/mailer/USAGE +3 -3
data/lib/rails/generators/mailer/mailer_generator.rb +8 -5
data/lib/rails/generators/mailer/templates/mailer.rb +2 -2
metadata +15 -14
data/lib/rails/generators/mailer/templates/application_mailer.rb +0 -4

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: d85bc14462cd772ec78e58939b2f36351f956394471545995fe1a7e7ac537f0b
-  data.tar.gz: 215de6367abadf4df7ab7d13e3d93c21d60ecc01ddc874e7ddc63b36d15f0dd5
+SHA1:
+  metadata.gz: 56789d48fc0a0b2b154ceb49bce402209a6bedad
+  data.tar.gz: fbbbdcb930198d46970bc07307ab65e8ebc4c0ba
 SHA512:
-  metadata.gz: ca89d4732b6b6d393efa689166e4625d8a677433e5ad43f540f2366f4559e16cc32256f5385215176c1c513d5493ee0e0c53a7dabaac63de57b5a763b0f2dc61
-  data.tar.gz: d5a57832464d0480d43a05a20a8de5d391846fb5bbc01628a24ba6059978292bb6e5c3b92b8b25b126bc8c18eabec7b1018b57b6cf3ec87538529665bd3ae0a3
+  metadata.gz: 1dcf35b84d00a94840c13730e7abc5b955ac16c8685f7de2ebc00bb7f5a9d093e202c216a9b717c9e91ce4fea9c56b7cc2da028cd31ad66ae216d19f8aa9cdb4
+  data.tar.gz: 58f33f59b8549216c0ff7a8ca623b94c9c755802c40f3f897a2190b9a14e7b08d75ae0d144b44a5ee1860d8fcfd52be1164dc0dcdca1cbdcaac6b0bc939886dc

data/CHANGELOG.md CHANGED

@@ -1,78 +1,28 @@
-## Rails 4.2.11.3 (May 15, 2020) ##
+## Rails 5.0.0.beta1 (December 18, 2015) ##
 *   No changes.
-## Rails 4.2.11.2 (May 15, 2020) ##
-*   No changes.
-## Rails 4.2.11.1 (March 11, 2019) ##
-*   No changes.
-## Rails 4.2.11 (November 27, 2018) ##
-*   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.
+*   `config.force_ssl = true` will set
+    `config.action_mailer.default_url_options = { protocol: 'https' }`
+    *Andrew Kampjes*
-## Rails 4.2.5.2 (February 26, 2016) ##
-*   No changes.
-## Rails 4.2.5.1 (January 25, 2015) ##
-*   No changes.
+*   Add `config.action_mailer.deliver_later_queue_name` configuration to set the
+    mailer queue name.
-## 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) ##
+    *Chris McGrath*
 *   `assert_emails` in block form use the given number as expected value.
     This makes the error message much easier to understand.
     *Yuji Yaginuma*
+*   Add support for inline images in mailer previews by using an interceptor
+    class to convert cid: urls in image src attributes to data urls.
+    *Andrew White*
 *   Mailer preview now uses `url_for` to fix links to emails for apps running on
     a subdirectory.
@@ -89,79 +39,59 @@
     *Yves Senn*
+*   Add `assert_enqueued_emails` and `assert_no_enqueued_emails`.
-## Rails 4.2.2 (June 16, 2015) ##
-* No Changes *
-## Rails 4.2.1 (March 19, 2015) ##
+    Example:
-* No Changes *
+        def test_emails
+          assert_enqueued_emails 2 do
+            ContactMailer.welcome.deliver_later
+            ContactMailer.welcome.deliver_later
+          end
+        end
+        def test_no_emails
+          assert_no_enqueued_emails do
+            # No emails enqueued here
+          end
+        end
-## Rails 4.2.0 (December 20, 2014) ##
+    *George Claghorn*
-*   `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.
+*   Add `_mailer` suffix to mailers created via generator, following the same
+    naming convention used in controllers and jobs.
-    *Andy Jeffries*
+    *Carlos Souza*
-*   `link_to` and `url_for` now generate URLs by default in templates.
-    Passing `only_path: false` is no longer needed.
+*   Remove deprecate `*_path` helpers in email views.
-    Fixes #16497 and #16589.
+    *Rafael Mendonça França*
-    *Xavier Noria*, *Richard Schneeman*
+*   Remove deprecated `deliver` and `deliver!` methods.
-*   Attachments can now be added while rendering the mail template.
+    *claudiob*
-    Fixes #16974.
+*   Template lookup now respects default locale and I18n fallbacks.
-    *Christian Felder*
+    Given the following templates:
-*   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.
+        mailer/demo.html.erb
+        mailer/demo.en.html.erb
+        mailer/demo.pt.html.erb
-    *DHH*, *Abdelkader Boudih*, *Cristian Bica*
+    Before this change, for a locale that doesn't have its associated file, the
+    `mailer/demo.html.erb` would be rendered even if `en` was the default locale.
-*   `ActionMailer::Previews` are now class methods instead of instance methods.
+    Now `mailer/demo.en.html.erb` has precedence over the file without locale.
-    *Cristian Bica*
+    Also, it is possible to give a fallback.
-*   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.
+        mailer/demo.pt.html.erb
+        mailer/demo.pt-BR.html.erb
-    *Richard Schneeman*
-*   Raise an exception when attachments are added after `mail` is called.
-    This is a safeguard to prevent invalid emails.
-    Fixes #16163.
-    *Yves Senn*
+    So if the locale is `pt-PT`, `mailer/demo.pt.html.erb` will be rendered given
+    the right I18n fallback configuration.
-*   Add `config.action_mailer.show_previews` configuration option.
-    This configuration option can be used to enable the mail preview in
-    environments other than development (such as staging).
-    Defaults to `true` in development and `false` elsewhere.
-    *Leonard Garvey*
-*   Allow preview interceptors to be registered through
-    `config.action_mailer.preview_interceptors`.
-    See #15739.
-    *Yves Senn*
+    *Rafael Mendonça França*
-Please check [4-1-stable](https://github.com/rails/rails/blob/4-1-stable/actionmailer/CHANGELOG.md)
-for previous changes.
+Please check [4-2-stable](https://github.com/rails/rails/blob/4-2-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-2015 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-2015 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/lib/action_mailer/base.rb CHANGED

@@ -21,11 +21,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'
   #
@@ -88,7 +88,7 @@ module ActionMailer
   #
   # To define a template to be used with a mailing, 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,32 +132,32 @@ 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.
+  # 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:
   #
-  #   Notifier.welcome(User.first).deliver_now # sends the email
-  #   mail = Notifier.welcome(User.first)      # => an ActionMailer::MessageDelivery object
-  #   mail.deliver_now                    # sends the email
+  #   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
   #
-  # 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.
+  # 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 delegator, or <tt>Mail::Message</tt>,
+  # you can call the <tt>message</tt> method on the <tt>ActionMailer::MessageDelivery</tt> object.
   #
-  #   Notifier.welcome(User.first).message     # => a Mail::Message object
+  #   NotifierMailer.welcome(User.first).message     # => a Mail::Message object
   #
-  # 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):
+  # 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):
   #
-  #   Notifier.welcome(User.first).deliver_later # enqueue the email sending to Active Job
+  #   NotifierMailer.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
   #
@@ -184,7 +184,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,7 +200,7 @@ 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: "")
@@ -212,7 +212,7 @@ module ActionMailer
   # 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 +251,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 +259,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,7 +269,7 @@ 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
@@ -277,7 +277,7 @@ module ActionMailer
   # 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:
   #
-  #   class Notifier < ApplicationMailer
+  #   class NotifierMailer < ApplicationMailer
   #     default 'X-Special-Header' => Proc.new { my_method }
   #
   #     private
@@ -288,7 +288,7 @@ module ActionMailer
   #   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
+  # set something in the default 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
@@ -302,7 +302,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
@@ -321,8 +321,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 +331,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
   #
@@ -414,6 +415,8 @@ 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>.
   class Base < AbstractController::Base
     include DeliveryMethods
     include Previews
@@ -438,8 +441,6 @@ module ActionMailer
     helper ActionMailer::MailHelper
-    private_class_method :new #:nodoc:
     class_attribute :default_params
     self.default_params = {
       mime_version: "1.0",
@@ -463,29 +464,25 @@ 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(delivery_interceptor)
+        Mail.register_interceptor(observer_class_for(interceptor))
+      end
+      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.
       # If this is an anonymous mailer, this method will return +anonymous+ instead.
@@ -544,10 +541,6 @@ module ActionMailer
         end
       end
-      def respond_to?(method, include_private = false) #:nodoc:
-        super || action_methods.include?(method.to_s)
-      end
     protected
       def set_payload_for_mail(payload, mail) #:nodoc:
@@ -569,6 +562,12 @@ module ActionMailer
           super
         end
       end
+    private
+      def respond_to_missing?(method, include_all = false) #:nodoc:
+        action_methods.include?(method.to_s)
+      end
     end
     attr_internal :message
@@ -577,11 +576,10 @@ 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:
@@ -591,8 +589,6 @@ module ActionMailer
       }
       ActiveSupport::Notifications.instrument("process.action_mailer", payload) do
-        lookup_context.skip_default_locale!
         super
         @_message = NullMail.new unless @_mail_was_called
       end
@@ -662,18 +658,18 @@ 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',
     #                                      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',
@@ -798,52 +794,40 @@ 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
+    protected
     # Used by #mail to set the content type of the message.
     #
@@ -860,7 +844,7 @@ module ActionMailer
       when user_content_type.present?
         user_content_type
       when m.has_attachments?
-        if m.attachments.detect { |a| a.inline? }
+        if m.attachments.detect(&:inline?)
           ["multipart", "related", params]
         else
           ["multipart", "mixed", params]
@@ -881,45 +865,70 @@ module ActionMailer
       I18n.t(:subject, interpolations.merge(scope: [mailer_scope, action_name], default: action_name.humanize))
     end
-    def collect_responses(headers) #:nodoc:
-      responses = []
+    # Emails do not support relative path links.
+    def self.supports_path?
+      false
+    end
+    private
+    def apply_defaults(headers)
+      default_values = self.class.default.map do |key, value|
+        [
+          key,
+          value.is_a?(Proc) ? instance_eval(&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)
       if block_given?
         collector = ActionMailer::Collector.new(lookup_context) { render(action_name) }
         yield(collector)
-        responses = collector.responses
+        collector.responses
       elsif headers[:body]
-        responses << {
+        [{
           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
+        collect_responses_from_templates(headers)
+      end
+    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 << {
-            body: render(template: template),
-            content_type: template.type.to_s
-          }
-        end
+      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
-      responses
     end
-    def each_template(paths, name, &block) #:nodoc:
+    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 { |t| t.formats }.each(&block)
+        templates.uniq(&:formats).each(&block)
       end
     end
-    def create_parts_from_responses(m, responses) #:nodoc:
+    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?
@@ -932,17 +941,12 @@ module ActionMailer
       end
     end
-    def insert_part(container, response, charset) #:nodoc:
+    def insert_part(container, response, charset)
       response[:charset] ||= charset
       part = Mail::Part.new(response)
       container.add_part(part)
     end
-    # Emails do not support relative path links.
-    def self.supports_path?
-      false
-    end
     ActiveSupport.run_load_hooks(:action_mailer, self)
   end
 end

data/lib/action_mailer/delivery_job.rb CHANGED

@@ -4,9 +4,9 @@ module ActionMailer
   # The <tt>ActionMailer::DeliveryJob</tt> class is used when you
   # want to send emails outside of the request-response cycle.
   class DeliveryJob < ActiveJob::Base # :nodoc:
-    queue_as :mailers
+    queue_as { ActionMailer::Base.deliver_later_queue_name }
-    def perform(mailer, mail_method, delivery_method, *args) # :nodoc:
+    def perform(mailer, mail_method, delivery_method, *args) #:nodoc:
       mailer.constantize.public_send(mail_method, *args).send(delivery_method)
     end
   end

data/lib/action_mailer/delivery_methods.rb CHANGED

@@ -16,6 +16,9 @@ module ActionMailer
       cattr_accessor :perform_deliveries
       self.perform_deliveries = true
+      cattr_accessor :deliver_later_queue_name
+      self.deliver_later_queue_name = :mailers
       self.delivery_methods = {}.freeze
       self.delivery_method  = :smtp
@@ -33,7 +36,7 @@ module ActionMailer
       add_delivery_method :sendmail, Mail::Sendmail,
         location:  '/usr/sbin/sendmail',
-        arguments: '-i'
+        arguments: '-i -t'
       add_delivery_method :test, Mail::TestMailer
     end

data/lib/action_mailer/gem_version.rb CHANGED

@@ -1,14 +1,14 @@
 module ActionMailer
-  # Returns the version of the currently loaded Action Mailer as a <tt>Gem::Version</tt>
+  # Returns the version of the currently loaded Action Mailer as a <tt>Gem::Version</tt>.
   def self.gem_version
     Gem::Version.new VERSION::STRING
   end
   module VERSION
-    MAJOR = 4
-    MINOR = 2
-    TINY  = 11
-    PRE   = "3"
+    MAJOR = 5
+    MINOR = 0
+    TINY  = 0
+    PRE   = "beta1"
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/action_mailer/inline_preview_interceptor.rb CHANGED

@@ -5,10 +5,10 @@ module ActionMailer
   # that use inline cid: style urls to data: style urls so that they are visible
   # when previewing a HTML email in a web browser.
   #
-  # This interceptor is not enabled by default, to use it just register it like any
-  # other mailer preview interceptor:
+  # This interceptor is enabled by default. To disable it, delete it from the
+  # <tt>ActionMailer::Base.preview_interceptors</tt> array:
   #
-  #   ActionMailer::Base.register_preview_interceptor(ActionMailer::InlinePreviewInterceptor)
+  #   ActionMailer::Base.preview_interceptors.delete(ActionMailer::InlinePreviewInterceptor)
   #
   class InlinePreviewInterceptor
     PATTERN  = /src=(?:"cid:[^"]+"|'cid:[^']+')/i

data/lib/action_mailer/log_subscriber.rb CHANGED

@@ -2,13 +2,13 @@ require 'active_support/log_subscriber'
 module ActionMailer
   # Implements the ActiveSupport::LogSubscriber for logging notifications when
-  # email is delivered and received.
+  # email is delivered or received.
   class LogSubscriber < ActiveSupport::LogSubscriber
     # An email was delivered.
     def deliver(event)
       info do
         recipients = Array(event.payload[:to]).join(', ')
-        "\nSent mail to #{recipients} (#{event.duration.round(1)}ms)"
+        "Sent mail to #{recipients} (#{event.duration.round(1)}ms)"
       end
       debug { event.payload[:mail] }
@@ -16,7 +16,7 @@ module ActionMailer
     # An email was received.
     def receive(event)
-      info { "\nReceived mail (#{event.duration.round(1)}ms)" }
+      info { "Received mail (#{event.duration.round(1)}ms)" }
       debug { event.payload[:mail] }
     end
@@ -25,11 +25,11 @@ module ActionMailer
       debug do
         mailer = event.payload[:mailer]
         action = event.payload[:action]
-        "\n#{mailer}##{action}: processed outbound mail in #{event.duration.round(1)}ms"
+        "#{mailer}##{action}: processed outbound mail in #{event.duration.round(1)}ms"
       end
     end
-    # Use the logger configured for ActionMailer::Base
+    # Use the logger configured for ActionMailer::Base.
     def logger
       ActionMailer::Base.logger
     end

data/lib/action_mailer/mail_helper.rb CHANGED

@@ -4,7 +4,17 @@ module ActionMailer
   # attachments list.
   module MailHelper
     # Take the text and format it, indented two spaces for each line, and
-    # wrapped at 72 columns.
+    # wrapped at 72 columns:
+    #
+    #   text = <<-TEXT
+    #     This is
+    #     the      paragraph.
+    #
+    #     * item1 * item2
+    #   TEXT
+    #
+    #   block_format text
+    #   # => "  This is the paragraph.\n\n  * item1\n  * item2\n"
     def block_format(text)
       formatted = text.split(/\n\r?\n/).collect { |paragraph|
         format_paragraph(paragraph)
@@ -33,6 +43,8 @@ module ActionMailer
     end
     # Returns +text+ wrapped at +len+ columns and indented +indent+ spaces.
+    # By default column length +len+ equals 72 characters and indent
+    # +indent+ equal two spaces.
     #
     #   my_text = 'Here is a sample text with more than 40 characters'
     #

data/lib/action_mailer/message_delivery.rb CHANGED

@@ -1,5 +1,4 @@
 require 'delegate'
-require 'active_support/core_ext/string/filters'
 module ActionMailer
@@ -22,7 +21,11 @@ module ActionMailer
     end
     def __getobj__ #:nodoc:
-      @obj ||= @mailer.send(:new, @mail_method, *@args).message
+      @obj ||= begin
+                 mailer = @mailer.new
+                 mailer.process @mail_method, *@args
+                 mailer.message
+               end
     end
     def __setobj__(obj) #:nodoc:
@@ -61,9 +64,9 @@ module ActionMailer
     #
     # Options:
     #
-    # * <tt>:wait</tt> - Enqueue the email to be delivered with a delay
-    # * <tt>:wait_until</tt> - Enqueue the email to be delivered at (after) a specific date / time
-    # * <tt>:queue</tt> - Enqueue the email on the specified queue
+    # * <tt>:wait</tt> - Enqueue the email to be delivered with a delay.
+    # * <tt>:wait_until</tt> - Enqueue the email to be delivered at (after) a specific date / time.
+    # * <tt>:queue</tt> - Enqueue the email on the specified queue.
     def deliver_later(options={})
       enqueue_delivery :deliver_now, options
     end
@@ -85,26 +88,6 @@ module ActionMailer
       message.deliver
     end
-    def deliver! #:nodoc:
-      ActiveSupport::Deprecation.warn(<<-MSG.squish)
-        `#deliver!` is deprecated and will be removed in Rails 5. Use
-        `#deliver_now!` to deliver immediately or `#deliver_later!` to
-        deliver through Active Job.
-      MSG
-      deliver_now!
-    end
-    def deliver #:nodoc:
-      ActiveSupport::Deprecation.warn(<<-MSG.squish)
-        `#deliver` is deprecated and will be removed in Rails 5. Use
-        `#deliver_now` to deliver immediately or `#deliver_later` to
-        deliver through Active Job.
-      MSG
-      deliver_now
-    end
     private
       def enqueue_delivery(delivery_method, options={})

data/lib/action_mailer/preview.rb CHANGED

@@ -21,7 +21,7 @@ module ActionMailer
       # :nodoc:
       mattr_accessor :preview_interceptors, instance_writer: false
-      self.preview_interceptors = []
+      self.preview_interceptors = [ActionMailer::InlinePreviewInterceptor]
     end
     module ClassMethods
@@ -52,7 +52,7 @@ module ActionMailer
     extend ActiveSupport::DescendantsTracker
     class << self
-      # Returns all mailer preview classes
+      # Returns all mailer preview classes.
       def all
         load_previews if descendants.empty?
         descendants
@@ -68,27 +68,27 @@ module ActionMailer
         message
       end
-      # Returns all of the available email previews
+      # Returns all of the available email previews.
       def emails
         public_instance_methods(false).map(&:to_s).sort
       end
-      # Returns true if the email exists
+      # Returns true if the email exists.
       def email_exists?(email)
         emails.include?(email)
       end
-      # Returns true if the preview exists
+      # Returns true if the preview exists.
       def exists?(preview)
         all.any?{ |p| p.preview_name == preview }
       end
-      # Find a mailer preview by its underscored class name
+      # Find a mailer preview by its underscored class name.
       def find(preview)
         all.find{ |p| p.preview_name == preview }
       end
-      # Returns the underscored name of the mailer preview without the suffix
+      # Returns the underscored name of the mailer preview without the suffix.
       def preview_name
         name.sub(/Preview$/, '').underscore
       end

data/lib/action_mailer/railtie.rb CHANGED

@@ -16,6 +16,11 @@ module ActionMailer
       paths   = app.config.paths
       options = app.config.action_mailer
+      if app.config.force_ssl
+        options.default_url_options ||= {}
+        options.default_url_options[:protocol] ||= 'https'
+      end
       options.assets_dir      ||= paths["public"].first
       options.javascripts_dir ||= paths["public/javascripts"].first
       options.stylesheets_dir ||= paths["public/stylesheets"].first
@@ -41,7 +46,7 @@ module ActionMailer
         options.each { |k,v| send("#{k}=", v) }
         if options.show_previews
-          app.routes.append do
+          app.routes.prepend do
             get '/rails/mailers'         => "rails/mailers#index"
             get '/rails/mailers/*path'   => "rails/mailers#preview"
           end

data/lib/action_mailer/test_case.rb CHANGED

@@ -57,29 +57,28 @@ module ActionMailer
       protected
-        def initialize_test_deliveries
+        def initialize_test_deliveries # :nodoc:
           set_delivery_method :test
           @old_perform_deliveries = ActionMailer::Base.perform_deliveries
           ActionMailer::Base.perform_deliveries = true
-          ActionMailer::Base.deliveries.clear
         end
-        def restore_test_deliveries
+        def restore_test_deliveries # :nodoc:
           restore_delivery_method
           ActionMailer::Base.perform_deliveries = @old_perform_deliveries
+          ActionMailer::Base.deliveries.clear
         end
-        def set_delivery_method(method)
+        def set_delivery_method(method) # :nodoc:
           @old_delivery_method = ActionMailer::Base.delivery_method
           ActionMailer::Base.delivery_method = method
         end
-        def restore_delivery_method
-          ActionMailer::Base.deliveries.clear
+        def restore_delivery_method # :nodoc:
           ActionMailer::Base.delivery_method = @old_delivery_method
         end
-        def set_expected_mail
+        def set_expected_mail # :nodoc:
           @expected = Mail.new
           @expected.content_type ["text", "plain", { "charset" => charset }]
           @expected.mime_version = '1.0'

data/lib/action_mailer/test_helper.rb CHANGED

@@ -1,7 +1,11 @@
+require 'active_job'
 module ActionMailer
   # Provides helper methods for testing Action Mailer, including #assert_emails
-  # and #assert_no_emails
+  # and #assert_no_emails.
   module TestHelper
+    include ActiveJob::TestHelper
     # Asserts that the number of emails sent matches the given number.
     #
     #   def test_emails
@@ -36,7 +40,7 @@ module ActionMailer
       end
     end
-    # Assert that no emails have been sent.
+    # Asserts that no emails have been sent.
     #
     #   def test_emails
     #     assert_no_emails
@@ -58,5 +62,52 @@ module ActionMailer
     def assert_no_emails(&block)
       assert_emails 0, &block
     end
+    # Asserts that the number of emails enqueued for later delivery matches
+    # the given number.
+    #
+    #   def test_emails
+    #     assert_enqueued_emails 0
+    #     ContactMailer.welcome.deliver_later
+    #     assert_enqueued_emails 1
+    #     ContactMailer.welcome.deliver_later
+    #     assert_enqueued_emails 2
+    #   end
+    #
+    # If a block is passed, that block should cause the specified number of
+    # emails to be enqueued.
+    #
+    #   def test_emails_again
+    #     assert_enqueued_emails 1 do
+    #       ContactMailer.welcome.deliver_later
+    #     end
+    #
+    #     assert_enqueued_emails 2 do
+    #       ContactMailer.welcome.deliver_later
+    #       ContactMailer.welcome.deliver_later
+    #     end
+    #   end
+    def assert_enqueued_emails(number, &block)
+      assert_enqueued_jobs number, only: ActionMailer::DeliveryJob, &block
+    end
+    # Asserts that no emails are enqueued for later delivery.
+    #
+    #   def test_no_emails
+    #     assert_no_enqueued_emails
+    #     ContactMailer.welcome.deliver_later
+    #     assert_enqueued_emails 1
+    #   end
+    #
+    # If a block is provided, it should not cause any emails to be enqueued.
+    #
+    #   def test_no_emails
+    #     assert_no_enqueued_emails do
+    #       # No emails should be enqueued from this block
+    #     end
+    #   end
+    def assert_no_enqueued_emails(&block)
+      assert_no_enqueued_jobs only: ActionMailer::DeliveryJob, &block
+    end
   end
 end

data/lib/rails/generators/mailer/USAGE CHANGED

@@ -11,7 +11,7 @@ Example:
     rails generate mailer Notifications signup forgot_password invoice
     creates a Notifications mailer class, views, and test:
-        Mailer:     app/mailers/notifications.rb
-        Views:      app/views/notifications/signup.text.erb [...]
-        Test:       test/mailers/notifications_test.rb
+        Mailer:     app/mailers/notifications_mailer.rb
+        Views:      app/views/notifications_mailer/signup.text.erb [...]
+        Test:       test/mailers/notifications_mailer_test.rb

data/lib/rails/generators/mailer/mailer_generator.rb CHANGED

@@ -4,16 +4,19 @@ module Rails
       source_root File.expand_path("../templates", __FILE__)
       argument :actions, type: :array, default: [], banner: "method method"
-      check_class_collision
+      check_class_collision suffix: "Mailer"
       def create_mailer_file
-        template "mailer.rb", File.join('app/mailers', class_path, "#{file_name}.rb")
-        if self.behavior == :invoke
-          template "application_mailer.rb", 'app/mailers/application_mailer.rb'
-        end
+        template "mailer.rb", File.join('app/mailers', class_path, "#{file_name}_mailer.rb")
       end
       hook_for :template_engine, :test_framework
+      protected
+        def file_name
+          @_file_name ||= super.gsub(/\_mailer/i, '')
+        end
     end
   end
 end

data/lib/rails/generators/mailer/templates/mailer.rb CHANGED

@@ -1,11 +1,11 @@
 <% module_namespacing do -%>
-class <%= class_name %> < ApplicationMailer
+class <%= class_name %>Mailer < ApplicationMailer
 <% actions.each do |action| -%>
   # Subject can be set in your I18n file at config/locales/en.yml
   # with the following lookup:
   #
-  #   en.<%= file_path.tr("/",".") %>.<%= action %>.subject
+  #   en.<%= file_path.tr("/",".") %>_mailer.<%= action %>.subject
   #
   def <%= action %>
     @greeting = "Hi"

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionmailer
 version: !ruby/object:Gem::Version
-  version: 4.2.11.3
+  version: 5.0.0.beta1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-15 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.11.3
+        version: 5.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.11.3
+        version: 5.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.11.3
+        version: 5.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.11.3
+        version: 5.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.11.3
+        version: 5.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.11.3
+        version: 5.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -119,9 +119,8 @@ files:
 - lib/action_mailer/version.rb
 - lib/rails/generators/mailer/USAGE
 - lib/rails/generators/mailer/mailer_generator.rb
-- lib/rails/generators/mailer/templates/application_mailer.rb
 - lib/rails/generators/mailer/templates/mailer.rb
-homepage: http://www.rubyonrails.org
+homepage: http://rubyonrails.org
 licenses:
 - MIT
 metadata: {}
@@ -133,16 +132,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
-rubygems_version: 3.0.3
+rubyforge_project:
+rubygems_version: 2.5.1
 signing_key:
 specification_version: 4
 summary: Email composition, delivery, and receiving framework (part of Rails).
 test_files: []
+has_rdoc:

data/lib/rails/generators/mailer/templates/application_mailer.rb DELETED

@@ -1,4 +0,0 @@
-class ApplicationMailer < ActionMailer::Base
-  default from: "from@example.com"
-  layout 'mailer'
-end