actionmailer 5.2.0.beta2 → 5.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: caf5a14cad136bf17b3373faf34bafbc0d35d680
-  data.tar.gz: bf335d47ef4d4b0ec4a31bb0b6c5de40f6245422
+SHA256:
+  metadata.gz: 0a88ea0f6b0b362379169ff271781d8ebeddd2b2320ccd650456cf9b039d723f
+  data.tar.gz: 06de6dd777fb1a5b5290f286b94144cbee52bdd638a186948ef894eccef9ef69
 SHA512:
-  metadata.gz: 3356f409b6ca28145d42f96ad08b50a98352698521eeda53cb500d5b49b275b993a27a2f92772dc229cc5d608f6c067062055e60808b29398d483af0a802a1a5
-  data.tar.gz: 6efcb181f6cec2b07b3bf5ba390f16386e43159dc8ad8a89d7405aede6fd5a49dec9925c841f3ccc7be7d03330e8a1529109ddfc916cb5cb11bc471d6ff8e7ac
+  metadata.gz: 77b7d2b0524ebd1c6ba755795222dd71255b558b8b9a26c151bdfea1a1b12c7bb3d7e50c765d22b1979256d22c8eaea71c9d85feee9165102b40b2a15b3aaa04
+  data.tar.gz: e04ba76ab9e6d30c334537cb76772b4f8458973b47bf0c87fb9d77d362c5819c557124bf6ed15d44e2c6ade528929ac63af4704851ce9964cd6a16010c6800cf

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## Rails 5.2.0.rc1 (January 30, 2018) ##
+
+*   Bring back proc with arity of 1 in `ActionMailer::Base.default` proc
+    since it was supported in Rails 5.0 but not deprecated.
+
+    *Jimmy Bourassa*
+
+
 ## Rails 5.2.0.beta2 (November 28, 2017) ##
 
 *   No changes.

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2017 David Heinemeier Hansson
+Copyright (c) 2004-2018 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/README.rdoc

@@ -148,7 +148,7 @@ The latest version of Action Mailer can be installed with RubyGems:
 
   $ gem install actionmailer
 
-Source code can be downloaded as part of the Rails project on GitHub
+Source code can be downloaded as part of the Rails project on GitHub:
 
 * https://github.com/rails/rails/tree/master/actionmailer
 
@@ -166,7 +166,7 @@ API documentation is at
 
 * http://api.rubyonrails.org
 
-Bug reports can be filed for the Ruby on Rails project here:
+Bug reports for the Ruby on Rails project can be filed here:
 
 * https://github.com/rails/rails/issues
 

data/lib/action_mailer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #--
-# Copyright (c) 2004-2017 David Heinemeier Hansson
+# Copyright (c) 2004-2018 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

@@ -889,7 +889,7 @@ module ActionMailer
         default_values = self.class.default.map do |key, value|
           [
             key,
-            value.is_a?(Proc) ? instance_exec(&value) : value
+            compute_default(value)
           ]
         end.to_h
 
@@ -898,6 +898,16 @@ module ActionMailer
         headers_with_defaults
       end
 
+      def compute_default(value)
+        return value unless value.is_a?(Proc)
+
+        if value.arity == 1
+          instance_exec(self, &value)
+        else
+          instance_exec(&value)
+        end
+      end
+
       def assign_headers_to_message(message, headers)
         assignable = headers.except(:parts_order, :content_type, :body, :template_name,
                                     :template_path, :delivery_method, :delivery_method_options)

data/lib/action_mailer/gem_version.rb

@@ -10,7 +10,7 @@ module ActionMailer
     MAJOR = 5
     MINOR = 2
     TINY  = 0
-    PRE   = "beta2"
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/action_mailer/inline_preview_interceptor.rb

@@ -4,7 +4,7 @@ require "base64"
 
 module ActionMailer
   # Implements a mailer preview interceptor that converts image tag src attributes
