actionmailer 6.1.7.8 → 7.0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: def8bbadc49606d6267fe87a18a4f52dc3d676a186170b43a5b3605c9cebe3ce
-  data.tar.gz: d84c0b290092229970717c932d80bf324073d95b7327fc511575e332ffd577e0
+  metadata.gz: 2f4d9c6fa5752fbe62db63c8de99ad3355f0c93160c07b459f44216129c5d2ca
+  data.tar.gz: f275a1e86c5ab3ba596624fd6eb415fb2023f5cb6b5af9b86dffc78df144a427
 SHA512:
-  metadata.gz: 4c3a1c27aa53dcade6b195fe49d83bf5d604d413bf408b11c179fbe6c750bb282b04774a298db413d245823211455dc9905dfa4bda58cfdeac4dcc9b94552985
-  data.tar.gz: 52fe7311dc77b87b4683aae87d78bb83b960cec4e9652e9316fe51e6e09741689f4388fc511c91cd4712c21ee1be0961b87145bc4ec56a366531c9cf4dca66c6
+  metadata.gz: 1012558b72b2e36dbaf4ea82105ed6a07b9547cdcbdc0249070dcf66963794b9ca1fea7301a5335cffc407ef8a95ca54728e5d0a97f836a11776ee6d5892300a
+  data.tar.gz: 38035f47626115c90371aa314ba587f8940c8ae0cd0b79748d10705991f66a4c2eaab3e47551bb4e281592e8bb907f70b0d8dbfd69672e8c2300b4ee002b6237

data/CHANGELOG.md

@@ -1,158 +1,170 @@
-## Rails 6.1.7.8 (June 04, 2024) ##
+## Rails 7.0.8.6 (October 23, 2024) ##
 
-*   No changes.
+*   Fix NoMethodError in `block_format` helper
 
+    *Michael Leimstaedtner*
 
-## Rails 6.1.7.7 (February 21, 2024) ##
 
-*   No changes.
+## Rails 7.0.8.5 (October 15, 2024) ##
+
+*   Avoid regex backtracking in `block_format` helper
+
+    [CVE-2024-47889]
 
 
-## Rails 6.1.7.6 (August 22, 2023) ##
+## Rails 7.0.8.4 (June 04, 2024) ##
 
 *   No changes.
 
 
-## Rails 6.1.7.5 (August 22, 2023) ##
+## Rails 7.0.8.3 (May 17, 2024) ##
 
 *   No changes.
 
 
-## Rails 6.1.7.4 (June 26, 2023) ##
+## Rails 7.0.8.2 (May 16, 2024) ##
 
 *   No changes.
 
 
-## Rails 6.1.7.3 (March 13, 2023) ##
+## Rails 7.0.8.1 (February 21, 2024) ##
 
 *   No changes.
 
 
-## Rails 6.1.7.2 (January 24, 2023) ##
+## Rails 7.0.8 (September 09, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.1.7.1 (January 17, 2023) ##
+## Rails 7.0.7.2 (August 22, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.1.7 (September 09, 2022) ##
+## Rails 7.0.7.1 (August 22, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.1.6.1 (July 12, 2022) ##
+## Rails 7.0.7 (August 09, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.1.6 (May 09, 2022) ##
+## Rails 7.0.6 (June 29, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.1.5.1 (April 26, 2022) ##
+## Rails 7.0.5.1 (June 26, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.1.5 (March 09, 2022) ##
+## Rails 7.0.5 (May 24, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.1.4.7 (March 08, 2022) ##
+## Rails 7.0.4.3 (March 13, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.1.4.6 (February 11, 2022) ##
+## Rails 7.0.4.2 (January 24, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.1.4.5 (February 11, 2022) ##
+## Rails 7.0.4.1 (January 17, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.1.4.4 (December 15, 2021) ##
+## Rails 7.0.4 (September 09, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.1.4.3 (December 14, 2021) ##
+## Rails 7.0.3.1 (July 12, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.1.4.2 (December 14, 2021) ##
+## Rails 7.0.3 (May 09, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.1.4.1 (August 19, 2021) ##
+## Rails 7.0.2.4 (April 26, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.1.4 (June 24, 2021) ##
+## Rails 7.0.2.3 (March 08, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.1.3.2 (May 05, 2021) ##
+## Rails 7.0.2.2 (February 11, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.1.3.1 (March 26, 2021) ##
+## Rails 7.0.2.1 (February 11, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.1.3 (February 17, 2021) ##
+## Rails 7.0.2 (February 08, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.1.2.1 (February 10, 2021) ##
+## Rails 7.0.1 (January 06, 2022) ##
 
