actionmailer 6.1.3 → 6.1.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dff58eecd74919db26275b08fe555b549083e3b7208ed343b694abc5a34e3636
-  data.tar.gz: dc813b712639bdf118fade6fa79ace0e3ca84fded560db2435964755da78826e
+  metadata.gz: fc6d1af3d2d417430eed15fedc157ea192044c08f2cf5643e5689f2e93ebbadf
+  data.tar.gz: 8e7a7c900d15dd26122a739edeb2b38a7650f85373a8c79d24e6e1a8c510ae62
 SHA512:
-  metadata.gz: 2d0559f23cc44a48f8aacdda08671f5f407bfca6ed72a5616332133183e3a8b7732766d5f6c1e0350605e4a106e25041b35f3e3e2114b791bf5f0536b3df8cbc
-  data.tar.gz: 9c058e208f7a2e59d802a502722af8a5c9a9ddc7ef9b6d321e9adb90165d128dd2b044089e99efd74832418e5629227a312272b68d73d0ad5f28a956e1660377
+  metadata.gz: 5ec41e9080709c5aa4793e0dc398e122e7f72bd5f1d264d7327376bd76febba683d3d23da98eb12e1ed14306445082ee8970cdcfce16ed745609e0d5b45db29a
+  data.tar.gz: 6be31be632ff6fda81d268d9793dd136bfb109a593aebed34ace3f686763ae723dcbcde277f9c7292e01ceb379aa50537817697ff876129c209d492b67d15385

data/CHANGELOG.md

@@ -1,3 +1,131 @@
+## Rails 6.1.7.10 (October 23, 2024) ##
+
+*   Fix NoMethodError in `block_format` helper
+
+    *Michael Leimstaedtner*
+
+## Rails 6.1.7.9 (October 15, 2024) ##
+
+*   Avoid regex backtracking in `block_format` helper
+
+    [CVE-2024-47889]
+
+
+## Rails 6.1.7.8 (June 04, 2024) ##
+
+*   No changes.
+
+
+## Rails 6.1.7.7 (February 21, 2024) ##
+
+*   No changes.
+
+
+## Rails 6.1.7.6 (August 22, 2023) ##
+
+*   No changes.
+
+
+## Rails 6.1.7.5 (August 22, 2023) ##
+
+*   No changes.
+
+
+## Rails 6.1.7.4 (June 26, 2023) ##
+
+*   No changes.
+
+
+## Rails 6.1.7.3 (March 13, 2023) ##
+
+*   No changes.
+
+
+## Rails 6.1.7.2 (January 24, 2023) ##
+
+*   No changes.
+
+
+## Rails 6.1.7.1 (January 17, 2023) ##
+
+*   No changes.
+
+
+## Rails 6.1.7 (September 09, 2022) ##
+
+*   No changes.
+
+
+## Rails 6.1.6.1 (July 12, 2022) ##
+
+*   No changes.
+
+
+## Rails 6.1.6 (May 09, 2022) ##
+
+*   No changes.
+
+
+## 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.
+
+
+## Rails 6.1.4.6 (February 11, 2022) ##
+
+*   No changes.
+
+
+## Rails 6.1.4.5 (February 11, 2022) ##
+
+*   No changes.
+
+
+## Rails 6.1.4.4 (December 15, 2021) ##
+
+*   No changes.
+
+
+## Rails 6.1.4.3 (December 14, 2021) ##
+
+*   No changes.
+
+
+## Rails 6.1.4.2 (December 14, 2021) ##
+
+*   No changes.
+
+
+## Rails 6.1.4.1 (August 19, 2021) ##
+
+*   No changes.
+
+
+## Rails 6.1.4 (June 24, 2021) ##
+
+*   No changes.
+
+
+## Rails 6.1.3.2 (May 05, 2021) ##
+
+*   No changes.
+
+
+## Rails 6.1.3.1 (March 26, 2021) ##
+
+*   No changes.
+
+
 ## Rails 6.1.3 (February 17, 2021) ##
 
 *   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  = 3
-    PRE   = nil
+    TINY  = 7
+    PRE   = "10"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/action_mailer/mail_helper.rb

@@ -23,10 +23,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/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.3
+  version: 6.1.7.10
 platform: ruby
 authors:
 - David Heinemeier Hansson
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-17 00:00:00.000000000 Z
+date: 2024-10-23 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.3
+        version: 6.1.7.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3
+        version: 6.1.7.10
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3
+        version: 6.1.7.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3
+        version: 6.1.7.10
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3
+        version: 6.1.7.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3
+        version: 6.1.7.10
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3
+        version: 6.1.7.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3
+        version: 6.1.7.10
 - !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,11 +138,12 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v6.1.3/actionmailer/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.1.3/
+  changelog_uri: https://github.com/rails/rails/blob/v6.1.7.10/actionmailer/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.1.7.10/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.1.3/actionmailer
-post_install_message:
+  source_code_uri: https://github.com/rails/rails/tree/v6.1.7.10/actionmailer
+  rubygems_mfa_required: 'true'
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -157,8 +159,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.5.16
+signing_key: 
 specification_version: 4
 summary: Email composition and delivery framework (part of Rails).
 test_files: []