-  # that use inline cid: style urls to data: style urls so that they are visible
+  # that use inline cid: style URLs to data: style URLs so that they are visible
   # when previewing an HTML email in a web browser.
   #
   # This interceptor is enabled by default. To disable it, delete it from the

data/lib/action_mailer/message_delivery.rb

@@ -53,6 +53,12 @@ module ActionMailer
     #   Notifier.welcome(User.first).deliver_later!(wait: 1.hour)
     #   Notifier.welcome(User.first).deliver_later!(wait_until: 10.hours.from_now)
     #
+    # Options:
+    #
+    # * <tt>:wait</tt> - Enqueue the email to be delivered with a delay
+    # * <tt>:wait_until</tt> - Enqueue the email to be delivered at (after) a specific date / time
+    # * <tt>:queue</tt> - Enqueue the email on the specified queue
+    #
     # By default, the email will be enqueued using <tt>ActionMailer::DeliveryJob</tt>. Each
     # <tt>ActionMailer::Base</tt> class can specify the job to use by setting the class variable
     # +delivery_job+.
@@ -60,12 +66,6 @@ module ActionMailer
     #   class AccountRegistrationMailer < ApplicationMailer
     #     self.delivery_job = RegistrationDeliveryJob
     #   end
-    #
-    # Options:
-    #
-    # * <tt>:wait</tt> - Enqueue the email to be delivered with a delay
-    # * <tt>:wait_until</tt> - Enqueue the email to be delivered at (after) a specific date / time
-    # * <tt>:queue</tt> - Enqueue the email on the specified queue
     def deliver_later!(options = {})
       enqueue_delivery :deliver_now!, options
     end
@@ -77,6 +77,12 @@ module ActionMailer
     #   Notifier.welcome(User.first).deliver_later(wait: 1.hour)
     #   Notifier.welcome(User.first).deliver_later(wait_until: 10.hours.from_now)
     #
+    # Options:
+    #
+    # * <tt>:wait</tt> - Enqueue the email to be delivered with a delay.
+    # * <tt>:wait_until</tt> - Enqueue the email to be delivered at (after) a specific date / time.
+    # * <tt>:queue</tt> - Enqueue the email on the specified queue.
+    #
     # By default, the email will be enqueued using <tt>ActionMailer::DeliveryJob</tt>. Each
     # <tt>ActionMailer::Base</tt> class can specify the job to use by setting the class variable
     # +delivery_job+.
@@ -84,12 +90,6 @@ module ActionMailer
     #   class AccountRegistrationMailer < ApplicationMailer
     #     self.delivery_job = RegistrationDeliveryJob
     #   end
-    #
-    # Options:
-    #
-    # * <tt>:wait</tt> - Enqueue the email to be delivered with a delay.
-    # * <tt>:wait_until</tt> - Enqueue the email to be delivered at (after) a specific date / time.
-    # * <tt>:queue</tt> - Enqueue the email on the specified queue.
     def deliver_later(options = {})
       enqueue_delivery :deliver_now, options
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionmailer
 version: !ruby/object:Gem::Version
-  version: 5.2.0.beta2
+  version: 5.2.0.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-28 00:00:00.000000000 Z
+date: 2018-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.0.beta2
+        version: 5.2.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.0.beta2
+        version: 5.2.0.rc1
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.0.beta2
+        version: 5.2.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.0.beta2
+        version: 5.2.0.rc1
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.0.beta2
+        version: 5.2.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.0.beta2
+        version: 5.2.0.rc1
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -121,8 +121,8 @@ homepage: http://rubyonrails.org
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/rails/rails/tree/v5.2.0.beta2/actionmailer
-  changelog_uri: https://github.com/rails/rails/blob/v5.2.0.beta2/actionmailer/CHANGELOG.md
+  source_code_uri: https://github.com/rails/rails/tree/v5.2.0.rc1/actionmailer
+  changelog_uri: https://github.com/rails/rails/blob/v5.2.0.rc1/actionmailer/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Email composition, delivery, and receiving framework (part of Rails).