-*   No changes.
+*   Keep configuration of `smtp_settings` consistent between 6.1 and 7.0.
+
+    *André Luis Leal Cardoso Junior*
 
 
-## Rails 6.1.2 (February 09, 2021) ##
+## Rails 7.0.0 (December 15, 2021) ##
 
 *   No changes.
 
 
-## Rails 6.1.1 (January 07, 2021) ##
+## Rails 7.0.0.rc3 (December 14, 2021) ##
+
+*   No changes.
 
-*   Sets default mailer queue to `"default"` in the mail assertions.
 
-    *Paul Keen*
+## Rails 7.0.0.rc2 (December 14, 2021) ##
 
+*   No changes.
 
-## Rails 6.1.0 (December 09, 2020) ##
+## Rails 7.0.0.rc1 (December 06, 2021) ##
 
-*   Change default queue name of the deliver (`:mailers`) job to be the job adapter's
-    default (`:default`).
+*   Remove deprecated `ActionMailer::DeliveryJob` and `ActionMailer::Parameterized::DeliveryJob`
+    in favor of `ActionMailer::MailDeliveryJob`.
 
     *Rafael Mendonça França*
 
-*   Remove deprecated `ActionMailer::Base.receive` in favor of [Action Mailbox](https://github.com/rails/rails/tree/master/actionmailbox).
+*   `email_address_with_name` returns just the address if name is blank.
 
-    *Rafael Mendonça França*
+    *Thomas Hutterer*
+
+
+## Rails 7.0.0.alpha2 (September 15, 2021) ##
+
+*   No changes.
 
-*   Fix ActionMailer assertions don't work for parameterized mail with legacy delivery job.
 
-    *bogdanvlviv*
+## Rails 7.0.0.alpha1 (September 15, 2021) ##
 
-*   Added `email_address_with_name` to properly escape addresses with names.
+*   Configures a default of 5 for both `open_timeout` and `read_timeout` for SMTP Settings.
 
-    *Sunny Ripert*
+    *André Luis Leal Cardoso Junior*
 
 
-Please check [6-0-stable](https://github.com/rails/rails/blob/6-0-stable/actionmailer/CHANGELOG.md) for previous changes.
+Please check [6-1-stable](https://github.com/rails/rails/blob/6-1-stable/actionmailer/CHANGELOG.md) for previous changes.

data/MIT-LICENSE

@@ -18,3 +18,4 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

data/README.rdoc

@@ -114,7 +114,7 @@ The latest version of Action Mailer can be installed with RubyGems:
 
   $ gem install actionmailer
 
-Source code can be downloaded as part of the Rails project on GitHub:
+Source code can be downloaded as part of the \Rails project on GitHub:
 
 * https://github.com/rails/rails/tree/main/actionmailer
 
@@ -132,7 +132,7 @@ API documentation is at
 
 * https://api.rubyonrails.org
 
-Bug reports for the Ruby on Rails project can be filed here:
+Bug reports for the Ruby on \Rails project can be filed here:
 
 * https://github.com/rails/rails/issues
 

data/lib/action_mailer/base.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "action_mailer/mail_with_error_handling"
+require "mail"
 require "action_mailer/collector"
 require "active_support/core_ext/string/inflections"
 require "active_support/core_ext/hash/except"
@@ -106,7 +106,7 @@ module ActionMailer
   #   You got a new note!
   #   <%= 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:
+  # 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) %>
@@ -149,9 +149,9 @@ module ActionMailer
   #   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 delegate that will call
+  # The ActionMailer::MessageDelivery 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.
+  # you can call the <tt>message</tt> method on the ActionMailer::MessageDelivery object.
   #
   #   NotifierMailer.welcome(User.first).message     # => a Mail::Message object
   #
@@ -334,14 +334,37 @@ module ActionMailer
   #   end
   #
   # Callbacks in Action Mailer are implemented using
-  # <tt>AbstractController::Callbacks</tt>, so you can define and configure
+  # AbstractController::Callbacks, so you can define and configure
   # callbacks in the same manner that you would use callbacks in classes that
-  # inherit from <tt>ActionController::Base</tt>.
+  # inherit from ActionController::Base.
   #
   # 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.
   #
+  # = Rescuing Errors
+  #
+  # +rescue+ blocks inside of a mailer method cannot rescue errors that occur
+  # outside of rendering -- for example, record deserialization errors in a
+  # background job, or errors from a third-party mail delivery service.
+  #
+  # To rescue errors that occur during any part of the mailing process, use
+  # {rescue_from}[rdoc-ref:ActiveSupport::Rescuable::ClassMethods#rescue_from]:
+  #
+  #   class NotifierMailer < ApplicationMailer
+  #     rescue_from ActiveJob::DeserializationError do
+  #       # ...
+  #     end
+  #
+  #     rescue_from "SomeThirdPartyService::ApiError" do
+  #       # ...
+  #     end
+  #
+  #     def notify(recipient)
+  #       mail(to: recipient, subject: "Notification")
+  #     end
+  #   end
+  #
   # = Previewing emails
   #
   # You can preview your email templates visually by adding a mailer preview file to the
@@ -402,6 +425,7 @@ module ActionMailer
   #     This is a symbol and one of <tt>:plain</tt> (will send the password Base64 encoded), <tt>:login</tt> (will
   #     send the password Base64 encoded) or <tt>:cram_md5</tt> (combines a Challenge/Response mechanism to exchange
   #     information and a cryptographic Message Digest 5 algorithm to hash important information)
+  #   * <tt>:enable_starttls</tt> - Use STARTTLS when connecting to your SMTP server and fail if unsupported. Defaults to <tt>false</tt>.
   #   * <tt>:enable_starttls_auto</tt> - Detects if STARTTLS is enabled in your SMTP server and starts
   #     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
@@ -409,6 +433,8 @@ module ActionMailer
   #     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>:open_timeout</tt> Number of seconds to wait while attempting to open a connection.
+  #   * <tt>:read_timeout</tt> Number of seconds to wait until timing-out a read(2) call.
   #
   # * <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>.
@@ -433,7 +459,10 @@ 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+.
+  # * <tt>delivery_job</tt> - The job class used with <tt>deliver_later</tt>. Defaults to
+  #   +ActionMailer::MailDeliveryJob+.
+  #
+  # * <tt>deliver_later_queue_name</tt> - The name of the queue used with <tt>deliver_later</tt>.
   class Base < AbstractController::Base
     include DeliveryMethods
     include Rescuable
@@ -457,7 +486,7 @@ module ActionMailer
 
     helper ActionMailer::MailHelper
 
-    class_attribute :delivery_job, default: ::ActionMailer::DeliveryJob
+    class_attribute :delivery_job, default: ::ActionMailer::MailDeliveryJob
     class_attribute :default_params, default: {
       mime_version: "1.0",
       charset:      "UTF-8",
@@ -487,28 +516,28 @@ module ActionMailer
       end
 
       # Register an Observer which will be notified when mail is delivered.
-      # Either a class, string or symbol can be passed in as the Observer.
+      # 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)
         Mail.register_observer(observer_class_for(observer))
       end
 
       # Unregister a previously registered Observer.
-      # Either a class, string or symbol can be passed in as the Observer.
+      # 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 unregister_observer(observer)
         Mail.unregister_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.
+      # 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)
         Mail.register_interceptor(observer_class_for(interceptor))
       end
 
       # Unregister a previously registered Interceptor.
-      # Either a class, string or symbol can be passed in as the Interceptor.
+      # 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 unregister_interceptor(interceptor)
         Mail.unregister_interceptor(observer_class_for(interceptor))
@@ -553,7 +582,7 @@ module ActionMailer
       # through a callback when you call <tt>:deliver</tt> on the <tt>Mail::Message</tt>,
       # calling +deliver_mail+ directly and passing a <tt>Mail::Message</tt> will do
       # nothing except tell the logger you sent the email.
-      def deliver_mail(mail) #:nodoc:
+      def deliver_mail(mail) # :nodoc:
         ActiveSupport::Notifications.instrument("deliver.action_mailer") do |payload|
           set_payload_for_mail(payload, mail)
           yield # Let Mail do the delivery actions
@@ -561,10 +590,12 @@ module ActionMailer
       end
 
       # Returns an email in the format "Name <email@example.com>".
+      #
+      # If the name is a blank string, it returns just the address.
       def email_address_with_name(address, name)
         Mail::Address.new.tap do |builder|
           builder.address = address
-          builder.display_name = name
+          builder.display_name = name.presence
         end.to_s
       end
 
@@ -589,7 +620,7 @@ module ActionMailer
           super
         end
       end
-      ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
+      ruby2_keywords(:method_missing)
 
       def respond_to_missing?(method, include_all = false)
         action_methods.include?(method.to_s) || super
@@ -604,7 +635,7 @@ module ActionMailer
       @_message = Mail.new
     end
 
-    def process(method_name, *args) #:nodoc:
+    def process(method_name, *args) # :nodoc:
       payload = {
         mailer: self.class.name,
         action: method_name,
@@ -616,8 +647,9 @@ module ActionMailer
         @_message = NullMail.new unless @_mail_was_called
       end
     end
+    ruby2_keywords(:process)
 
-    class NullMail #:nodoc:
+    class NullMail # :nodoc:
       def body; "" end
       def header; {} end
 
@@ -636,6 +668,8 @@ module ActionMailer
     end
 
     # Returns an email in the format "Name <email@example.com>".
+    #
+    # If the name is a blank string, it returns just the address.
     def email_address_with_name(address, name)
       self.class.email_address_with_name(address, name)
     end
@@ -687,7 +721,7 @@ 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.
-    # It will also set the Content-Type, Content-Disposition, Content-Transfer-Encoding
+    # It will also set the +Content-Type+, +Content-Disposition+, and +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:
@@ -748,7 +782,7 @@ module ActionMailer
     #   or an array of addresses.
     # * +:bcc+ - Who you would like to Blind-Carbon-Copy on this email, can be a string of
     #   addresses, or an array of addresses.
-    # * +:reply_to+ - Who to set the Reply-To header of the email to.
+    # * +:reply_to+ - Who to set the +Reply-To+ header of the email to.
     # * +:date+ - The date to say the email was sent on.
     #
     # You can set default values for any of the above headers (except +:date+)
@@ -899,7 +933,7 @@ module ActionMailer
       end
 
       def apply_defaults(headers)
-        default_values = self.class.default.transform_values do |value|
+        default_values = self.class.default.except(*headers.keys).transform_values do |value|
           compute_default(value)
         end
 

data/lib/action_mailer/gem_version.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
 module ActionMailer
-  # Returns the version of the currently loaded Action Mailer as a <tt>Gem::Version</tt>.
+  # Returns the currently loaded version of Action Mailer as a <tt>Gem::Version</tt>.
   def self.gem_version
     Gem::Version.new VERSION::STRING
   end
 
   module VERSION
-    MAJOR = 6
-    MINOR = 1
-    TINY  = 7
-    PRE   = "8"
+    MAJOR = 7
+    MINOR = 0
+    TINY  = 8
+    PRE   = "6"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/action_mailer/inline_preview_interceptor.rb

@@ -17,15 +17,15 @@ module ActionMailer
 
     include Base64
 
-    def self.previewing_email(message) #:nodoc:
+    def self.previewing_email(message) # :nodoc:
       new(message).transform!
     end
 
-    def initialize(message) #:nodoc:
+    def initialize(message) # :nodoc:
       @message = message
     end
 
-    def transform! #:nodoc:
+    def transform! # :nodoc:
       return message if html_part.blank?
 
       html_part.body = html_part.decoded.gsub(PATTERN) do |match|

data/lib/action_mailer/mail_helper.rb

@@ -23,10 +23,18 @@ module ActionMailer
       }.join("\n\n")
 
       # Make list points stand on their own line
-      formatted.gsub!(/[ ]*([*]+) ([^*]*)/) { "  #{$1} #{$2.strip}\n" }
-      formatted.gsub!(/[ ]*([#]+) ([^#]*)/) { "  #{$1} #{$2.strip}\n" }
+      output = +""
+      splits = formatted.split(/(\*+|\#+)/)
+      while line = splits.shift
+        if line.start_with?("*", "#") && splits.first&.start_with?(" ")
+          output.chomp!(" ") while output.end_with?(" ")
+          output << "  #{line} #{splits.shift.strip}\n"
+        else
+          output << line
+        end
+      end
 
-      formatted
+      output
     end
 
     # Access the mailer instance.

data/lib/action_mailer/message_delivery.rb

@@ -15,7 +15,7 @@ module ActionMailer
   #   Notifier.welcome(User.first).deliver_later # enqueue email delivery as a job through Active Job
   #   Notifier.welcome(User.first).message       # a Mail::Message object
   class MessageDelivery < Delegator
-    def initialize(mailer_class, action, *args) #:nodoc:
+    def initialize(mailer_class, action, *args) # :nodoc:
       @mailer_class, @action, @args = mailer_class, action, args
 
       # The mail is only processed if we try to call any methods on it.
@@ -23,15 +23,15 @@ module ActionMailer
       @processed_mailer = nil
       @mail_message = nil
     end
-    ruby2_keywords(:initialize) if respond_to?(:ruby2_keywords, true)
+    ruby2_keywords(:initialize)
 
     # Method calls are delegated to the Mail::Message that's ready to deliver.
-    def __getobj__ #:nodoc:
+    def __getobj__ # :nodoc:
       @mail_message ||= processed_mailer.message
     end
 
     # Unused except for delegator internals (dup, marshalling).
-    def __setobj__(mail_message) #:nodoc:
+    def __setobj__(mail_message) # :nodoc:
       @mail_message = mail_message
     end
 
@@ -62,8 +62,8 @@ module ActionMailer
     # * <tt>:queue</tt> - Enqueue the email on the specified queue
     # * <tt>:priority</tt> - Enqueues the email with the specified priority
     #
-    # By default, the email will be enqueued using <tt>ActionMailer::DeliveryJob</tt>. Each
-    # <tt>ActionMailer::Base</tt> class can specify the job to use by setting the class variable
+    # By default, the email will be enqueued using <tt>ActionMailer::MailDeliveryJob</tt>. Each
+    # ActionMailer::Base class can specify the job to use by setting the class variable
     # +delivery_job+.
     #
     #   class AccountRegistrationMailer < ApplicationMailer
@@ -88,8 +88,8 @@ module ActionMailer
     # * <tt>:queue</tt> - Enqueue the email on the specified queue.
     # * <tt>:priority</tt> - Enqueues the email with the specified priority
     #
-    # By default, the email will be enqueued using <tt>ActionMailer::DeliveryJob</tt>. Each
-    # <tt>ActionMailer::Base</tt> class can specify the job to use by setting the class variable
+    # By default, the email will be enqueued using <tt>ActionMailer::MailDeliveryJob</tt>. Each
+    # ActionMailer::Base class can specify the job to use by setting the class variable
     # +delivery_job+.
     #
     #   class AccountRegistrationMailer < ApplicationMailer
@@ -140,38 +140,8 @@ module ActionMailer
             "#deliver_later, 2. only touch the message *within your mailer " \
             "method*, or 3. use a custom Active Job instead of #deliver_later."
         else
-          job = @mailer_class.delivery_job
-
-          if use_new_args?(job)
-            job.set(options).perform_later(
-              @mailer_class.name, @action.to_s, delivery_method.to_s, args: @args)
-          elsif job <= DeliveryJob
-            job.set(options).perform_later(
-              @mailer_class.name, @action.to_s, delivery_method.to_s, *@args)
-          else
-            ActiveSupport::Deprecation.warn(<<~EOM)
-              In Rails 7.0, Action Mailer will pass the mail arguments inside the `:args` keyword argument.
-              The `perform` method of the #{job} needs to change and forward the mail arguments
-              from the `args` keyword argument.
-
-              The `perform` method should now look like:
-
-              `def perform(mailer, mail_method, delivery, args:)`
-            EOM
-
-            job.set(options).perform_later(
-              @mailer_class.name, @action.to_s, delivery_method.to_s, *@args)
-          end
-        end
-      end
-
-      def use_new_args?(job)
-        parameters = job.public_instance_method(:perform).parameters
-
-        parameters.find do |key, name|
-          return true if key == :keyreq && name == :args
-
-          key == :keyrest and name != :**
+          @mailer_class.delivery_job.set(options).perform_later(
+            @mailer_class.name, @action.to_s, delivery_method.to_s, args: @args)
         end
       end
   end

data/lib/action_mailer/parameterized.rb

@@ -115,26 +115,19 @@ module ActionMailer
             super
           end
         end
-        ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
+        ruby2_keywords(:method_missing)
 
         def respond_to_missing?(method, include_all = false)
           @mailer.respond_to?(method, include_all)
         end
     end
 
-    class DeliveryJob < ActionMailer::DeliveryJob # :nodoc:
-      def perform(mailer, mail_method, delivery_method, params, *args)
-        mailer.constantize.with(params).public_send(mail_method, *args).send(delivery_method)
-      end
-      ruby2_keywords(:perform) if respond_to?(:ruby2_keywords, true)
-    end
-
     class MessageDelivery < ActionMailer::MessageDelivery # :nodoc:
       def initialize(mailer_class, action, params, *args)
         super(mailer_class, action, *args)
         @params = params
       end
-      ruby2_keywords(:initialize) if respond_to?(:ruby2_keywords, true)
+      ruby2_keywords(:initialize)
 
       private
         def processed_mailer
@@ -148,23 +141,8 @@ module ActionMailer
           if processed?
             super
           else
-            job = delivery_job_class
-
-            if job <= MailDeliveryJob
-              job.set(options).perform_later(
-                @mailer_class.name, @action.to_s, delivery_method.to_s, params: @params, args: @args)
-            else
-              job.set(options).perform_later(
-                @mailer_class.name, @action.to_s, delivery_method.to_s, @params, *@args)
-            end
-          end
-        end
-
-        def delivery_job_class
-          if @mailer_class.delivery_job <= MailDeliveryJob
-            @mailer_class.delivery_job
-          else
-            Parameterized::DeliveryJob
+            @mailer_class.delivery_job.set(options).perform_later(
+              @mailer_class.name, @action.to_s, delivery_method.to_s, params: @params, args: @args)
           end
         end
     end

data/lib/action_mailer/preview.rb

@@ -3,7 +3,7 @@
 require "active_support/descendants_tracker"
 
 module ActionMailer
-  module Previews #:nodoc:
+  module Previews # :nodoc:
     extend ActiveSupport::Concern
 
     included do

data/lib/action_mailer/railtie.rb

@@ -45,6 +45,17 @@ module ActionMailer
           self.delivery_job = delivery_job.constantize
         end
 
+        if options.smtp_settings
+          self.smtp_settings = options.smtp_settings
+        end
+
+        smtp_timeout = options.delete(:smtp_timeout)
+
+        if self.smtp_settings && smtp_timeout
+          self.smtp_settings[:open_timeout] ||= smtp_timeout
+          self.smtp_settings[:read_timeout] ||= smtp_timeout
+        end
+
         options.each { |k, v| send("#{k}=", v) }
       end
 

data/lib/action_mailer/rescuable.rb

@@ -1,26 +1,28 @@
 # frozen_string_literal: true
 
-module ActionMailer #:nodoc:
-  # Provides +rescue_from+ for mailers. Wraps mailer action processing,
-  # mail job processing, and mail delivery.
+module ActionMailer # :nodoc:
+  # Provides
+  # {rescue_from}[rdoc-ref:ActiveSupport::Rescuable::ClassMethods#rescue_from]
+  # for mailers. Wraps mailer action processing, mail job processing, and mail
+  # delivery to handle configured errors.
   module Rescuable
     extend ActiveSupport::Concern
     include ActiveSupport::Rescuable
 
     class_methods do
-      def handle_exception(exception) #:nodoc:
+      def handle_exception(exception) # :nodoc:
         rescue_with_handler(exception) || raise(exception)
       end
     end
 
-    def handle_exceptions #:nodoc:
+    def handle_exceptions # :nodoc:
       yield
     rescue => exception
       rescue_with_handler(exception) || raise
     end
 
     private
-      def process(*)
+      def process(...)
         handle_exceptions do
           super
         end

data/lib/action_mailer/test_helper.rb

@@ -155,8 +155,7 @@ module ActionMailer
       def delivery_job_filter(job)
         job_class = job.is_a?(Hash) ? job.fetch(:job) : job.class
 
-        Base.descendants.map(&:delivery_job).include?(job_class) ||
-          ActionMailer::Parameterized::DeliveryJob == job_class
+        Base.descendants.map(&:delivery_job).include?(job_class)
       end
   end
 end

data/lib/action_mailer/version.rb

@@ -3,7 +3,7 @@
 require_relative "gem_version"
 
 module ActionMailer
-  # Returns the version of the currently loaded Action Mailer as a
+  # Returns the currently loaded version of Action Mailer as a
   # <tt>Gem::Version</tt>.
   def self.version
     gem_version

data/lib/action_mailer.rb

@@ -51,13 +51,12 @@ module ActionMailer
   autoload :TestCase
   autoload :TestHelper
   autoload :MessageDelivery
-  autoload :DeliveryJob
   autoload :MailDeliveryJob
 
   def self.eager_load!
     super
 
-    require "action_mailer/mail_with_error_handling"
+    require "mail"
     Mail.eager_autoload!
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionmailer
 version: !ruby/object:Gem::Version
-  version: 6.1.7.8
+  version: 7.0.8.6
 platform: ruby
 authors:
 - David Heinemeier Hansson
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-04 00:00:00.000000000 Z
+date: 2024-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.7.8
+        version: 7.0.8.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.7.8
+        version: 7.0.8.6
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.7.8
+        version: 7.0.8.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.7.8
+        version: 7.0.8.6
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.7.8
+        version: 7.0.8.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.7.8
+        version: 7.0.8.6
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.7.8
+        version: 7.0.8.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.7.8
+        version: 7.0.8.6
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +86,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.5.4
+- !ruby/object:Gem::Dependency
+  name: net-imap
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-pop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-smtp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails-dom-testing
   requirement: !ruby/object:Gem::Requirement
@@ -113,14 +155,12 @@ files:
 - lib/action_mailer.rb
 - lib/action_mailer/base.rb
 - lib/action_mailer/collector.rb
-- lib/action_mailer/delivery_job.rb
 - lib/action_mailer/delivery_methods.rb
 - lib/action_mailer/gem_version.rb
 - lib/action_mailer/inline_preview_interceptor.rb
 - lib/action_mailer/log_subscriber.rb
 - lib/action_mailer/mail_delivery_job.rb
 - lib/action_mailer/mail_helper.rb
-- lib/action_mailer/mail_with_error_handling.rb
 - lib/action_mailer/message_delivery.rb
 - lib/action_mailer/parameterized.rb
 - lib/action_mailer/preview.rb
@@ -138,12 +178,12 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v6.1.7.8/actionmailer/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.1.7.8/
+  changelog_uri: https://github.com/rails/rails/blob/v7.0.8.6/actionmailer/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.0.8.6/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.1.7.8/actionmailer
+  source_code_uri: https://github.com/rails/rails/tree/v7.0.8.6/actionmailer
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -151,7 +191,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -159,8 +199,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.3.27
-signing_key:
+rubygems_version: 3.5.16
+signing_key: 
 specification_version: 4
 summary: Email composition and delivery framework (part of Rails).
 test_files: []

data/lib/action_mailer/delivery_job.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-require "active_job"
-
-module ActionMailer
-  # The <tt>ActionMailer::DeliveryJob</tt> class is used when you
-  # want to send emails outside of the request-response cycle.
-  #
-  # Exceptions are rescued and handled by the mailer class.
-  class DeliveryJob < ActiveJob::Base # :nodoc:
-    queue_as { ActionMailer::Base.deliver_later_queue_name }
-
-    rescue_from StandardError, with: :handle_exception_with_mailer_class
-
-    before_perform do
-      ActiveSupport::Deprecation.warn <<~MSG.squish
-        Sending mail with DeliveryJob and Parameterized::DeliveryJob
-        is deprecated and will be removed in Rails 7.0.
-        Please use MailDeliveryJob instead.
-      MSG
-    end
-
-    def perform(mailer, mail_method, delivery_method, *args) #:nodoc:
-      mailer.constantize.public_send(mail_method, *args).send(delivery_method)
-    end
-    ruby2_keywords(:perform) if respond_to?(:ruby2_keywords, true)
-
-    private
-      # "Deserialize" the mailer class name by hand in case another argument
-      # (like a Global ID reference) raised DeserializationError.
-      def mailer_class
-        if mailer = Array(@serialized_arguments).first || Array(arguments).first
-          mailer.constantize
-        end
-      end
-
-      def handle_exception_with_mailer_class(exception)
-        if klass = mailer_class
-          klass.handle_exception exception
-        else
-          raise exception
-        end
-      end
-  end
-end

data/lib/action_mailer/mail_with_error_handling.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-begin
-  require "mail"
-rescue LoadError => error
-  if error.message.match?(/net\/smtp/)
-    $stderr.puts "You don't have net-smtp installed in your application. Please add it to your Gemfile and run bundle install"
-    raise
-  end
-end