premailer-rails 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1acf912800a7228a1dcf6b89f5412ee87490f975
-  data.tar.gz: 2ab5e6bf63b3d7a0fa974b5495df7919eaeb9d10
+  metadata.gz: 7d3ecd8b9d9f55c3039cad6467d7de1fc2676565
+  data.tar.gz: 985538b2930d3bae69fe75b9415af3f4d4f411eb
 SHA512:
-  metadata.gz: feef5aa13b18d39709bf2f9fd931eecff8876a11bf3500199f91c2ba06e15853d60787984425371b51ef4fbc60c555a7b8df38ab0e108e4c4766e4e624fba52b
-  data.tar.gz: dc7c3b13551d5445c58998154a342d79f2b4e0d56fd4b909d1264df3d0511e958d03bbd475f98a387c3c8bdec23fcead519c7a60ac150dff7955f78da46bb884
+  metadata.gz: 4e13cd460126fb67c58f89d186157463ca47162a228cc12e46dfc373bd9773d30a11ba318c9ea36d1892474b94bf3a2008c49e847ed35b049acf095f6da517d0
+  data.tar.gz: c0cdc0051dd65ef19bffb36378943733c4f66f68c3ef8662f77a66763a4439f8024daf20b1a35f5d11285bb730bc8ef256eed8ea8460fee387fa2fdda8f9a39b

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.8.1
+
+- Add support for longer fingerprint generated by sprocket 3.
+
 ## v1.8.0
 
 - `ActionMailer` interceptors are registered after Rails initialization and no

data/README.md

@@ -1,4 +1,4 @@
-# premailer-rails
+ki premailer-rails
 
 CSS styled emails without the hassle.
 
@@ -137,6 +137,11 @@ class UserMailer < ActionMailer::Base
 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.
+
 ## Small Print
 
 ### Author

data/VERSION

@@ -1 +1 @@
-1.8.0
+1.8.1

data/lib/premailer/rails.rb

@@ -6,7 +6,6 @@ require 'premailer/rails/css_loaders'
 require 'premailer/rails/css_helper'
 require 'premailer/rails/customized_premailer'
 require 'premailer/rails/hook'
-require 'premailer/rails/railtie' if defined?(Rails)
 
 class Premailer
   module Rails
@@ -27,3 +26,5 @@ class Premailer
     end
   end
 end
+
+require 'premailer/rails/railtie' if defined?(Rails)

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

@@ -19,7 +19,7 @@ class Premailer
         def file_name(url)
           URI(url).path
             .sub("#{::Rails.configuration.assets.prefix}/", '')
-            .sub(/-\h{32}\.css$/, '.css')
+            .sub(/-(\h{32}|\h{64})\.css$/, '.css')
         end
       end
     end

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

@@ -14,7 +14,7 @@ class Premailer
 
           if not valid_uri?(uri) and defined?(::Rails)
             scheme, host =
-              ::Rails.configuration.action_controller.asset_host.split(%r{:?//})
+              asset_host.split(%r{:?//})
             scheme = 'http' if scheme.blank?
             uri.scheme ||= scheme
             uri.host ||= host
@@ -26,6 +26,16 @@ class Premailer
         def valid_uri?(uri)
           uri.host.present? && uri.scheme.present?
         end
+
+        def asset_host
+          host = ::Rails.configuration.action_controller.asset_host
+
+          if host.respond_to?(:call)
+            host.call
+          else
+            host
+          end
+        end
       end
     end
   end

data/lib/premailer/rails/hook.rb

@@ -42,7 +42,7 @@ class Premailer
       # Returns true if the message itself has a content type of text/html, thus
       # it does not contain other parts such as alternatives and attachments.
       def pure_html_message?
-        message.content_type.include?('text/html')
+        message.content_type && message.content_type.include?('text/html')
       end
 
       def generate_html_part_replacement

data/spec/unit/css_loaders/asset_pipeline_loader_spec.rb

@@ -17,11 +17,16 @@ describe Premailer::Rails::CSSLoaders::AssetPipelineLoader do
       it { is_expected.to eq('application.css') }
     end
 
-    context "when asset file path contains fingerprint" do
+    context "when asset file path contains 32 chars fingerprint" do
       let(:asset) { 'application-6776f581a4329e299531e1d52aa59832.css' }
       it { is_expected.to eq('application.css') }
     end
 
+    context "when asset file path contains 64 chars fingerprint" do
+      let(:asset) { 'application-02275ccb3fd0c11615bbfb11c99ea123ca2287e75045fe7b72cefafb880dad2b.css' }
+      it { is_expected.to eq('application.css') }
+    end
+
     context "when asset file page contains numbers, but not a fingerprint" do
       let(:asset) { 'test/20130708152545-foo-bar.css' }
       it { is_expected.to eq("test/20130708152545-foo-bar.css") }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: premailer-rails
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Philipe Fatio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-31 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: premailer
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Easily create styled HTML emails in Rails.