actionmailer_inline_css 1.5.2 → 1.5.3

data/.gitignore

@@ -1,3 +1,5 @@
+.rvmrc
+.idea
 Gemfile.lock
 *.swp
 *.swo

data/LICENSE

@@ -0,0 +1,20 @@
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/actionmailer_inline_css.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = "actionmailer_inline_css"
-  s.version  = "1.5.2"
+  s.version  = "1.5.3"
   s.date = Time.now.strftime('%Y-%m-%d')
   s.summary  = "Always send HTML e-mails with inline CSS, using the 'premailer' gem"
   s.email    = "nathan.f77@gmail.com"

data/lib/action_mailer/inline_css_hook.rb

@@ -4,38 +4,40 @@
 module ActionMailer
   class InlineCssHook
     def self.delivering_email(message)
+
       if html_part = (message.html_part || (message.content_type =~ /text\/html/ && message))
-        # Generate an email with all CSS inlined (access CSS a FS path)
-        premailer = ::Premailer.new(html_part.body.to_s,
-                                    :with_html_string => true)
-
-        # Prepend host to remaning URIs.
-        # Two-phase conversion to avoid request deadlock from dev. server (Issue #4)
-        premailer = ::Premailer.new(premailer.to_inline_css,
-                                      :with_html_string => true,
-                                      :base_url => message.header[:host].to_s)
-        existing_text_part = message.text_part && message.text_part.body.to_s
-        existing_attachments = message.attachments
+        host = ActionMailerInlineCss.base_url || message.header[:host].to_s
+
+        # Generate an email with all CSS inlined (access CSS a FS path), and URIs
+        premailer = ::Premailer.new(html_part.body.to_s, :with_html_string => true, :base_url => host)
+
         msg_charset = message.charset
 
-        # Reset the body
-        message.body = nil
-        message.body.instance_variable_set("@parts", Mail::PartsList.new)
+        if message.text_part && message.text_part.body.to_s
+          html_part.content_type "text/html; charset=#{msg_charset}"
+          html_part.body premailer.to_inline_css
+        else
+          existing_attachments = message.attachments
 
-        # Add an HTML part with CSS inlined.
-        message.html_part do
-          content_type "text/html; charset=#{msg_charset}"
-          body premailer.to_inline_css
-        end
+          # Clear body to make a multipart email
+          message.body = nil
 
-        # Add a text part with either the pre-existing text part, or one generated with premailer.
-        message.text_part do
-          content_type "text/plain; charset=#{msg_charset}"
-          body existing_text_part || premailer.to_plain_text
-        end
+          # IMPORTANT: Plain text part must be generated before CSS is inlined.
+          # Not doing so results in CSS declarations (<style>) visible in the plain text part.
+          message.text_part = Mail::Part.new do
+            content_type "text/plain; charset=#{msg_charset}"
+            body premailer.to_plain_text
+          end
+
+          message.html_part = Mail::Part.new do
+            content_type "text/html; charset=#{msg_charset}"
+            body premailer.to_inline_css
+          end
 
-        # Re-add any attachments
-        existing_attachments.each {|a| message.body << a }
+          message.content_type 'multipart/mixed' if ! existing_attachments.empty?
+
+          existing_attachments.each {|a| message.body << a }
+        end
 
         message
       end

data/lib/actionmailer_inline_css.rb

@@ -6,3 +6,7 @@ require 'overrides/premailer/adapter/nokogiri'
 
 ActionMailer::Base.register_interceptor ActionMailer::InlineCssHook
 
+module ActionMailerInlineCss
+  mattr_accessor :base_url
+end
+

data/lib/overrides/premailer/premailer.rb

@@ -6,9 +6,13 @@ Premailer.class_eval do
   # a leading slash and a cache buster (e.g. ?12412422).
   # This override handles these cases, while falling back to the default implementation.
   def load_css_from_local_file_with_rails_path!(path)
-    rails_path = Rails.root.join("public", path.sub(/\?[0-9a-zA-Z]+$/, '').sub(/^\//, '')).to_s
+    # Remove query string and the path
+    clean_path = path.sub(/\?.*$/, '').sub(%r(^https?://[^/]*/), '')
+    rails_path = Rails.root.join('public', clean_path)
     if File.exist?(rails_path)
       load_css_from_string(File.read(rails_path))
+    elsif (asset = Rails.application.assets.find_asset(clean_path.sub("#{Rails.configuration.assets.prefix}/", '')))
+      load_css_from_string(asset.source)
     else
       load_css_from_local_file_without_rails_path!(path)
     end

data/test/inline_css_hook_test.rb

@@ -58,8 +58,7 @@ class HelperMailer < ActionMailer::Base
 
   def use_inline_css_hook_with_utf_8
     mail_with_defaults do |format|
-      charset "utf8"
-      format.html { render(:inline => TEST_HTML_UTF8) }
+      format.html(:charset => "utf8") { render(:inline => TEST_HTML_UTF8) }
     end
   end
 
@@ -130,4 +129,15 @@ class InlineCssHookTest < ActionMailer::TestCase
     assert_equal original_hello_attachment_url, mail.attachments["hello"].url
   end
 
+  def test_alternative_content_type
+    mail = HelperMailer.use_inline_css_hook_with_text_and_html_parts.deliver
+    assert_match /multipart\/alternative/, mail.content_type
+  end
+
+  def test_mixed_content_type
+    File.stubs(:read).returns("world")
+    mail = HelperMailer.with_attachment
+    m = ActionMailer::InlineCssHook.delivering_email(mail.deliver)
+    assert_equal "multipart/mixed", m.content_type
+  end
 end

data/test/premailer_stylesheet_link_tag_test.rb

@@ -30,12 +30,12 @@ end
 
 class PremailerStylesheetLinkTagTest < ActionMailer::TestCase
   def test_premailer_stylesheet_link_tag
-    css_file = "div.test { color: #119911; }"
     File.stubs(:exist?).returns(true)
-    File.stubs(:read).returns(css_file)
+    File.stubs(:exists?).returns(true)
+    File.stubs(:read).returns("div.test { color: #119911; }")
 
     mail = HelperMailer.use_stylesheet_link_tag.deliver
-    assert_match "<div class=\"test\" style=\"color: #119911;\">", mail.html_part.body.encoded
+    assert_match %Q{<div class="test" style="color: #119911;">}, mail.html_part.body.encoded
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actionmailer_inline_css
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-08 00:00:00.000000000Z
+date: 2013-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
-  requirement: &19144080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *19144080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: premailer
-  requirement: &19143300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 1.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *19143300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &19142740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: 1.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *19142740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.4
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &19142140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *19142140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.0
 description: Module for ActionMailer to improve the rendering of HTML emails by using
   the 'premailer' gem, which inlines CSS and makes relative links absolute.
 email: nathan.f77@gmail.com
@@ -65,6 +85,7 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - actionmailer_inline_css.gemspec
@@ -95,8 +116,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.8
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Always send HTML e-mails with inline CSS, using the 'premailer' gem
 test_files: []
+has_rdoc: false