actionmailer 7.1.0 → 7.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b0e663bb9c70b6e9ca92404d6148f620a2cb5033dde97472af7bbb5a913af91
-  data.tar.gz: be9f88001b5e3aae466c92539d2328c5a1c76684f8c68d33ea714fa6ba584492
+  metadata.gz: 07b7a9aec1986d24d75eb514f3e717e949f2fc27929a1b8e6d32528b11aa39e5
+  data.tar.gz: 70a624c37e3d140754177912693c5399aa19ece3542f1ace5b51c3a76defe9d2
 SHA512:
-  metadata.gz: abd1903b2e839a026808e7b7185d09203935326087b3cedd4586b04331fc726045d54a7afea88fe2fef74054740928e7dc9584f1498156bafe3bd61a3f021f47
-  data.tar.gz: 00a1eeae613cc1e04f8b0546ccd943bd1e25d847783e51619845c408725c7c55300990738f413a76a26a091b091d17268376d0c12af28495a231ade152fe8fc2
+  metadata.gz: ffa758070ad98f04f49308a31b8e53c104ca906b31f613d04ffb62f75c04c7b14212bc0184709856dedc41f9ccb7dd4f1683ce42f89b14c55401dbdaee370239
+  data.tar.gz: f367f213daa44ac80ecf02085c3d829ac807f425f48bd2e5f935d638ae83372cade6c68522a0d9cb2f2fa3b2149b819b036c0aa4ac307d479877121cd951d31d

data/CHANGELOG.md

@@ -1,143 +1,37 @@
-## Rails 7.1.0 (October 05, 2023) ##
+## Rails 7.2.2 (October 30, 2024) ##
 
 *   No changes.
 
 
-## Rails 7.1.0.rc2 (October 01, 2023) ##
+## Rails 7.2.1.2 (October 23, 2024) ##
 
-*   No changes.
-
-
-## Rails 7.1.0.rc1 (September 27, 2023) ##
-
-*   Introduce `ActionMailer::FormBuilder`
-
-    Use the `default_form_builder` method in mailers to set the default form builder
-    for templates rendered by that mailer. Matches the behaviour in Action Controller.
-
-    *Alex Ghiculescu*
-
-
-## Rails 7.1.0.beta1 (September 13, 2023) ##
-
-*   Mailers are listed in alphabetical order on the mailer preview page now.
-
-    *Martin Spickermann*
-
-*   Deprecate passing params to `assert_enqueued_email_with` via the `:args`
-    kwarg. `assert_enqueued_email_with` now supports a `:params` kwarg, so use
-    that to pass params:
-
-    ```ruby
-    # BEFORE
-    assert_enqueued_email_with MyMailer, :my_method, args: { my_param: "value" }
-
-    # AFTER
-    assert_enqueued_email_with MyMailer, :my_method, params: { my_param: "value" }
-    ```
-
-    To specify named mailer args as a Hash, wrap the Hash in an array:
-
-    ```ruby
-    assert_enqueued_email_with MyMailer, :my_method, args: [{ my_arg: "value" }]
-    # OR
-    assert_enqueued_email_with MyMailer, :my_method, args: [my_arg: "value"]
-    ```
-
-    *Jonathan Hefner*
+*   Fix NoMethodError in `block_format` helper
 
-*   Accept procs for args and params in `assert_enqueued_email_with`
+    *Michael Leimstaedtner*
 
-    ```ruby
-    assert_enqueued_email_with DeliveryJob, params: -> p { p[:token] =~ /\w+/ } do
-      UserMailer.with(token: user.generate_token).email_verification.deliver_later
-    end
-    ```
 
-    *Max Chernyak*
+## Rails 7.2.1.1 (October 15, 2024) ##
 
-*   Added `*_deliver` callbacks to `ActionMailer::Base` that wrap mail message delivery.
+*   Avoid regex backtracking in `block_format` helper
 
-    Example:
+    [CVE-2024-47889]
 
-    ```ruby
-    class EventsMailer < ApplicationMailer
-      after_deliver do
-        User.find_by(email: message.to.first).update(email_provider_id: message.message_id, emailed_at: Time.current)
-      end
-    end
-    ```
+    *John Hawthorn*
 
-    *Ben Sheldon*
 
-*   Added `deliver_enqueued_emails` to `ActionMailer::TestHelper`. This method
-    delivers all enqueued email jobs.
+## Rails 7.2.1 (August 22, 2024) ##
 
