premailer-rails3 1.0.2 → 1.1.0

data/CHANGELOG.md

@@ -0,0 +1,16 @@
+# Changelog
+
+## v1.1.0
+
+- Fixed several bugs
+
+- Strip asset digest from CSS path
+
+- Improve nokogiri support
+
+- Request CSS file if asset is not found locally
+
+  This allows you to host all your assets on a CDN and deploy the
+  app without the `app/assets` folder.
+
+Thanks to everyone who contributed!

data/lib/premailer-rails3.rb

@@ -3,7 +3,7 @@ require 'premailer-rails3/css_helper'
 require 'premailer-rails3/premailer'
 require 'premailer-rails3/hook'
 
-module PremailerRails3
+module PremailerRails
   @config = {}
   class << self
     attr_accessor :config

data/lib/premailer-rails3/css_helper.rb

@@ -1,3 +1,6 @@
+require 'open-uri'
+require 'zlib'
+
 module PremailerRails
   module CSSHelper
     extend self
@@ -6,7 +9,7 @@ module PremailerRails
 
     def css_for_doc(doc)
       css = doc.search('link[@type="text/css"]').map { |link|
-              url = link.attributes['href']
+              url = link.attributes['href'].to_s
               load_css_at_path(url) unless url.blank?
             }.reject(&:blank?).join("\n")
       css = load_css_at_path(:default) if css.blank?
@@ -20,7 +23,7 @@ module PremailerRails
         # Remove everything after ? including ?
         path = path[0..(path.index('?') - 1)] if path.include? '?'
         # Remove the host
-        path = path.gsub(/^https?\:\/\/[^\/]*/, '') if path.index('http') == 0
+        path = path.sub(/^https?\:\/\/[^\/]*/, '') if path.index('http') == 0
       end
 
       # Don't cache in development.
@@ -33,12 +36,13 @@ module PremailerRails
             file = if path == :default
                      'email.css'
                    else
-                     path.sub("#{Rails.configuration.assets.prefix}/", '')
+                     path.sub("#{Rails.configuration.assets.prefix}/", '') \
+                         .sub(/-.*\.css$/, '.css')
                    end
             if asset = Rails.application.assets.find_asset(file)
               asset.to_s
             else
-              raise "Couldn't find asset #{file} for premailer-rails3."
+              request_and_unzip(file)
             end
           else
             file = path == :default ? '/stylesheets/email.css' : path
@@ -48,13 +52,28 @@ module PremailerRails
 
       @@css_cache[path]
     rescue => ex
-      # Print an error and store empty string as the CSS.
+      # Print an error and return empty css:
       puts ex.message
-      @@css_cache[path] = ''
+      ''
     end
 
     def assets_enabled?
       Rails.configuration.assets.enabled rescue false
     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
+        response.rewind
+        response.read
+      end
+    end
   end
 end

data/lib/premailer-rails3/premailer.rb

@@ -11,7 +11,7 @@ module PremailerRails
       ::Premailer.send(:include, Adapter.find(Adapter.use))
       doc = load_html(html)
 
