actionmailer 6.1.3.1 → 7.0.0.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e27c45adc95de9eacb6701d33de39f5202e313d4a592236eba043608b720c5a
-  data.tar.gz: 535a8c3f783721eaf22f77053ea2234cfa2af43b6dcbf13ec70a290b3473984e
+  metadata.gz: 6159118c4a22077610712d15bf29827879bafebb249106a91745882e38a45554
+  data.tar.gz: ef51dca707ab5c296f62d4672672d39d439edcd6dd5e9ab4e7308eeb8b969e7d
 SHA512:
-  metadata.gz: 1082cd48c55c4fa2c57fc5f734dbc9045ae36de07c7517da551a80ab7788a3534e9c197e6b184ff84167f637953671bddcfbde1c96fd873103ebd93b01dae11e
-  data.tar.gz: c498ccefdc5c154a6d8f69bd5b01b947b22388c09b201ce1308bcaf53eeef2249d1f9246f484c717142b2372d6fac93e56fa75360f62722f50c96062fe91fc89
+  metadata.gz: 429027df6573b75fba33755ef047db4300dc218b316b12007f525a4448c9f10434c7dbfa42e43f25eb277e1e98ee5fc9cadff7d51730bd821f21a29e4d6777c0
+  data.tar.gz: f4b23b271e150623678ebd7a5208d853d8f2e7ecb5ed9856ed517f9249b5c12820524317f9bb0a4efbe50842c44b6a20a5386d47c25330ed112683cca6fc970c

data/CHANGELOG.md

@@ -1,48 +1,8 @@
-## Rails 6.1.3.1 (March 26, 2021) ##
+## Rails 7.0.0.alpha1 (September 15, 2021) ##
 
-*   No changes.
+*   Configures a default of 5 for both `open_timeout` and `read_timeout` for SMTP Settings.
 
+    *André Luis Leal Cardoso Junior*
 
-## Rails 6.1.3 (February 17, 2021) ##
 
