actionmailer 4.2.11 → 5.1.0

data/lib/action_mailer/preview.rb

@@ -1,4 +1,4 @@
-require 'active_support/descendants_tracker'
+require "active_support/descendants_tracker"
 
 module ActionMailer
   module Previews #:nodoc:
@@ -21,7 +21,7 @@ module ActionMailer
 
       # :nodoc:
       mattr_accessor :preview_interceptors, instance_writer: false
-      self.preview_interceptors = []
+      self.preview_interceptors = [ActionMailer::InlinePreviewInterceptor]
     end
 
     module ClassMethods
@@ -34,7 +34,8 @@ module ActionMailer
       # 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.
       def register_preview_interceptor(interceptor)
-        preview_interceptor = case interceptor
+        preview_interceptor = \
+          case interceptor
           when String, Symbol
             interceptor.to_s.camelize.constantize
           else
@@ -52,7 +53,7 @@ module ActionMailer
     extend ActiveSupport::DescendantsTracker
 
     class << self
-      # Returns all mailer preview classes
+      # Returns all mailer preview classes.
       def all
         load_previews if descendants.empty?
         descendants
@@ -62,53 +63,53 @@ module ActionMailer
       # 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 = self.new
+        preview = new
         message = preview.public_send(email)
         inform_preview_interceptors(message)
         message
       end
 
-      # Returns all of the available email previews
+      # Returns all of the available email previews.
       def emails
         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 }
+        all.any? { |p| p.preview_name == preview }
       end
 
-      # Find a mailer preview by its underscored class name
+      # Find a mailer preview by its underscored class name.
       def find(preview)
-        all.find{ |p| p.preview_name == preview }
+        all.find { |p| p.preview_name == preview }
       end
 
-      # Returns the underscored name of the mailer preview without the suffix
+      # Returns the underscored name of the mailer preview without the suffix.
       def preview_name
-        name.sub(/Preview$/, '').underscore
+        name.sub(/Preview$/, "").underscore
       end
 
-      protected
-        def load_previews #:nodoc:
+      private
+        def load_previews
           if preview_path
-            Dir["#{preview_path}/**/*_preview.rb"].each{ |file| require_dependency file }
+            Dir["#{preview_path}/**/*_preview.rb"].each { |file| require_dependency file }
           end
         end
 
-        def preview_path #:nodoc:
+        def preview_path
           Base.preview_path
         end
 
-        def show_previews #:nodoc:
+        def show_previews
           Base.show_previews
         end
 
-        def inform_preview_interceptors(message) #:nodoc:
+        def inform_preview_interceptors(message)
           Base.preview_interceptors.each do |interceptor|
             interceptor.previewing_email(message)
           end

data/lib/action_mailer/railtie.rb

@@ -1,4 +1,4 @@
-require 'active_job/railtie'
+require "active_job/railtie"
 require "action_mailer"
 require "rails"
 require "abstract_controller/railties/routes_helpers"
@@ -16,13 +16,19 @@ module ActionMailer
       paths   = app.config.paths
       options = app.config.action_mailer
 
+      if app.config.force_ssl
+        options.default_url_options ||= {}
+        options.default_url_options[:protocol] ||= "https"
+      end
+
       options.assets_dir      ||= paths["public"].first
       options.javascripts_dir ||= paths["public/javascripts"].first
       options.stylesheets_dir ||= paths["public/stylesheets"].first
       options.show_previews = Rails.env.development? if options.show_previews.nil?
+      options.cache_store ||= Rails.cache
 
       if options.show_previews
-        options.preview_path  ||= defined?(Rails.root) ? "#{Rails.root}/test/mailers/previews" : nil
+        options.preview_path ||= defined?(Rails.root) ? "#{Rails.root}/test/mailers/previews" : nil
       end
 
       # make sure readers methods get compiled
@@ -38,15 +44,10 @@ module ActionMailer
         register_preview_interceptors(options.delete(:preview_interceptors))
         register_observers(options.delete(:observers))
 
-        options.each { |k,v| send("#{k}=", v) }
-
-        if options.show_previews
-          app.routes.append do
-            get '/rails/mailers'         => "rails/mailers#index"
-            get '/rails/mailers/*path'   => "rails/mailers#preview"
-          end
-        end
+        options.each { |k, v| send("#{k}=", v) }
       end
+
+      ActiveSupport.on_load(:action_dispatch_integration_test) { include ActionMailer::TestCase::ClearTestDeliveries }
     end
 
     initializer "action_mailer.compile_config_methods" do
@@ -55,9 +56,18 @@ module ActionMailer
       end
     end
 
-    config.after_initialize do
-      if ActionMailer::Base.preview_path
-        ActiveSupport::Dependencies.autoload_paths << ActionMailer::Base.preview_path
+    config.after_initialize do |app|
+      options = app.config.action_mailer
+
+      if options.show_previews
+        app.routes.prepend do
+          get "/rails/mailers"         => "rails/mailers#index", internal: true
+          get "/rails/mailers/*path"   => "rails/mailers#preview", internal: true
+        end
+
+        if options.preview_path
+          ActiveSupport::Dependencies.autoload_paths << options.preview_path
+        end
       end
     end
   end

