actionmailer 5.1.7 → 5.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 21d21b354f74e3ca7d2d44ea80b3ec3221492de57b82c75b252d86425a972da8
-  data.tar.gz: 00f576ea551426f15e90f47d96468392d85c9e57174c8e7c22ae3063cc9d3fbd
+SHA1:
+  metadata.gz: e523eb4e2f1d78411521778e43eb15a8f245c788
+  data.tar.gz: 7a626ca99f22910610d817b7877583c593e5d688
 SHA512:
-  metadata.gz: 8fb5b0ca3159ed45665cb074ef6a775b8ffbb310242a377fe8544749c63ea18a4d0b6d4bb21f6a977d60cf2e5f7f83da9f91ae2b0544c5f0d8032052941238d4
-  data.tar.gz: 06d4102be2bae8addf1b635e6d4cc13e171a61d125a244000b1fcb6309a7be0699cb31b628f461441b53bab84eabddcb5e662d0060125ac8d88f003d09f9689b
+  metadata.gz: 868c9832b7aecbba7008c4d46faefcdf02ac5f59e6d6ce8b02a5ed114c73afc587c8e685190f21a1f8cad4fb1d11757516162f60668720a1171c714382333cf6
+  data.tar.gz: a106e88fe583fb203f7fbddc61ea97e689b2cb93c7982610e01d3f0a3d8b397226f4d6ddcd99ccb44b579bff76e8c9501c7d64caf86cf2f2d310ac43f717f7a3

data/CHANGELOG.md

@@ -1,101 +1,22 @@
-## Rails 5.1.7 (March 27, 2019) ##
+## Rails 5.2.0.beta1 (November 27, 2017) ##
 
-*   No changes.
+*   Add `assert_enqueued_email_with` test helper.
 
+        assert_enqueued_email_with ContactMailer, :welcome do
+          ContactMailer.welcome.deliver_later
+        end
 
-## Rails 5.1.6.2 (March 11, 2019) ##
-
-*   No changes.
-
-
-## Rails 5.1.6.1 (November 27, 2018) ##
-
-*   No changes.
-
-
-## Rails 5.1.6 (March 29, 2018) ##
-
-*   No changes.
-
-
-## Rails 5.1.5 (February 14, 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.1.4 (September 07, 2017) ##
-
-*   No changes.
-
-
-## Rails 5.1.4.rc1 (August 24, 2017) ##
-
-*   No changes.
-
-
-## Rails 5.1.3 (August 03, 2017) ##
-
-*   No changes.
-
-
-## Rails 5.1.3.rc3 (July 31, 2017) ##
-
-*   No changes.
-
-
-## Rails 5.1.3.rc2 (July 25, 2017) ##
-
-*   No changes.
-
-
-## Rails 5.1.3.rc1 (July 19, 2017) ##
-
-*   No changes.
-
-
-## Rails 5.1.2 (June 26, 2017) ##
-
-*   No changes.
-
-
-## Rails 5.1.1 (May 12, 2017) ##
-
-*   No changes.
-
-
-## Rails 5.1.0 (April 27, 2017) ##
-
-*   Add `:args` to `process.action_mailer` event.
-
-    *Yuji Yaginuma*
-
-*   Add parameterized invocation of mailers as a way to share before filters and defaults between actions.
-    See `ActionMailer::Parameterized` for a full example of the benefit.
-
-    *DHH*
-
-*   Allow lambdas to be used as lazy defaults in addition to procs.
-
-    *DHH*
+    *Mikkel Malmberg*
 
-*   Mime type: allow to custom content type when setting body in headers
-    and attachments.
+*   Allow Action Mailer classes to configure their delivery job.
 
-    Example:
+        class MyMailer < ApplicationMailer
+          self.delivery_job = MyCustomDeliveryJob
 
-        def test_emails
-          attachments["invoice.pdf"] = "This is test File content"
-          mail(body: "Hello there", content_type: "text/html")
+          ...
         end
 
-    *Minh Quy*
-
-*   Exception handling: use `rescue_from` to handle exceptions raised by
-    mailer actions, by message delivery, and by deferred delivery jobs.
+    *Matthew Mongeau*
 
-    *Jeremy Daer*
 
