premailer-rails 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41073202cdcfc614302e4ebd78983e637bca0509
-  data.tar.gz: e6cffc67a632087c4403ae5ae3bc315f6949bcee
+  metadata.gz: faaccc100fbcc92e0c79ee426a2a3b4b2ae16ecd
+  data.tar.gz: 4e183a0856f2bcd01e5955efc1d7bd750e19edf4
 SHA512:
-  metadata.gz: af6af666d40e0d924d3a8982fd240d407d9b5f01e8295d03c7aaa411285876ef23c03dc54aad10e0c4e0e28caa0c5132f7d0230c74edf0828e79664e1b30bf37
-  data.tar.gz: e1b3fa698a622be4fe6fd1bd18d9407dbac7823417fc0bf251adda5af9f096dec35fdbbca0f055dc5754fe7de763db3e541cfd84edbf0180d44a8d81012ffcbd
+  metadata.gz: 83535e5fd7f0b6540c8d9e18769a6b3e0dd0112559f56fa33dd279bbd399e281aee0ecbf3f885aea3bad3e529f2eca0026ef8c1092c6b70844c214caec7ddb6d
+  data.tar.gz: e195868f2495abe7d4a8b188f389d0a84ce9870d1b66e48793b62b8c72722ed86d3bf73d2fce29d8869c63f692677b035423732e2befe2ea1e98570c95dad282

data/.travis.yml

@@ -3,8 +3,6 @@ script: "bundle exec rspec"
 rvm:
   - 2.0.0
   - 1.9.3
-  - 1.8.7
-  - jruby-18mode # JRuby in 1.8 mode
-  - jruby-19mode # JRuby in 1.9 mode
-  - rbx-18mode
+  - jruby-19mode
   - rbx-19mode
+env: "JRUBY_OPTS=--debug"

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## v1.5.0
+
+- No longer support ruby 1.8
+
+- Find linked stylesheets by `rel='stylesheet'` attribute instead of
+  `type='text/css'`
+
+- Don't test hpricot on JRuby due to incompatibility
+
+## v1.4.0
+
+- Fix attachments
+
+## v1.3.2
+
+- Rename gem to premailer-rails (drop the 3)
+
+- Add support for rails 4
+
+- Refactor code
+
+- Add support for precompiled assets
+
+- No longer include default `email.css`
+
 ## v1.1.0
 
 - Fixed several bugs

data/README.md

