actionmailer 6.1.4.7 → 6.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65f0a18daa9a4ef90dbcaadac0c0944cf503c001941d6603842f4d27cd06dde3
-  data.tar.gz: c90efc03de1673b7cc9ea38ba1e0f714bc93ff8a83c82ecdbe3da8239adc534a
+  metadata.gz: c9ded5a148624dcd847e1e726b12d51bbb0e100205f2c309f7096852b73b08de
+  data.tar.gz: 28242dad8649b8638397366b74173353e7b8e73b7136dc3958a67e98cce147e2
 SHA512:
-  metadata.gz: 31588eb9aed8ef3e6d856da925685a8797c0962adb4a11c51a1bdc45d698a9bd13ab1dc233cd341817983350abc70c98c07268daef0e79059e937a2447de40a0
-  data.tar.gz: 58fa1ca413c07de1d5f4f6942605155d6a6e8ac62eae0b26f47840f2e56f4b6ddb32aace31f8fea4288e62fa037c1cf81f6f55fb2b89a157f361ed9e06592942
+  metadata.gz: 10965746ce72cc60082071117a7b734e217d5a60da892701dab0001f608c0f9e59df9b38f9b6035ccb6ddc8c177c82353f05ea722c49bb8c94a8e53bc18caa20
+  data.tar.gz: 45a08dcd83bb399edde82af12228fd400b251dbebb9397f7fd2c92e478fa7a3ba927b7a8478c2876af0c67b1060c615feb2618e040cae089c04ee07ec0161c32

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## Rails 6.1.5.1 (April 26, 2022) ##
+
+*   No changes.
+
+
+## Rails 6.1.5 (March 09, 2022) ##
+
+*   No changes.
+
+
 ## Rails 6.1.4.7 (March 08, 2022) ##
 
 *   No changes.

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2020 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"

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.2.
+        is deprecated and will be removed in Rails 7.0.
         Please use MailDeliveryJob instead.
       MSG
     end

data/lib/action_mailer/gem_version.rb

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

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

@@ -150,7 +150,7 @@ module ActionMailer
               @mailer_class.name, @action.to_s, delivery_method.to_s, *@args)
           else
             ActiveSupport::Deprecation.warn(<<~EOM)
-              In Rails 6.2, Action Mailer will pass the mail arguments inside the `:args` keyword argument.
+              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.
 
@@ -171,7 +171,7 @@ module ActionMailer
         parameters.find do |key, name|
           return true if key == :keyreq && name == :args
 
-          key == :keyrest
+          key == :keyrest and name != :**
         end
       end
   end

data/lib/action_mailer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #--
-# Copyright (c) 2004-2020 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionmailer
 version: !ruby/object:Gem::Version
-  version: 6.1.4.7
+  version: 6.1.6
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-08 00:00:00.000000000 Z
+date: 2022-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.7
+        version: 6.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.7
+        version: 6.1.6
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.7
+        version: 6.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.7
+        version: 6.1.6
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.7
+        version: 6.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.7
+        version: 6.1.6
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.7
+        version: 6.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.7
+        version: 6.1.6
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -120,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
@@ -137,10 +138,11 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v6.1.4.7/actionmailer/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.1.4.7/
+  changelog_uri: https://github.com/rails/rails/blob/v6.1.6/actionmailer/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.1.6/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.1.4.7/actionmailer
+  source_code_uri: https://github.com/rails/rails/tree/v6.1.6/actionmailer
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -157,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Email composition and delivery framework (part of Rails).