-Please check [5-0-stable](https://github.com/rails/rails/blob/5-0-stable/actionmailer/CHANGELOG.md) for previous changes.
+Please check [5-1-stable](https://github.com/rails/rails/blob/5-1-stable/actionmailer/CHANGELOG.md) for previous changes.

data/README.rdoc

@@ -157,7 +157,7 @@ Source code can be downloaded as part of the Rails project on GitHub
 
 Action Mailer is released under the MIT license:
 
-* http://www.opensource.org/licenses/MIT
+* https://opensource.org/licenses/MIT
 
 
 == Support

data/lib/action_mailer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # Copyright (c) 2004-2017 David Heinemeier Hansson
 #

data/lib/action_mailer/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "mail"
 require "action_mailer/collector"
 require "active_support/core_ext/string/inflections"
@@ -57,7 +59,7 @@ module ActionMailer
   # The hash passed to the mail method allows you to specify any header that a <tt>Mail::Message</tt>
   # will accept (any valid email header including optional fields).
   #
-  # The mail method, if not passed a block, will inspect your views and send all the views with
+  # The +mail+ method, if not passed a block, will inspect your views and send all the views with
   # the same name as the method, so the above action would send the +welcome.text.erb+ view
   # file as well as the +welcome.html.erb+ view file in a +multipart/alternative+ email.
   #
@@ -136,7 +138,7 @@ module ActionMailer
   # You can also define a <tt>default_url_options</tt> method on individual mailers to override these
   # default settings per-mailer.
   #
-  # By default when <tt>config.force_ssl</tt> is true, URLs generated for hosts will use the HTTPS protocol.
+  # By default when <tt>config.force_ssl</tt> is +true+, URLs generated for hosts will use the HTTPS protocol.
   #
   # = Sending mail
   #
@@ -314,7 +316,7 @@ module ActionMailer
   #
   # = Callbacks
   #
-  # You can specify callbacks using before_action and after_action for configuring your messages.
+  # You can specify callbacks using <tt>before_action</tt> and <tt>after_action</tt> for configuring your messages.
   # This may be useful, for example, when you want to add default inline attachments for all
   # messages sent out by a certain mailer class:
   #
@@ -459,8 +461,8 @@ module ActionMailer
 
     helper ActionMailer::MailHelper
 
-    class_attribute :default_params
-    self.default_params = {
+    class_attribute :delivery_job, default: ::ActionMailer::DeliveryJob
+    class_attribute :default_params, default: {
       mime_version: "1.0",
       charset:      "UTF-8",
       content_type: "text/plain",
@@ -588,10 +590,6 @@ module ActionMailer
 
     attr_internal :message
 
-    # Instantiate a new mailer object. If +method_name+ is not +nil+, the mailer
-    # will be initialized according to the named method. If not, the mailer will
-    # remain uninitialized (useful when you only need to invoke the "receive"
-    # method, for instance).
     def initialize
       super()
       @_mail_was_called = false
@@ -891,7 +889,7 @@ module ActionMailer
         default_values = self.class.default.map do |key, value|
           [
             key,
-            compute_default(value)
+            value.is_a?(Proc) ? instance_exec(&value) : value
           ]
         end.to_h
 
@@ -900,16 +898,6 @@ 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/collector.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "abstract_controller/collector"
 require "active_support/core_ext/hash/reverse_merge"
 require "active_support/core_ext/array/extract_options"

data/lib/action_mailer/delivery_job.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_job"
 
 module ActionMailer

data/lib/action_mailer/delivery_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "tmpdir"
 
 module ActionMailer
@@ -7,20 +9,13 @@ module ActionMailer
     extend ActiveSupport::Concern
 
     included do
-      class_attribute :delivery_methods, :delivery_method
-
       # Do not make this inheritable, because we always want it to propagate
-      cattr_accessor :raise_delivery_errors
-      self.raise_delivery_errors = true
-
-      cattr_accessor :perform_deliveries
-      self.perform_deliveries = true
-
-      cattr_accessor :deliver_later_queue_name
-      self.deliver_later_queue_name = :mailers
+      cattr_accessor :raise_delivery_errors, default: true
+      cattr_accessor :perform_deliveries, default: true
+      cattr_accessor :deliver_later_queue_name, default: :mailers
 
-      self.delivery_methods = {}.freeze
-      self.delivery_method  = :smtp
+      class_attribute :delivery_methods, default: {}.freeze
+      class_attribute :delivery_method, default: :smtp
 
       add_delivery_method :smtp, Mail::SMTP,
         address:              "localhost",

data/lib/action_mailer/gem_version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionMailer
   # Returns the version of the currently loaded Action Mailer as a <tt>Gem::Version</tt>.
   def self.gem_version
@@ -6,9 +8,9 @@ module ActionMailer
 
   module VERSION
     MAJOR = 5
-    MINOR = 1
-    TINY  = 7
-    PRE   = nil
+    MINOR = 2
+    TINY  = 0
+    PRE   = "beta1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/action_mailer/inline_preview_interceptor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "base64"
 
 module ActionMailer

data/lib/action_mailer/log_subscriber.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/log_subscriber"
 
 module ActionMailer

data/lib/action_mailer/mail_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionMailer
   # Provides helper methods for ActionMailer::Base that can be used for easily
   # formatting messages, accessing mailer or message instances, and the

data/lib/action_mailer/message_delivery.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require "delegate"
 
 module ActionMailer
   # The <tt>ActionMailer::MessageDelivery</tt> class is used by
-  # <tt>ActionMailer::Base</tt> when creating a new mailer.
+  # ActionMailer::Base when creating a new mailer.
   # <tt>MessageDelivery</tt> is a wrapper (+Delegator+ subclass) around a lazy
   # created <tt>Mail::Message</tt>. You can get direct access to the
   # <tt>Mail::Message</tt>, deliver the email or schedule the email to be sent
@@ -51,6 +53,14 @@ module ActionMailer
     #   Notifier.welcome(User.first).deliver_later!(wait: 1.hour)
     #   Notifier.welcome(User.first).deliver_later!(wait_until: 10.hours.from_now)
     #
+    # 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+.
+    #
+    #   class AccountRegistrationMailer < ApplicationMailer
+    #     self.delivery_job = RegistrationDeliveryJob
+    #   end
+    #
     # Options:
     #
     # * <tt>:wait</tt> - Enqueue the email to be delivered with a delay
@@ -67,6 +77,14 @@ module ActionMailer
     #   Notifier.welcome(User.first).deliver_later(wait: 1.hour)
     #   Notifier.welcome(User.first).deliver_later(wait_until: 10.hours.from_now)
     #
+    # 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+.
+    #
+    #   class AccountRegistrationMailer < ApplicationMailer
+    #     self.delivery_job = RegistrationDeliveryJob
+    #   end
+    #
     # Options:
     #
     # * <tt>:wait</tt> - Enqueue the email to be delivered with a delay.
@@ -118,7 +136,8 @@ module ActionMailer
             "method*, or 3. use a custom Active Job instead of #deliver_later."
         else
           args = @mailer_class.name, @action.to_s, delivery_method.to_s, *@args
-          ::ActionMailer::DeliveryJob.set(options).perform_later(*args)
+          job = @mailer_class.delivery_job
+          job.set(options).perform_later(*args)
         end
       end
   end

data/lib/action_mailer/parameterized.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionMailer
   # Provides the option to parameterize mailers in order to share instance variable
   # setup, processing, and common headers.

data/lib/action_mailer/preview.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/descendants_tracker"
 
 module ActionMailer
@@ -15,13 +17,12 @@ module ActionMailer
       #
       #     config.action_mailer.show_previews = true
       #
-      # Defaults to true for development environment
+      # Defaults to +true+ for development environment
       #
       mattr_accessor :show_previews, instance_writer: false
 
       # :nodoc:
-      mattr_accessor :preview_interceptors, instance_writer: false
-      self.preview_interceptors = [ActionMailer::InlinePreviewInterceptor]
+      mattr_accessor :preview_interceptors, instance_writer: false, default: [ActionMailer::InlinePreviewInterceptor]
     end
 
     module ClassMethods
@@ -32,7 +33,7 @@ module ActionMailer
 
       # Register an Interceptor which will be called before mail is previewed.
       # Either a class or a string can be passed in as the Interceptor. If a
-      # string is passed in it will be <tt>constantize</tt>d.
+      # string is passed in it will be constantized.
       def register_preview_interceptor(interceptor)
         preview_interceptor = \
           case interceptor
@@ -52,6 +53,12 @@ module ActionMailer
   class Preview
     extend ActiveSupport::DescendantsTracker
 
+    attr_reader :params
+
+    def initialize(params = {})
+      @params = params
+    end
+
     class << self
       # Returns all mailer preview classes.
       def all
@@ -62,8 +69,8 @@ module ActionMailer
       # Returns the mail object for the given email name. The registered preview
       # interceptors will be informed so that they can transform the message
       # as they would if the mail was actually being delivered.
-      def call(email)
-        preview = new
+      def call(email, params = {})
+        preview = new(params)
         message = preview.public_send(email)
         inform_preview_interceptors(message)
         message
@@ -74,12 +81,12 @@ module ActionMailer
         public_instance_methods(false).map(&:to_s).sort
       end
 
-      # Returns true if the email exists.
+      # Returns +true+ if the email exists.
       def email_exists?(email)
         emails.include?(email)
       end
 
-      # Returns true if the preview exists.
+      # Returns +true+ if the preview exists.
       def exists?(preview)
         all.any? { |p| p.preview_name == preview }
       end
@@ -97,7 +104,7 @@ module ActionMailer
       private
         def load_previews
           if preview_path
-            Dir["#{preview_path}/**/*_preview.rb"].each { |file| require_dependency file }
+            Dir["#{preview_path}/**/*_preview.rb"].sort.each { |file| require_dependency file }
           end
         end
 

data/lib/action_mailer/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_job/railtie"
 require "action_mailer"
 require "rails"
@@ -56,6 +58,12 @@ module ActionMailer
       end
     end
 
+    initializer "action_mailer.eager_load_actions" do
+      ActiveSupport.on_load(:after_initialize) do
+        ActionMailer::Base.descendants.each(&:action_methods) if config.eager_load
+      end
+    end
+
     config.after_initialize do |app|
       options = app.config.action_mailer
 

data/lib/action_mailer/rescuable.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module ActionMailer #:nodoc:
-  # Provides `rescue_from` for mailers. Wraps mailer action processing,
+  # Provides +rescue_from+ for mailers. Wraps mailer action processing,
   # mail job processing, and mail delivery.
   module Rescuable
     extend ActiveSupport::Concern

data/lib/action_mailer/test_case.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/test_case"
 require "rails-dom-testing"
 

data/lib/action_mailer/test_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_job"
 
 module ActionMailer
@@ -91,6 +93,48 @@ module ActionMailer
       assert_enqueued_jobs number, only: [ ActionMailer::DeliveryJob, ActionMailer::Parameterized::DeliveryJob ], &block
     end
 
+    # Asserts that a specific email has been enqueued, optionally
+    # matching arguments.
+    #
+    #   def test_email
+    #     ContactMailer.welcome.deliver_later
+    #     assert_enqueued_email_with ContactMailer, :welcome
+    #   end
+    #
+    #   def test_email_with_arguments
+    #     ContactMailer.welcome("Hello", "Goodbye").deliver_later
+    #     assert_enqueued_email_with ContactMailer, :welcome, args: ["Hello", "Goodbye"]
+    #   end
+    #
+    # If a block is passed, that block should cause the specified email
+    # to be enqueued.
+    #
+    #   def test_email_in_block
+    #     assert_enqueued_email_with ContactMailer, :welcome do
+    #       ContactMailer.welcome.deliver_later
+    #     end
+    #   end
+    #
+    # If `args` is provided as a Hash, a parameterized email is matched.
+    #
+    #   def test_parameterized_email
+    #     assert_enqueued_email_with ContactMailer, :welcome,
+    #       args: {email: 'user@example.com} do
+    #       ContactMailer.with(email: 'user@example.com').welcome.deliver_later
+    #     end
+    #   end
+    def assert_enqueued_email_with(mailer, method, args: nil, queue: "mailers", &block)
+      if args.is_a? Hash
+        job = ActionMailer::Parameterized::DeliveryJob
+        args = [mailer.to_s, method.to_s, "deliver_now", args]
+      else
+        job = ActionMailer::DeliveryJob
+        args = [mailer.to_s, method.to_s, "deliver_now", *args]
+      end
+
+      assert_enqueued_with(job: job, args: args, queue: queue, &block)
+    end
+
     # Asserts that no emails are enqueued for later delivery.
     #
     #   def test_no_emails

data/lib/action_mailer/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "gem_version"
 
 module ActionMailer

data/lib/rails/generators/mailer/mailer_generator.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Rails
   module Generators
     class MailerGenerator < NamedBase
-      source_root File.expand_path("../templates", __FILE__)
+      source_root File.expand_path("templates", __dir__)
 
       argument :actions, type: :array, default: [], banner: "method method"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionmailer
 version: !ruby/object:Gem::Version
-  version: 5.1.7
+  version: 5.2.0.beta1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-28 00:00:00.000000000 Z
+date: 2017-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.7
+        version: 5.2.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.7
+        version: 5.2.0.beta1
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.7
+        version: 5.2.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.7
+        version: 5.2.0.beta1
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.7
+        version: 5.2.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.7
+        version: 5.2.0.beta1
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -115,14 +115,14 @@ files:
 - lib/action_mailer/version.rb
 - lib/rails/generators/mailer/USAGE
 - lib/rails/generators/mailer/mailer_generator.rb
-- lib/rails/generators/mailer/templates/application_mailer.rb
-- lib/rails/generators/mailer/templates/mailer.rb
+- lib/rails/generators/mailer/templates/application_mailer.rb.tt
+- lib/rails/generators/mailer/templates/mailer.rb.tt
 homepage: http://rubyonrails.org
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/rails/rails/tree/v5.1.7/actionmailer
-  changelog_uri: https://github.com/rails/rails/blob/v5.1.7/actionmailer/CHANGELOG.md
+  source_code_uri: https://github.com/rails/rails/tree/v5.2.0.beta1/actionmailer
+  changelog_uri: https://github.com/rails/rails/blob/v5.2.0.beta1/actionmailer/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -134,12 +134,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Email composition, delivery, and receiving framework (part of Rails).