actionmailer_inline_css 1.5.0 → 1.5.1

data/.gitignore

@@ -4,3 +4,4 @@ Gemfile.lock
 .bundle
 bin
 pkg/*
+*.gem

data/.travis.yml

@@ -1,3 +1,4 @@
 rvm:
   - 1.8.7
   - 1.9.2
+  - 1.9.3

data/actionmailer_inline_css.gemspec

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

@@ -16,19 +16,21 @@ module ActionMailer
                                       :base_url => message.header[:host].to_s)
         existing_text_part = message.text_part && message.text_part.body.to_s
         existing_attachments = message.attachments
+        msg_charset = message.charset
 
         # Reset the body
         message.body = nil
+        message.body.instance_variable_set("@parts", Mail::PartsList.new)
 
         # Add an HTML part with CSS inlined.
         message.html_part do
-          content_type "text/html; charset=utf-8"
+          content_type "text/plain; charset=#{charset}"
           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"
+          content_type "text/plain; charset=#{charset}"
           body existing_text_part || premailer.to_plain_text
         end
 

data/test/inline_css_hook_test.rb

@@ -98,15 +98,20 @@ class InlineCssHookTest < ActionMailer::TestCase
     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
     # 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 = nil
     mail = HelperMailer.use_inline_css_hook_with_utf_8.deliver
-    assert_match 'ᚠᛇᚻ᛫ᛒᛦᚦ᛫ᚠᚱᚩᚠᚢᚱ', mail.html_part.body.encoded
-    assert_match 'Gonçalves', mail.html_part.body.encoded
-    assert_match 'ᚠᛇᚻ᛫ᛒᛦᚦ᛫ᚠᚱᚩᚠᚢᚱ', mail.text_part.body.encoded
+
+    assert_match 'ᚠᛇᚻ᛫ᛒᛦᚦ᛫ᚠᚱᚩᚠᚢᚱ', mail.html_part.decoded
+    assert_match 'Gonçalves',      mail.html_part.decoded
+    assert_match 'ᚠᛇᚻ᛫ᛒᛦᚦ᛫ᚠᚱᚩᚠᚢᚱ', mail.text_part.decoded
+    assert_match '=E1=9A=A0=E1=9B=87=E1=9A=BB=', mail.html_part.encoded
+
+    assert_equal mail.html_part.content_transfer_encoding, "quoted-printable"
+    assert_equal mail.text_part.content_transfer_encoding, "base64"
   end
 
   def test_inline_css_hook_with_base_url

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actionmailer_inline_css
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-06 00:00:00.000000000Z
+date: 2012-01-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
-  requirement: &73251340 !ruby/object:Gem::Requirement
+  requirement: &83824600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *73251340
+  version_requirements: *83824600
 - !ruby/object:Gem::Dependency
   name: premailer
-  requirement: &73251100 !ruby/object:Gem::Requirement
+  requirement: &83824360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *73251100
+  version_requirements: *83824360
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &73250870 !ruby/object:Gem::Requirement
+  requirement: &83824130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *73250870
+  version_requirements: *83824130
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &73250640 !ruby/object:Gem::Requirement
+  requirement: &83823900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *73250640
+  version_requirements: *83823900
 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