-    Example:
-
-    ```ruby
-    def test_deliver_enqueued_emails
-      deliver_enqueued_emails do
-        ContactMailer.welcome.deliver_later
-      end
-      assert_emails 1
-    end
-    ```
-
-    *Andrew Novoselac*
-
-*   The `deliver_later_queue_name` used by the default mailer job can now be
-    configured on a per-mailer basis. Previously this was only configurable
-    for all mailers via `ActionMailer::Base`.
-
-    Example:
-
-    ```ruby
-    class EventsMailer < ApplicationMailer
-      self.deliver_later_queue_name = :throttled_mailer
-    end
-    ```
-
-    *Jeffrey Hardy*
-
-*   Email previews now include an expandable section to show all headers.
-
-    Headers like `Message-ID` for threading or email service provider specific
-    features like analytics tags or account metadata can now be viewed directly
-    in the mailer preview.
-
-    *Matt Swanson*
-
-*   Default `ActionMailer::Parameterized#params` to an empty `Hash`
-
-    *Sean Doyle*
-
-*   Introduce the `capture_emails` test helper.
-
-    Returns all emails that are sent in a block.
-
-    ```ruby
-    def test_emails
-      emails = capture_emails do
-        ContactMailer.welcome.deliver_now
-        ContactMailer.welcome.deliver_later
-      end
-      assert_email "Hi there", emails.first.subject
-    end
-    ```
+*   No changes.
 
-    *Alex Ghiculescu*
 
-*   Added ability to download `.eml` file for the email preview.
+## Rails 7.2.0 (August 09, 2024) ##
 
-    *Igor Kasyanchuk*
+*   Remove deprecated params via `:args` for `assert_enqueued_email_with`.
 
-*   Support multiple preview paths for mailers.
+    *Rafael Mendonça França*
 
-    Option `config.action_mailer.preview_path` is deprecated in favor of
-    `config.action_mailer.preview_paths`. Appending paths to this configuration option
-    will cause those paths to be used in the search for mailer previews.
+*   Remove deprecated `config.action_mailer.preview_path`.
 
-    *fatkodima*
+    *Rafael Mendonça França*
 
