actionmailer 4.1.16 → 4.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c18771d664786d54151d54abdc1c3c12a3b9e71f
-  data.tar.gz: ba3ad4d7e614a64f9a94ec8c1e723fdbd35944ff
+  metadata.gz: b645b4249222f8f9158e506e7ce6f9896b94ffb1
+  data.tar.gz: c37159e974453b38edeb571c2a7856520c80bd40
 SHA512:
-  metadata.gz: 391411b6f6e35d8796e46e065108100ebf7be0407d4519d29a4ded1621625a969f518b0d9a35657d7500c4aed21076a058ae72ca8d45a79887d253bca5467507
-  data.tar.gz: 7c0413e4e8fb0952252b01e8dccf3887ea85c17ca22639a07f1c423503a4ad3dd777783c95351ae9c38ecf1c2618aa9e306beb0658cbf5044caa0cfd44805f35
+  metadata.gz: b7be91503097c551664c180a89064411f1a0e0caedcb57568b72a952dbb1ba416e1b0cdb6921caa23eda9cd7cf35cdb7838dfe22e8885805d7bfbe385afbb5e1
+  data.tar.gz: b5f6483b59c93b59c7f290ece2214e96def84c552255f5365b2cf5fe0a02eeb94ace98e024ec223e2f6aaa74dff81d62332dbf1fd85acb2f5cf6fffa23d0eebc

data/CHANGELOG.md

@@ -1,91 +1,8 @@
-## Rails 4.1.16 (July 12, 2016) ##
-
-*   No changes.
-
-
-## Rails 4.1.15 (March 07, 2016) ##
-
-*   No changes.
-
-
-## Rails 4.1.14.2 (February 26, 2016) ##
-
-*   No changes.
-
-
-## Rails 4.1.14.1 (January 25, 2015) ##
-
-*   No changes.
-
-
-## Rails 4.1.14 (November 12, 2015) ##
-
-*   No changes.
-
-
-## Rails 4.1.14.rc1 (October 30, 2015) ##
-
-*   No changes.
-
-
-## Rails 4.1.13 (August 24, 2015) ##
-
-*   No changes.
-
-
-## Rails 4.1.12 (June 25, 2015) ##
-
-*   Mailer preview now uses `url_for` to fix links to emails for apps running on
-    a subdirectory.
-
-    *Remo Mueller*
-
-*   Mailer previews no longer crash when the `mail` method wasn't called
-    (`NullMail`).
-
-    Fixes #19849.
-
-    *Yves Senn*
-
-*   Make sure labels and values line up in mailer previews.
-
-    *Yves Senn*
-
-
-## Rails 4.1.11 (June 16, 2015) ##
-
-*   No changes.
-
-
-## Rails 4.1.10 (March 19, 2015) ##
-
-*   No changes.
-
-
-## Rails 4.1.9 (January 6, 2015) ##
-
-*   No changes.
-
-
-## Rails 4.1.8 (November 16, 2014) ##
-
-*   Attachments can be added while rendering the mail template.
-
-    Fixes #16974.
-
-    *Christian Felder*
-
-## Rails 4.1.7.1 (November 19, 2014) ##
-
-*   No changes.
-
-
-## Rails 4.1.7 (October 29, 2014) ##
-
-*   No changes.
-
-
-## Rails 4.1.6 (September 11, 2014) ##
+*   Added #deliver_later in addition to #deliver, which will enqueue a job to render and
+    deliver the mail instead of delivering it right at that moment. The job is enqueued 
+    using the new Active Job framework in Rails, and will use whatever queue is configured for Rails.
+    
+    *DHH/Abdelkader Boudih/Cristian Bica*
 
 *   Make ActionMailer::Previews methods class methods. Previously they were
     instance methods and ActionMailer tries to render a message when they
@@ -93,6 +10,12 @@
 
     *Cristian Bica*
 
+*   Deprecate `*_path` helpers in email views. When used they generate
+    non-working links and are not the intention of most developers. Instead
+    we recommend to use `*_url` helper.
+
+    *Richard Schneeman*
+
 *   Raise an exception when attachments are added after `mail` was called.
     This is a safeguard to prevent invalid emails.
 