@@ -4,7 +4,6 @@
 [![Gem Version](https://badge.fury.io/rb/premailer-rails.png)](http://badge.fury.io/rb/premailer-rails)
 [![Dependency Status](https://gemnasium.com/fphilipe/premailer-rails.png)](https://gemnasium.com/fphilipe/premailer-rails)
 [![Code Climate](https://codeclimate.com/github/fphilipe/premailer-rails.png)](https://codeclimate.com/github/fphilipe/premailer-rails)
-[![Coverage Status](https://coveralls.io/repos/fphilipe/premailer-rails/badge.png?branch=master)](https://coveralls.io/r/fphilipe/premailer-rails)
 
 This gem is a no config solution for the wonderful [Premailer gem](https://github.com/alexdunae/premailer) to be used with Rails.
 It uses interceptors which were introduced in Rails 3 and tweaks all mails which are `deliver`ed and adds a plain text part to them and inlines all CSS rules into the HTML part.
@@ -12,7 +11,7 @@ It uses interceptors which were introduced in Rails 3 and tweaks all mails which
 By default it inlines all inline `<style>` declarations and all the CSS files that are linked to in the HTML:
 
 ```html
-<link type='text/css' ... />
+<link rel="stylesheet" ... />
 ```
 
 Don't worry about the host in the CSS URL since this will be ignored.
@@ -50,8 +49,8 @@ pass these options on to the underlying premailer instance, specify them in an
 initializer:
 
 ```ruby
-Premailer::Rails.config.merge!(:preserve_styles => true,
-                               :remove_ids      => true)
+Premailer::Rails.config.merge!(preserve_styles: true,
+                               remove_ids:      true)
 ```
 
 For a list of options, refer to the [Premailer documentation](http://rubydoc.info/gems/premailer/1.7.3/Premailer:initialize)
@@ -60,9 +59,9 @@ The default configs are:
 
 ```ruby
 {
-  :input_encoding     => 'UTF-8',
-  :inputencoding      => 'UTF-8',
-  :generate_text_part => true
+  input_encoding:     'UTF-8',
+  inputencoding:      'UTF-8',
+  generate_text_part: true
 }
 ```
 
@@ -73,3 +72,7 @@ If you want to use another encoding make sure to specify the right one or both.
 If you don't want to automatically generate a text part from the html part, set the config `:generate_text_part` to false.
 
 Note that the options `:with_html_string` and `:css_string` are used internally and thus will be overridden.
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/fphilipe/premailer-rails/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

data/Rakefile

@@ -4,4 +4,4 @@ Bundler::GemHelper.install_tasks
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.5.0

data/lib/premailer/rails.rb

@@ -11,9 +11,9 @@ require 'premailer/rails/nokogiri_fix'
 class Premailer
   module Rails
     @config = {
-      :input_encoding     => 'UTF-8',
-      :inputencoding      => 'UTF-8',
-      :generate_text_part => true
+      input_encoding:     'UTF-8',
+      inputencoding:      'UTF-8',
+      generate_text_part: true
     }
     class << self
       attr_accessor :config

data/lib/premailer/rails/css_helper.rb

@@ -24,7 +24,7 @@ class Premailer
       private
 
       def css_urls_in_doc(doc)
-        doc.search('link[@type="text/css"]').map do |link|
+        doc.search('link[@rel="stylesheet"]').map do |link|
           link.attributes['href'].to_s
         end
       end

data/lib/premailer/rails/css_loaders.rb

@@ -32,8 +32,9 @@ class Premailer
         end
 
         def file_name(path)
-          path.sub("#{::Rails.configuration.assets.prefix}/", '') \
-            .sub(/-.*\.css$/, '.css')
+          path
+            .sub("#{::Rails.configuration.assets.prefix}/", '')
+            .sub(/-\h{32}\.css$/, '.css')
         end
 
         def request_and_unzip(file)

data/lib/premailer/rails/customized_premailer.rb

@@ -8,11 +8,11 @@ class Premailer
         # 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.
-        @options = Rails.config.merge(:with_html_string => true)
+        @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))
+        options = @options.merge(css_string: CSSHelper.css_for_doc(doc))
         super(html, options)
       end
     end

data/lib/premailer/rails/hook.rb

@@ -44,7 +44,7 @@ class Premailer
       end
 
       def generate_alternative_part
-        part = Mail::Part.new(:content_type => 'multipart/alternative')
+        part = Mail::Part.new(content_type: 'multipart/alternative')
         part.add_part(generate_html_part)
         part.add_part(generate_text_part)
 
@@ -57,18 +57,18 @@ class Premailer
         generate_text_part  if generate_text_part?
 
         Mail::Part.new(
-          :content_type => "text/html; charset=#{html_part.charset}",
-          :body => premailer.to_inline_css)
+          content_type: "text/html; charset=#{html_part.charset}",
+          body: premailer.to_inline_css)
       end
 
       def generate_text_part
         @text_part ||= Mail::Part.new(
-          :content_type => "text/plain; charset=#{html_part.charset}",
-          :body => premailer.to_plain_text)
+          content_type: "text/plain; charset=#{html_part.charset}",
+          body: premailer.to_plain_text)
       end
 
       def premailer
-        @premailer ||= CustomizedPremailer.new(html_part.body.to_s)
+        @premailer ||= CustomizedPremailer.new(html_part.decoded)
       end
 
       def html_part
@@ -91,7 +91,7 @@ class Premailer
       # are used for the message. If the new part is
       def replace_in_pure_html_message(new_part)
         if new_part.content_type.include?('text/html')
-          message.body = new_part.body.to_s
+          message.body = new_part.decoded
           message.content_type = new_part.content_type
         else
           message.body = nil

data/premailer-rails.gemspec

@@ -20,14 +20,13 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency("premailer", ["~> 1.7"])
-  s.add_dependency("rails", [">= 3"])
+  s.add_dependency 'premailer', '~> 1.7'
+  s.add_dependency 'rails', '>= 3'
 
   s.add_development_dependency 'rspec-core'
   s.add_development_dependency 'rspec-expectations'
   s.add_development_dependency 'mocha'
   s.add_development_dependency 'mail'
   s.add_development_dependency 'nokogiri'
-  s.add_development_dependency 'hpricot'
-  s.add_development_dependency 'coveralls'
+  s.add_development_dependency 'hpricot' unless RUBY_PLATFORM == 'java'
 end

data/spec/fixtures/html.rb

@@ -19,7 +19,7 @@ module Fixtures
     HTML
 
     LINK = <<-LINK
-<link rel='stylesheet' type='text/css' href='%s' />
+<link rel='stylesheet' href='%s' />
     LINK
 
     def with_css_links(*files)

data/spec/fixtures/message.rb

@@ -52,7 +52,7 @@ nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
       content_part = message
 
       if part_types.include?(:html) and part_types.include?(:text)
-        content_part = Mail::Part.new(:content_type => 'multipart/alternative')
+        content_part = Mail::Part.new(content_type: 'multipart/alternative')
         message.add_part(content_part)
       end
 
@@ -73,7 +73,7 @@ nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
       end
 
       if part_types.include? :attachment
-        message.add_file(:filename => 'foo.png', :content => 'foobar')
+        message.add_file(filename: 'foo.png', content: 'foobar')
       end
 
       message.ready_to_send!

data/spec/lib/css_helper_spec.rb

@@ -14,19 +14,19 @@ describe Premailer::Rails::CSSHelper do
 
   describe '#css_for_doc' do
     let(:html) { Fixtures::HTML.with_css_links(*files) }
-    let(:doc) { Hpricot(html) }
+    let(:doc) { Nokogiri(html) }
 
     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
-        Premailer::Rails::CSSHelper \
-          .expects(:load_css) \
-          .with('http://example.com/stylesheets/base.css') \
+        Premailer::Rails::CSSHelper
+          .expects(:load_css)
+          .with('http://example.com/stylesheets/base.css')
           .returns('content of base.css')
-        Premailer::Rails::CSSHelper \
-          .expects(:load_css) \
-          .with('http://example.com/stylesheets/font.css') \
+        Premailer::Rails::CSSHelper
+          .expects(:load_css)
+          .with('http://example.com/stylesheets/font.css')
           .returns('content of font.css')
 
         css_for_doc(doc).should == "content of base.css\ncontent of font.css"
@@ -57,7 +57,7 @@ describe Premailer::Rails::CSSHelper do
           Premailer::Rails::CSSHelper.send(:instance_variable_get, '@cache')
         cache['/stylesheets/base.css'] = 'content of base.css'
 
-        load_css('http://example.com/stylesheets/base.css') \
+        load_css('http://example.com/stylesheets/base.css')
           .should == 'content of base.css'
       end
     end
@@ -67,12 +67,12 @@ 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') \
+        File.expects(:read)
+            .with('RAILS_ROOT/public/stylesheets/base.css')
             .returns('new content of base.css')
         Rails.env.stubs(:development?).returns(true)
 
-        load_css('http://example.com/stylesheets/base.css') \
+        load_css('http://example.com/stylesheets/base.css')
           .should == 'new content of base.css'
       end
     end
@@ -81,26 +81,27 @@ describe Premailer::Rails::CSSHelper do
       before {
         Rails.configuration.stubs(:assets).returns(
           stub(
-            :enabled => true,
-            :prefix  => '/assets'
+            enabled: true,
+            prefix:  '/assets'
           )
         )
       }
 
       it 'should return the content of the file compiled by Rails' do
-        Rails.application.assets.expects(:find_asset) \
-                                .with('base.css') \
-                                .returns(mock(:to_s => 'content of base.css'))
+        Rails.application.assets
+          .expects(:find_asset)
+          .with('base.css')
+          .returns(mock(to_s: 'content of base.css'))
 
-        load_css('http://example.com/assets/base.css') \
+        load_css('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'))
+        Rails.application.assets
+          .expects(:find_asset)
+          .with('base.css')
+          .returns(mock(to_s: 'content of base.css'))
 
         load_css(
           'http://example.com/assets/base-089e35bd5d84297b8d31ad552e433275.css'
@@ -111,13 +112,13 @@ describe Premailer::Rails::CSSHelper do
         before {
           Rails.application.assets.stubs(:find_asset).returns(nil)
           Rails.configuration.stubs(:action_controller).returns(
-            stub(:asset_host => 'http://example.com')
+            stub(asset_host: 'http://example.com')
           )
           Rails.configuration.stubs(:assets).returns(
             stub(
-              :enabled => true,
-              :prefix  => '/assets',
-              :digests => {
+              enabled: true,
+              prefix:  '/assets',
+              digests: {
                 'base.css' => 'base-089e35bd5d84297b8d31ad552e433275.css'
               }
             )
@@ -148,11 +149,11 @@ describe Premailer::Rails::CSSHelper do
 
     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') \
+        File.expects(:read)
+            .with('RAILS_ROOT/public/stylesheets/base.css')
             .returns('content of base.css')
 
-        load_css('http://example.com/stylesheets/base.css') \
+        load_css('http://example.com/stylesheets/base.css')
           .should == 'content of base.css'
       end
     end

data/spec/lib/customized_premailer_spec.rb

@@ -4,15 +4,17 @@ require 'spec_helper'
 
 describe Premailer::Rails::CustomizedPremailer do
   [ :nokogiri, :hpricot ].each do |adapter|
+    next if adapter == :hpricot and RUBY_PLATFORM == 'java'
+
     context "when adapter is #{adapter}" do
       before { Premailer::Adapter.stubs(:use).returns(adapter) }
 
       describe '#to_plain_text' do
         it 'should include the text from the HTML part' do
           premailer =
-            Premailer::Rails::CustomizedPremailer \
+            Premailer::Rails::CustomizedPremailer
               .new(Fixtures::Message::HTML_PART)
-          premailer.to_plain_text.gsub(/\s/, ' ').strip \
+          premailer.to_plain_text.gsub(/\s/, ' ').strip
             .should == Fixtures::Message::TEXT_PART.gsub(/\s/, ' ').strip
         end
       end
@@ -20,12 +22,12 @@ describe Premailer::Rails::CustomizedPremailer do
       describe '#to_inline_css' do
         context 'when inline CSS block present' do
           it 'should return the HTML with the CSS inlined' do
-            Premailer::Rails::CSSHelper \
-              .stubs(:css_for_doc) \
+            Premailer::Rails::CSSHelper
+              .stubs(:css_for_doc)
               .returns('p { color: red; }')
             html = Fixtures::Message::HTML_PART
             premailer = Premailer::Rails::CustomizedPremailer.new(html)
-            premailer.to_inline_css.should include '<p style="color: red;">'
+            premailer.to_inline_css.should =~ /<p style=("|')color: ?red;?\1>/
           end
         end
 
@@ -33,7 +35,7 @@ describe Premailer::Rails::CustomizedPremailer do
           it 'should return the HTML with the CSS inlined' do
             html = Fixtures::Message::HTML_PART_WITH_CSS
             premailer = Premailer::Rails::CustomizedPremailer.new(html)
-            premailer.to_inline_css.should include '<p style="color: red;">'
+            premailer.to_inline_css.should =~ /<p style=("|')color: ?red;?\1>/
           end
         end
       end
@@ -47,13 +49,13 @@ describe Premailer::Rails::CustomizedPremailer do
     end
 
     it 'should pass on the configs' do
-      Premailer::Rails.config = { :foo => :bar }
+      Premailer::Rails.config = { foo: :bar }
       premailer = Premailer::Rails::CustomizedPremailer.new('some html')
       premailer.instance_variable_get(:'@options')[:foo].should == :bar
     end
 
     it 'should not allow to override with_html_string' do
-      Premailer::Rails.config = { :with_html_string => false }
+      Premailer::Rails.config = { with_html_string: false }
       premailer = Premailer::Rails::CustomizedPremailer.new('some html')
       options = premailer.instance_variable_get(:'@options')
       options[:with_html_string].should == true

data/spec/lib/hook_registration_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe 'ActionMailer::Base.register_interceptor' do
   it 'should register interceptor Premailer::Rails::Hook' do
-    ActionMailer::Base \
-      .expects(:register_interceptor) \
+    ActionMailer::Base
+      .expects(:register_interceptor)
       .with(Premailer::Rails::Hook)
     load 'premailer/rails.rb'
   end

data/spec/lib/premailer_rails_3_spec.rb

@@ -4,8 +4,8 @@ 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 } }
+      before { Premailer::Rails.config = { foo: :bar } }
+      it { should == { foo: :bar } }
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,10 +1,3 @@
-if RUBY_VERSION >= '1.9'
-  require 'coveralls'
-  Coveralls.wear! do
-    add_filter 'spec/'
-  end
-end
-
 require 'premailer/rails'
 
 require 'stubs/action_mailer'
@@ -12,7 +5,7 @@ require 'stubs/rails'
 require 'fixtures/message'
 require 'fixtures/html'
 
-require 'hpricot'
+require 'hpricot' unless RUBY_PLATFORM == 'java'
 require 'nokogiri'
 
 RSpec.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: premailer-rails
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Philipe Fatio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2013-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: premailer
@@ -122,20 +122,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  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'
 description: |-
   This gem brings you the power of the premailer gem to Rails
                        without any configuration needs. Create HTML emails,
@@ -195,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Easily create styled HTML emails in Rails.