actionmailer 6.0.0 → 6.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55ef14268d45d7a535760751b1b1fb2753af791ae34074e3ebea138f2abd5b0f
-  data.tar.gz: 6f3bc72286f71badba0715b37dc1fd1fdb740a97723f2d2d46f551821d61de72
+  metadata.gz: '029f176ac2451d7e23bc4933f3a2d027016bc4a808c52200d3ec36fc485e9b4b'
+  data.tar.gz: 7a39096f7a7c29ecd7cc134f6aeaaa20204ba0ee3f9337a393ab115f19278609
 SHA512:
-  metadata.gz: 2613c547a7061aa3bc303faedc72020cd50166347ab01065d8ac0f4a2cfeea69a174f8570a004fb95725eac3c91c85adba6265bae4559fe33b32074d3e9f13bc
-  data.tar.gz: e22509967176e017ed6cef838ea3cc9844d1468a32a9b769d87305cb7bac103b5604b110638a713167cda51c06166f8b690befe73a12af5d7c1eb5a1e1618024
+  metadata.gz: 87cdb325fbf63d10c26adcfefad03f640b90286d9e545b854433b2e82f084e7ebf0875a9cb4bc5c1f7844d1b994757949b51b51f648158b5592e675112e28b8b
+  data.tar.gz: ac54573ee7c46ee662fa1ed4e7067ea5ef20e9618ecba7df7876499bb6d235156ee3fdfc776bb048a72267d7e92d8e3f77cb706cd1dc43cec5e1038eaee2a895

data/CHANGELOG.md

@@ -1,3 +1,30 @@
+## Rails 6.0.3 (May 06, 2020) ##
+
+*   No changes.
+
+
+## Rails 6.0.2.2 (March 19, 2020) ##
+
+*   No changes.
+
+
+## Rails 6.0.2.1 (December 18, 2019) ##
+
+*   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) ##
+
+*   No changes.
+
+
 ## Rails 6.0.0 (August 16, 2019) ##
 
 *   No changes.

data/README.rdoc

@@ -138,4 +138,4 @@ Bug reports for the Ruby on Rails project can be filed here:
 
 Feature requests should be discussed on the rails-core mailing list here:
 
-* https://groups.google.com/forum/?fromgroups#!forum/rubyonrails-core
+* https://discuss.rubyonrails.org/c/rubyonrails-core

data/lib/action_mailer/base.rb

@@ -591,7 +591,6 @@ module ActionMailer
       end
 
     private
-
       def set_payload_for_mail(payload, mail)
         payload[:mail]               = mail.encoded
         payload[:mailer]             = name
@@ -612,6 +611,7 @@ module ActionMailer
           super
         end
       end
+      ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
 
       def respond_to_missing?(method, include_all = false)
         action_methods.include?(method.to_s) || super
@@ -873,7 +873,6 @@ module ActionMailer
     end
 
     private
-
       # Used by #mail to set the content type of the message.
       #
       # It will use the given +user_content_type+, or multipart if the mail
@@ -907,7 +906,7 @@ module ActionMailer
       # If the subject has interpolations, you can pass them through the +interpolations+ parameter.
       def default_i18n_subject(interpolations = {}) # :doc:
         mailer_scope = self.class.mailer_name.tr("/", ".")
-        I18n.t(:subject, interpolations.merge(scope: [mailer_scope, action_name], default: action_name.humanize))
+        I18n.t(:subject, **interpolations.merge(scope: [mailer_scope, action_name], default: action_name.humanize))
       end
 
       # Emails do not support relative path links.

data/lib/action_mailer/delivery_job.rb

@@ -23,6 +23,7 @@ module ActionMailer
     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

data/lib/action_mailer/gem_version.rb

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

data/lib/action_mailer/mail_delivery_job.rb

@@ -13,9 +13,14 @@ module ActionMailer
 
     rescue_from StandardError, with: :handle_exception_with_mailer_class
 
-    def perform(mailer, mail_method, delivery_method, args:, params: nil) #:nodoc:
+    def perform(mailer, mail_method, delivery_method, args:, kwargs: nil, params: nil)
       mailer_class = params ? mailer.constantize.with(params) : mailer.constantize
-      mailer_class.public_send(mail_method, *args).send(delivery_method)
+      message = if kwargs
+        mailer_class.public_send(mail_method, *args, **kwargs)
+      else
+        mailer_class.public_send(mail_method, *args)
+      end
+      message.send(delivery_method)
     end
 
     private

data/lib/action_mailer/message_delivery.rb

@@ -23,6 +23,7 @@ module ActionMailer
       @processed_mailer = nil
       @mail_message = nil
     end
+    ruby2_keywords(:initialize) if respond_to?(:ruby2_keywords, true)
 
     # Method calls are delegated to the Mail::Message that's ready to deliver.
     def __getobj__ #:nodoc:
@@ -136,16 +137,14 @@ module ActionMailer
             "method*, or 3. use a custom Active Job instead of #deliver_later."
         else
           job = @mailer_class.delivery_job
-          args = arguments_for(job, delivery_method)
-          job.set(options).perform_later(*args)
-        end
-      end
 
-      def arguments_for(delivery_job, delivery_method)
-        if delivery_job <= MailDeliveryJob
-          [@mailer_class.name, @action.to_s, delivery_method.to_s, args: @args]
-        else
-          [@mailer_class.name, @action.to_s, delivery_method.to_s, *@args]
+          if job <= MailDeliveryJob
+            job.set(options).perform_later(
+              @mailer_class.name, @action.to_s, delivery_method.to_s, args: @args)
+          else
+            job.set(options).perform_later(
+              @mailer_class.name, @action.to_s, delivery_method.to_s, *@args)
+          end
         end
       end
   end

data/lib/action_mailer/parameterized.rb

@@ -115,6 +115,7 @@ module ActionMailer
             super
           end
         end
+        ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
 
         def respond_to_missing?(method, include_all = false)
           @mailer.respond_to?(method, include_all)
@@ -125,6 +126,7 @@ module ActionMailer
       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:
@@ -132,6 +134,7 @@ module ActionMailer
         super(mailer_class, action, *args)
         @params = params
       end
+      ruby2_keywords(:initialize) if respond_to?(:ruby2_keywords, true)
 
       private
         def processed_mailer
@@ -145,9 +148,15 @@ module ActionMailer
           if processed?
             super
           else
-            job  = delivery_job_class
-            args = arguments_for(job, delivery_method)
-            job.set(options).perform_later(*args)
+            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
 
@@ -158,14 +167,6 @@ module ActionMailer
             Parameterized::DeliveryJob
           end
         end
-
-        def arguments_for(delivery_job, delivery_method)
-          if delivery_job <= MailDeliveryJob
-            [@mailer_class.name, @action.to_s, delivery_method.to_s, params: @params, args: @args]
-          else
-            [@mailer_class.name, @action.to_s, delivery_method.to_s, @params, *@args]
-          end
-        end
     end
   end
 end

data/lib/action_mailer/preview.rb

@@ -55,7 +55,6 @@ module ActionMailer
       end
 
       private
-
         def interceptor_class_for(interceptor)
           case interceptor
           when String, Symbol

data/lib/action_mailer/test_case.rb

@@ -22,7 +22,6 @@ module ActionMailer
       end
 
       private
-
         def clear_test_deliveries
           if ActionMailer::Base.delivery_method == :test
             ActionMailer::Base.deliveries.clear
@@ -76,7 +75,6 @@ module ActionMailer
       end
 
       private
-
         def initialize_test_deliveries
           set_delivery_method :test
           @old_perform_deliveries = ActionMailer::Base.perform_deliveries

data/lib/action_mailer/test_helper.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionmailer
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.3
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-16 00:00:00.000000000 Z
+date: 2020-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.0.3
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.0.3
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.0.3
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -122,8 +122,11 @@ homepage: https://rubyonrails.org
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/rails/rails/tree/v6.0.0/actionmailer
-  changelog_uri: https://github.com/rails/rails/blob/v6.0.0/actionmailer/CHANGELOG.md
+  bug_tracker_uri: https://github.com/rails/rails/issues
+  changelog_uri: https://github.com/rails/rails/blob/v6.0.3/actionmailer/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.0.3/
+  mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
+  source_code_uri: https://github.com/rails/rails/tree/v6.0.3/actionmailer
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -140,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.0.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Email composition and delivery framework (part of Rails).