@@ -100,99 +23,20 @@
 
     *Yves Senn*
 
-*   Allow preview interceptors to be registered through
-    `config.action_mailer.preview_interceptors`.
-
-    See #15739.
-
-    *Yves Senn*
-
-
-## Rails 4.1.5 (August 18, 2014) ##
-
-*   No changes.
-
-
-## Rails 4.1.4 (July 2, 2014) ##
-
-*   No changes.
-
-
-## Rails 4.1.3 (July 2, 2014) ##
-
-*   No changes.
-
-
-## Rails 4.1.2 (June 26, 2014) ##
-
-*   No changes.
-
+*   Add `config.action_mailer.show_previews` configuration option.
 
-## Rails 4.1.1 (May 6, 2014) ##
+    This config option can be used to enable the mail preview in environments
+    other than development (such as staging).
 
-*   No changes.
+    Defaults to `true` in development and false elsewhere.
 
+    *Leonard Garvey*
 
-## Rails 4.1.0 (April 8, 2014) ##
-
-*   Support the use of underscored symbols when registering interceptors and
-    observers like we do elsewhere within Rails.
-
-    *Andrew White*
-
-*   Add the ability to intercept emails before previewing in a similar fashion
-    to how emails can be intercepted before delivery.
-
-    Fixes #13622.
-
-    Example:
-
-        class CSSInlineStyler
-          def self.previewing_email(message)
-            # inline CSS styles
-          end
-        end
-
-        ActionMailer::Base.register_preview_interceptor CSSInlineStyler
-
-    *Andrew White*
-
-*   Add mailer previews feature based on 37 Signals mail_view gem.
-
-    *Andrew White*
-
-*   Calling `mail()` without arguments serves as getter for the current mail
-    message and keeps previously set headers.
-
-    Fixes #13090.
-
-    Example:
-
-        class MailerWithCallback < ActionMailer::Base
-          after_action :a_callback
-
-          def welcome
-            mail subject: "subject", to: ["joe@example.com"]
-          end
+*   Allow preview interceptors to be registered through
+    `config.action_mailer.preview_interceptors`.
 
-          def a_callback
-            mail # => returns the current mail message
-          end
-        end
+    See #15739.
 
     *Yves Senn*
 
