premailer-rails 1.9.3 → 1.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88c3e4cb9ff7a5d1bcf7437242957d0882d5c783
-  data.tar.gz: b89082332333a80f33437e2f424a3c77cf33ce88
+  metadata.gz: 6c72ab2474486b2defef2795a17b651f4333b3e4
+  data.tar.gz: 10be620db0873f11ebb75e25b0a2684f7e1b6eb0
 SHA512:
-  metadata.gz: 16f4d14dcad194bc945ab41f360b88669428408d21e9035ac8c05b1c91095fb51f6658ec160f0ea3b8a1085acb17d253f45cc319d9862060802e2a6121c8e91a
-  data.tar.gz: a7bd533d813480744b008ac7ba60418588e8c183aaec38c34df993e248ea613b7e3b1744df170180d06a76b589813dc233abf7bafacb72c278b212e0c6d797b3
+  metadata.gz: deafb4ba758c0881f42dba0e2c4a3b7da335d1e146d8e2fba30b66bf37f3e899de457ce5435ad95ae2902204cef00d0dee607af89919657256da6b655d9101a8
+  data.tar.gz: 00039726a8423529faacdb11788c649f072f7d0a8ff120f70b6476cbea90eb6588826bb63d4f5d13dae104eef0eac9e0ff0b450b9094e8d2c9eae77f77221a5e

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v1.9.4
+
+- Improve check for Rails module
+- Preserve body encoding to prevent garbled mails
+
 ## v1.9.3
 
 - Add support for rails' `relative_url_root` config

data/VERSION

@@ -1 +1 @@
-1.9.3
+1.9.4

data/lib/premailer/rails/css_loaders/asset_pipeline_loader.rb

@@ -14,6 +14,7 @@ class Premailer
 
         def asset_pipeline_present?
           defined?(::Rails) &&
+            ::Rails.respond_to?(:application) &&
             ::Rails.application.respond_to?(:assets) &&
             ::Rails.application.assets
         end

data/lib/premailer/rails/css_loaders/cache_loader.rb

@@ -19,7 +19,9 @@ class Premailer
         end
 
         def development_env?
-          defined?(::Rails) && ::Rails.env.development?
+          defined?(::Rails) &&
+            ::Rails.respond_to?(:env) &&
+            ::Rails.env.development?
         end
       end
     end

data/lib/premailer/rails/css_loaders/network_loader.rb

@@ -25,7 +25,8 @@ class Premailer
         end
 
         def asset_host_present?
-          ::Rails.configuration.action_controller.asset_host.present?
+          ::Rails.respond_to?(:configuration) &&
+            ::Rails.configuration.action_controller.asset_host.present?
         end
 
         def asset_host(url)

data/lib/premailer/rails/hook.rb

@@ -70,17 +70,27 @@ class Premailer
         # can end up containing CSS rules.
         generate_text_part if generate_text_part?
 
-        Mail::Part.new(
-          content_transfer_encoding: html_part.content_transfer_encoding,
-          content_type: "text/html; charset=#{html_part.charset}",
-          body: premailer.to_inline_css)
+        part = html_part
+        html = premailer.to_inline_css
+        Mail::Part.new do
+          content_transfer_encoding part.content_transfer_encoding
+          content_type "text/html; charset=#{part.charset}"
+          body html
+          body_encoding part.body.encoding
+        end
       end
 
       def generate_text_part
-        @text_part ||= Mail::Part.new(
-          content_transfer_encoding: html_part.content_transfer_encoding,
-          content_type: "text/plain; charset=#{html_part.charset}",
-          body: premailer.to_plain_text)
+        @text_part ||= begin
+          part = html_part
+          text = premailer.to_plain_text
+          Mail::Part.new do
+            content_transfer_encoding part.content_transfer_encoding
+            content_type "text/plain; charset=#{part.charset}"
+            body text
+            body_encoding part.body.encoding
+          end
+        end
       end
 
       def premailer

data/spec/integration/hook_spec.rb

@@ -5,6 +5,10 @@ describe Premailer::Rails::Hook do
     Premailer::Rails::Hook.perform(message)
   end
 
+  def body_content(message)
+    Nokogiri::HTML(message.html_string).at('body').content
+  end
+
   class Mail::Message
     def html_string
       (html_part || self).body.to_s
@@ -54,6 +58,18 @@ describe Premailer::Rails::Hook do
     end
   end
 
+  it 'does not screw up the text by maintaining the original body encoding' do
+    raw_msg = Fixtures::Message.latin_message
+    processed_msg = Fixtures::Message.latin_message
+    run_hook(processed_msg)
+    expect(body_content(processed_msg)).to eq(body_content(raw_msg))
+
+    raw_msg = Fixtures::Message.non_latin_message
+    processed_msg = Fixtures::Message.non_latin_message
+    run_hook(processed_msg)
+    expect(body_content(processed_msg)).to eq(body_content(raw_msg))
+  end
+
   it 'generates a text part from the html' do
     expect { run_hook(message) }.to change(message, :text_part)
   end

data/spec/support/fixtures/message.rb

@@ -114,6 +114,22 @@ nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
       message
     end
 
+    def latin_message
+      base_message.tap do |message|
+        message.body = HTML_PART
+        message.content_type 'text/html; charset=UTF-8'
+        message.ready_to_send!
+      end
+    end
+
+    def non_latin_message
+      base_message.tap do |message|
+        message.body = HTML_PART_WITH_UNICODE
+        message.content_type 'text/html; charset=UTF-8'
+        message.ready_to_send!
+      end
+    end
+
     private
 
     def base_message

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: premailer-rails
 version: !ruby/object:Gem::Version
-  version: 1.9.3
+  version: 1.9.4
 platform: ruby
 authors:
 - Philipe Fatio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-12 00:00:00.000000000 Z
+date: 2016-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: premailer