actionmailer 6.0.0.beta3 → 6.0.2.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e5d07d9ee3f318af4a4829cf4431bf6cca8f8ce76916d2ceaad435eca335c7a
-  data.tar.gz: 7ae7c5e4f893e668f7068675cf0a6a002a615255a8375ccfa019b24a8de89c12
+  metadata.gz: 1eccd23773deaf8e6e0e55deee50fe801adc0321e1cdc535a1b5cd173cc0cfaa
+  data.tar.gz: 66a79bff21ba9efd460b5cefd0fa3ebd04b8d7c6b3f0196c7e294629320ab1f7
 SHA512:
-  metadata.gz: '09749d5bde90657bdf3e8ed4b7f6265a8b4c3460655935a479cb5276897785ee0568979f331198f0b6e7f565924003101885c01d7db0301cea186d2127cc8f8b'
-  data.tar.gz: 50fef8ca46cb960b8762f3a59f9fa2debd0b955002cf5756b642230ec1bbae94544ff340c875acaf9d86c13b8dba1c7773ea2d6ee3bfa8458d8f9b363a3fed0a
+  metadata.gz: a7d3ba3c67cfed55e0843719ff403ad9ab7bc2a251d925ae61570e9d6f8e2d9e020492005b518b5111d2d14967e2b3a1f4819e3c1a6fcc56e3c765d373707fea
+  data.tar.gz: 192dbc36c241d4015d077b950a542fcdbedcf624d2ff83ac7c6371231ff0b7730a0dd5adbff798f5617bdc385abc1dc00de9167422fc38d912d5362635e8aade

data/CHANGELOG.md

@@ -1,3 +1,30 @@
+## Rails 6.0.2.rc2 (December 09, 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.
+
+
+## Rails 6.0.0.rc2 (July 22, 2019) ##
+
+*   No changes.
+
+
+## Rails 6.0.0.rc1 (April 24, 2019) ##
+
+*   No changes.
+
+
 ## Rails 6.0.0.beta3 (March 11, 2019) ##
 
 *   No changes.

data/README.rdoc

@@ -13,6 +13,8 @@ Additionally, an Action Mailer class can be used to process incoming email,
 such as allowing a blog to accept new posts from an email (which could even
 have been sent from a phone).
 
+You can read more about Action Mailer in the {Action Mailer Basics}[https://edgeguides.rubyonrails.org/action_mailer_basics.html] guide.
+
 == Sending emails
 
 The framework works by initializing any instance variables you want to be
@@ -128,7 +130,7 @@ Action Mailer is released under the MIT license:
 
 API documentation is at
 
-* http://api.rubyonrails.org
+* https://api.rubyonrails.org
 
 Bug reports for the Ruby on Rails project can be filed here:
 

data/lib/action_mailer/base.rb

@@ -408,7 +408,7 @@ module ActionMailer
   #     really useful if you need to validate a self-signed and/or a wildcard certificate. You can use the name
   #     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>:ssl/:tls</tt> Enables the SMTP connection to use SMTP/TLS (SMTPS: SMTP over direct TLS connection)
   #
   # * <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>.
@@ -944,9 +944,9 @@ module ActionMailer
         assignable.each { |k, v| message[k] = v }
       end
 
-      def collect_responses(headers)
+      def collect_responses(headers, &block)
         if block_given?
-          collect_responses_from_block(headers, &Proc.new)
+          collect_responses_from_block(headers, &block)
         elsif headers[:body]
           collect_responses_from_text(headers)
         else
@@ -973,10 +973,10 @@ module ActionMailer
         templates_name = headers[:template_name] || action_name
 
         each_template(Array(templates_path), templates_name).map do |template|
-          self.formats = [template.format]
+          format = template.format || self.formats.first
           {
-            body: render(template: template),
-            content_type: template.type.to_s
+            body: render(template: template, formats: [format]),
+            content_type: Mime[format].to_s
           }
         end
       end

data/lib/action_mailer/gem_version.rb

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

data/lib/action_mailer/test_helper.rb

@@ -156,7 +156,8 @@ 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)
+        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.beta3
+  version: 6.0.2.rc2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-13 00:00:00.000000000 Z
+date: 2019-12-09 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.beta3
+        version: 6.0.2.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta3
+        version: 6.0.2.rc2
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta3
+        version: 6.0.2.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta3
+        version: 6.0.2.rc2
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta3
+        version: 6.0.2.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta3
+        version: 6.0.2.rc2
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -118,12 +118,15 @@ files:
 - lib/rails/generators/mailer/mailer_generator.rb
 - lib/rails/generators/mailer/templates/application_mailer.rb.tt
 - lib/rails/generators/mailer/templates/mailer.rb.tt
-homepage: http://rubyonrails.org
+homepage: https://rubyonrails.org
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/rails/rails/tree/v6.0.0.beta3/actionmailer
-  changelog_uri: https://github.com/rails/rails/blob/v6.0.0.beta3/actionmailer/CHANGELOG.md
+  bug_tracker_uri: https://github.com/rails/rails/issues
+  changelog_uri: https://github.com/rails/rails/blob/v6.0.2.rc2/actionmailer/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.0.2.rc2/
+  mailing_list_uri: https://groups.google.com/forum/#!forum/rubyonrails-talk
+  source_code_uri: https://github.com/rails/rails/tree/v6.0.2.rc2/actionmailer
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -140,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements:
 - none
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Email composition and delivery framework (part of Rails).