data/lib/action_mailer/rescuable.rb

@@ -0,0 +1,27 @@
+module ActionMailer #:nodoc:
+  # Provides `rescue_from` for mailers. Wraps mailer action processing,
+  # mail job processing, and mail delivery.
+  module Rescuable
+    extend ActiveSupport::Concern
+    include ActiveSupport::Rescuable
+
+    class_methods do
+      def handle_exception(exception) #:nodoc:
+        rescue_with_handler(exception) || raise(exception)
+      end
+    end
+
+    def handle_exceptions #:nodoc:
+      yield
+    rescue => exception
+      rescue_with_handler(exception) || raise
+    end
+
+    private
+      def process(*)
+        handle_exceptions do
+          super
+        end
+      end
+  end
+end

data/lib/action_mailer/test_case.rb

@@ -1,16 +1,33 @@
-require 'active_support/test_case'
-require 'rails-dom-testing'
+require "active_support/test_case"
+require "rails-dom-testing"
 
 module ActionMailer
   class NonInferrableMailerError < ::StandardError
     def initialize(name)
-      super "Unable to determine the mailer to test from #{name}. " +
-        "You'll need to specify it using tests YourMailer in your " +
+      super "Unable to determine the mailer to test from #{name}. " \
+        "You'll need to specify it using tests YourMailer in your " \
         "test case definition"
     end
   end
 
   class TestCase < ActiveSupport::TestCase
+    module ClearTestDeliveries
+      extend ActiveSupport::Concern
+
+      included do
+        setup :clear_test_deliveries
+        teardown :clear_test_deliveries
+      end
+
+      private
+
+        def clear_test_deliveries
+          if ActionMailer::Base.delivery_method == :test
+            ActionMailer::Base.deliveries.clear
+          end
+        end
+    end
+
     module Behavior
       extend ActiveSupport::Concern
 
@@ -24,6 +41,7 @@ module ActionMailer
         setup :initialize_test_deliveries
         setup :set_expected_mail
         teardown :restore_test_deliveries
+        ActiveSupport.run_load_hooks(:action_mailer_test_case, self)
       end
 
       module ClassMethods
@@ -39,7 +57,7 @@ module ActionMailer
         end
 
         def mailer_class
-          if mailer = self._mailer_class
+          if mailer = _mailer_class
             mailer
           else
             tests determine_default_mailer(name)
@@ -55,7 +73,7 @@ module ActionMailer
         end
       end
 
-      protected
+      private
 
         def initialize_test_deliveries
           set_delivery_method :test
@@ -82,11 +100,9 @@ module ActionMailer
         def set_expected_mail
           @expected = Mail.new
           @expected.content_type ["text", "plain", { "charset" => charset }]
-          @expected.mime_version = '1.0'
+          @expected.mime_version = "1.0"
         end
 
-      private
-
         def charset
           "UTF-8"
         end
@@ -96,7 +112,7 @@ module ActionMailer
         end
 
         def read_fixture(action)
-          IO.readlines(File.join(Rails.root, 'test', 'fixtures', self.class.mailer_class.name.underscore, action))
+          IO.readlines(File.join(Rails.root, "test", "fixtures", self.class.mailer_class.name.underscore, action))
         end
     end
 

data/lib/action_mailer/test_helper.rb

@@ -1,7 +1,11 @@
+require "active_job"
+
 module ActionMailer
   # Provides helper methods for testing Action Mailer, including #assert_emails
-  # and #assert_no_emails
+  # and #assert_no_emails.
   module TestHelper
+    include ActiveJob::TestHelper
+
     # Asserts that the number of emails sent matches the given number.
     #
     #   def test_emails
@@ -36,7 +40,7 @@ module ActionMailer
       end
     end
 
-    # Assert that no emails have been sent.
+    # Asserts that no emails have been sent.
     #
     #   def test_emails
     #     assert_no_emails
@@ -58,5 +62,52 @@ module ActionMailer
     def assert_no_emails(&block)
       assert_emails 0, &block
     end
+
+    # Asserts that the number of emails enqueued for later delivery matches
+    # the given number.
+    #
+    #   def test_emails
+    #     assert_enqueued_emails 0
+    #     ContactMailer.welcome.deliver_later
+    #     assert_enqueued_emails 1
+    #     ContactMailer.welcome.deliver_later
+    #     assert_enqueued_emails 2
+    #   end
+    #
+    # If a block is passed, that block should cause the specified number of
+    # emails to be enqueued.
+    #
+    #   def test_emails_again
+    #     assert_enqueued_emails 1 do
+    #       ContactMailer.welcome.deliver_later
+    #     end
+    #
+    #     assert_enqueued_emails 2 do
+    #       ContactMailer.welcome.deliver_later
+    #       ContactMailer.welcome.deliver_later
+    #     end
+    #   end
+    def assert_enqueued_emails(number, &block)
+      assert_enqueued_jobs number, only: [ ActionMailer::DeliveryJob, ActionMailer::Parameterized::DeliveryJob ], &block
+    end
+
+    # Asserts that no emails are enqueued for later delivery.
+    #
+    #   def test_no_emails
+    #     assert_no_enqueued_emails
+    #     ContactMailer.welcome.deliver_later
+    #     assert_enqueued_emails 1
+    #   end
+    #
+    # If a block is provided, it should not cause any emails to be enqueued.
+    #
+    #   def test_no_emails
+    #     assert_no_enqueued_emails do
+    #       # No emails should be enqueued from this block
+    #     end
+    #   end
+    def assert_no_enqueued_emails(&block)
+      assert_no_enqueued_jobs only: [ ActionMailer::DeliveryJob, ActionMailer::Parameterized::DeliveryJob ], &block
+    end
   end
 end

