actionmailer 4.1.11 → 4.1.12.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e6fd941b2ff67ad1fe2b1f670424ff7f9081134
-  data.tar.gz: 09dd5d871c8471413c6c1109cad4e79c48e6ea9b
+  metadata.gz: e024105b8752861f2d87e2aa0e463696f57d7382
+  data.tar.gz: cc9209a06c0b79c7a17d130823cacbc5909f9213
 SHA512:
-  metadata.gz: b5a3d8cd8e5cb995fa7c31b85ed7d62e790d834de248ef750e0c6d81e75ffc0daba1baf947109ed51db2cb006207e5ed166ef9d6cba19fc17cdbef80161d5e03
-  data.tar.gz: fd16829c63b0261c5c18554652905c6de4ee415534696f3989a8f98b081ef12e950cfbf06754f1865c71cd6b9b98042c52ec5a5485e9b88ac236ddc1fef71e77
+  metadata.gz: 642b24fcb08493533d566d97fb890c89ddb8c4bbaecc5dd6492824472fcfa05ccd5069f0b355a699a1c4da8dc6bb0bb6bf6dfdb8f77b109f35cb05c2b91230c9
+  data.tar.gz: e561a910d0d51c68a4ec1eaeb57e04eb273bd5fbf12c1e72350cb6c01a629f7e08c6bcca24cdb5c74c57a8456cd40595b2ff0c73183eb28457699eff5428e8d0

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## Rails 4.1.12 (June 22, 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.

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

@@ -584,6 +584,7 @@ module ActionMailer
 
     class NullMail #:nodoc:
       def body; '' end
+      def header; {} end
 
       def method_missing(*args)
         nil

data/lib/action_mailer/gem_version.rb

@@ -7,8 +7,8 @@ module ActionMailer
   module VERSION
     MAJOR = 4
     MINOR = 1
-    TINY  = 11
-    PRE   = nil
+    TINY  = 12
+    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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionmailer
 version: !ruby/object:Gem::Version
-  version: 4.1.11
+  version: 4.1.12.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,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.11
+        version: 4.1.12.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.11
+        version: 4.1.12.rc1
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.11
+        version: 4.1.12.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.11
+        version: 4.1.12.rc1
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -73,6 +73,7 @@ files:
 - lib/action_mailer/collector.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/preview.rb
@@ -98,9 +99,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: