actionmailer 6.0.6.1 → 6.1.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29c980d88d2f291c80157bbfc789b99151edd49c3b837069a44c4351415a0ba7
-  data.tar.gz: 23481d7eace9aa5f410a7e11508a8634f3c9dbdbb557a1bf2c8db5c237be4367
+  metadata.gz: 108f3c55ba55b639ad73688d53b9171c521de8f40dcad016babd5602b765743c
+  data.tar.gz: 3cb3c5659972171a6acc740ded03c04d949ede59a99e54e9bc37ae94db0106a2
 SHA512:
-  metadata.gz: 89a916c2a203b14f0e05c1459670923550d820328e565b93bfd439c1f06db04726bf44eab484f6fceb5812b84ddd58cfb15ca08d088f0b40ae29b3405c9764c7
-  data.tar.gz: bf14baba84d405e761b33a3e42768c82981e64703b68e9037048f23ee1a2d5e978f146260ac697331c85bd28b88da80a4066a30e6e5193713aad621915beacb1
+  metadata.gz: 48d5ea4f1da22db3495b016ad056ab9f999b2badf04d4aa559b5028fd3ac529630831396c2c04a8acad4b211d4b865b0c0fa1f891c5ec8356310dc37b591804a
+  data.tar.gz: 22852825a97032541031e648936abff15db25b578a81746b6979f78db918e2a4ce3589d724d4f6baaf8f6639ffe25b631a56d7c29128b6bba7e8a5db3d7cf339

data/CHANGELOG.md

@@ -1,223 +1,148 @@
-## Rails 6.0.6.1 (January 17, 2023) ##
+## Rails 6.1.7.6 (August 22, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.0.6 (September 09, 2022) ##
+## Rails 6.1.7.5 (August 22, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.0.5.1 (July 12, 2022) ##
+## Rails 6.1.7.4 (June 26, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.0.5 (May 09, 2022) ##
+## Rails 6.1.7.3 (March 13, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.0.4.8 (April 26, 2022) ##
+## Rails 6.1.7.2 (January 24, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.0.4.7 (March 08, 2022) ##
+## Rails 6.1.7.1 (January 17, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.0.4.6 (February 11, 2022) ##
+## Rails 6.1.7 (September 09, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.0.4.5 (February 11, 2022) ##
+## Rails 6.1.6.1 (July 12, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.0.4.4 (December 15, 2021) ##
+## Rails 6.1.6 (May 09, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.0.4.3 (December 14, 2021) ##
+## Rails 6.1.5.1 (April 26, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.0.4.2 (December 14, 2021) ##
+## Rails 6.1.5 (March 09, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.0.4.1 (August 19, 2021) ##
+## Rails 6.1.4.7 (March 08, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.0.4 (June 15, 2021) ##
+## Rails 6.1.4.6 (February 11, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.0.3.7 (May 05, 2021) ##
+## Rails 6.1.4.5 (February 11, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.0.3.6 (March 26, 2021) ##
+## Rails 6.1.4.4 (December 15, 2021) ##
 
 *   No changes.
 
 
-## Rails 6.0.3.5 (February 10, 2021) ##
+## Rails 6.1.4.3 (December 14, 2021) ##
 
 *   No changes.
 
 
-## Rails 6.0.3.4 (October 07, 2020) ##
+## Rails 6.1.4.2 (December 14, 2021) ##
 
 *   No changes.
 
 
-## Rails 6.0.3.3 (September 09, 2020) ##
+## Rails 6.1.4.1 (August 19, 2021) ##
 
 *   No changes.
 
 
-## Rails 6.0.3.2 (June 17, 2020) ##
+## Rails 6.1.4 (June 24, 2021) ##
 
 *   No changes.
 
 
-## Rails 6.0.3.1 (May 18, 2020) ##
+## Rails 6.1.3.2 (May 05, 2021) ##
 
 *   No changes.
 
 
-## Rails 6.0.3 (May 06, 2020) ##
+## Rails 6.1.3.1 (March 26, 2021) ##
 
 *   No changes.
 
 
-## Rails 6.0.2.2 (March 19, 2020) ##
+## Rails 6.1.3 (February 17, 2021) ##
 
 *   No changes.
 
 
-## Rails 6.0.2.1 (December 18, 2019) ##
+## Rails 6.1.2.1 (February 10, 2021) ##
 
 *   No changes.
 
 
-## Rails 6.0.2 (December 13, 2019) ##
-
-*   Fix ActionMailer assertions don't work for parameterized mail with legacy delivery job.
-
-    *bogdanvlviv*
-
-
-## Rails 6.0.1 (November 5, 2019) ##
+## Rails 6.1.2 (February 09, 2021) ##
 
 *   No changes.
 
 
-## Rails 6.0.0 (August 16, 2019) ##
+## Rails 6.1.1 (January 07, 2021) ##
 
-*   No changes.
-
-
-## Rails 6.0.0.rc2 (July 22, 2019) ##
-
-*   No changes.
+*   Sets default mailer queue to `"default"` in the mail assertions.
 
+    *Paul Keen*
 
-## Rails 6.0.0.rc1 (April 24, 2019) ##
-
-*   No changes.
-
-
-## Rails 6.0.0.beta3 (March 11, 2019) ##
-
-*   No changes.
-
-
-## Rails 6.0.0.beta2 (February 25, 2019) ##
-
-*   No changes.
 
+## Rails 6.1.0 (December 09, 2020) ##
 
-## Rails 6.0.0.beta1 (January 18, 2019) ##
+*   Change default queue name of the deliver (`:mailers`) job to be the job adapter's
+    default (`:default`).
 
-*   Deprecate `ActionMailer::Base.receive` in favor of [Action Mailbox](https://github.com/rails/rails/tree/master/actionmailbox).
+    *Rafael Mendonça França*
 
-    *George Claghorn*
+*   Remove deprecated `ActionMailer::Base.receive` in favor of [Action Mailbox](https://github.com/rails/rails/tree/master/actionmailbox).
 
-*   Add `MailDeliveryJob` for delivering both regular and parameterized mail. Deprecate using `DeliveryJob` and `Parameterized::DeliveryJob`.
+    *Rafael Mendonça França*
 
-    *Gannon McGibbon*
-
-*   Fix ActionMailer assertions not working when a Mail defines
-    a custom delivery job class
-
-    *Edouard Chin*
-
-*   Mails with multipart `format` blocks with implicit render now also check for
-    a template name in options hash instead of only using the action name.
-
-    *Marcus Ilgner*
-
-*   `ActionDispatch::IntegrationTest` includes `ActionMailer::TestHelper` module by default.
-
-    *Ricardo Díaz*
-
-*   Add `perform_deliveries` to a payload of `deliver.action_mailer` notification.
-
-    *Yoshiyuki Kinjo*
-
-*   Change delivery logging message when `perform_deliveries` is false.
-
-    *Yoshiyuki Kinjo*
-
-*   Allow call `assert_enqueued_email_with` with no block.
-
-    Example:
-    ```
-    def test_email
-      ContactMailer.welcome.deliver_later
-      assert_enqueued_email_with ContactMailer, :welcome
-    end
-
-    def test_email_with_arguments
-      ContactMailer.welcome("Hello", "Goodbye").deliver_later
-      assert_enqueued_email_with ContactMailer, :welcome, args: ["Hello", "Goodbye"]
-    end
-    ```
+*   Fix ActionMailer assertions don't work for parameterized mail with legacy delivery job.
 
     *bogdanvlviv*
 
-*   Ensure mail gem is eager autoloaded when eager load is true to prevent thread deadlocks.
-
-    *Samuel Cochran*
-
-*   Perform email jobs in `assert_emails`.
-
-    *Gannon McGibbon*
-
-*   Add `Base.unregister_observer`, `Base.unregister_observers`,
-    `Base.unregister_interceptor`, `Base.unregister_interceptors`,
-    `Base.unregister_preview_interceptor` and `Base.unregister_preview_interceptors`.
-    This makes it possible to dynamically add and remove email observers and
-    interceptors at runtime in the same way they're registered.
-
-    *Claudio Ortolina*, *Kota Miyake*
-
-*   Rails 6 requires Ruby 2.5.0 or newer.
+*   Added `email_address_with_name` to properly escape addresses with names.
 
-    *Jeremy Daer*, *Kasper Timm Hansen*
+    *Sunny Ripert*
 
 
-Please check [5-2-stable](https://github.com/rails/rails/blob/5-2-stable/actionmailer/CHANGELOG.md) for previous changes.
+Please check [6-0-stable](https://github.com/rails/rails/blob/6-0-stable/actionmailer/CHANGELOG.md) for previous changes.

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2019 David Heinemeier Hansson
+Copyright (c) 2004-2022 David Heinemeier Hansson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -18,4 +18,3 @@ 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/lib/action_mailer/base.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "mail"
+require "action_mailer/mail_with_error_handling"
 require "action_mailer/collector"
 require "active_support/core_ext/string/inflections"
 require "active_support/core_ext/hash/except"
@@ -16,11 +16,11 @@ module ActionMailer
   #
   # To use Action Mailer, you need to create a mailer model.
   #
-  #   $ rails generate mailer Notifier
+  #   $ bin/rails generate mailer Notifier
   #
   # The generated model inherits from <tt>ApplicationMailer</tt> which in turn
   # inherits from <tt>ActionMailer::Base</tt>. A mailer model defines methods
-  # used to generate an email message. In these methods, you can setup variables to be used in
+  # used to generate an email message. In these methods, you can set up variables to be used in
   # the mailer views, options on the mail itself such as the <tt>:from</tt> address, and attachments.
   #
   #   class ApplicationMailer < ActionMailer::Base
@@ -455,10 +455,6 @@ module ActionMailer
 
     PROTECTED_IVARS = AbstractController::Rendering::DEFAULT_PROTECTED_INSTANCE_VARIABLES + [:@_action_has_layout]
 
-    def _protected_ivars # :nodoc:
-      PROTECTED_IVARS
-    end
-
     helper ActionMailer::MailHelper
 
     class_attribute :delivery_job, default: ::ActionMailer::DeliveryJob
@@ -551,32 +547,6 @@ module ActionMailer
       #    config.action_mailer.default_options = { from: "no-reply@example.org" }
       alias :default_options= :default
 
-      # Receives a raw email, parses it into an email object, decodes it,
-      # instantiates a new mailer, and passes the email object to the mailer
-      # object's +receive+ method.
-      #
-      # If you want your mailer to be able to process incoming messages, you'll
-      # need to implement a +receive+ method that accepts the raw email string
-      # as a parameter:
-      #
-      #   class MyMailer < ActionMailer::Base
-      #     def receive(mail)
-      #       # ...
-      #     end
-      #   end
-      def receive(raw_mail)
-        ActiveSupport::Deprecation.warn(<<~MESSAGE.squish)
-          ActionMailer::Base.receive is deprecated and will be removed in Rails 6.1.
-          Use Action Mailbox to process inbound email.
-        MESSAGE
-
-        ActiveSupport::Notifications.instrument("receive.action_mailer") do |payload|
-          mail = Mail.new(raw_mail)
-          set_payload_for_mail(payload, mail)
-          new.receive(mail)
-        end
-      end
-
       # Wraps an email delivery inside of <tt>ActiveSupport::Notifications</tt> instrumentation.
       #
       # This method is actually called by the <tt>Mail::Message</tt> object itself
@@ -590,6 +560,14 @@ module ActionMailer
         end
       end
 
+      # Returns an email in the format "Name <email@example.com>".
+      def email_address_with_name(address, name)
+        Mail::Address.new.tap do |builder|
+          builder.address = address
+          builder.display_name = name
+        end.to_s
+      end
+
     private
       def set_payload_for_mail(payload, mail)
         payload[:mail]               = mail.encoded
@@ -657,6 +635,11 @@ module ActionMailer
       self.class.mailer_name
     end
 
+    # Returns an email in the format "Name <email@example.com>".
+    def email_address_with_name(address, name)
+      self.class.email_address_with_name(address, name)
+    end
+
     # Allows you to pass random and unusual headers to the new <tt>Mail::Message</tt>
     # object which will add them to itself.
     #
@@ -738,7 +721,7 @@ module ActionMailer
     end
 
     class LateAttachmentsProxy < SimpleDelegator
-      def inline; _raise_error end
+      def inline; self end
       def []=(_name, _content); _raise_error end
 
       private
@@ -859,8 +842,9 @@ module ActionMailer
       @_mail_was_called = true
 
       create_parts_from_responses(message, responses)
+      wrap_inline_attachments(message)
 
-      # Setup content type, reapply charset and handle parts order
+      # Set up content type, reapply charset and handle parts order
       message.content_type = set_content_type(message, content_type, headers[:content_type])
       message.charset      = charset
 
@@ -888,7 +872,7 @@ module ActionMailer
         when user_content_type.present?
           user_content_type
         when m.has_attachments?
-          if m.attachments.detect(&:inline?)
+          if m.attachments.all?(&:inline?)
             ["multipart", "related", params]
           else
             ["multipart", "mixed", params]
@@ -915,12 +899,9 @@ module ActionMailer
       end
 
       def apply_defaults(headers)
-        default_values = self.class.default.map do |key, value|
-          [
-            key,
-            compute_default(value)
-          ]
-        end.to_h
+        default_values = self.class.default.transform_values do |value|
+          compute_default(value)
+        end
 
         headers_with_defaults = headers.reverse_merge(default_values)
         headers_with_defaults[:subject] ||= default_i18n_subject
@@ -989,6 +970,27 @@ module ActionMailer
         end
       end
 
+      def wrap_inline_attachments(message)
+        # If we have both types of attachment, wrap all the inline attachments
+        # in multipart/related, but not the actual attachments
+        if message.attachments.detect(&:inline?) && message.attachments.detect { |a| !a.inline? }
+          related = Mail::Part.new
+          related.content_type = "multipart/related"
+          mixed = [ related ]
+
+          message.parts.each do |p|
+            if p.attachment? && !p.inline?
+              mixed << p
+            else
+              related.add_part(p)
+            end
+          end
+
+          message.parts.clear
+          mixed.each { |c| message.add_part(c) }
+        end
+      end
+
       def create_parts_from_responses(m, responses)
         if responses.size == 1 && !m.has_attachments?
           responses[0].each { |k, v| m[k] = v }
@@ -1020,6 +1022,10 @@ module ActionMailer
         "action_mailer"
       end
 
+      def _protected_ivars
+        PROTECTED_IVARS
+      end
+
       ActiveSupport.run_load_hooks(:action_mailer, self)
   end
 end

data/lib/action_mailer/delivery_job.rb

@@ -15,7 +15,7 @@ module ActionMailer
     before_perform do
       ActiveSupport::Deprecation.warn <<~MSG.squish
         Sending mail with DeliveryJob and Parameterized::DeliveryJob
-        is deprecated and will be removed in Rails 6.1.
+        is deprecated and will be removed in Rails 7.0.
         Please use MailDeliveryJob instead.
       MSG
     end

data/lib/action_mailer/delivery_methods.rb

@@ -49,7 +49,7 @@ module ActionMailer
       #     arguments: '-i'
       def add_delivery_method(symbol, klass, default_options = {})
         class_attribute(:"#{symbol}_settings") unless respond_to?(:"#{symbol}_settings")
-        send(:"#{symbol}_settings=", default_options)
+        public_send(:"#{symbol}_settings=", default_options)
         self.delivery_methods = delivery_methods.merge(symbol.to_sym => klass).freeze
       end
 

data/lib/action_mailer/gem_version.rb

@@ -8,9 +8,9 @@ module ActionMailer
 
   module VERSION
     MAJOR = 6
-    MINOR = 0
-    TINY  = 6
-    PRE   = "1"
+    MINOR = 1
+    TINY  = 7
+    PRE   = "6"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/action_mailer/log_subscriber.rb

@@ -20,12 +20,6 @@ module ActionMailer
       debug { event.payload[:mail] }
     end
 
-    # An email was received.
-    def receive(event)
-      info { "Received mail (#{event.duration.round(1)}ms)" }
-      debug { event.payload[:mail] }
-    end
-
     # An email was generated.
     def process(event)
       debug do

data/lib/action_mailer/mail_with_error_handling.rb

@@ -0,0 +1,10 @@
+# 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

data/lib/action_mailer/message_delivery.rb

@@ -53,12 +53,14 @@ module ActionMailer
     #   Notifier.welcome(User.first).deliver_later!
     #   Notifier.welcome(User.first).deliver_later!(wait: 1.hour)
     #   Notifier.welcome(User.first).deliver_later!(wait_until: 10.hours.from_now)
+    #   Notifier.welcome(User.first).deliver_later!(priority: 10)
     #
     # 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>: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
@@ -77,12 +79,14 @@ module ActionMailer
     #   Notifier.welcome(User.first).deliver_later
     #   Notifier.welcome(User.first).deliver_later(wait: 1.hour)
     #   Notifier.welcome(User.first).deliver_later(wait_until: 10.hours.from_now)
+    #   Notifier.welcome(User.first).deliver_later(priority: 10)
     #
     # 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>: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
@@ -138,14 +142,37 @@ module ActionMailer
         else
           job = @mailer_class.delivery_job
 
-          if job <= MailDeliveryJob
+          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 != :**
+        end
+      end
   end
 end

data/lib/action_mailer/preview.rb

@@ -114,7 +114,7 @@ module ActionMailer
 
       # Returns the underscored name of the mailer preview without the suffix.
       def preview_name
-        name.sub(/Preview$/, "").underscore
+        name.delete_suffix("Preview").underscore
       end
 
       private

data/lib/action_mailer/railtie.rb

@@ -18,11 +18,6 @@ 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

data/lib/action_mailer/test_helper.rb

@@ -123,13 +123,13 @@ module ActionMailer
     #       ContactMailer.with(email: 'user@example.com').welcome.deliver_later
     #     end
     #   end
-    def assert_enqueued_email_with(mailer, method, args: nil, queue: "mailers", &block)
+    def assert_enqueued_email_with(mailer, method, args: nil, queue: ActionMailer::Base.deliver_later_queue_name || "default", &block)
       args = if args.is_a?(Hash)
         [mailer.to_s, method.to_s, "deliver_now", params: args, args: []]
       else
         [mailer.to_s, method.to_s, "deliver_now", args: Array(args)]
       end
-      assert_enqueued_with(job: mailer.delivery_job, args: args, queue: queue, &block)
+      assert_enqueued_with(job: mailer.delivery_job, args: args, queue: queue.to_s, &block)
     end
 
     # Asserts that no emails are enqueued for later delivery.

data/lib/action_mailer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #--
-# Copyright (c) 2004-2019 David Heinemeier Hansson
+# Copyright (c) 2004-2022 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -57,7 +57,7 @@ module ActionMailer
   def self.eager_load!
     super
 
-    require "mail"
+    require "action_mailer/mail_with_error_handling"
     Mail.eager_autoload!
   end
 end
@@ -67,4 +67,5 @@ autoload :Mime, "action_dispatch/http/mime_type"
 ActiveSupport.on_load(:action_view) do
   ActionView::Base.default_formats ||= Mime::SET.symbols
   ActionView::Template::Types.delegate_to Mime
+  ActionView::LookupContext::DetailsKey.clear
 end

data/lib/rails/generators/mailer/USAGE

@@ -1,6 +1,6 @@
 Description:
 ============
-    Stubs out a new mailer and its views. Passes the mailer name, either
+    Generates a new mailer and its views. Passes the mailer name, either
     CamelCased or under_scored, and an optional list of emails as arguments.
 
     This generates a mailer class in app/mailers and invokes your template
@@ -8,10 +8,9 @@ Description:
 
 Example:
 ========
-    rails generate mailer Notifications signup forgot_password invoice
+    bin/rails generate mailer Notifications signup forgot_password invoice
 
     creates a Notifications mailer class, views, and test:
         Mailer:     app/mailers/notifications_mailer.rb
         Views:      app/views/notifications_mailer/signup.text.erb [...]
         Test:       test/mailers/notifications_mailer_test.rb
-

metadata

@@ -1,57 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: actionmailer
 version: !ruby/object:Gem::Version
-  version: 6.0.6.1
+  version: 6.1.7.6
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-17 00:00:00.000000000 Z
+date: 2023-08-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 6.1.7.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 6.1.7.6
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.6.1
+        version: 6.1.7.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.6.1
+        version: 6.1.7.6
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.6.1
+        version: 6.1.7.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.6.1
+        version: 6.1.7.6
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.6.1
+        version: 6.1.7.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.6.1
+        version: 6.1.7.6
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -106,6 +120,7 @@ files:
 - 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
@@ -123,10 +138,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v6.0.6.1/actionmailer/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.0.6.1/
+  changelog_uri: https://github.com/rails/rails/blob/v6.1.7.6/actionmailer/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.1.7.6/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.0.6.1/actionmailer
+  source_code_uri: https://github.com/rails/rails/tree/v6.1.7.6/actionmailer
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -144,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.4.3
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Email composition and delivery framework (part of Rails).