actionmailer 7.0.0.alpha1 → 7.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6159118c4a22077610712d15bf29827879bafebb249106a91745882e38a45554
-  data.tar.gz: ef51dca707ab5c296f62d4672672d39d439edcd6dd5e9ab4e7308eeb8b969e7d
+  metadata.gz: 710c053793efa82d0a4adcaf8517552dcd1645974e74c0429d11b3889c1cd524
+  data.tar.gz: eccac3d1f2c375b1191ac470965bb7646dc4ae8a78b10ee6b0fdc4618cc156d4
 SHA512:
-  metadata.gz: 429027df6573b75fba33755ef047db4300dc218b316b12007f525a4448c9f10434c7dbfa42e43f25eb277e1e98ee5fc9cadff7d51730bd821f21a29e4d6777c0
-  data.tar.gz: f4b23b271e150623678ebd7a5208d853d8f2e7ecb5ed9856ed517f9249b5c12820524317f9bb0a4efbe50842c44b6a20a5386d47c25330ed112683cca6fc970c
+  metadata.gz: 588163ac52858454d0e7bedaf5b4a46df7fc85aafd49c9b884f59ef6350e307e09aba53a325292783a5cafe6c9c00f11f3862c7c046274bd394920da88e95f48
+  data.tar.gz: cf5bd72590a01fa9a5b9ed13ee2dbb52e1f4d8b9bcb432b49f453384327a6e60cda2cbebd39fd9e9732776ed7d5108ec4230525ca3e9fd07e4e100cd8a9c8c9f

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+## Rails 7.0.0.rc3 (December 14, 2021) ##
+
+*   No changes.
+
+
+## Rails 7.0.0.rc2 (December 14, 2021) ##
+
+*   Remove deprecated `ActionMailer::DeliveryJob` and `ActionMailer::Parameterized::DeliveryJob`
+    in favor of `ActionMailer::MailDeliveryJob`.
+
+    *Rafael Mendonça França*
+
+*   `email_address_with_name` returns just the address if name is blank.
+
+    *Thomas Hutterer*
+
+
+## Rails 7.0.0.alpha2 (September 15, 2021) ##
+
+*   No changes.
+
+
 ## Rails 7.0.0.alpha1 (September 15, 2021) ##
 
 *   Configures a default of 5 for both `open_timeout` and `read_timeout` for SMTP Settings.

data/lib/action_mailer/base.rb

@@ -435,6 +435,9 @@ 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>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
@@ -459,7 +462,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",
@@ -563,10 +566,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
 
@@ -638,6 +643,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

data/lib/action_mailer/gem_version.rb

@@ -10,7 +10,7 @@ module ActionMailer
     MAJOR = 7
     MINOR = 0
     TINY  = 0
-    PRE   = "alpha1"
+    PRE   = "rc3"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/action_mailer/message_delivery.rb

@@ -62,7 +62,7 @@ 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
+    # By default, the email will be enqueued using <tt>ActionMailer::MailDeliveryJob</tt>. Each
     # <tt>ActionMailer::Base</tt> class can specify the job to use by setting the class variable
     # +delivery_job+.
     #
@@ -88,7 +88,7 @@ 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
+    # By default, the email will be enqueued using <tt>ActionMailer::MailDeliveryJob</tt>. Each
     # <tt>ActionMailer::Base</tt> class can specify the job to use by setting the class variable
     # +delivery_job+.
     #
@@ -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
+          @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

@@ -122,13 +122,6 @@ module ActionMailer
         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)
-    end
-
     class MessageDelivery < ActionMailer::MessageDelivery # :nodoc:
       def initialize(mailer_class, action, params, *args)
         super(mailer_class, action, *args)
@@ -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/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.rb

@@ -51,7 +51,6 @@ module ActionMailer
   autoload :TestCase
   autoload :TestHelper
   autoload :MessageDelivery
-  autoload :DeliveryJob
   autoload :MailDeliveryJob
 
   def self.eager_load!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionmailer
 version: !ruby/object:Gem::Version
-  version: 7.0.0.alpha1
+  version: 7.0.0.rc3
 platform: ruby
 authors:
 - David Heinemeier Hansson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-15 00:00:00.000000000 Z
+date: 2021-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0.alpha1
+        version: 7.0.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0.alpha1
+        version: 7.0.0.rc3
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0.alpha1
+        version: 7.0.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0.alpha1
+        version: 7.0.0.rc3
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0.alpha1
+        version: 7.0.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0.alpha1
+        version: 7.0.0.rc3
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0.alpha1
+        version: 7.0.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0.alpha1
+        version: 7.0.0.rc3
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -113,7 +113,6 @@ 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
@@ -137,11 +136,12 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.0.0.alpha1/actionmailer/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.0.0.alpha1/
+  changelog_uri: https://github.com/rails/rails/blob/v7.0.0.rc3/actionmailer/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.0.0.rc3/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.0.0.alpha1/actionmailer
-post_install_message: 
+  source_code_uri: https://github.com/rails/rails/tree/v7.0.0.rc3/actionmailer
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -157,8 +157,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements:
 - none
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.2.15
+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)
-
-    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