actionmailer_inline_css 1.2.1 → 1.3.0

data/Gemfile

@@ -5,9 +5,7 @@ gem 'rake'
 gemspec
 
 group :development, :test do
-  unless ENV['TRAVIS']
-    gem 'ruby-debug', :platform => :mri_18
-    gem 'ruby-debug19', :platform => :mri_19, :require => 'ruby-debug'
-  end
+  gem 'ruby-debug',   :platforms => :mri_18
+  gem 'ruby-debug19', :platforms => :mri_19
 end
 

data/README.md

@@ -42,8 +42,12 @@ To use this in your Rails app, simply add `gem "actionmailer_inline_css"` to you
 
 #### NOTE:
 
-The current version of premailer doesn't support UTF-8, so I have written a small
-workaround to enforce it. This works for both Ruby 1.9 and 1.8.
+The current version of premailer doesn't support UTF-8, so this gem has some built-in workarounds.
+These work for both Ruby 1.9 and 1.8.
+
+* Premailer's Nokogiri adapter has been patched to force UTF-8 encoding for the input html.
+* The email's HTML part is always encoded and sent with a transfer type of <tt>base64</tt>.
+  (The default 'quoted-printable' type escapes '=' and '?' symbols.)
 
 
 ### Including CSS in Mail Templates

data/actionmailer_inline_css.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = "actionmailer_inline_css"
-  s.version  = "1.2.1"
+  s.version  = "1.3.0"
   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

@@ -1,3 +1,4 @@
+require 'base64'
 #
 # Always inline CSS for HTML emails
 #
@@ -5,20 +6,23 @@ module ActionMailer
   class InlineCssHook
     def self.delivering_email(message)
       if html_part = (message.html_part || (message.content_type =~ /text\/html/ && message))
-        premailer = ::Premailer.new(html_part.body.to_s, :with_html_string => true)
+        premailer = Premailer.new(html_part.body.to_s, :with_html_string => true)
         existing_text_part = message.text_part && message.text_part.body.to_s
+
         # Reset the body
         message.body = nil
-        # Add an HTML part with CSS inlined.
-        message.html_part do
-          content_type "text/html; charset=utf-8"
-          body premailer.to_inline_css
-        end
+
         # 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=utf-8"
           body existing_text_part || premailer.to_plain_text
         end
+
+        # Add an HTML part with CSS inlined.
+        message.html_part do
+          content_type "text/html; charset=utf-8"
+          content_transfer_encoding "base64"
+          body Base64.encode64(premailer.to_inline_css)
+        end
       end
     end
   end

data/lib/overrides/premailer/adapter/nokogiri.rb

@@ -6,8 +6,7 @@ Premailer::Adapter::Nokogiri.module_eval do
   def load_html(html)
     # Force UTF-8 encoding
     if RUBY_VERSION =~ /1.9/
-      html = html.force_encoding('UTF-8').encode!
-      doc = ::Nokogiri::HTML(html) {|c| c.recover }
+      doc = ::Nokogiri::HTML(html.encode('UTF-8')) {|c| c.recover }
     else
       doc = ::Nokogiri::HTML(html, nil, 'UTF-8') {|c| c.recover }
     end

data/test/inline_css_hook_test.rb

@@ -58,22 +58,31 @@ end
 class InlineCssHookTest < ActionMailer::TestCase
   def test_inline_css_hook_with_only_html_part
     mail = HelperMailer.use_inline_css_hook_with_only_html_part.deliver
-    assert_match '<div id="test" style="color: #123456;">Test</div>', mail.html_part.body.encoded
+    assert_match '<div id="test" style="color: #123456;">Test</div>', mail.html_part.decoded
     # Test generated text part
-    assert_match 'Test', mail.text_part.body.encoded
+    assert_match 'Test', mail.text_part.decoded
   end
 
   def test_inline_css_hook_with_text_and_html_parts
     mail = HelperMailer.use_inline_css_hook_with_text_and_html_parts.deliver
-    assert_match '<div id="test" style="color: #123456;">Test</div>', mail.html_part.body.encoded
+    assert_match '<div id="test" style="color: #123456;">Test</div>', mail.html_part.decoded
     # Test specified text part
-    assert_match 'Different Text Part', mail.text_part.body.encoded
+    assert_match 'Different Text Part', mail.text_part.decoded
   end
 
   def test_inline_css_hook_with_utf_8_characters
     mail = HelperMailer.use_inline_css_hook_with_utf_8.deliver
-    assert_match 'ᚠᛇᚻ᛫ᛒᛦᚦ᛫ᚠᚱᚩᚠᚢᚱ᛫ᚠᛁᚱᚪ᛫ᚷᛖᚻᚹᛦᛚᚳᚢᛗ', mail.html_part.body.encoded
-    assert_match 'ᚠᛇᚻ᛫ᛒᛦᚦ᛫ᚠᚱᚩᚠᚢᚱ᛫ᚠᛁᚱᚪ᛫ᚷᛖᚻᚹᛦᛚᚳᚢᛗ', mail.text_part.body.encoded
+
+    html, text = mail.html_part.body.decoded, mail.text_part.body.decoded
+    if RUBY_VERSION =~ /1.9/
+      # In Ruby 1.9, Mail does not set encoding to UTF-8 when decoding the Base64 string.
+      # This is an internal issue, and not a problem for email clients.
+      html, text = html.force_encoding('UTF-8'), text.force_encoding('UTF-8')
+    end
+
+    [html, text].each do |part|
+      assert_match 'ᚠᛇᚻ᛫ᛒᛦᚦ᛫ᚠᚱᚩᚠᚢᚱ᛫ᚠᛁᚱᚪ᛫ᚷᛖᚻᚹᛦᛚᚳᚢᛗ', part
+    end
   end
 end
 

data/test/premailer_stylesheet_link_tag_test.rb

@@ -33,7 +33,7 @@ class PremailerStylesheetLinkTagTest < ActionMailer::TestCase
     File.stubs(:read).returns(css_file)
 
     mail = HelperMailer.use_stylesheet_link_tag.deliver
-    assert_match "<div class=\"test\" style=\"color: #119911;\">", mail.html_part.body.encoded
+    assert_match "<div class=\"test\" style=\"color: #119911;\">", mail.html_part.decoded
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actionmailer_inline_css
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-30 00:00:00.000000000Z
+date: 2011-09-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
-  requirement: &79452640 !ruby/object:Gem::Requirement
+  requirement: &21170660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *79452640
+  version_requirements: *21170660
 - !ruby/object:Gem::Dependency
   name: premailer
-  requirement: &79451970 !ruby/object:Gem::Requirement
+  requirement: &21170080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *79451970
+  version_requirements: *21170080
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &79451160 !ruby/object:Gem::Requirement
+  requirement: &21169420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *79451160
+  version_requirements: *21169420
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &79450260 !ruby/object:Gem::Requirement
+  requirement: &21168680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *79450260
+  version_requirements: *21168680
 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
@@ -89,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 455282451
+      hash: 2714414003163735864
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -98,10 +98,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 455282451
+      hash: 2714414003163735864
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: Always send HTML e-mails with inline CSS, using the 'premailer' gem