-*   Instrument the generation of Action Mailer messages. The time it takes to
-    generate a message is written to the log.
-
-    *Daniel Schierbeck*
-
-*   Invoke mailer defaults as procs only if they are procs, do not convert with
-    `to_proc`. That an object is convertible to a proc does not mean it's meant
-    to be always used as a proc.
-
-    Fixes #11533.
-
-    *Alex Tsukernik*
-
-Please check [4-0-stable](https://github.com/rails/rails/blob/4-0-stable/actionmailer/CHANGELOG.md) for previous changes.
+Please check [4-1-stable](https://github.com/rails/rails/blob/4-1-stable/actionmailer/CHANGELOG.md) for previous changes.

data/README.rdoc

@@ -102,7 +102,7 @@ Example:
       )
 
       if email.has_attachments?
-        email.attachments.each do |attachment| 
+        email.attachments.each do |attachment|
           page.attachments.create({
             file: attachment, description: email.subject
           })
@@ -140,7 +140,7 @@ The latest version of Action Mailer can be installed with RubyGems:
 
 Source code can be downloaded as part of the Rails project on GitHub
 
-* https://github.com/rails/rails/tree/4-1-stable/actionmailer
+* https://github.com/rails/rails/tree/master/actionmailer
 
 
 == License
@@ -156,7 +156,11 @@ API documentation is at
 
 * http://api.rubyonrails.org
 
-Bug reports and feature requests can be filed with the rest for the Ruby on Rails project here:
+Bug reports can be filed for the Ruby on Rails project here:
 
 * https://github.com/rails/rails/issues
 
+Feature requests should be discussed on the rails-core mailing list here:
+
+* https://groups.google.com/forum/?fromgroups#!forum/rubyonrails-core
+

data/lib/action_mailer.rb

@@ -40,10 +40,11 @@ module ActionMailer
 
   autoload :Base
   autoload :DeliveryMethods
-  autoload :InlinePreviewInterceptor
   autoload :MailHelper
   autoload :Preview
   autoload :Previews, 'action_mailer/preview'
   autoload :TestCase
   autoload :TestHelper
+  autoload :MessageDelivery
+  autoload :DeliveryJob
 end

data/lib/action_mailer/base.rb

@@ -94,7 +94,7 @@ module ActionMailer
   #   Hi <%= @account.name %>,
   #   Thanks for joining our service! Please check back often.
   #
-  # You can even use Action Pack helpers in these views. For example:
+  # You can even use Action View helpers in these views. For example:
   #
   #   You got a new note!
   #   <%= truncate(@note.body, length: 25) %>
@@ -154,7 +154,7 @@ module ActionMailer
   # * signup_notification.text.erb
   # * signup_notification.html.erb
   # * signup_notification.xml.builder
-  # * signup_notification.yaml.erb
+  # * signup_notification.yml.erb
   #
   # Each would be rendered and added as a separate part to the message, with the corresponding content
   # type. The content type for the entire message is automatically set to <tt>multipart/alternative</tt>,
@@ -301,12 +301,13 @@ module ActionMailer
   #       end
   #   end
   #
-  # Callbacks in ActionMailer are implemented using AbstractController::Callbacks, so you
-  # can define and configure callbacks in the same manner that you would use callbacks in
-  # classes that inherit from ActionController::Base.
+  # Callbacks in Action Mailer are implemented using
+  # <tt>AbstractController::Callbacks</tt>, so you can define and configure
+  # callbacks in the same manner that you would use callbacks in classes that
+  # inherit from <tt>ActionController::Base</tt>.
   #
   # Note that unless you have a specific reason to do so, you should prefer using before_action
-  # rather than after_action in your ActionMailer classes so that headers are parsed properly.
+  # rather than after_action in your Action Mailer classes so that headers are parsed properly.
   #
   # = Previewing emails
   #
@@ -325,7 +326,7 @@ module ActionMailer
   # directory can be configured using the <tt>preview_path</tt> option which has a default
   # of <tt>test/mailers/previews</tt>:
   #
-  #     config.action_mailer.preview_path = "#{Rails.root}/lib/mailer_previews"
+  #   config.action_mailer.preview_path = "#{Rails.root}/lib/mailer_previews"
   #
   # An overview of all previews is accessible at <tt>http://localhost:3000/rails/mailers</tt>
   # on a running development server instance.
@@ -368,8 +369,8 @@ module ActionMailer
   #     This is a symbol and one of <tt>:plain</tt> (will send the password in the clear), <tt>:login</tt> (will
   #     send password Base64 encoded) or <tt>:cram_md5</tt> (combines a Challenge/Response mechanism to exchange
   #     information and a cryptographic Message Digest 5 algorithm to hash important information)
-  #   * <tt>:enable_starttls_auto</tt> - When set to true, detects if STARTTLS is enabled in your SMTP server
-  #     and starts to use it.
+  #   * <tt>:enable_starttls_auto</tt> - Detects if STARTTLS is enabled in your SMTP server and starts
+  #     to use it. Defaults to <tt>true</tt>.
   #   * <tt>:openssl_verify_mode</tt> - When using TLS, you can set how OpenSSL checks the certificate. This is
   #     really useful if you need to validate a self-signed and/or a wildcard certificate. You can use the name
   #     of an OpenSSL verify constant (<tt>'none'</tt>, <tt>'peer'</tt>, <tt>'client_once'</tt>,
@@ -393,7 +394,7 @@ module ActionMailer
   #   implement for a custom delivery agent.
   #
   # * <tt>perform_deliveries</tt> - Determines whether emails are actually sent from Action Mailer when you
-  #   call <tt>.deliver</tt> on an mail message or on an Action Mailer method. This is on by default but can
+  #   call <tt>.deliver</tt> on an email message or on an Action Mailer method. This is on by default but can
   #   be turned off to aid in functional testing.
   #
   # * <tt>deliveries</tt> - Keeps an array of all the emails sent out through the Action Mailer with
@@ -547,8 +548,8 @@ module ActionMailer
       end
 
       def method_missing(method_name, *args) # :nodoc:
-        if respond_to?(method_name)
-          new(method_name, *args).message
+        if action_methods.include?(method_name.to_s)
+          MessageDelivery.new(self, method_name, *args)
         else
           super
         end
@@ -584,7 +585,10 @@ module ActionMailer
 
     class NullMail #:nodoc:
       def body; '' end
-      def header; {} end
+
+      def respond_to?(string, include_all=false)
+        true
+      end
 
       def method_missing(*args)
         nil
@@ -760,6 +764,7 @@ module ActionMailer
     def mail(headers = {}, &block)
       return @_message if @_mail_was_called && headers.blank? && !block
 
+      @_mail_was_called = true
       m = @_message
 
       # At the beginning, do not consider class default for content_type
@@ -787,8 +792,6 @@ module ActionMailer
 
       # Render the templates and blocks
       responses = collect_responses(headers, &block)
-      @_mail_was_called = true
-
       create_parts_from_responses(m, responses)
 
       # Setup content type, reapply charset and handle parts order
@@ -898,6 +901,11 @@ module ActionMailer
       container.add_part(part)
     end
 
+    # Emails do not support relative path links.
+    def self.supports_path?
+      false
+    end
+
     ActiveSupport.run_load_hooks(:action_mailer, self)
   end
 end

data/lib/action_mailer/delivery_job.rb

@@ -0,0 +1,11 @@
+require 'active_job'
+
+module ActionMailer
+  class DeliveryJob < ActiveJob::Base
+    queue_as :mailers
+
+    def perform(mailer, mail_method, delivery_method, *args)
+      mailer.constantize.public_send(mail_method, *args).send(delivery_method)
+    end
+  end
+end

data/lib/action_mailer/gem_version.rb

@@ -6,9 +6,9 @@ module ActionMailer
 
   module VERSION
     MAJOR = 4
-    MINOR = 1
-    TINY  = 16
-    PRE   = nil
+    MINOR = 2
+    TINY  = 0
+    PRE   = "beta1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/action_mailer/log_subscriber.rb

@@ -6,24 +6,27 @@ module ActionMailer
   class LogSubscriber < ActiveSupport::LogSubscriber
     # An email was delivered.
     def deliver(event)
-      return unless logger.info?
-      recipients = Array(event.payload[:to]).join(', ')
-      info("\nSent mail to #{recipients} (#{event.duration.round(1)}ms)")
-      debug(event.payload[:mail])
+      info do
+        recipients = Array(event.payload[:to]).join(', ')
+        "\nSent mail to #{recipients} (#{event.duration.round(1)}ms)"
+      end
+
+      debug { event.payload[:mail] }
     end
 
     # An email was received.
     def receive(event)
-      return unless logger.info?
-      info("\nReceived mail (#{event.duration.round(1)}ms)")
-      debug(event.payload[:mail])
+      info { "\nReceived mail (#{event.duration.round(1)}ms)" }
+      debug { event.payload[:mail] }
     end
 
     # An email was generated.
     def process(event)
-      mailer = event.payload[:mailer]
-      action = event.payload[:action]
-      debug("\n#{mailer}##{action}: processed outbound mail in #{event.duration.round(1)}ms")
+      debug do
+        mailer = event.payload[:mailer]
+        action = event.payload[:action]
+        "\n#{mailer}##{action}: processed outbound mail in #{event.duration.round(1)}ms"
+      end
     end
 
     # Use the logger configured for ActionMailer::Base

data/lib/action_mailer/mail_helper.rb

@@ -11,8 +11,8 @@ module ActionMailer
       }.join("\n\n")
 
       # Make list points stand on their own line
-      formatted.gsub!(/[ ]*([*]+) ([^*]*)/) { |s| "  #{$1} #{$2.strip}\n" }
-      formatted.gsub!(/[ ]*([#]+) ([^#]*)/) { |s| "  #{$1} #{$2.strip}\n" }
+      formatted.gsub!(/[ ]*([*]+) ([^*]*)/) { "  #{$1} #{$2.strip}\n" }
+      formatted.gsub!(/[ ]*([#]+) ([^#]*)/) { "  #{$1} #{$2.strip}\n" }
 
       formatted
     end
@@ -29,7 +29,7 @@ module ActionMailer
 
     # Access the message attachments list.
     def attachments
-      mailer.attachments
+      @_message.attachments
     end
 
     # Returns +text+ wrapped at +len+ columns and indented +indent+ spaces.

data/lib/action_mailer/message_delivery.rb

@@ -0,0 +1,45 @@
+require 'delegate'
+
+module ActionMailer
+  class MessageDelivery < Delegator
+    def initialize(mailer, mail_method, *args)
+      @mailer = mailer
+      @mail_method = mail_method
+      @args = args
+    end
+
+    def __getobj__
+      @obj ||= @mailer.send(:new, @mail_method, *@args).message
+    end
+
+    def __setobj__(obj)
+      @obj = obj
+    end
+
+    def message #:nodoc:
+      __getobj__
+    end
+
+    def deliver_later!(options={})
+      enqueue_delivery :deliver!, options
+    end
+
+    def deliver_later(options={})
+      enqueue_delivery :deliver, options
+    end
+
+    private
+    def enqueue_delivery(delivery_method, options={})
+      args = @mailer.name, @mail_method.to_s, delivery_method.to_s, *@args
+      enqueue_method = :enqueue
+      if options[:at]
+        enqueue_method = :enqueue_at
+        args.unshift options[:at]
+      elsif options[:in]
+        enqueue_method = :enqueue_in
+        args.unshift options[:in]
+      end
+      ActionMailer::DeliveryJob.send enqueue_method, *args
+    end
+  end
+end

data/lib/action_mailer/preview.rb

@@ -11,6 +11,14 @@ module ActionMailer
       #
       mattr_accessor :preview_path, instance_writer: false
 
+      # Enable or disable mailer previews through app configuration:
+      #
+      #     config.action_mailer.show_previews = true
+      #
+      # Defaults to true for development environment
+      #
+      mattr_accessor :show_previews, instance_writer: false
+
       # :nodoc:
       mattr_accessor :preview_interceptors, instance_writer: false
       self.preview_interceptors = []
@@ -96,6 +104,10 @@ module ActionMailer
           Base.preview_path
         end
 
+        def show_previews #:nodoc:
+          Base.show_previews
+        end
+
         def inform_preview_interceptors(message) #:nodoc:
           Base.preview_interceptors.each do |interceptor|
             interceptor.previewing_email(message)

data/lib/action_mailer/railtie.rb

@@ -18,8 +18,9 @@ module ActionMailer
       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?
 
-      if Rails.env.development?
+      if options.show_previews
         options.preview_path  ||= defined?(Rails.root) ? "#{Rails.root}/test/mailers/previews" : nil
       end
 
@@ -29,7 +30,7 @@ module ActionMailer
 
       ActiveSupport.on_load(:action_mailer) do
         include AbstractController::UrlFor
-        extend ::AbstractController::Railties::RoutesHelpers.with(app.routes)
+        extend ::AbstractController::Railties::RoutesHelpers.with(app.routes, false)
         include app.routes.mounted_helpers
 
         register_interceptors(options.delete(:interceptors))
@@ -37,6 +38,13 @@ module ActionMailer
         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
       end
     end
 

data/lib/action_mailer/test_case.rb

@@ -1,4 +1,5 @@
 require 'active_support/test_case'
+require 'rails-dom-testing'
 
 module ActionMailer
   class NonInferrableMailerError < ::StandardError
@@ -15,11 +16,13 @@ module ActionMailer
 
       include ActiveSupport::Testing::ConstantLookup
       include TestHelper
+      include Rails::Dom::Testing::Assertions::SelectorAssertions
 
       included do
         class_attribute :_mailer_class
         setup :initialize_test_deliveries
         setup :set_expected_mail
+        teardown :restore_test_deliveries
       end
 
       module ClassMethods
@@ -54,11 +57,26 @@ module ActionMailer
       protected
 
         def initialize_test_deliveries
-          ActionMailer::Base.delivery_method = :test
+          set_delivery_method :test
+          @old_perform_deliveries = ActionMailer::Base.perform_deliveries
           ActionMailer::Base.perform_deliveries = true
+        end
+
+        def restore_test_deliveries
+          restore_delivery_method
+          ActionMailer::Base.perform_deliveries = @old_perform_deliveries
           ActionMailer::Base.deliveries.clear
         end
 
+        def set_delivery_method(method)
+          @old_delivery_method = ActionMailer::Base.delivery_method
+          ActionMailer::Base.delivery_method = method
+        end
+
+        def restore_delivery_method
+          ActionMailer::Base.delivery_method = @old_delivery_method
+        end
+
         def set_expected_mail
           @expected = Mail.new
           @expected.content_type ["text", "plain", { "charset" => charset }]

data/lib/action_mailer/test_helper.rb

@@ -1,4 +1,6 @@
 module ActionMailer
+  # Provides helper methods for testing Action Mailer, including #assert_emails
+  # and #assert_no_emails
   module TestHelper
     # Asserts that the number of emails sent matches the given number.
     #

data/lib/action_mailer/version.rb

@@ -1,7 +1,8 @@
 require_relative 'gem_version'
 
 module ActionMailer
-  # Returns the version of the currently loaded ActionMailer as a <tt>Gem::Version</tt>
+  # Returns the version of the currently loaded Action Mailer as a
+  # <tt>Gem::Version</tt>.
   def self.version
     gem_version
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionmailer
 version: !ruby/object:Gem::Version
-  version: 4.1.16
+  version: 4.2.0.beta1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.16
+        version: 4.2.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.16
+        version: 4.2.0.beta1
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.16
+        version: 4.2.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.16
+        version: 4.2.0.beta1
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -58,6 +58,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.5.4
+- !ruby/object:Gem::Dependency
+  name: rails-dom-testing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+  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.2
 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
@@ -71,11 +91,12 @@ files:
 - lib/action_mailer.rb
 - lib/action_mailer/base.rb
 - lib/action_mailer/collector.rb
+- lib/action_mailer/delivery_job.rb
 - lib/action_mailer/delivery_methods.rb
 - lib/action_mailer/gem_version.rb
-- lib/action_mailer/inline_preview_interceptor.rb
 - lib/action_mailer/log_subscriber.rb
 - lib/action_mailer/mail_helper.rb
+- lib/action_mailer/message_delivery.rb
 - lib/action_mailer/preview.rb
 - lib/action_mailer/railtie.rb
 - lib/action_mailer/test_case.rb
@@ -99,13 +120,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Email composition, delivery, and receiving framework (part of Rails).

data/lib/action_mailer/inline_preview_interceptor.rb

@@ -1,61 +0,0 @@
-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
-  # when previewing a HTML email in a web browser.
-  #
-  # This interceptor is not enabled by default, to use it just register it like any
-  # other mailer preview interceptor:
-  #
-  #   ActionMailer::Base.register_preview_interceptor(ActionMailer::InlinePreviewInterceptor)
-  #
-  class InlinePreviewInterceptor
-    PATTERN  = /src=(?:"cid:[^"]+"|'cid:[^']+')/i
-
-    include Base64
-
-    def self.previewing_email(message) #:nodoc:
-      new(message).transform!
-    end
-
-    def initialize(message) #:nodoc:
-      @message = message
-    end
-
-    def transform! #:nodoc:
-      return message if html_part.blank?
-
-      html_source.gsub!(PATTERN) do |match|
-        if part = find_part(match[9..-2])
-          %[src="#{data_url(part)}"]
-        else
-          match
-        end
-      end
-
-      message
-    end
-
-    private
-      def message
-        @message
-      end
-
-      def html_part
-        @html_part ||= message.html_part
-      end
-
-      def html_source
-        html_part.body.raw_source
-      end
-
-      def data_url(part)
-        "data:#{part.mime_type};base64,#{strict_encode64(part.body.raw_source)}"
-      end
-
-      def find_part(cid)
-        message.all_parts.find{ |p| p.attachment? && p.cid == cid }
-      end
-  end
-end