premailer-rails 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: faaccc100fbcc92e0c79ee426a2a3b4b2ae16ecd
-  data.tar.gz: 4e183a0856f2bcd01e5955efc1d7bd750e19edf4
+  metadata.gz: c14b05b4d57365b47366c6c56d7080ed7610bb0e
+  data.tar.gz: 3bb5ba65597cc2fe6d40fc053785683ad0e08d69
 SHA512:
-  metadata.gz: 83535e5fd7f0b6540c8d9e18769a6b3e0dd0112559f56fa33dd279bbd399e281aee0ecbf3f885aea3bad3e529f2eca0026ef8c1092c6b70844c214caec7ddb6d
-  data.tar.gz: e195868f2495abe7d4a8b188f389d0a84ce9870d1b66e48793b62b8c72722ed86d3bf73d2fce29d8869c63f692677b035423732e2befe2ea1e98570c95dad282
+  metadata.gz: af255aab35b0a2ebbbe9fc554d45bbf190878531ba2faef489cc88dcc4d1b40031713da7a21f8cdbbc1cdc49fdd8e96ca32ac2a3f439f40af4602fc3874c4bbc
+  data.tar.gz: 7aed5714d084a540a096da8df6606894d68616dbcfe1de3fb9bdcaee3eeb61624c2f1377064a850c10c6e454926ef8fda3815fc8aaca635f1398b5bd4e8c2046

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## v1.5.1
+
+- Prefer precompiled assets over asset pipeline
+
+- Improve construction of file URL when requesting from CDN
+
+- No longer use open-uri
+
+- Remove gzip unzipping after requesting file
+
 ## v1.5.0
 
 - No longer support ruby 1.8

data/VERSION

@@ -1 +1 @@
-1.5.0
+1.5.1

data/lib/premailer/rails/css_helper.rb

@@ -1,6 +1,3 @@
-require 'open-uri'
-require 'zlib'
-
 class Premailer
   module Rails
     module CSSHelper
@@ -11,8 +8,8 @@ class Premailer
 
       STRATEGIES = [
         CSSLoaders::CacheLoader,
-        CSSLoaders::AssetPipelineLoader,
-        CSSLoaders::FileSystemLoader
+        CSSLoaders::FileSystemLoader,
+        CSSLoaders::AssetPipelineLoader
       ]
 
       # Returns all linked CSS files concatenated as string.

data/lib/premailer/rails/css_loaders.rb

@@ -1,3 +1,6 @@
+require 'uri'
+require 'zlib'
+
 class Premailer
   module Rails
     module CSSLoaders
@@ -22,7 +25,7 @@ class Premailer
             if asset = ::Rails.application.assets.find_asset(file)
               asset.to_s
             else
-              request_and_unzip(file)
+              Net::HTTP.get(uri_for_path(path))
             end
           end
         end
@@ -37,19 +40,13 @@ class Premailer
             .sub(/-\h{32}\.css$/, '.css')
         end
 
-        def request_and_unzip(file)
-          url = [
-            ::Rails.configuration.action_controller.asset_host,
-            ::Rails.configuration.assets.prefix.sub(/^\//, ''),
-            ::Rails.configuration.assets.digests[file]
-          ].join('/')
-          response = Kernel.open(url)
-
-          begin
-            Zlib::GzipReader.new(response).read
-          rescue Zlib::GzipFile::Error, Zlib::Error
-            response.rewind
-            response.read
+        def uri_for_path(path)
+          URI(path).tap do |uri|
+            scheme, host =
+              ::Rails.configuration.action_controller.asset_host.split(%r{:?//})
+            scheme = 'http' if scheme.blank?
+            uri.scheme ||= scheme
+            uri.host ||= host
           end
         end
       end
@@ -59,7 +56,8 @@ class Premailer
         extend self
 
         def load(path)
-          File.read("#{::Rails.root}/public#{path}")
+          file_path = "#{::Rails.root}/public#{path}"
+          File.read(file_path) if File.exist?(file_path)
         end
       end
     end

data/spec/lib/css_helper_spec.rb

@@ -12,6 +12,11 @@ describe Premailer::Rails::CSSHelper do
     Premailer::Rails::CSSHelper.css_for_doc(doc)
   end
 
+  def expect_file(path, content=nil)
+    File.stubs(:exist?).with(path).returns(true)
+    File.expects(:read).with(path).returns(content)
+  end
+
   describe '#css_for_doc' do
     let(:html) { Fixtures::HTML.with_css_links(*files) }
     let(:doc) { Nokogiri(html) }
@@ -37,7 +42,7 @@ describe Premailer::Rails::CSSHelper do
   describe '#load_css' do
     context 'when path is a url' do
       it 'should load the CSS at the local path' do
-        File.expects(:read).with('RAILS_ROOT/public/stylesheets/base.css')
+        expect_file('RAILS_ROOT/public/stylesheets/base.css')
 
         load_css('http://example.com/stylesheets/base.css?test')
       end
@@ -45,8 +50,7 @@ describe Premailer::Rails::CSSHelper do
 
     context 'when path is a relative url' do
       it 'should load the CSS at the local path' do
-        File.expects(:read).with('RAILS_ROOT/public/stylesheets/base.css')
-
+        expect_file('RAILS_ROOT/public/stylesheets/base.css')
         load_css('/stylesheets/base.css?test')
       end
     end
@@ -67,13 +71,11 @@ describe Premailer::Rails::CSSHelper do
         cache =
           Premailer::Rails::CSSHelper.send(:instance_variable_get, '@cache')
         cache['/stylesheets/base.css'] = 'cached content of base.css'
-        File.expects(:read)
-            .with('RAILS_ROOT/public/stylesheets/base.css')
-            .returns('new content of base.css')
+        content = 'new content of base.css'
+        expect_file('RAILS_ROOT/public/stylesheets/base.css', content)
         Rails.env.stubs(:development?).returns(true)
 
-        load_css('http://example.com/stylesheets/base.css')
-          .should == 'new content of base.css'
+        load_css('http://example.com/stylesheets/base.css').should == content
       end
     end
 
@@ -87,6 +89,15 @@ describe Premailer::Rails::CSSHelper do
         )
       }
 
+      context 'and a precompiled file exists' do
+        it 'should return that file' do
+          path = '/assets/email-digest.css'
+          content = 'read from file'
+          expect_file("RAILS_ROOT/public#{path}", content)
+          load_css(path).should == content
+        end
+      end
+
       it 'should return the content of the file compiled by Rails' do
         Rails.application.assets
           .expects(:find_asset)
@@ -109,52 +120,44 @@ describe Premailer::Rails::CSSHelper do
       end
 
       context 'when asset can not be found' do
-        before {
+        let(:response) { 'content of base.css' }
+        let(:path) { '/assets/base-089e35bd5d84297b8d31ad552e433275.css' }
+        let(:url) { "http://assets.example.com#{path}" }
+        let(:asset_host) { 'http://assets.example.com' }
+
+        before do
           Rails.application.assets.stubs(:find_asset).returns(nil)
           Rails.configuration.stubs(:action_controller).returns(
-            stub(asset_host: 'http://example.com')
-          )
-          Rails.configuration.stubs(:assets).returns(
-            stub(
-              enabled: true,
-              prefix:  '/assets',
-              digests: {
-                'base.css' => 'base-089e35bd5d84297b8d31ad552e433275.css'
-              }
-            )
+            stub(asset_host: asset_host)
           )
-        }
-        let(:string_io) { StringIO.new('content of base.css') }
-        let(:url) {
-          'http://example.com/assets/base-089e35bd5d84297b8d31ad552e433275.css'
-        }
+          Net::HTTP.stubs(:get).with { |uri| uri.to_s == url }.returns(response)
+        end
 
         it 'should request the file' do
-          Kernel.expects(:open).with(url).returns(string_io)
-
-          load_css(
-            'http://example.com/assets/base.css'
-          ).should == 'content of base.css'
+          load_css(url).should == 'content of base.css'
         end
 
-        it 'should request the same file when path contains file fingerprint' do
-          Kernel.expects(:open).with(url).returns(string_io)
+        context 'when file url does not include the host' do
+          it 'should request the file using the asset host as host' do
+            load_css(path).should == 'content of base.css'
+          end
+
+          context 'and the asset host uses protocol relative scheme' do
+            let(:asset_host) { '//assets.example.com' }
 
-          load_css(
-            'http://example.com/assets/base-089e35bd5d84297b8d31ad552e433275.css'
-          ).should == 'content of base.css'
+            it 'should request the file using http as the scheme' do
+              load_css(path).should == 'content of base.css'
+            end
+          end
         end
-      end
+     end
     end
 
     context 'when static stylesheets are used' do
       it 'should return the content of the static file' do
-        File.expects(:read)
-            .with('RAILS_ROOT/public/stylesheets/base.css')
-            .returns('content of base.css')
-
-        load_css('http://example.com/stylesheets/base.css')
-          .should == 'content of base.css'
+        content = 'content of base.css'
+        expect_file('RAILS_ROOT/public/stylesheets/base.css', content)
+        load_css('http://example.com/stylesheets/base.css').should == content
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: premailer-rails
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Philipe Fatio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-31 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: premailer