premailer-rails 1.8.2 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ef9ec48ca64d88fcd427db297397c18a20f6711
-  data.tar.gz: f6c87f62f912f57f0d5f302138abd6160a65d99d
+  metadata.gz: 3a6895871c0ec4e4443e1a1d6bf22d9239756659
+  data.tar.gz: 9143e6f08bc542eb428ac14433bf1b0fb7d5851b
 SHA512:
-  metadata.gz: aa2493ad95cdc85442f350a4d613ce66a996b114ac2054dd0c2a145f9ce54c844371dbbb053e4011e3a4a95a4a2986e98037d2d6fe00a8879bfec2f0edf952bd
-  data.tar.gz: 946de795ff75887899fb882ed7b74d0497b5e78af394f118c4369f8c779aede8626f08def7bfd5675b645f925b882f596d04269f40719c1c50a80b8d653ab14e
+  metadata.gz: 6a72305f6009dee21b9b29dbc06cd4619012606e7b10dc0949abdc45854763aebce9fb5f6c08b0ba50934cdc8cf5c2a03df01f1658f4efbae0c07065695ffbae
+  data.tar.gz: ce3df301bb6e8a81d46c6ae51bf7d3bc8af5ba9360b60b51b43bb8f68d5f6c75100625e96fc941057f428a9ae1d051580d7f546bdf3e45d71ee8552d40b09aad

data/.travis.yml

@@ -1,21 +1,18 @@
+sudo: false
 language: ruby
-before_install:
-  - gem install bundler
 cache: bundler
 script: "bundle exec rspec"
 rvm:
-  - 2.1.0
-  - 2.0.0
   - 1.9.3
+  - 2.2.2
   - ruby-head
   - jruby-19mode
-  - rbx-2
 env:
-  - "ACTION_MAILER_VERSION=3.1.0"
-  - "ACTION_MAILER_VERSION=3.2.0"
-  - "ACTION_MAILER_VERSION=4.0.0"
-  - "ACTION_MAILER_VERSION=head"
+  - "ACTION_MAILER_VERSION=3.2"
+  - "ACTION_MAILER_VERSION=4.0"
+  - "ACTION_MAILER_VERSION=master"
 matrix:
   allow_failures:
-    - env: "ACTION_MAILER_VERSION=head"
+    - env: "ACTION_MAILER_VERSION=master"
     - rvm: ruby-head
+    - rvm: rbx-2

data/CHANGELOG.md

@@ -1,9 +1,15 @@
 # Changelog
 
+## v1.9.0
+
+- Improved CSS loading and caching.
+- Fixed incompatibility with newer rails and sprockets versions.
+
 ## v1.8.2
 
 - `Premailer::Rails::CSSLoaders::NetworkLoader` is more resilient and works even
   if the Rails asset host is set without a URI scheme. (panthomakos)
+- Remove stylesheet links from the HTML that have been processed.
 
 ## v1.8.1
 

data/Gemfile

@@ -4,7 +4,7 @@ gemspec
 
 action_mailer_version = ENV.fetch('ACTION_MAILER_VERSION', '4.0')
 
-if action_mailer_version == 'head'
+if action_mailer_version == 'master'
   git 'git://github.com/rails/rails.git' do
     gem 'actionmailer'
   end
@@ -16,3 +16,5 @@ platforms :rbx do
   gem 'rubysl'
   gem 'racc'
 end
+
+gem 'tins', '< 1.7' if RUBY_VERSION.split('.').first.to_i < 2

data/README.md

@@ -7,7 +7,6 @@ CSS styled emails without the hassle.
 [![Dependency Status][deps-image]][deps-link]
 [![Code Climate][gpa-image]][gpa-link]
 [![Coverage Status][cov-image]][cov-link]
-[![Bitdeli Badge][stats-image]][stats-link]
 
 ## Introduction
 
@@ -148,25 +147,21 @@ transformed into a string, causing `'false'` to become truethy.
 
 Philipe Fatio ([@fphilipe][fphilipe twitter])
 
-[![Support via Gittip][tip-image]][tip-link]
-
 ### License
 
 premailer-rails is released under the MIT license. See the [license file].
 
-[build-image]: https://travis-ci.org/fphilipe/premailer-rails.png
+[build-image]: https://travis-ci.org/fphilipe/premailer-rails.svg
 [build-link]:  https://travis-ci.org/fphilipe/premailer-rails
-[gem-image]:   https://badge.fury.io/rb/premailer-rails.png
+[gem-image]:   https://badge.fury.io/rb/premailer-rails.svg
 [gem-link]:    https://rubygems.org/gems/premailer-rails
-[deps-image]:  https://gemnasium.com/fphilipe/premailer-rails.png
+[deps-image]:  https://gemnasium.com/fphilipe/premailer-rails.svg
 [deps-link]:   https://gemnasium.com/fphilipe/premailer-rails
-[gpa-image]:   https://codeclimate.com/github/fphilipe/premailer-rails.png
+[gpa-image]:   https://codeclimate.com/github/fphilipe/premailer-rails.svg
 [gpa-link]:    https://codeclimate.com/github/fphilipe/premailer-rails
-[cov-image]:   https://coveralls.io/repos/fphilipe/premailer-rails/badge.png
+[cov-image]:   https://coveralls.io/repos/fphilipe/premailer-rails/badge.svg
 [cov-link]:    https://coveralls.io/r/fphilipe/premailer-rails
-[stats-image]: https://d2weczhvl823v0.cloudfront.net/fphilipe/premailer-rails/trend.png
-[stats-link]:  https://bitdeli.com/
-[tip-image]:   https://rawgithub.com/twolfson/gittip-badge/0.1.0/dist/gittip.png
+[tip-image]:   https://rawgithub.com/twolfson/gittip-badge/0.1.0/dist/gittip.svg
 [tip-link]:    https://www.gittip.com/fphilipe/
 
 [premailer]:    https://github.com/premailer/premailer

data/VERSION

@@ -1 +1 @@
-1.8.2
+1.9.0

data/example/Gemfile

@@ -1,8 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', github: 'rails'
-gem 'sprockets-rails'
-
+gem 'rails', '4.2.5'
 gem 'premailer-rails', path: '..'
 gem 'nokogiri'
 

data/example/config.ru

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path('../config/environment', __FILE__)
 run Rails.application

data/example/config/application.rb

@@ -2,6 +2,7 @@ require File.expand_path('../boot', __FILE__)
 
 require 'action_controller/railtie'
 require 'action_mailer/railtie'
+require 'sprockets/railtie'
 
 Bundler.require(*Rails.groups)
 

data/example/config/boot.rb

@@ -1,4 +1,3 @@
-# Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' # Set up gems listed in the Gemfile.

data/example/config/environments/development.rb

@@ -2,4 +2,8 @@ Rails.application.configure do
   config.cache_classes = false
   config.eager_load = false
   config.consider_all_requests_local = true
+  config.action_controller.perform_caching = false
+  config.assets.debug = true
+  config.assets.digest = true
+  config.assets.raise_runtime_errors = true
 end

data/example/config/environments/production.rb

@@ -0,0 +1,9 @@
+Rails.application.configure do
+  config.cache_classes = true
+  config.eager_load = true
+  config.consider_all_requests_local = false
+  config.action_controller.perform_caching = true
+  config.assets.compile = false
+  config.assets.digest = true
+  config.log_level = :info
+end

data/example/config/initializers/assets.rb

@@ -0,0 +1,2 @@
+Rails.application.config.assets.version = '1.0'
+Rails.application.config.assets.precompile += %w( email.css )

data/lib/premailer/rails/css_helper.rb

@@ -3,8 +3,7 @@ class Premailer
     module CSSHelper
       extend self
 
-      @cache = {}
-      attr :cache
+      FileNotFound = Class.new(StandardError)
 
       STRATEGIES = [
         CSSLoaders::CacheLoader,
@@ -15,24 +14,31 @@ class Premailer
 
       # Returns all linked CSS files concatenated as string.
       def css_for_doc(doc)
-        urls = css_urls_in_doc(doc)
-        urls.map { |url| load_css(url).force_encoding('UTF-8') }.join("\n")
+        css_urls_in_doc(doc).map { |url| css_for_url(url) }.join("\n")
+      end
+
+      def css_for_url(url)
+        load_css(url).tap do |content|
+          CSSLoaders::CacheLoader.store(url, content)
+        end
       end
 
       private
 
       def css_urls_in_doc(doc)
         doc.search('link[@rel="stylesheet"]').map do |link|
+          link.remove
           link.attributes['href'].to_s
         end
       end
 
       def load_css(url)
-        @cache[url] =
-          STRATEGIES.each do |strategy|
-            css = strategy.load(url)
-            break css if css
-          end
+        STRATEGIES.each do |strategy|
+          css = strategy.load(url)
+          return css.force_encoding('UTF-8') if css
+        end
+
+        raise FileNotFound, %{File with URL "#{url}" could not be loaded by any strategy.}
       end
     end
   end

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

@@ -13,7 +13,9 @@ class Premailer
         end
 
         def asset_pipeline_present?
-          defined?(::Rails) and ::Rails.application.respond_to?(:assets)
+          defined?(::Rails) &&
+            ::Rails.application.respond_to?(:assets) &&
+            ::Rails.application.assets
         end
 
         def file_name(url)

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

@@ -4,14 +4,22 @@ class Premailer
       module CacheLoader
         extend self
 
+        @cache = {}
+
         def load(url)
-          unless development_env?
-            CSSHelper.cache[url]
-          end
+          @cache[url] unless development_env?
+        end
+
+        def store(url, content)
+          @cache[url] ||= content unless development_env?
+        end
+
+        def clear!
+          @cache = {}
         end
 
         def development_env?
-          defined?(::Rails) and ::Rails.env.development?
+          defined?(::Rails) && ::Rails.env.development?
         end
       end
     end

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

@@ -24,10 +24,6 @@ class Premailer
           end
         end
 
-        def valid_uri?(uri)
-          uri.host.present? && uri.scheme.present?
-        end
-
         def asset_host_present?
           ::Rails.configuration.action_controller.asset_host.present?
         end

data/lib/premailer/rails/customized_premailer.rb

@@ -11,9 +11,9 @@ class Premailer
         @options = Rails.config.merge(with_html_string: true)
         Premailer.send(:include, Adapter.find(Adapter.use))
         doc = load_html(html)
-
         options = @options.merge(css_string: CSSHelper.css_for_doc(doc))
-        super(html, options)
+
+        super(doc.to_s, options)
       end
     end
   end

data/premailer-rails.gemspec

@@ -16,14 +16,14 @@ Gem::Specification.new do |s|
                      premailer will inline the included CSS.}
 
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.test_files    = `git ls-files -- {example,spec}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
   s.add_dependency 'premailer', '~> 1.7', '>= 1.7.9'
   s.add_dependency 'actionmailer', '>= 3', '< 5'
 
-  s.add_development_dependency 'rspec', '~> 3.0.0'
+  s.add_development_dependency 'rspec', '~> 3.3'
   s.add_development_dependency 'nokogiri'
   s.add_development_dependency 'hpricot' unless RUBY_PLATFORM == 'java'
   s.add_development_dependency 'coveralls' if RUBY_ENGINE == 'ruby'

data/spec/integration/css_helper_spec.rb

@@ -3,11 +3,11 @@ require 'spec_helper'
 describe Premailer::Rails::CSSHelper do
   # Reset the CSS cache:
   after do
-    Premailer::Rails::CSSHelper.send(:instance_variable_set, '@cache', {})
+    Premailer::Rails::CSSLoaders::CacheLoader.clear!
   end
 
-  def load_css(path)
-    Premailer::Rails::CSSHelper.send(:load_css, path)
+  def css_for_url(path)
+    Premailer::Rails::CSSHelper.css_for_url(path)
   end
 
   def css_for_doc(doc)
@@ -28,11 +28,11 @@ describe Premailer::Rails::CSSHelper do
 
       it 'returns the content of both files concatenated' do
         allow(Premailer::Rails::CSSHelper).to \
-          receive(:load_css)
+          receive(:css_for_url)
             .with('http://example.com/stylesheets/base.css')
             .and_return('content of base.css')
         allow(Premailer::Rails::CSSHelper).to \
-          receive(:load_css)
+          receive(:css_for_url)
             .with('http://example.com/stylesheets/font.css')
             .and_return('content of font.css')
 
@@ -41,44 +41,45 @@ describe Premailer::Rails::CSSHelper do
     end
   end
 
-  describe '#load_css' do
+  describe '#css_for_url' do
     context 'when path is a url' do
       it 'loads the CSS at the local path' do
         expect_file('public/stylesheets/base.css')
 
-        load_css('http://example.com/stylesheets/base.css?test')
+        css_for_url('http://example.com/stylesheets/base.css?test')
       end
     end
 
     context 'when path is a relative url' do
       it 'loads the CSS at the local path' do
         expect_file('public/stylesheets/base.css')
-        load_css('/stylesheets/base.css?test')
+        css_for_url('/stylesheets/base.css?test')
       end
     end
 
     context 'when file is cached' do
       it 'returns the cached value' do
-        cache =
-          Premailer::Rails::CSSHelper.send(:instance_variable_get, '@cache')
-        cache['http://example.com/stylesheets/base.css'] = 'content of base.css'
+        Premailer::Rails::CSSLoaders::CacheLoader.store(
+          'http://example.com/stylesheets/base.css',
+          'content of base.css'
+        )
 
-        expect(load_css('http://example.com/stylesheets/base.css')).to \
+        expect(css_for_url('http://example.com/stylesheets/base.css')).to \
           eq('content of base.css')
       end
     end
 
     context 'when in development mode' do
       it 'does not return cached values' do
-        cache =
-          Premailer::Rails::CSSHelper.send(:instance_variable_get, '@cache')
-        cache['http://example.com/stylesheets/base.css'] =
+        Premailer::Rails::CSSLoaders::CacheLoader.store(
+          'http://example.com/stylesheets/base.css',
           'cached content of base.css'
+        )
         content = 'new content of base.css'
         expect_file('public/stylesheets/base.css', content)
         allow(Rails.env).to receive(:development?).and_return(true)
 
-        expect(load_css('http://example.com/stylesheets/base.css')).to eq(content)
+        expect(css_for_url('http://example.com/stylesheets/base.css')).to eq(content)
       end
     end
 
@@ -92,7 +93,7 @@ describe Premailer::Rails::CSSHelper do
           path = '/assets/email-digest.css'
           content = 'read from file'
           expect_file("public#{path}", content)
-          expect(load_css(path)).to eq(content)
+          expect(css_for_url(path)).to eq(content)
         end
       end
 
@@ -102,7 +103,7 @@ describe Premailer::Rails::CSSHelper do
             .with('base.css')
             .and_return(double(to_s: 'content of base.css'))
 
-        expect(load_css('http://example.com/assets/base.css')).to \
+        expect(css_for_url('http://example.com/assets/base.css')).to \
           eq('content of base.css')
       end
 
@@ -112,7 +113,7 @@ describe Premailer::Rails::CSSHelper do
             .with('base.css')
             .and_return(double(to_s: 'content of base.css'))
 
-        expect(load_css(
+        expect(css_for_url(
           'http://example.com/assets/base-089e35bd5d84297b8d31ad552e433275.css'
         )).to eq('content of base.css')
       end
@@ -137,30 +138,30 @@ describe Premailer::Rails::CSSHelper do
         end
 
         it 'requests the file' do
-          expect(load_css(url)).to eq('content of base.css')
+          expect(css_for_url(url)).to eq('content of base.css')
         end
 
         context 'when file url does not include the host' do
           it 'requests the file using the asset host as host' do
-            expect(load_css(path)).to eq('content of base.css')
+            expect(css_for_url(path)).to eq('content of base.css')
           end
 
           context 'and the asset host uses protocol relative scheme' do
             let(:asset_host) { '//assets.example.com' }
 
             it 'requests the file using http as the scheme' do
-              expect(load_css(path)).to eq('content of base.css')
+              expect(css_for_url(path)).to eq('content of base.css')
             end
           end
         end
-     end
+      end
     end
 
     context 'when static stylesheets are used' do
       it 'returns the content of the static file' do
         content = 'content of base.css'
         expect_file('public/stylesheets/base.css', content)
-        loaded_content = load_css('http://example.com/stylesheets/base.css')
+        loaded_content = css_for_url('http://example.com/stylesheets/base.css')
         expect(loaded_content).to eq(content)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: premailer-rails
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.9.0
 platform: ruby
 authors:
 - Philipe Fatio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-25 00:00:00.000000000 Z
+date: 2015-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: premailer
@@ -56,14 +56,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +139,8 @@ files:
 - example/config/boot.rb
 - example/config/environment.rb
 - example/config/environments/development.rb
+- example/config/environments/production.rb
+- example/config/initializers/assets.rb
 - example/config/routes.rb
 - example/config/secrets.yml
 - example/test/mailers/previews/example_mailer_preview.rb
@@ -185,11 +187,27 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Easily create styled HTML emails in Rails.
 test_files:
+- example/Gemfile
+- example/README.md
+- example/Rakefile
+- example/app/assets/stylesheets/email.css
+- example/app/mailers/example_mailer.rb
+- example/app/views/example_mailer/test_message.html.erb
+- example/config.ru
+- example/config/application.rb
+- example/config/boot.rb
+- example/config/environment.rb
+- example/config/environments/development.rb
+- example/config/environments/production.rb
+- example/config/initializers/assets.rb
+- example/config/routes.rb
+- example/config/secrets.yml
+- example/test/mailers/previews/example_mailer_preview.rb
 - spec/integration/css_helper_spec.rb
 - spec/integration/hook_registration_spec.rb
 - spec/integration/hook_spec.rb
@@ -202,3 +220,4 @@ test_files:
 - spec/unit/css_loaders/network_loader_spec.rb
 - spec/unit/customized_premailer_spec.rb
 - spec/unit/premailer_rails_spec.rb
+has_rdoc: