premailer-rails 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 665414165c8702efcbef9842568949b076dfb340
-  data.tar.gz: d0db56e2bde48b63b36ef13a7734af8571cc24c1
+  metadata.gz: 1acf912800a7228a1dcf6b89f5412ee87490f975
+  data.tar.gz: 2ab5e6bf63b3d7a0fa974b5495df7919eaeb9d10
 SHA512:
-  metadata.gz: 11a390432a6f4b4bdec544d5ef520a74021690a5bec1e937fc2940814b1bebfaae0d56c095d30e8f5baa76fcce080a233329c09d7c56be9e6123335bebb0ee7c
-  data.tar.gz: 708f338f00b204317d585d9fa632ed499bd7e97c473f0afdb007b36ab9ae7adba51cd4886f4f614da5fd285ffbc60be68c1e75f3d42490ef39c1207db1603b0e
+  metadata.gz: feef5aa13b18d39709bf2f9fd931eecff8876a11bf3500199f91c2ba06e15853d60787984425371b51ef4fbc60c555a7b8df38ab0e108e4c4766e4e624fba52b
+  data.tar.gz: dc7c3b13551d5445c58998154a342d79f2b4e0d56fd4b909d1264df3d0511e958d03bbd475f98a387c3c8bdec23fcead519c7a60ac150dff7955f78da46bb884

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
+before_install:
+  - gem install bundler
 cache: bundler
 script: "bundle exec rspec"
 rvm:
@@ -7,7 +9,7 @@ rvm:
   - 1.9.3
   - ruby-head
   - jruby-19mode
-  - rbx-2.1.1
+  - rbx-2
 env:
   - "ACTION_MAILER_VERSION=3.1.0"
   - "ACTION_MAILER_VERSION=3.2.0"

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v1.8.0
+
+- `ActionMailer` interceptors are registered after Rails initialization and no
+  longer when loading this gem. If you were using this gem outside Rails, you'll
+  need to call `Premailer::Rails.register_interceptors` manually.
+
 ## v1.7.0
 
 - Register preview hook for the new previewing functionality introduced in

data/README.md

@@ -117,6 +117,11 @@ the config `:generate_text_part` to false.
 Note that the options `:with_html_string` and `:css_string` are used internally
 by premailer-rails and thus will be overridden.
 
+If you're using this gem outside of Rails, you'll need to call
+`Premailer::Rails.register_interceptors` manually in order for it to work. This
+is done ideally in some kind of initializer, depending on the framework you're
+using.
+
 ## Usage
 
 premailer-rails processes all outgoing emails by default. If you wish to skip

data/VERSION

@@ -1 +1 @@
-1.7.0
+1.8.0

data/lib/premailer/rails.rb

@@ -6,6 +6,7 @@ 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
@@ -16,11 +17,13 @@ class Premailer
     class << self
       attr_accessor :config
     end
-  end
-end
 
-ActionMailer::Base.register_interceptor(Premailer::Rails::Hook)
+    def self.register_interceptors
+      ActionMailer::Base.register_interceptor(Premailer::Rails::Hook)
 
-if ActionMailer::Base.respond_to?(:register_preview_interceptor)
-  ActionMailer::Base.register_preview_interceptor(Premailer::Rails::Hook)
+      if ActionMailer::Base.respond_to?(:register_preview_interceptor)
+        ActionMailer::Base.register_preview_interceptor(Premailer::Rails::Hook)
+      end
+    end
+  end
 end

data/lib/premailer/rails/railtie.rb

@@ -0,0 +1,9 @@
+class Premailer
+  module Rails
+    class Railtie < ::Rails::Railtie
+      config.after_initialize do
+        ::Premailer::Rails.register_interceptors
+      end
+    end
+  end
+end

data/premailer-rails.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'premailer', '~> 1.7', '>= 1.7.9'
   s.add_dependency 'actionmailer', '>= 3', '< 5'
 
-  s.add_development_dependency 'rspec', '>= 3.0.0.beta1'
+  s.add_development_dependency 'rspec', '~> 3.0.0'
   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