-      options = PremailerRails3.config.merge(
+      options = PremailerRails.config.merge(
         :with_html_string => true,
         :css_string       => CSSHelper.css_for_doc(doc)
       )

data/lib/premailer-rails3/version.rb

@@ -1,3 +1,3 @@
 module PremailerRails
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

data/spec/premailer-rails3/css_helper_spec.rb

@@ -116,7 +116,7 @@ describe PremailerRails::CSSHelper do
       it 'should load email.css when the default CSS is requested' do
         Rails.application.assets.expects(:find_asset) \
                                 .with('email.css') \
-                                .returns(mock(:body => 'content of default css'))
+                                .returns(mock(:to_s => 'content of default css'))
 
         load_css_at_path(:default).should == 'content of default css'
       end
@@ -124,11 +124,60 @@ describe PremailerRails::CSSHelper do
       it 'should return the content of the file compiled by Rails' do
         Rails.application.assets.expects(:find_asset) \
                                 .with('base.css') \
-                                .returns(mock(:body => 'content of base.css'))
+                                .returns(mock(:to_s => 'content of base.css'))
 
         load_css_at_path('http://example.com/assets/base.css') \
           .should == 'content of base.css'
       end
+
+      it 'should return same file when path contains file fingerprint' do
+        Rails.application.assets \
+                         .expects(:find_asset) \
+                         .with('base.css') \
+                         .returns(mock(:to_s => 'content of base.css'))
+
+        load_css_at_path(
+          'http://example.com/assets/base-089e35bd5d84297b8d31ad552e433275.css'
+        ).should == 'content of base.css'
+      end
+
+      context 'when asset can not be found' do
+        before {
+          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'
+              }
+            )
+          )
+        }
+        let(:string_io) { StringIO.new('content of base.css') }
+        let(:url) {
+          'http://example.com/assets/base-089e35bd5d84297b8d31ad552e433275.css'
+        }
+
+        it 'should request the file' do
+          Kernel.expects(:open).with(url).returns(string_io)
+
+          load_css_at_path(
+            'http://example.com/assets/base.css'
+          ).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)
+
+          load_css_at_path(
+            'http://example.com/assets/base-089e35bd5d84297b8d31ad552e433275.css'
+          ).should == 'content of base.css'
+        end
+      end
     end
 
     context 'when static stylesheets are used' do

data/spec/premailer-rails3/premailer_rails_3_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
-describe PremailerRails3 do
+describe PremailerRails do
   describe '#config' do
-    subject { PremailerRails3.config }
+    subject { PremailerRails.config }
     it { should == {} }
 
     context 'when set' do
-      before { PremailerRails3.config = { :foo => :bar } }
+      before { PremailerRails.config = { :foo => :bar } }
       it { should == { :foo => :bar } }
     end
   end

data/spec/premailer-rails3/premailer_spec.rb

@@ -33,7 +33,7 @@ describe PremailerRails::Premailer do
     end
 
     it 'should pass on the configs' do
-      PremailerRails3.config = { :foo => :bar }
+      PremailerRails.config = { :foo => :bar }
       premailer = PremailerRails::Premailer.new('some html')
       premailer.instance_variable_get(:'@options')[:foo].should == :bar
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: premailer-rails3
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-10 00:00:00.000000000Z
+date: 2012-02-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: premailer
-  requirement: &2166561480 !ruby/object:Gem::Requirement
+  requirement: &2151950140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *2166561480
+  version_requirements: *2151950140
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2166560900 !ruby/object:Gem::Requirement
+  requirement: &2151949620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *2166560900
+  version_requirements: *2151949620
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &2166560420 !ruby/object:Gem::Requirement
+  requirement: &2151949240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166560420
+  version_requirements: *2151949240
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
-  requirement: &2166559940 !ruby/object:Gem::Requirement
+  requirement: &2151948780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166559940
+  version_requirements: *2151948780
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2166559460 !ruby/object:Gem::Requirement
+  requirement: &2151948360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166559460
+  version_requirements: *2151948360
 - !ruby/object:Gem::Dependency
   name: mail
-  requirement: &2166558980 !ruby/object:Gem::Requirement
+  requirement: &2151947940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166558980
+  version_requirements: *2151947940
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2166558500 !ruby/object:Gem::Requirement
+  requirement: &2151947520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166558500
+  version_requirements: *2151947520
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &2166558020 !ruby/object:Gem::Requirement
+  requirement: &2151947100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166558020
+  version_requirements: *2151947100
 description: ! "This gem brings you the power of the premailer gem to Rails 3\n                     without
   any configuration needs. Create HTML emails, include a\n                     CSS
   file as you do in a normal HTML document and premailer will\n                     inline
@@ -111,6 +111,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile