premailer-rails 1.9.7 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 34449fbe39f5a20061a3f6b389a95c4286b6a2cc
-  data.tar.gz: 551a7262f0926f02554a6bea9c47eb4446d04d82
+SHA256:
+  metadata.gz: 77899a5ba8ec23d6cf40d3b3d630f7872e92cbc959ba64ac528b31a658ae6f13
+  data.tar.gz: 4d13e28457b824306a517a7cff731fd83713654367562c9a7192e8a632d62aa2
 SHA512:
-  metadata.gz: 507c28b394a9ec1fdf24e6a51b45f0cad7ac6b7ad3012f7c5993db164eeb1f100d9a410a10d4d5876f68cf9e8f9a3a2febf8a5cad5cc116823abaa84714ba8e7
-  data.tar.gz: f3fb70d57c1acf9e196dadc98c53061ed45b2604c9a721e8eff194dd9e42b45243c5c07b4bcaa6b555ae97e5d163ba27c65cb6dcbfab61ed9b4f2168f813f853
+  metadata.gz: fc27f934b5772cc632cb7424013d31176afcdf47e60696479eb712c4ee85abe24a5d2524848e862e5a1489aea0778a789b1f2e96dc308df5caeb91a06f763e96
+  data.tar.gz: c3de5ed3a8625350eff2c07b30ed01cf418f6bb0a820e2244ad1e5c1018f495d8270e699539e21fbcac2e31c43d5e9fc36202b867b4d784c8955f8ea6338d13d

data/.gitignore

@@ -2,3 +2,7 @@
 doc/
 Gemfile.lock
 coverage/
+spec/rails_app/tmp/
+spec/rails_app/log/
+.ruby-version
+/.bundle

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v1.10.0
+
+- Drop support for hpricot now that premailer-rails also doesn't support it
+- Use `Rails.application.assets_manifest` instead of `Rails.application.assets` in Asset Pipeline loader (@kirs, #201)
+- Introduce `:strategies` config option that allows to control CSS fetching stragies
+
 ## v1.9.7
 
 - Use `Rails.root` in `FileSystemLoader` (@stanhu, #195)

data/Gemfile

@@ -2,16 +2,20 @@ source 'https://rubygems.org'
 
 gemspec
 
-action_mailer_version = ENV.fetch('ACTION_MAILER_VERSION', '5')
+rails_version = ENV.fetch('ACTION_MAILER_VERSION', '5')
 
-if action_mailer_version == 'master'
+if rails_version == 'master'
   git 'git://github.com/rails/rails.git' do
-    gem 'actionmailer'
+    gem 'rails'
   end
+  gem 'sprockets-rails', github: 'rails/sprockets-rails'
+  gem 'arel', github: 'rails/arel'
 else
-  gem 'actionmailer', "~> #{action_mailer_version}"
+  gem 'rails', "~> #{rails_version}"
 end
 
+gem 'byebug'
+
 platforms :rbx do
   gem 'rubysl'
   gem 'racc'

data/README.md

@@ -39,34 +39,34 @@ styled emails without having to set anything up.
 Whenever premailer-rails processes an email, it collects the URLs of all linked
 stylesheets (`<link rel="stylesheet" href="css_url">`). Then, for each of these
 URLs, it tries to get the content through a couple of strategies. As long as
-a strategy does not return anything, the next one is used. The strategies and
-their order are as follows:
+a strategy does not return anything, the next one is used. The strategies
+available are:
 
-1.  **Cache:** If there's a file in cache matching that URL, the cache content
-    is returned.  The cache right now is rather rudimentary. Whenever a CSS file
-    is retrieved, it is stored in memory such that subsequent requests to the
-    same file are faster. The caching is disabled inside Rails in the
-    development environment.
-
-2.  **File System:** If there's a file inside `public/` with the same path as in
+-   `:filesystem`: If there's a file inside `public/` with the same path as in
     the URL, it is read from disk. E.g. if the URL is
     `http://cdn.example.com/assets/email.css` the contents of the file located
     at `public/assets/email.css` gets returned if it exists.
 
-3.  **Asset Pipeline:** If Rails is available and the asset pipeline is enabled,
+-   `:asset_pipeline`: If Rails is available and the asset pipeline is enabled,
     the file is retrieved through the asset pipeline. E.g. if the URL is
     `http://cdn.example.com/assets/email-fingerprint123.css`, the file
     `email.css` is requested from the asset pipeline. That is, the fingerprint
     and the prefix (in this case `assets` is the prefix) are stripped before
     requesting it from the asset pipeline.
 
-4.  **Network:** As a last resort, the URL is simply requested and the response
-    body is used. This is usefull when the assets are not bundled in the
+-   `:network`: As a last resort, the URL is simply requested and the response
+    body is used. This is useful when the assets are not bundled in the
     application and only available on a CDN. On Heroku e.g. you can add assets
     to your `.slugignore` causing your assets to not be available to the app
     (and thus resulting in a smaller app) and deploy the assets to a CDN such
     as S3/CloudFront.
 
+You can configure which strategies you want to use as well as specify their
+order. Refer to the *Configuration* section for more on this.
+
+Note that the retrieved CSS is cached when the gem is running with Rails in
+production.
+
 ## Installation
 
 Simply add the gem to your `Gemfile`:
@@ -75,20 +75,12 @@ Simply add the gem to your `Gemfile`:
 gem 'premailer-rails'
 ```
 
-premailer-rails requires either [nokogiri] or [hpricot]. It doesn't list them as
-a dependency so you can choose which one to use. Since hpricot is no longer
-maintained, I suggest you to go with nokogiri. Add either one to your `Gemfile`:
-
-```ruby
-gem 'nokogiri'
-# or
-gem 'hpricot'
-```
-
-If both gems are loaded for some reason, premailer chooses hpricot.
-
-You can also explicitly configure the apapter as documented
-[here](https://github.com/premailer/premailer#adapters).
+premailer-rails and premailer require a gem that is used to parse the email's
+HTML. For a list of supported gems and how to select which one to use, please
+refer to the [*Adapter*
+section](https://github.com/premailer/premailer#adapters) of premailer. Note
+that there is no hard dependency from either gem so you should add one yourself.
+Also note that this gem is only tested with [nokogiri].
 
 ## Configuration
 
@@ -107,7 +99,8 @@ configs are:
 ```ruby
 {
   input_encoding: 'UTF-8',
-  generate_text_part: true
+  generate_text_part: true,
+  strategies: [:filesystem, :asset_pipeline, :network]
 }
 ```
 
@@ -185,7 +178,6 @@ premailer-rails is released under the MIT license. See the [license file].
 [premailer]:    https://github.com/premailer/premailer
 [actionmailer]: https://github.com/rails/rails/tree/master/actionmailer
 [nokogiri]:     https://github.com/sparklemotion/nokogiri
-[hpricot]:      https://github.com/hpricot/hpricot
 
 [premailer documentation]: http://rubydoc.info/gems/premailer/1.7.3/Premailer:initialize
 

data/VERSION

@@ -1 +1 @@
-1.9.7
+1.10.0

data/lib/premailer/rails.rb

@@ -11,7 +11,8 @@ class Premailer
   module Rails
     @config = {
       input_encoding: 'UTF-8',
-      generate_text_part: true
+      generate_text_part: true,
+      strategies: [:filesystem, :asset_pipeline, :network]
     }
     class << self
       attr_accessor :config

data/lib/premailer/rails/css_helper.rb

@@ -5,12 +5,8 @@ class Premailer
 
       FileNotFound = Class.new(StandardError)
 
-      STRATEGIES = [
-        CSSLoaders::CacheLoader,
-        CSSLoaders::FileSystemLoader,
-        CSSLoaders::AssetPipelineLoader,
-        CSSLoaders::NetworkLoader
-      ]
+      attr_accessor :cache
+      self.cache = {}
 
       # Returns all linked CSS files concatenated as string.
       def css_for_doc(doc)
@@ -18,8 +14,10 @@ class Premailer
       end
 
       def css_for_url(url)
-        load_css(url).tap do |content|
-          CSSLoaders::CacheLoader.store(url, content)
+        if cache_enabled?
+          load_css_with_cache(url)
+        else
+          load_css(url)
         end
       end
 
@@ -36,14 +34,35 @@ class Premailer
         end
       end
 
+      def load_css_with_cache(url)
+        self.cache[url] ||= load_css(url)
+      end
+
+      def cache_enabled?
+        defined?(::Rails) && ::Rails.env.production?
+      end
+
       def load_css(url)
-        STRATEGIES.each do |strategy|
-          css = strategy.load(url)
+        Premailer::Rails.config.fetch(:strategies).each do |strategy|
+          css = find_strategy(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
+
+      def find_strategy(key)
+        case key
+        when :filesystem
+          CSSLoaders::FileSystemLoader
+        when :asset_pipeline
+          CSSLoaders::AssetPipelineLoader
+        when :network
+          CSSLoaders::NetworkLoader
+        else
+          key
+        end
+      end
     end
   end
 end

data/lib/premailer/rails/css_loaders.rb

@@ -1,6 +1,5 @@
 require 'uri'
 
-require 'premailer/rails/css_loaders/cache_loader'
 require 'premailer/rails/css_loaders/file_system_loader'
 require 'premailer/rails/css_loaders/asset_pipeline_loader'
 require 'premailer/rails/css_loaders/network_loader'

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

@@ -5,18 +5,11 @@ class Premailer
         extend self
 
         def load(url)
-          if asset_pipeline_present?
-            file = file_name(url)
-            asset = ::Rails.application.assets.find_asset(file)
-            asset.to_s if asset
-          end
-        end
+          return unless asset_pipeline_present?
 
-        def asset_pipeline_present?
-          defined?(::Rails) &&
-            ::Rails.respond_to?(:application) &&
-            ::Rails.application.respond_to?(:assets) &&
-            ::Rails.application.assets
+          file = file_name(url)
+          ::Rails.application.assets_manifest.find_sources(file).first
+        rescue Errno::ENOENT => _error
         end
 
         def file_name(url)
@@ -29,6 +22,10 @@ class Premailer
             .sub(/\A#{prefix}/, '')
             .sub(/-(\h{32}|\h{64})\.css\z/, '.css')
         end
+
+        def asset_pipeline_present?
+          defined?(::Rails) && ::Rails.application && ::Rails.application.assets_manifest
+        end
       end
     end
   end

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

@@ -14,7 +14,7 @@ class Premailer
 
           if uri.host.present?
             return uri if uri.scheme.present?
-            URI("http://#{uri.to_s}")
+            URI("http:#{uri}")
           elsif asset_host_present?
             scheme, host = asset_host(url).split(%r{:?//})
             scheme, host = host, scheme if host.nil?

data/lib/premailer/rails/customized_premailer.rb

@@ -4,10 +4,10 @@ class Premailer
       def initialize(html)
         # In order to pass the CSS as string to super it is necessary to access
         # the parsed HTML beforehand. To do so, the adapter needs to be
-        # initialized. The ::Premailer::Adaptor handles the discovery of a
-        # suitable adaptor (Nokogiri or Hpricot). To make load_html work, an
-        # adaptor needs to be included and @options[:with_html_string] needs to
-        # be set. For further information, refer to ::Premailer#initialize.
+        # initialized. The ::Premailer::Adapter handles the discovery of
+        # a suitable adapter. To make load_html work, an adapter needs to be
+        # included and @options[:with_html_string] needs to be set. For further
+        # information, refer to ::Premailer#initialize.
         @options = Rails.config.merge(with_html_string: true)
         Premailer.send(:include, Adapter.find(Adapter.use))
         doc = load_html(html)

data/premailer-rails.gemspec

@@ -26,6 +26,5 @@ Gem::Specification.new do |s|
 
   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'
 end

data/spec/integration/css_helper_spec.rb

@@ -1,186 +1,200 @@
 require 'spec_helper'
 
 describe Premailer::Rails::CSSHelper do
-  [ :Nokogiri, :Hpricot ].each do |adapter|
-    next if adapter == :Hpricot and RUBY_PLATFORM == 'java'
+  # Reset the CSS cache:
+  after do
+    Premailer::Rails::CSSHelper.cache = {}
+  end
 
-    context "when adapter is #{adapter}" do
-      # Reset the CSS cache:
-      after do
-        Premailer::Rails::CSSLoaders::CacheLoader.clear!
-      end
+  def css_for_url(path)
+    Premailer::Rails::CSSHelper.css_for_url(path)
+  end
 
-      def css_for_url(path)
-        Premailer::Rails::CSSHelper.css_for_url(path)
-      end
+  def css_for_doc(doc)
+    Premailer::Rails::CSSHelper.css_for_doc(doc)
+  end
+
+  def expect_file(path, content='file content')
+    path = "#{Rails.root}/#{path}"
+    allow(File).to receive(:file?).with(path).and_return(true)
+    expect(File).to receive(:read).with(path).and_return(content)
+  end
 
-      def css_for_doc(doc)
-        Premailer::Rails::CSSHelper.css_for_doc(doc)
+  describe '#css_for_doc' do
+    let(:html) { Fixtures::HTML.with_css_links(*files) }
+    let(:doc) { Nokogiri(html) }
+
+    context 'when HTML contains linked CSS files' do
+      let(:files) { %w[ stylesheets/base.css stylesheets/font.css ] }
+
+      it 'returns the content of both files concatenated' do
+        allow(Premailer::Rails::CSSHelper).to \
+          receive(:css_for_url)
+            .with('http://example.com/stylesheets/base.css')
+            .and_return('content of base.css')
+        allow(Premailer::Rails::CSSHelper).to \
+          receive(:css_for_url)
+            .with('http://example.com/stylesheets/font.css')
+            .and_return('content of font.css')
+
+        expect(css_for_doc(doc)).to eq("content of base.css\ncontent of font.css")
       end
+    end
 
-      def expect_file(path, content='file content')
-        allow(File).to receive(:file?).with(path).and_return(true)
-        expect(File).to receive(:read).with(path).and_return(content)
+    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_doc' do
-        let(:html) { Fixtures::HTML.with_css_links(*files) }
-        let(:doc) { send(adapter, html) }
+  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')
 
-        context 'when HTML contains linked CSS files' do
-          let(:files) { %w[ stylesheets/base.css stylesheets/font.css ] }
+        css_for_url('http://example.com/stylesheets/base.css?test')
+      end
+    end
 
-          it 'returns the content of both files concatenated' do
-            allow(Premailer::Rails::CSSHelper).to \
-              receive(:css_for_url)
-                .with('http://example.com/stylesheets/base.css')
-                .and_return('content of base.css')
-            allow(Premailer::Rails::CSSHelper).to \
-              receive(:css_for_url)
-                .with('http://example.com/stylesheets/font.css')
-                .and_return('content of font.css')
+    context 'when path is a relative url' do
+      it 'loads the CSS at the local path' do
+        expect_file('public/stylesheets/base.css')
+        css_for_url('/stylesheets/base.css?test')
+      end
+    end
 
-            expect(css_for_doc(doc)).to eq("content of base.css\ncontent of font.css")
-          end
-        end
+    context 'when cache is enabled' do
+      before do
+        allow(Premailer::Rails::CSSHelper).to receive(:cache_enabled?).and_return(true)
+      end
 
-        context 'when HTML contains ignored links' do
-          let(:files) { ['ignore.css', 'data-premailer' => 'ignore'] }
+      context 'when file is cached' do
+        it 'returns the cached value' do
+          Premailer::Rails::CSSHelper.cache['http://example.com/stylesheets/base.css'] = 'content of base.css'
 
-          it 'ignores links' do
-            expect(Premailer::Rails::CSSHelper).to_not receive(:css_for_url)
-            css_for_doc(doc)
-          end
+          expect(css_for_url('http://example.com/stylesheets/base.css')).to \
+            eq('content of base.css')
         end
       end
+    end
 
-      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')
+    context 'when cache is disabled' do
+      before do
+        allow(Premailer::Rails::CSSHelper).to receive(:cache_enabled?).and_return(false)
+      end
 
-            css_for_url('http://example.com/stylesheets/base.css?test')
-          end
-        end
+      it 'does not return cached values' do
+        Premailer::Rails::CSSHelper.cache['http://example.com/stylesheets/base.css'] = 'cached content'
+        content = 'new content of base.css'
+        expect_file('public/stylesheets/base.css', content)
 
-        context 'when path is a relative url' do
-          it 'loads the CSS at the local path' do
-            expect_file('public/stylesheets/base.css')
-            css_for_url('/stylesheets/base.css?test')
-          end
-        end
+        expect(css_for_url('http://example.com/stylesheets/base.css')).to eq(content)
+      end
+    end
 
-        context 'when file is cached' do
-          it 'returns the cached value' do
-            Premailer::Rails::CSSLoaders::CacheLoader.store(
-              'http://example.com/stylesheets/base.css',
-              'content of base.css'
-            )
+    context 'when Rails asset pipeline is used' do
+      before do
+        allow(Rails.configuration)
+          .to receive(:assets).and_return(double(prefix: '/assets'))
+        allow(Rails.configuration)
+          .to receive(:relative_url_root).and_return(nil)
+      end
 
-            expect(css_for_url('http://example.com/stylesheets/base.css')).to \
-              eq('content of base.css')
-          end
+      context 'and a precompiled file exists' do
+        it 'returns that file' do
+          path = '/assets/email-digest.css'
+          content = 'read from file'
+          expect_file("public#{path}", content)
+          expect(css_for_url(path)).to eq(content)
         end
+      end
 
-        context 'when in development mode' do
-          it 'does not return cached values' do
-            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(css_for_url('http://example.com/stylesheets/base.css')).to eq(content)
-          end
-        end
+      context "when find_sources raises Errno::ENOENT" do
+        let(:response) { 'content of base.css' }
+        let(:uri) { URI('http://example.com/assets/base.css') }
 
-        context 'when Rails asset pipeline is used' do
-          before do
-            allow(Rails.configuration)
-              .to receive(:assets).and_return(double(prefix: '/assets'))
-            allow(Rails.configuration)
-              .to receive(:relative_url_root).and_return(nil)
-          end
+        it "falls back to Net::HTTP" do
+          expect(Rails.application.assets_manifest).to \
+            receive(:find_sources)
+              .with('base.css')
+              .and_raise(Errno::ENOENT)
 
-          context 'and a precompiled file exists' do
-            it 'returns that file' do
-              path = '/assets/email-digest.css'
-              content = 'read from file'
-              expect_file("public#{path}", content)
-              expect(css_for_url(path)).to eq(content)
-            end
-          end
+          allow(Net::HTTP).to \
+            receive(:get).with(uri).and_return(response)
+          expect(css_for_url('http://example.com/assets/base.css')).to \
+            eq(response)
+        end
+      end
 
-          it 'returns the content of the file compiled by Rails' do
-            expect(Rails.application.assets).to \
-              receive(:find_asset)
-                .with('base.css')
-                .and_return(double(to_s: 'content of base.css'))
+      it 'returns the content of the file compiled by Rails' do
+        expect(Rails.application.assets_manifest).to \
+          receive(:find_sources)
+            .with('base.css')
+            .and_return(['content of base.css'])
 
-            expect(css_for_url('http://example.com/assets/base.css')).to \
-              eq('content of base.css')
-          end
+        expect(css_for_url('http://example.com/assets/base.css')).to \
+          eq('content of base.css')
+      end
 
-          it 'returns same file when path contains file fingerprint' do
-            expect(Rails.application.assets).to \
-              receive(:find_asset)
-                .with('base.css')
-                .and_return(double(to_s: 'content of base.css'))
+      it 'returns same file when path contains file fingerprint' do
+        expect(Rails.application.assets_manifest).to \
+          receive(:find_sources)
+            .with('base.css')
+            .and_return(['content of base.css'])
 
-            expect(css_for_url(
-              'http://example.com/assets/base-089e35bd5d84297b8d31ad552e433275.css'
-            )).to eq('content of base.css')
-          end
+        expect(css_for_url(
+          'http://example.com/assets/base-089e35bd5d84297b8d31ad552e433275.css'
+        )).to eq('content of base.css')
+      end
 
-          context 'when asset can not be found' do
-            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' }
+      context 'when asset can not be found' do
+        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
-              allow(Rails.application.assets).to \
-                receive(:find_asset).and_return(nil)
+        before do
+          allow(Rails.application.assets_manifest).to \
+            receive(:find_sources).and_return([])
 
-              config = double(asset_host: asset_host)
-              allow(Rails.configuration).to \
-                receive(:action_controller).and_return(config)
+          config = double(asset_host: asset_host)
+          allow(Rails.configuration).to \
+            receive(:action_controller).and_return(config)
 
-              uri_satisfaction = satisfy { |uri| uri.to_s == url }
-              allow(Net::HTTP).to \
-                receive(:get).with(uri_satisfaction).and_return(response)
-            end
+          allow(Net::HTTP).to \
+            receive(:get).with(URI(url)).and_return(response)
+        end
 
-            it 'requests the file' do
-              expect(css_for_url(url)).to eq('content of base.css')
-            end
+        it 'requests the file' do
+          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(css_for_url(path)).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(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' }
+          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(css_for_url(path)).to eq('content of base.css')
-                end
-              end
+            it 'requests the file using http as the scheme' do
+              expect(css_for_url(path)).to eq('content of base.css')
             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 = css_for_url('http://example.com/stylesheets/base.css')
-            expect(loaded_content).to eq(content)
-          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 = css_for_url('http://example.com/stylesheets/base.css')
+        expect(loaded_content).to eq(content)
       end
     end
   end

data/spec/integration/delivery_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe 'ActionMailer::Base delivery' do
+  it 'delivers email with inlined CSS' do
+    WelcomeMailer.welcome_email("world").deliver_now
+
+    mail = ActionMailer::Base.deliveries.last
+    expect(mail).to be_present
+    body = mail.html_part.body.to_s
+    expect(body).to be_present
+    expect(body).to include(%{<p style="font-size: 12px;">Hello world</p>})
+  end
+end

data/spec/integration/hook_spec.rb

@@ -91,7 +91,7 @@ describe Premailer::Rails::Hook do
 
     it 'does not replace any message part' do
       expect { run_hook(message) }.to_not \
-        change { message.all_parts.map(&:content_type) }
+        change { message.all_parts.map(&:content_type).sort }
     end
   end
 

data/spec/rails_app/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

data/spec/rails_app/app/assets/stylesheets/application.css

@@ -0,0 +1,3 @@
+p {
+  font-size: 12px;
+}

data/spec/rails_app/app/mailers/application_mailer.rb

@@ -0,0 +1,4 @@
+class ApplicationMailer < ActionMailer::Base
+  default from: 'from@example.com'
+  layout 'mailer'
+end

data/spec/rails_app/app/mailers/welcome_mailer.rb

@@ -0,0 +1,6 @@
+class WelcomeMailer < ApplicationMailer
+  def welcome_email(greeting)
+    @greeting = greeting
+    mail to: "example@example.com"
+  end
+end

data/spec/rails_app/app/views/layouts/mailer.html.erb

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <link rel="stylesheet" href="/assets/application.css"/>
+  </head>
+
+  <body>
+    <%= yield %>
+  </body>
+</html>

data/spec/rails_app/app/views/welcome_mailer/welcome_email.html.erb

@@ -0,0 +1 @@
+<p>Hello <%= @greeting %></p>

data/spec/rails_app/config.ru

@@ -0,0 +1,5 @@
+# This file is used by Rack-based servers to start the application.
+
+require_relative 'config/environment'
+
+run Rails.application

data/spec/rails_app/config/application.rb

@@ -0,0 +1,13 @@
+require_relative 'boot'
+
+require "action_mailer/railtie"
+require "action_view/railtie"
+require "sprockets/railtie"
+require "rails/test_unit/railtie"
+
+Bundler.require(*Rails.groups)
+
+module Dummy
+  class Application < Rails::Application
+  end
+end

data/spec/rails_app/config/boot.rb

@@ -0,0 +1,5 @@
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../Gemfile', __dir__)
+
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+$LOAD_PATH.unshift File.expand_path('../../../lib', __dir__)

data/spec/rails_app/config/environment.rb

@@ -0,0 +1,2 @@
+require_relative 'application'
+Rails.application.initialize!

data/spec/rails_app/config/environments/test.rb

@@ -0,0 +1,10 @@
+Rails.application.configure do
+  config.cache_classes = true
+  config.eager_load = false
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+  config.action_dispatch.show_exceptions = false
+  config.action_controller.allow_forgery_protection = false
+  config.action_mailer.delivery_method = :test
+  config.active_support.deprecation = :stderr
+end

data/spec/rails_app/config/initializers/assets.rb

@@ -0,0 +1 @@
+Rails.application.config.assets.version = '1.0'

data/spec/rails_app/config/routes.rb

@@ -0,0 +1,3 @@
+Rails.application.routes.draw do
+  root 'application#main'
+end

data/spec/spec_helper.rb

@@ -11,16 +11,11 @@ if RUBY_ENGINE == 'ruby'
   end
 end
 
-# Temporary fix for missing require. See
-# https://github.com/rails/rails/pull/28835
-require 'active_support/rescuable'
+# Configure Rails Environment
+ENV["RAILS_ENV"] = "test"
+require File.expand_path("../../spec/rails_app/config/environment.rb", __FILE__)
 
-require 'premailer/rails'
-
-require 'support/stubs/action_mailer'
-require 'support/stubs/rails'
 require 'support/fixtures/message'
 require 'support/fixtures/html'
 
-require 'hpricot' unless RUBY_PLATFORM == 'java'
 require 'nokogiri'

data/spec/unit/css_loaders/network_loader_spec.rb

@@ -18,7 +18,7 @@ describe Premailer::Rails::CSSLoaders::NetworkLoader do
 
     context 'with a protocol relative URL' do
       let(:url) { '//example.com/test.css' }
-      it { is_expected.to eq(URI("http://#{url}")) }
+      it { is_expected.to eq(URI("http:#{url}")) }
     end
 
     context 'with a file path' do

data/spec/unit/customized_premailer_spec.rb

@@ -1,51 +1,43 @@
 require 'spec_helper'
 
 describe Premailer::Rails::CustomizedPremailer do
-  [ :nokogiri, :hpricot ].each do |adapter|
-    next if adapter == :hpricot and RUBY_PLATFORM == 'java'
+  describe '#to_plain_text' do
+    it 'includes the text from the HTML part' do
+      premailer =
+        Premailer::Rails::CustomizedPremailer
+          .new(Fixtures::Message::HTML_PART)
+      expect(premailer.to_plain_text.gsub(/\s/, ' ').strip).to \
+        eq(Fixtures::Message::TEXT_PART.gsub(/\s/, ' ').strip)
+    end
+  end
 
-    context "when adapter is #{adapter}" do
-      before { allow(Premailer::Adapter).to receive(:use).and_return(adapter) }
+  describe '#to_inline_css' do
+    let(:regex) { %r{<p style=("|')color: ?red;?\1>} }
 
-      describe '#to_plain_text' do
-        it 'includes the text from the HTML part' do
-          premailer =
-            Premailer::Rails::CustomizedPremailer
-              .new(Fixtures::Message::HTML_PART)
-          expect(premailer.to_plain_text.gsub(/\s/, ' ').strip).to \
-            eq(Fixtures::Message::TEXT_PART.gsub(/\s/, ' ').strip)
-        end
+    context 'when inline CSS block present' do
+      it 'returns the HTML with the CSS inlined' do
+        allow(Premailer::Rails::CSSHelper).to \
+          receive(:css_for_doc).and_return('p { color: red; }')
+        html = Fixtures::Message::HTML_PART
+        premailer = Premailer::Rails::CustomizedPremailer.new(html)
+        expect(premailer.to_inline_css).to match(regex)
       end
+    end
 
-      describe '#to_inline_css' do
-        let(:regex) { %r{<p style=("|')color: ?red;?\1>} }
-
-        context 'when inline CSS block present' do
-          it 'returns the HTML with the CSS inlined' do
-            allow(Premailer::Rails::CSSHelper).to \
-              receive(:css_for_doc).and_return('p { color: red; }')
-            html = Fixtures::Message::HTML_PART
-            premailer = Premailer::Rails::CustomizedPremailer.new(html)
-            expect(premailer.to_inline_css).to match(regex)
-          end
-        end
-
-        context 'when CSS is loaded externally' do
-          it 'returns the HTML with the CSS inlined' do
-            html = Fixtures::Message::HTML_PART_WITH_CSS
-            premailer = Premailer::Rails::CustomizedPremailer.new(html)
-            expect(premailer.to_inline_css).to match(regex)
-          end
-        end
+    context 'when CSS is loaded externally' do
+      it 'returns the HTML with the CSS inlined' do
+        html = Fixtures::Message::HTML_PART_WITH_CSS
+        premailer = Premailer::Rails::CustomizedPremailer.new(html)
+        expect(premailer.to_inline_css).to match(regex)
+      end
+    end
 
-        context 'when HTML contains unicode' do
-          it 'does not mess those up' do
-            html = Fixtures::Message::HTML_PART_WITH_UNICODE
-            premailer = Premailer::Rails::CustomizedPremailer.new(html)
-            expect(premailer.to_inline_css).to \
-              include(Fixtures::Message::UNICODE_STRING)
-          end
-        end
+    context 'when HTML contains unicode' do
+      it 'does not mess those up' do
+        html = Fixtures::Message::HTML_PART_WITH_UNICODE
+        premailer = Premailer::Rails::CustomizedPremailer.new(html)
+        expect(premailer.to_inline_css).to \
+          include(Fixtures::Message::UNICODE_STRING)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: premailer-rails
 version: !ruby/object:Gem::Version
-  version: 1.9.7
+  version: 1.10.0
 platform: ruby
 authors:
 - Philipe Fatio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-26 00:00:00.000000000 Z
+date: 2017-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: premailer
@@ -78,20 +78,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: hpricot
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -149,7 +135,6 @@ files:
 - lib/premailer/rails/css_helper.rb
 - lib/premailer/rails/css_loaders.rb
 - lib/premailer/rails/css_loaders/asset_pipeline_loader.rb
-- lib/premailer/rails/css_loaders/cache_loader.rb
 - lib/premailer/rails/css_loaders/file_system_loader.rb
 - lib/premailer/rails/css_loaders/network_loader.rb
 - lib/premailer/rails/customized_premailer.rb
@@ -158,13 +143,24 @@ files:
 - lib/premailer/rails/version.rb
 - premailer-rails.gemspec
 - spec/integration/css_helper_spec.rb
-- spec/integration/hook_registration_spec.rb
+- spec/integration/delivery_spec.rb
 - spec/integration/hook_spec.rb
+- spec/rails_app/app/assets/config/manifest.js
+- spec/rails_app/app/assets/stylesheets/application.css
+- spec/rails_app/app/mailers/application_mailer.rb
+- spec/rails_app/app/mailers/welcome_mailer.rb
+- spec/rails_app/app/views/layouts/mailer.html.erb
+- spec/rails_app/app/views/welcome_mailer/welcome_email.html.erb
+- spec/rails_app/config.ru
+- spec/rails_app/config/application.rb
+- spec/rails_app/config/boot.rb
+- spec/rails_app/config/environment.rb
+- spec/rails_app/config/environments/test.rb
+- spec/rails_app/config/initializers/assets.rb
+- spec/rails_app/config/routes.rb
 - spec/spec_helper.rb
 - spec/support/fixtures/html.rb
 - spec/support/fixtures/message.rb
-- spec/support/stubs/action_mailer.rb
-- spec/support/stubs/rails.rb
 - spec/unit/css_loaders/asset_pipeline_loader_spec.rb
 - spec/unit/css_loaders/file_system_loader_spec.rb
 - spec/unit/css_loaders/network_loader_spec.rb
@@ -190,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.2
 signing_key: 
 specification_version: 4
 summary: Easily create styled HTML emails in Rails.
@@ -213,13 +209,24 @@ test_files:
 - 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/delivery_spec.rb
 - spec/integration/hook_spec.rb
+- spec/rails_app/app/assets/config/manifest.js
+- spec/rails_app/app/assets/stylesheets/application.css
+- spec/rails_app/app/mailers/application_mailer.rb
+- spec/rails_app/app/mailers/welcome_mailer.rb
+- spec/rails_app/app/views/layouts/mailer.html.erb
+- spec/rails_app/app/views/welcome_mailer/welcome_email.html.erb
+- spec/rails_app/config.ru
+- spec/rails_app/config/application.rb
+- spec/rails_app/config/boot.rb
+- spec/rails_app/config/environment.rb
+- spec/rails_app/config/environments/test.rb
+- spec/rails_app/config/initializers/assets.rb
+- spec/rails_app/config/routes.rb
 - spec/spec_helper.rb
 - spec/support/fixtures/html.rb
 - spec/support/fixtures/message.rb
-- spec/support/stubs/action_mailer.rb
-- spec/support/stubs/rails.rb
 - spec/unit/css_loaders/asset_pipeline_loader_spec.rb
 - spec/unit/css_loaders/file_system_loader_spec.rb
 - spec/unit/css_loaders/network_loader_spec.rb

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

@@ -1,29 +0,0 @@
-class Premailer
-  module Rails
-    module CSSLoaders
-      module CacheLoader
-        extend self
-
-        @cache = {}
-
-        def load(url)
-          @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) &&
-            ::Rails.respond_to?(:env) &&
-            ::Rails.env.development?
-        end
-      end
-    end
-  end
-end

data/spec/integration/hook_registration_spec.rb

@@ -1,11 +0,0 @@
-require 'spec_helper'
-
-describe 'ActionMailer::Base.register_interceptor' do
-  it 'registers interceptors' do
-    expect(ActionMailer::Base).to \
-      receive(:register_interceptor).with(Premailer::Rails::Hook)
-    expect(ActionMailer::Base).to \
-      receive(:register_preview_interceptor).with(Premailer::Rails::Hook)
-    load 'premailer/rails.rb'
-  end
-end

data/spec/support/stubs/action_mailer.rb

@@ -1,5 +0,0 @@
-module ActionMailer
-  class Base
-    def self.register_interceptor(x); end
-  end
-end

data/spec/support/stubs/rails.rb

@@ -1,51 +0,0 @@
-module Rails
-  extend self
-
-  module Configuration
-    extend self
-  end
-
-  module Env
-    extend self
-
-    def development?
-      false
-    end
-  end
-
-  module Application
-    extend self
-
-    module Assets
-      extend self
-    end
-
-    def assets
-      Assets
-    end
-  end
-
-  class Railtie
-    class Configuration
-      def after_initialize
-        yield
-      end
-    end
-
-    def self.config
-      Configuration.new
-    end
-  end
-
-  def env
-    Env
-  end
-
-  def configuration
-    Configuration
-  end
-
-  def application
-    Application
-  end
-end