@@ -26,7 +26,7 @@ describe Premailer::Rails::CSSHelper do
     context 'when HTML contains linked CSS files' do
       let(:files) { %w[ stylesheets/base.css stylesheets/font.css ] }
 
-      it 'should return the content of both files concatenated' do
+      it 'returns the content of both files concatenated' do
         allow(Premailer::Rails::CSSHelper).to \
           receive(:load_css)
             .with('http://example.com/stylesheets/base.css')
@@ -43,7 +43,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
+      it 'loads the CSS at the local path' do
         expect_file('public/stylesheets/base.css')
 
         load_css('http://example.com/stylesheets/base.css?test')
@@ -51,14 +51,14 @@ describe Premailer::Rails::CSSHelper do
     end
 
     context 'when path is a relative url' do
-      it 'should load the CSS at the local path' do
+      it 'loads the CSS at the local path' do
         expect_file('public/stylesheets/base.css')
         load_css('/stylesheets/base.css?test')
       end
     end
 
     context 'when file is cached' do
-      it 'should return the cached value' 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'
@@ -69,7 +69,7 @@ describe Premailer::Rails::CSSHelper do
     end
 
     context 'when in development mode' do
-      it 'should not return cached values' do
+      it 'does not return cached values' do
         cache =
           Premailer::Rails::CSSHelper.send(:instance_variable_get, '@cache')
         cache['http://example.com/stylesheets/base.css'] =
@@ -88,7 +88,7 @@ describe Premailer::Rails::CSSHelper do
       end
 
       context 'and a precompiled file exists' do
-        it 'should return that file' do
+        it 'returns that file' do
           path = '/assets/email-digest.css'
           content = 'read from file'
           expect_file("public#{path}", content)
@@ -96,7 +96,7 @@ describe Premailer::Rails::CSSHelper do
         end
       end
 
-      it 'should return the content of the file compiled by Rails' do
+      it 'returns the content of the file compiled by Rails' do
         expect(Rails.application.assets).to \
           receive(:find_asset)
             .with('base.css')
@@ -106,7 +106,7 @@ describe Premailer::Rails::CSSHelper do
           eq('content of base.css')
       end
 
-      it 'should return same file when path contains file fingerprint' do
+      it 'returns same file when path contains file fingerprint' do
         expect(Rails.application.assets).to \
           receive(:find_asset)
             .with('base.css')
@@ -136,19 +136,19 @@ describe Premailer::Rails::CSSHelper do
             receive(:get).with(uri_satisfaction).and_return(response)
         end
 
-        it 'should request the file' do
+        it 'requests the file' do
           expect(load_css(url)).to eq('content of base.css')
         end
 
         context 'when file url does not include the host' do
-          it 'should request the file using the asset host as host' do
+          it 'requests the file using the asset host as host' do
             expect(load_css(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 'should request the file using http as the scheme' do
+            it 'requests the file using http as the scheme' do
               expect(load_css(path)).to eq('content of base.css')
             end
           end
@@ -157,7 +157,7 @@ describe Premailer::Rails::CSSHelper do
     end
 
     context 'when static stylesheets are used' do
-      it 'should return the content of the static file' 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')

data/spec/integration/hook_registration_spec.rb

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

data/spec/spec_helper.rb

@@ -20,8 +20,3 @@ require 'support/fixtures/html'
 
 require 'hpricot' unless RUBY_PLATFORM == 'java'
 require 'nokogiri'
-
-RSpec.configure do |config|
-  config.raise_errors_for_deprecations!
-  config.expect_with(:rspec) { |c| c.syntax = :expect }
-end

data/spec/support/stubs/rails.rb

@@ -25,6 +25,18 @@ module Rails
     end
   end
 
+  class Railtie
+    class Configuration
+      def after_initialize
+        yield
+      end
+    end
+
+    def self.config
+      Configuration.new
+    end
+  end
+
   def env
     Env
   end

data/spec/unit/css_loaders/asset_pipeline_loader_spec.rb

@@ -14,17 +14,17 @@ describe Premailer::Rails::CSSLoaders::AssetPipelineLoader do
 
     context "when asset file path contains prefix" do
       let(:asset) { '/assets/application.css' }
-      it { should == 'application.css' }
+      it { is_expected.to eq('application.css') }
     end
 
     context "when asset file path contains fingerprint" do
       let(:asset) { 'application-6776f581a4329e299531e1d52aa59832.css' }
-      it { should == 'application.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 { should == "test/20130708152545-foo-bar.css" }
+      it { is_expected.to eq("test/20130708152545-foo-bar.css") }
     end
   end
 end

data/spec/unit/customized_premailer_spec.rb

@@ -8,7 +8,7 @@ describe Premailer::Rails::CustomizedPremailer do
       before { allow(Premailer::Adapter).to receive(:use).and_return(adapter) }
 
       describe '#to_plain_text' do
-        it 'should include the text from the HTML part' do
+        it 'includes the text from the HTML part' do
           premailer =
             Premailer::Rails::CustomizedPremailer
               .new(Fixtures::Message::HTML_PART)
@@ -21,7 +21,7 @@ describe Premailer::Rails::CustomizedPremailer do
         let(:regex) { %r{<p style=("|')color: ?red;?\1>} }
 
         context 'when inline CSS block present' do
-          it 'should return the HTML with the CSS inlined' 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
@@ -31,7 +31,7 @@ describe Premailer::Rails::CustomizedPremailer do
         end
 
         context 'when CSS is loaded externally' do
-          it 'should return the HTML with the CSS inlined' 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)
@@ -39,7 +39,7 @@ describe Premailer::Rails::CustomizedPremailer do
         end
 
         context 'when HTML contains unicode' do
-          it 'should not mess those up' 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 \
@@ -51,18 +51,18 @@ describe Premailer::Rails::CustomizedPremailer do
   end
 
   describe '.new' do
-    it 'should extract the CSS' do
+    it 'extracts the CSS' do
       expect(Premailer::Rails::CSSHelper).to receive(:css_for_doc)
       Premailer::Rails::CustomizedPremailer.new('some html')
     end
 
-    it 'should pass on the configs' do
+    it 'passes on the configs' do
       Premailer::Rails.config.merge!(foo: :bar)
       premailer = Premailer::Rails::CustomizedPremailer.new('some html')
       expect(premailer.instance_variable_get(:'@options')[:foo]).to eq(:bar)
     end
 
-    it 'should not allow to override with_html_string' do
+    it 'does not allow to override with_html_string' do
       Premailer::Rails.config.merge!(with_html_string: false)
       premailer = Premailer::Rails::CustomizedPremailer.new('some html')
       options = premailer.instance_variable_get(:'@options')

data/spec/unit/premailer_rails_spec.rb

@@ -4,8 +4,16 @@ describe Premailer::Rails do
   describe '#config' do
     subject { Premailer::Rails.config }
     context 'when set' do
-      before { Premailer::Rails.config = { foo: :bar } }
-      it { should == { foo: :bar } }
+      around do |example|
+        begin
+          default_config = described_class.config
+          described_class.config = { foo: :bar }
+          example.run
+        ensure
+          described_class.config = default_config
+        end
+      end
+      it { is_expected.to eq(foo: :bar) }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: premailer-rails
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Philipe Fatio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-07 00:00:00.000000000 Z
+date: 2014-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: premailer
@@ -54,16 +54,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -151,6 +151,7 @@ files:
 - lib/premailer/rails/css_loaders/network_loader.rb
 - lib/premailer/rails/customized_premailer.rb
 - lib/premailer/rails/hook.rb
+- lib/premailer/rails/railtie.rb
 - lib/premailer/rails/version.rb
 - premailer-rails.gemspec
 - spec/integration/css_helper_spec.rb
@@ -183,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Easily create styled HTML emails in Rails.
@@ -199,4 +200,3 @@ test_files:
 - spec/unit/css_loaders/asset_pipeline_loader_spec.rb
 - spec/unit/customized_premailer_spec.rb
 - spec/unit/premailer_rails_spec.rb
-has_rdoc: