premailer-rails 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a6895871c0ec4e4443e1a1d6bf22d9239756659
-  data.tar.gz: 9143e6f08bc542eb428ac14433bf1b0fb7d5851b
+  metadata.gz: 1a4e3c274d320126db1a2edecd52529cae72f3f7
+  data.tar.gz: d4a9a0fd22637f82da097b07cf8930827feb5161
 SHA512:
-  metadata.gz: 6a72305f6009dee21b9b29dbc06cd4619012606e7b10dc0949abdc45854763aebce9fb5f6c08b0ba50934cdc8cf5c2a03df01f1658f4efbae0c07065695ffbae
-  data.tar.gz: ce3df301bb6e8a81d46c6ae51bf7d3bc8af5ba9360b60b51b43bb8f68d5f6c75100625e96fc941057f428a9ae1d051580d7f546bdf3e45d71ee8552d40b09aad
+  metadata.gz: dc5726488711de669ba671ef6f048ae38b9c1cb44d1be95a8a9728d359d9adf6b1e66a74cfe05d894e8a9fe2b648b82a62317a08e6f5d11d43f5cd486715b87f
+  data.tar.gz: 58c425afba99b7996f89e7c9858df716670211beadae82b18e6866de8f141c766771ea9f2d3770d84ebc9b0f66bcb513efd97a614ac2fc53bbcc503c16072efb

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v1.9.1
+
+- Respect data-premailer="ignore" on link tags
+- Ensure content-transfer-encoding is maintained
+
 ## v1.9.0
 
 - Improved CSS loading and caching.

data/README.md

@@ -139,7 +139,7 @@ end
 Note that the mere presence of this header causes premailer to be skipped, i.e.,
 even setting `skip_premailer: false` will cause premailer to be skipped. The
 reason for that is that the `skip_premailer` is a simple header and the value is
-transformed into a string, causing `'false'` to become truethy.
+transformed into a string, causing `'false'` to become truthy.
 
 ## Small Print
 

data/VERSION

@@ -1 +1 @@
-1.9.0
+1.9.1

data/example/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'

data/lib/premailer/rails/css_helper.rb

@@ -26,7 +26,7 @@ class Premailer
       private
 
       def css_urls_in_doc(doc)
-        doc.search('link[@rel="stylesheet"]').map do |link|
+        doc.search('link[@rel="stylesheet"]:not([@data-premailer="ignore"])').map do |link|
           link.remove
           link.attributes['href'].to_s
         end

data/lib/premailer/rails/hook.rb

@@ -68,15 +68,17 @@ class Premailer
       def generate_html_part
         # Make sure that the text part is generated first. Otherwise the text
         # can end up containing CSS rules.
-        generate_text_part  if generate_text_part?
+        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)
       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)
       end

data/spec/integration/css_helper_spec.rb

@@ -39,6 +39,15 @@ describe Premailer::Rails::CSSHelper do
         expect(css_for_doc(doc)).to eq("content of base.css\ncontent of font.css")
       end
     end
+
+    context 'when HTML contains ignored links' do
+      let(:files) { ['ignore.css', 'data-premailer' => 'ignore'] }
+
+      it 'ignores links' do
+        expect(Premailer::Rails::CSSHelper).to_not receive(:css_for_url)
+        css_for_doc(doc)
+      end
+    end
   end
 
   describe '#css_for_url' do

data/spec/integration/hook_spec.rb

@@ -43,6 +43,17 @@ describe Premailer::Rails::Hook do
     expect(processed_message.parts).to match_array(expected_parts)
   end
 
+  describe 'when the content-transfer-encoding is set' do
+    before { message.content_transfer_encoding = 'quoted-printable' }
+
+    it 'should maintain the value' do
+      expect(processed_message.parts.first.content_transfer_encoding).to \
+        eq 'quoted-printable'
+      expect(processed_message.parts.last.content_transfer_encoding).to \
+        eq 'quoted-printable'
+    end
+  end
+
   it 'generates a text part from the html' do
     expect { run_hook(message) }.to change(message, :text_part)
   end

data/spec/support/fixtures/html.rb

@@ -18,17 +18,21 @@ module Fixtures
 </html>
     HTML
 
-    LINK = <<-LINK
-<link rel='stylesheet' href='%s' />
-    LINK
+    LINK = "<link rel='stylesheet' %s />\n"
 
     def with_css_links(*files)
+      opts = files.last.is_a?(Hash) ? files.pop : {}
       links = []
       files.each do |file|
-        links << LINK % "http://example.com/#{file}"
+        attrs = { href: "http://example.com/#{file}" }.merge(opts)
+        links << LINK % hash_to_attributes(attrs)
       end
 
       TEMPLATE % links.join
     end
+
+    def hash_to_attributes(attrs)
+      attrs.map { |attr, value| "#{attr}='#{value}'" }.join(' ')
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: premailer-rails
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Philipe Fatio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2016-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: premailer
@@ -134,6 +134,7 @@ files:
 - example/app/assets/stylesheets/email.css
 - example/app/mailers/example_mailer.rb
 - example/app/views/example_mailer/test_message.html.erb
+- example/bin/rails
 - example/config.ru
 - example/config/application.rb
 - example/config/boot.rb
@@ -198,6 +199,7 @@ test_files:
 - example/app/assets/stylesheets/email.css
 - example/app/mailers/example_mailer.rb
 - example/app/views/example_mailer/test_message.html.erb
+- example/bin/rails
 - example/config.ru
 - example/config/application.rb
 - example/config/boot.rb