-Please check [7-0-stable](https://github.com/rails/rails/blob/7-0-stable/actionmailer/CHANGELOG.md) for previous changes.
+Please check [7-1-stable](https://github.com/rails/rails/blob/7-1-stable/actionmailer/CHANGELOG.md) for previous changes.

data/lib/action_mailer/base.rb

@@ -14,7 +14,7 @@ module ActionMailer
   #
   # Action Mailer allows you to send email from your application using a mailer model and views.
   #
-  # = Mailer Models
+  # == Mailer Models
   #
   # To use Action Mailer, you need to create a mailer model.
   #
@@ -86,7 +86,7 @@ module ActionMailer
   #     format.html { render "some_other_template" }
   #   end
   #
-  # = Mailer views
+  # == Mailer views
   #
   # Like Action Controller, each mailer class has a corresponding view directory in which each
   # method of the class looks for a template with its name.
@@ -114,7 +114,7 @@ module ActionMailer
   #   <%= truncate(@note.body, length: 25) %>
   #
   #
-  # = Generating URLs
+  # == Generating URLs
   #
   # URLs can be generated in mailer views using <tt>url_for</tt> or named routes. Unlike controllers from
   # Action Pack, the mailer instance doesn't have any context about the incoming request, so you'll need
@@ -142,7 +142,7 @@ module ActionMailer
   #
   # By default when <tt>config.force_ssl</tt> is +true+, URLs generated for hosts will use the HTTPS protocol.
   #
-  # = Sending mail
+  # == Sending mail
   #
   # Once a mailer action and template are defined, you can deliver your message or defer its creation and
   # delivery for later:
@@ -167,7 +167,7 @@ module ActionMailer
   # You never instantiate your mailer class. Rather, you just call the method you defined on the class itself.
   # All instance methods are expected to return a message object to be sent.
   #
-  # = Multipart Emails
+  # == Multipart Emails
   #
   # Multipart messages can also be used implicitly because Action Mailer will automatically detect and use
   # multipart templates, where each template is named after the name of the action, followed by the content
@@ -188,7 +188,7 @@ module ActionMailer
   # This means that you'll have to manually add each part to the email and set the content type of the email
   # to <tt>multipart/alternative</tt>.
   #
-  # = Attachments
+  # == Attachments
   #
   # Sending attachment in emails is easy:
   #
@@ -228,7 +228,7 @@ module ActionMailer
   #       end
   #     end
   #
-  # = Inline Attachments
+  # == Inline Attachments
   #
   # You can also specify that a file should be displayed inline with other HTML. This is useful
   # if you want to display a corporate logo or a photo.
@@ -254,7 +254,7 @@ module ActionMailer
   #
   #   <%= image_tag attachments['photo.png'].url, alt: 'Our Photo', class: 'photo' -%>
   #
-  # = Observing and Intercepting Mails
+  # == Observing and Intercepting Mails
   #
   # Action Mailer provides hooks into the Mail observer and interceptor methods. These allow you to
   # register classes that are called during the mail delivery life cycle.
@@ -267,7 +267,7 @@ module ActionMailer
   # the delivery agents. Your class should make any needed modifications directly to the passed
   # in +Mail::Message+ instance.
   #
-  # = Default \Hash
+  # == Default \Hash
   #
   # Action Mailer provides some intelligent defaults for your emails, these are usually specified in a
   # default method inside the class definition:
@@ -316,7 +316,7 @@ module ActionMailer
   #
   #    config.action_mailer.default_options = { from: "no-reply@example.org" }
   #
-  # = \Callbacks
+  # == \Callbacks
   #
   # You can specify callbacks using <tt>before_action</tt> and <tt>after_action</tt> for configuring your messages,
   # and using <tt>before_deliver</tt> and <tt>after_deliver</tt> for wrapping the delivery process.
@@ -350,7 +350,7 @@ module ActionMailer
   # using <tt>before_action</tt> rather than <tt>after_action</tt> in your
   # Action Mailer classes so that headers are parsed properly.
   #
-  # = Rescuing Errors
+  # == Rescuing Errors
   #
   # +rescue+ blocks inside of a mailer method cannot rescue errors that occur
   # outside of rendering -- for example, record deserialization errors in a
@@ -373,7 +373,7 @@ module ActionMailer
   #     end
   #   end
   #
-  # = Previewing emails
+  # == Previewing emails
   #
   # You can preview your email templates visually by adding a mailer preview file to the
   # <tt>ActionMailer::Base.preview_paths</tt>. Since most emails do something interesting
@@ -410,7 +410,7 @@ module ActionMailer
   # and <tt>register_preview_interceptor</tt> if they should operate on both sending and
   # previewing emails.
   #
-  # = Configuration options
+  # == Configuration options
   #
   # These options are specified on the class level, like
   # <tt>ActionMailer::Base.raise_delivery_errors = true</tt>
@@ -625,17 +625,16 @@ module ActionMailer
         payload[:perform_deliveries] = mail.perform_deliveries
       end
 
-      def method_missing(method_name, *args)
-        if action_methods.include?(method_name.to_s)
-          MessageDelivery.new(self, method_name, *args)
+      def method_missing(method_name, ...)
+        if action_methods.include?(method_name.name)
+          MessageDelivery.new(self, method_name, ...)
         else
           super
         end
       end
-      ruby2_keywords(:method_missing)
 
       def respond_to_missing?(method, include_all = false)
-        action_methods.include?(method.to_s) || super
+        action_methods.include?(method.name) || super
       end
     end
 
@@ -669,7 +668,7 @@ module ActionMailer
         true
       end
 
-      def method_missing(*args)
+      def method_missing(...)
         nil
       end
     end

data/lib/action_mailer/delivery_methods.rb

@@ -32,8 +32,7 @@ module ActionMailer
 
       add_delivery_method :sendmail, Mail::Sendmail,
         location:  "/usr/sbin/sendmail",
-        # See breaking change in the mail gem - https://github.com/mikel/mail/commit/7e1196bd29815a0901d7290c82a332c0959b163a
-        arguments: Gem::Version.new(Mail::VERSION.version) >= Gem::Version.new("2.8.0") ? %w[-i] : "-i"
+        arguments: %w[-i]
 
       add_delivery_method :test, Mail::TestMailer
     end

data/lib/action_mailer/gem_version.rb

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

data/lib/action_mailer/mail_helper.rb

@@ -25,10 +25,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/parameterized.rb

@@ -114,14 +114,13 @@ module ActionMailer
       end
 
       private
-        def method_missing(method_name, *args)
-          if @mailer.action_methods.include?(method_name.to_s)
-            ActionMailer::Parameterized::MessageDelivery.new(@mailer, method_name, @params, *args)
+        def method_missing(method_name, ...)
+          if @mailer.action_methods.include?(method_name.name)
+            ActionMailer::Parameterized::MessageDelivery.new(@mailer, method_name, @params, ...)
           else
             super
           end
         end
-        ruby2_keywords(:method_missing)
 
         def respond_to_missing?(method, include_all = false)
           @mailer.respond_to?(method, include_all)
@@ -129,11 +128,10 @@ module ActionMailer
     end
 
     class MessageDelivery < ActionMailer::MessageDelivery # :nodoc:
-      def initialize(mailer_class, action, params, *args)
-        super(mailer_class, action, *args)
+      def initialize(mailer_class, action, params, ...)
+        super(mailer_class, action, ...)
         @params = params
       end
-      ruby2_keywords(:initialize)
 
       private
         def processed_mailer

data/lib/action_mailer/preview.rb

@@ -25,31 +25,7 @@ module ActionMailer
       mattr_accessor :preview_interceptors, instance_writer: false, default: [ActionMailer::InlinePreviewInterceptor]
     end
 
-    def preview_path
-      ActionMailer.deprecator.warn(<<-MSG.squish)
-        Using preview_path option is deprecated and will be removed in Rails 7.2.
-        Please use preview_paths instead.
-      MSG
-      self.class.preview_paths.first
-    end
-
     module ClassMethods
-      def preview_path=(value)
-        ActionMailer.deprecator.warn(<<-MSG.squish)
-          Using preview_path= option is deprecated and will be removed in Rails 7.2.
-          Please use preview_paths= instead.
-        MSG
-        self.preview_paths << value
-      end
-
-      def preview_path
-        ActionMailer.deprecator.warn(<<-MSG.squish)
-          Using preview_path option is deprecated and will be removed in Rails 7.2.
-          Please use preview_paths instead.
-        MSG
-        self.preview_paths.first
-      end
-
       # Register one or more Interceptors which will be called before mail is previewed.
       def register_preview_interceptors(*interceptors)
         interceptors.flatten.compact.each { |interceptor| register_preview_interceptor(interceptor) }

data/lib/action_mailer/railtie.rb

@@ -71,16 +71,6 @@ module ActionMailer
     initializer "action_mailer.set_autoload_paths", before: :set_autoload_paths do |app|
       options = app.config.action_mailer
       app.config.paths["test/mailers/previews"].concat(options.preview_paths)
-
-      # Preview paths configuration needs a pass.
-      #
-      # config.paths is cached as soon as it is accessed. Therefore, mutating
-      # paths["test/mailers/previews"] does not guarantee config.autoload_paths
-      # is going to include them.
-      #
-      # If config.paths was accessed before, config.autoload_paths is going to
-      # have whatever paths["test/mailers/previews"] had when cached.
-      app.config.autoload_paths.concat(options.preview_paths)
     end
 
     initializer "action_mailer.compile_config_methods" do

data/lib/action_mailer/test_helper.rb

@@ -160,26 +160,6 @@ module ActionMailer
         mailer = mailer.instance_variable_get(:@mailer)
       end
 
-      if args.is_a?(Hash)
-        ActionMailer.deprecator.warn <<~MSG
-          Passing a Hash to the assert_enqueued_email_with :args kwarg causes the
-          Hash to be treated as params. This behavior is deprecated and will be
-          removed in Rails 7.2.
-
-          To specify a params Hash, use the :params kwarg:
-
-            assert_enqueued_email_with MyMailer, :my_method, params: { my_param: "value" }
-
-          Or, to specify named mailer args as a Hash, wrap the Hash in an array:
-
-            assert_enqueued_email_with MyMailer, :my_method, args: [{ my_arg: "value" }]
-            # OR
-            assert_enqueued_email_with MyMailer, :my_method, args: [my_arg: "value"]
-        MSG
-
-        params, args = args, nil
-      end
-
       args = Array(args) unless args.is_a?(Proc)
       queue ||= mailer.deliver_later_queue_name || ActiveJob::Base.default_queue_name
 

data/lib/action_mailer.rb

@@ -35,7 +35,7 @@ require "active_support/core_ext/module/attr_internal"
 require "active_support/core_ext/string/inflections"
 require "active_support/lazy_load_hooks"
 
-# :include: actionmailer/README.rdoc
+# :include: ../README.rdoc
 module ActionMailer
   extend ::ActiveSupport::Autoload
 

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

@@ -1,7 +1,9 @@
 <% module_namespacing do -%>
 class <%= class_name %>Mailer < ApplicationMailer
-<% actions.each do |action| -%>
+<% actions.each_with_index do |action, index| -%>
+<% if index != 0 -%>
 
+<% end -%>
   # Subject can be set in your I18n file at config/locales/en.yml
   # with the following lookup:
   #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionmailer
 version: !ruby/object:Gem::Version
-  version: 7.1.0
+  version: 7.2.2
 platform: ruby
 authors:
 - David Heinemeier Hansson
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-05 00:00:00.000000000 Z
+date: 2024-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,118 +16,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.2
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.2
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.2
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.2
 - !ruby/object:Gem::Dependency
   name: mail
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.5.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.5'
-    - - ">="
-      - !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'
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: rails-dom-testing
   requirement: !ruby/object:Gem::Requirement
@@ -182,12 +134,12 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.1.0/actionmailer/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.1.0/
+  changelog_uri: https://github.com/rails/rails/blob/v7.2.2/actionmailer/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.2.2/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.1.0/actionmailer
+  source_code_uri: https://github.com/rails/rails/tree/v7.2.2/actionmailer
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -195,7 +147,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -203,8 +155,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.4.18
-signing_key:
+rubygems_version: 3.5.16
+signing_key: 
 specification_version: 4
 summary: Email composition and delivery framework (part of Rails).
 test_files: []