-*   No changes.
-
-
-## Rails 6.1.2.1 (February 10, 2021) ##
-
-*   No changes.
-
-
-## Rails 6.1.2 (February 09, 2021) ##
-
-*   No changes.
-
-
-## Rails 6.1.1 (January 07, 2021) ##
-
-*   Sets default mailer queue to `"default"` in the mail assertions.
-
-    *Paul Keen*
-
-
-## Rails 6.1.0 (December 09, 2020) ##
-
-*   Change default queue name of the deliver (`:mailers`) job to be the job adapter's
-    default (`:default`).
-
-    *Rafael Mendonça França*
-
-*   Remove deprecated `ActionMailer::Base.receive` in favor of [Action Mailbox](https://github.com/rails/rails/tree/master/actionmailbox).
-
-    *Rafael Mendonça França*
-
-*   Fix ActionMailer assertions don't work for parameterized mail with legacy delivery job.
-
-    *bogdanvlviv*
-
-*   Added `email_address_with_name` to properly escape addresses with names.
-
-    *Sunny Ripert*
-
-
-Please check [6-0-stable](https://github.com/rails/rails/blob/6-0-stable/actionmailer/CHANGELOG.md) for previous changes.
+Please check [6-1-stable](https://github.com/rails/rails/blob/6-1-stable/actionmailer/CHANGELOG.md) for previous changes.

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2020 David Heinemeier Hansson
+Copyright (c) 2004-2021 David Heinemeier Hansson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/action_mailer/base.rb

@@ -409,6 +409,8 @@ module ActionMailer
   #     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>:open_timeout</tt> Number of seconds to wait while attempting to open a connection.
+  #   * <tt>:read_timeout</tt> Number of seconds to wait until timing-out a read(2) call.
   #
   # * <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>.
@@ -433,7 +435,7 @@ 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>deliver_later_queue_name</tt> - The name of the queue used with <tt>deliver_later</tt>. Defaults to +mailers+.
+  # * <tt>deliver_later_queue_name</tt> - The name of the queue used with <tt>deliver_later</tt>.
   class Base < AbstractController::Base
     include DeliveryMethods
     include Rescuable
@@ -553,7 +555,7 @@ module ActionMailer
       # through a callback when you call <tt>:deliver</tt> on the <tt>Mail::Message</tt>,
       # calling +deliver_mail+ directly and passing a <tt>Mail::Message</tt> will do
       # nothing except tell the logger you sent the email.
-      def deliver_mail(mail) #:nodoc:
+      def deliver_mail(mail) # :nodoc:
         ActiveSupport::Notifications.instrument("deliver.action_mailer") do |payload|
           set_payload_for_mail(payload, mail)
           yield # Let Mail do the delivery actions
@@ -589,7 +591,7 @@ module ActionMailer
           super
         end
       end
-      ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
+      ruby2_keywords(:method_missing)
 
       def respond_to_missing?(method, include_all = false)
         action_methods.include?(method.to_s) || super
@@ -604,7 +606,7 @@ module ActionMailer
       @_message = Mail.new
     end
 
-    def process(method_name, *args) #:nodoc:
+    def process(method_name, *args) # :nodoc:
       payload = {
         mailer: self.class.name,
         action: method_name,
@@ -617,7 +619,7 @@ module ActionMailer
       end
     end
 
-    class NullMail #:nodoc:
+    class NullMail # :nodoc:
       def body; "" end
       def header; {} end
 
@@ -899,7 +901,7 @@ module ActionMailer
       end
 
       def apply_defaults(headers)
-        default_values = self.class.default.transform_values do |value|
+        default_values = self.class.default.except(*headers.keys).transform_values do |value|
           compute_default(value)
         end
 

data/lib/action_mailer/delivery_job.rb

@@ -15,15 +15,15 @@ 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
 
-    def perform(mailer, mail_method, delivery_method, *args) #:nodoc:
+    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)
+    ruby2_keywords(:perform)
 
     private
       # "Deserialize" the mailer class name by hand in case another argument

data/lib/action_mailer/gem_version.rb

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

data/lib/action_mailer/inline_preview_interceptor.rb

@@ -17,15 +17,15 @@ module ActionMailer
 
     include Base64
 
-    def self.previewing_email(message) #:nodoc:
+    def self.previewing_email(message) # :nodoc:
       new(message).transform!
     end
 
-    def initialize(message) #:nodoc:
+    def initialize(message) # :nodoc:
       @message = message
     end
 
-    def transform! #:nodoc:
+    def transform! # :nodoc:
       return message if html_part.blank?
 
       html_part.body = html_part.decoded.gsub(PATTERN) do |match|

data/lib/action_mailer/message_delivery.rb

@@ -15,7 +15,7 @@ module ActionMailer
   #   Notifier.welcome(User.first).deliver_later # enqueue email delivery as a job through Active Job
   #   Notifier.welcome(User.first).message       # a Mail::Message object
   class MessageDelivery < Delegator
-    def initialize(mailer_class, action, *args) #:nodoc:
+    def initialize(mailer_class, action, *args) # :nodoc:
       @mailer_class, @action, @args = mailer_class, action, args
 
       # The mail is only processed if we try to call any methods on it.
@@ -23,15 +23,15 @@ module ActionMailer
       @processed_mailer = nil
       @mail_message = nil
     end
-    ruby2_keywords(:initialize) if respond_to?(:ruby2_keywords, true)
+    ruby2_keywords(:initialize)
 
     # Method calls are delegated to the Mail::Message that's ready to deliver.
-    def __getobj__ #:nodoc:
+    def __getobj__ # :nodoc:
       @mail_message ||= processed_mailer.message
     end
 
     # Unused except for delegator internals (dup, marshalling).
-    def __setobj__(mail_message) #:nodoc:
+    def __setobj__(mail_message) # :nodoc:
       @mail_message = mail_message
     end
 
@@ -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.
 

data/lib/action_mailer/parameterized.rb

@@ -115,7 +115,7 @@ module ActionMailer
             super
           end
         end
-        ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
+        ruby2_keywords(:method_missing)
 
         def respond_to_missing?(method, include_all = false)
           @mailer.respond_to?(method, include_all)
@@ -126,7 +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)
+      ruby2_keywords(:perform)
     end
 
     class MessageDelivery < ActionMailer::MessageDelivery # :nodoc:
@@ -134,7 +134,7 @@ module ActionMailer
         super(mailer_class, action, *args)
         @params = params
       end
-      ruby2_keywords(:initialize) if respond_to?(:ruby2_keywords, true)
+      ruby2_keywords(:initialize)
 
       private
         def processed_mailer

data/lib/action_mailer/preview.rb

@@ -3,7 +3,7 @@
 require "active_support/descendants_tracker"
 
 module ActionMailer
-  module Previews #:nodoc:
+  module Previews # :nodoc:
     extend ActiveSupport::Concern
 
     included do

data/lib/action_mailer/railtie.rb

@@ -45,6 +45,15 @@ module ActionMailer
           self.delivery_job = delivery_job.constantize
         end
 
+        if smtp_settings = options.delete(:smtp_settings)
+          self.smtp_settings = smtp_settings
+        end
+
+        if smtp_timeout = options.delete(:smtp_timeout)
+          self.smtp_settings[:open_timeout] ||= smtp_timeout
+          self.smtp_settings[:read_timeout] ||= smtp_timeout
+        end
+
         options.each { |k, v| send("#{k}=", v) }
       end
 

data/lib/action_mailer/rescuable.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ActionMailer #:nodoc:
+module ActionMailer # :nodoc:
   # Provides +rescue_from+ for mailers. Wraps mailer action processing,
   # mail job processing, and mail delivery.
   module Rescuable
@@ -8,12 +8,12 @@ module ActionMailer #:nodoc:
     include ActiveSupport::Rescuable
 
     class_methods do
-      def handle_exception(exception) #:nodoc:
+      def handle_exception(exception) # :nodoc:
         rescue_with_handler(exception) || raise(exception)
       end
     end
 
-    def handle_exceptions #:nodoc:
+    def handle_exceptions # :nodoc:
       yield
     rescue => exception
       rescue_with_handler(exception) || raise

data/lib/action_mailer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #--
-# Copyright (c) 2004-2020 David Heinemeier Hansson
+# Copyright (c) 2004-2021 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionmailer
 version: !ruby/object:Gem::Version
-  version: 6.1.3.1
+  version: 7.0.0.alpha1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-26 00:00:00.000000000 Z
+date: 2021-09-15 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.1
+        version: 7.0.0.alpha1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.1
+        version: 7.0.0.alpha1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.1
+        version: 7.0.0.alpha1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.1
+        version: 7.0.0.alpha1
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.1
+        version: 7.0.0.alpha1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.1
+        version: 7.0.0.alpha1
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.1
+        version: 7.0.0.alpha1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.1
+        version: 7.0.0.alpha1
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -137,10 +137,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v6.1.3.1/actionmailer/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.1.3.1/
+  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/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.1.3.1/actionmailer
+  source_code_uri: https://github.com/rails/rails/tree/v7.0.0.alpha1/actionmailer
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -149,15 +149,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Email composition and delivery framework (part of Rails).