data/lib/action_mailer/version.rb

@@ -1,4 +1,4 @@
-require_relative 'gem_version'
+require_relative "gem_version"
 
 module ActionMailer
   # Returns the version of the currently loaded Action Mailer as a

data/lib/rails/generators/mailer/USAGE

@@ -11,7 +11,7 @@ Example:
     rails generate mailer Notifications signup forgot_password invoice
 
     creates a Notifications mailer class, views, and test:
-        Mailer:     app/mailers/notifications.rb
-        Views:      app/views/notifications/signup.text.erb [...]
-        Test:       test/mailers/notifications_test.rb
+        Mailer:     app/mailers/notifications_mailer.rb
+        Views:      app/views/notifications_mailer/signup.text.erb [...]
+        Test:       test/mailers/notifications_mailer_test.rb
 

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

@@ -4,16 +4,33 @@ module Rails
       source_root File.expand_path("../templates", __FILE__)
 
       argument :actions, type: :array, default: [], banner: "method method"
-      check_class_collision
+
+      check_class_collision suffix: "Mailer"
 
       def create_mailer_file
-        template "mailer.rb", File.join('app/mailers', class_path, "#{file_name}.rb")
-        if self.behavior == :invoke
-          template "application_mailer.rb", 'app/mailers/application_mailer.rb'
+        template "mailer.rb", File.join("app/mailers", class_path, "#{file_name}_mailer.rb")
+
+        in_root do
+          if behavior == :invoke && !File.exist?(application_mailer_file_name)
+            template "application_mailer.rb", application_mailer_file_name
+          end
         end
       end
 
       hook_for :template_engine, :test_framework
+
+      private
+        def file_name # :doc:
+          @_file_name ||= super.gsub(/_mailer/i, "")
+        end
+
+        def application_mailer_file_name
+          @_application_mailer_file_name ||= if mountable_engine?
+            "app/mailers/#{namespaced_path}/application_mailer.rb"
+          else
+            "app/mailers/application_mailer.rb"
+          end
+        end
     end
   end
 end

data/lib/rails/generators/mailer/templates/application_mailer.rb

@@ -1,4 +1,6 @@
+<% module_namespacing do -%>
 class ApplicationMailer < ActionMailer::Base
-  default from: "from@example.com"
+  default from: 'from@example.com'
   layout 'mailer'
 end
+<% end %>

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

@@ -1,11 +1,11 @@
 <% module_namespacing do -%>
-class <%= class_name %> < ApplicationMailer
+class <%= class_name %>Mailer < ApplicationMailer
 <% actions.each do |action| -%>
 
   # Subject can be set in your I18n file at config/locales/en.yml
   # with the following lookup:
   #
-  #   en.<%= file_path.tr("/",".") %>.<%= action %>.subject
+  #   en.<%= file_path.tr("/",".") %>_mailer.<%= action %>.subject
   #
   def <%= action %>
     @greeting = "Hi"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionmailer
 version: !ruby/object:Gem::Version
-  version: 4.2.11
+  version: 5.1.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-27 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.11
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.11
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.11
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.11
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.11
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.11
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -78,20 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: '2.0'
 description: Email on Rails. Compose, deliver, receive, and test emails using the
   familiar controller/view pattern. First-class support for multipart email and attachments.
 email: david@loudthinking.com
@@ -112,8 +106,10 @@ files:
 - lib/action_mailer/log_subscriber.rb
 - lib/action_mailer/mail_helper.rb
 - lib/action_mailer/message_delivery.rb
+- lib/action_mailer/parameterized.rb
 - lib/action_mailer/preview.rb
 - lib/action_mailer/railtie.rb
+- lib/action_mailer/rescuable.rb
 - lib/action_mailer/test_case.rb
 - lib/action_mailer/test_helper.rb
 - lib/action_mailer/version.rb
@@ -121,7 +117,7 @@ files:
 - lib/rails/generators/mailer/mailer_generator.rb
 - lib/rails/generators/mailer/templates/application_mailer.rb
 - lib/rails/generators/mailer/templates/mailer.rb
-homepage: http://www.rubyonrails.org
+homepage: http://rubyonrails.org
 licenses:
 - MIT
 metadata: {}
@@ -133,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -142,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Email composition, delivery, and receiving framework (part of Rails).