actionmailer 4.2.2 → 4.2.3.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d08a4fe32d63b5a869ea297764da9602ab7458ed
-  data.tar.gz: 39cad5a3b22679e1f4aaf4d8fc0bdf2add1bdad5
+  metadata.gz: 95bf7d98e9eb4f7a05005ed8a79df1146b4635da
+  data.tar.gz: 1b6bb805060606d3c9244053f27322ffe0029694
 SHA512:
-  metadata.gz: 24d81aadc8b3cd36e858bd0363eaf678641857742ea2445af9d4e7b5910a372146373b963c4c2fc68f133653cb66ebeeb2701e8a6ba19c2dee059a77164688ab
-  data.tar.gz: 50dd088ffc5d768888c1a03606e57cd7205bca74a7905e4e88299127357e19e68a78a46a1dc6df66ca4aac7e1b26a55af6a7c77dbb8c4183c2f6a1d1021f1974
+  metadata.gz: 64f27b1b83e064be1be380014cdf11937b82ac0adc533729cb1d37a698f413fee2f7bef889ff8df28e6eba445c2a1937af28100b007f971b5ab49c5765b0e30c
+  data.tar.gz: d5ad4425863bdfa83f624aac4199199ff3e1ac272a140afa70a20fa68c8fa20663777b51a6f80a1da708a843f6823dd97d1067747b543eb7f7fad6e87ca9f7cc

data/CHANGELOG.md

@@ -1,11 +1,35 @@
+## Rails 4.2.3 (June 22, 2015) ##
+
+*   `assert_emails` in block form use the given number as expected value.
+    This makes the error message much easier to understand.
+
+    *Yuji Yaginuma*
+
+*   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.2.2 (June 16, 2015) ##
 
 * No Changes *
 
 
-## Rails 4.2.1 (March 19, 2014) ##
+## Rails 4.2.1 (March 19, 2015) ##
 
-* No changes *
+* No Changes *
 
 
 ## Rails 4.2.0 (December 20, 2014) ##

data/lib/action_mailer.rb

@@ -40,6 +40,7 @@ module ActionMailer
 
   autoload :Base
   autoload :DeliveryMethods
+  autoload :InlinePreviewInterceptor
   autoload :MailHelper
   autoload :Preview
   autoload :Previews, 'action_mailer/preview'

data/lib/action_mailer/base.rb

@@ -381,8 +381,8 @@ module ActionMailer
   #   * <tt>:password</tt> - If your mail server requires authentication, set the password in this setting.
   #   * <tt>:authentication</tt> - If your mail server requires authentication, you need to specify the
   #     authentication type here.
-  #     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
+  #     This is a symbol and one of <tt>:plain</tt> (will send the password Base64 encoded), <tt>:login</tt> (will
+  #     send the 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> - Detects if STARTTLS is enabled in your SMTP server and starts
   #     to use it. Defaults to <tt>true</tt>.
@@ -600,6 +600,7 @@ module ActionMailer
 
     class NullMail #:nodoc:
       def body; '' end
+      def header; {} end
 
       def respond_to?(string, include_all=false)
         true

data/lib/action_mailer/gem_version.rb

@@ -7,8 +7,8 @@ module ActionMailer
   module VERSION
     MAJOR = 4
     MINOR = 2
-    TINY  = 2
-    PRE   = nil
+    TINY  = 3
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/action_mailer/inline_preview_interceptor.rb

@@ -0,0 +1,61 @@
+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

data/lib/action_mailer/test_helper.rb

@@ -30,7 +30,7 @@ module ActionMailer
         original_count = ActionMailer::Base.deliveries.size
         yield
         new_count = ActionMailer::Base.deliveries.size
-        assert_equal original_count + number, new_count, "#{number} emails expected, but #{new_count - original_count} were sent"
+        assert_equal number, new_count - original_count, "#{number} emails expected, but #{new_count - original_count} were sent"
       else
         assert_equal number, ActionMailer::Base.deliveries.size
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionmailer
 version: !ruby/object:Gem::Version
-  version: 4.2.2
+  version: 4.2.3.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-16 00:00:00.000000000 Z
+date: 2015-06-22 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.2
+        version: 4.2.3.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.2
+        version: 4.2.3.rc1
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.2
+        version: 4.2.3.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.2
+        version: 4.2.3.rc1
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.2
+        version: 4.2.3.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.2
+        version: 4.2.3.rc1
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,7 @@ files:
 - 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
@@ -135,9 +136,9 @@ 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: