inline-style 0.4.2 → 0.4.6

data/.gitignore

@@ -0,0 +1,4 @@
+pkg/*
+*.gem
+.bundle
+*.swp

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in inline-style.gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,52 @@
+PATH
+  remote: .
+  specs:
+    inline-style (0.4.6)
+      css_parser
+      maca-fork-csspool
+      nokogiri
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.0.4)
+    css_parser (1.1.5)
+    diff-lcs (1.1.2)
+    ffi (1.0.6)
+      rake (>= 0.8.7)
+    i18n (0.5.0)
+    maca-fork-csspool (2.0.2)
+      ffi
+    mail (2.2.15)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    nokogiri (1.4.4)
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rake (0.8.7)
+    rspec (2.4.0)
+      rspec-core (~> 2.4.0)
+      rspec-expectations (~> 2.4.0)
+      rspec-mocks (~> 2.4.0)
+    rspec-core (2.4.0)
+    rspec-expectations (2.4.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.4.0)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  css_parser
+  inline-style!
+  maca-fork-csspool
+  mail
+  nokogiri
+  rack
+  rspec
+  rspec-core

data/Manifest.txt

@@ -1,12 +1,19 @@
 History.txt
 Manifest.txt
-README.rdoc
+README.txt
 Rakefile
 example.rb
+inline-style.gemspec
 lib/inline-style.rb
+lib/inline-style/css_parsers.rb
+lib/inline-style/css_parsers/css_parser.rb
+lib/inline-style/css_parsers/csspool.rb
+lib/inline-style/mail/interceptor.rb
 lib/inline-style/rack/middleware.rb
 spec/as_middleware_spec.rb
 spec/css_inlining_spec.rb
+spec/css_parsers_spec.rb
+spec/factory_spec.rb
 spec/fixtures/all.css
 spec/fixtures/boletin.html
 spec/fixtures/box-model.html
@@ -15,4 +22,5 @@ spec/fixtures/none.css
 spec/fixtures/print.css
 spec/fixtures/selectors.html
 spec/fixtures/style.css
+spec/interceptor_spec.rb
 spec/spec_helper.rb

data/{README.rdoc → README.txt}

@@ -10,6 +10,8 @@ each refered element taking selector specificity and declarator order.
 Useful for html email: some clients (gmail, et all) won't render non inline styles.
 
 * Includes a Rack middleware for using with Rails, Sinatra, etc...
+* Includes a interceptor for the mail gem which allows automatic
+  inline processing for both mail as well as ActionMailer.
 * It takes into account selector specificity.
 
 == USAGE
@@ -92,12 +94,23 @@ Will become:
     
     # Restrict processing to some routes:
     use InlineStyle::Rack::Middleware, :paths => [%r(/mails/.*), "/somepath"]
+
+== MAIL INTERCEPTOR
+
+If using the mail library the following code will work:
+
+   Mail.register_interceptor \
+     InlineStyle::Mail::Interceptor.new(:stylesheets_path => 'public')
+
+If using ActionMailer (which wraps mail):
+
+   ActionMailer::Base.register_interceptor \
+     InlineStyle::Mail::Interceptor.new(:stylesheets_path => 'public')
     
 == ISSUES:
 
 * It supports pseudo classes according to W3C specification for style in style attribute: http://www.w3.org/TR/css-style-attr, although browsers
 doesn't seems to.
-* It strips any numeric character (Rails may add) at the end of the stylesheet file name, anyway stylesheets should end with .css extension
 
 == REQUIREMENTS:
 
@@ -130,4 +143,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,26 +1,9 @@
-require 'rubygems' unless ENV['NO_RUBYGEMS']
-%w[rake rake/clean fileutils newgem rubigen].each { |f| require f }
-require File.dirname(__FILE__) + '/lib/inline-style'
-
-$hoe = Hoe.new('inline-style', InlineStyle::VERSION) do |p|
-  p.developer('Macario Ortega', 'macarui@gmail.com')
-  p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.rubyforge_name       = p.name
-  p.extra_deps         = [
-    ['nokogiri','>= 1.3.3'],
-    ['maca-fork-csspool', '>= 2.0.2']  
-  ]
-  p.extra_dev_deps = [
-    ['newgem', ">= #{::Newgem::VERSION}"]
-  ]
-  
-  p.clean_globs |= %w[**/.DS_Store tmp *.log]
-  path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
-  p.remote_rdoc_dir = File.join(path.gsub(/^#{p.rubyforge_name}\/?/,''), 'rdoc')
-  p.rsync_args = '-av --delete --ignore-errors'
-end
-
-require 'newgem/tasks'
-Dir['tasks/**/*.rake'].each { |t| load t }
-
-
+require 'bundler'
+require "rspec/core/rake_task"
+
+task :default => [:spec]
+
+desc "Run specs"
+RSpec::Core::RakeTask.new(:spec)
+
+Bundler::GemHelper.install_tasks

data/inline-style.gemspec

@@ -0,0 +1,30 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "inline-style/version"
+
+Gem::Specification.new do |s|
+  s.name        = "inline-style"
+  s.version     = Inline::Style::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Macario Ortega", "Eric Anderson"]
+  s.email       = ["macarui@gmail.com"]
+  s.homepage    = ""
+  s.summary     = %q{Inlines CSS for html email delivery}
+  s.description = %q{Inlines CSS for html email delivery}
+
+  # s.rubyforge_project = "inline-style"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rack'
+  s.add_development_dependency 'rspec-core'
+  s.add_development_dependency 'mail'
+
+  s.add_dependency 'nokogiri'
+  s.add_dependency 'css_parser'
+  s.add_dependency 'maca-fork-csspool'
+end

data/lib/inline-style.rb

@@ -1,14 +1,11 @@
 require 'nokogiri'
 require 'open-uri'
 
-gem 'maca-fork-csspool'
-require 'csspool'
-
+require "#{ File.dirname( __FILE__ ) }/inline-style/css_parsers"
 require "#{ File.dirname( __FILE__ ) }/inline-style/rack/middleware"
+require "#{ File.dirname( __FILE__ ) }/inline-style/mail/interceptor"
 
 module InlineStyle
-  VERSION = '0.4.2'  
-
   #   Options:
   #     +:stylesheets_path+
   #       Stylesheets root path, can also be a URL
@@ -27,41 +24,44 @@ module InlineStyle
     css   = extract_css html, stylesheets_path
     nodes = {}
 
-    css.rule_sets.each do |rule_set|
-      rule_set.selectors.each do |selector|
-        css_selector = selector.to_s
+    css.each_rule_set do |rule_set|
+      rule_set.each_selector do |css_selector, declarations, specificity|
+        orig_selector = css_selector.dup
         css_selector = "#{ 'body ' unless /^body/ === css_selector }#{ css_selector.gsub /:.*/, '' }"
         
         html.css(css_selector).each do |node|
           nodes[node] ||= []
-          nodes[node].push selector
+          nodes[node].push [css_selector, declarations, specificity, orig_selector]
           
           next unless node['style']
           
           path = node.css_path
           path << "##{ node['id'] }" if node['id']
           path << ".#{ node['class'].scan(/\S+/).join('.') }" if node['class']
-          
-          CSSPool.CSS("#{ path }{#{ node['style'] }}").rule_sets.each{ |rule| nodes[node].push *rule.selectors }
+
+          InlineStyle::CssParsers.parser.new("#{ path }{#{ node['style'] }}").each_rule_set do |rule|
+            rule.each_selector do |css_selector_inner, declarations_inner, specificity_inner|
+              nodes[node].push [css_selector_inner, declarations_inner, specificity_inner, css_selector_inner]
+            end
+          end
         end
       end
     end
 
     nodes.each_pair do |node, style|
-      style = style.sort_by{ |sel| "#{ sel.specificity }%03d" % style.index(sel) }
-      sets  = style.partition{ |sel| not /:\w+/ === sel.to_s  }
+      style = style.sort_by{ |(sel, dec, spe, orig)| "#{ spe }%03d" % style.index([sel, dec, spe, orig]) }
+      sets  = style.partition{ |(sel, dec, spe, orig)| not /:\w+/ === orig  }
       
       sets.pop if not pseudo or sets.last.empty?
       
       node['style'] = sets.collect do |selectors|
         index = sets.index selectors
         
-        set   = selectors.map do |selector|
-          declarations = selector.declarations.map{ |d| d.to_css.squeeze(' ') }.join
-          index == 0 ? declarations : "\n#{ selector.to_s.gsub /\w(?=:)/, '' } {#{ declarations }}"
+        set   = selectors.map do |(css_selector, declarations, specificity, orig_selector)|
+          index == 0 ? declarations : "\n#{ orig_selector.gsub /\w(?=:)/, '' } {#{ declarations }}"
         end
                      
-        index == 0 && sets.size > 1 ? "{#{ set }}" : set.join
+        index == 0 && sets.size > 1 ? "{#{ set }}" : set.collect(&:strip).join(' ')
       end.join.strip
     end
     
@@ -70,8 +70,8 @@ module InlineStyle
   
   # Returns CSSPool::Document
   def self.extract_css html, stylesheets_path = ''
-    CSSPool.CSS html.css('style, link').collect { |e|
-      next unless e['media'].nil?  or ['screen', 'all'].include? e['media']
+    InlineStyle::CssParsers.parser.new html.css('style, link').collect { |e|
+      next unless e['media'].nil? || ['screen', 'all'].include?(e['media'])
       next(e.remove and e.content) if e.name == 'style'
       next unless e['rel'] == 'stylesheet'
       e.remove
@@ -80,4 +80,4 @@ module InlineStyle
       open(uri).read rescue nil
     }.join("\n")
   end
-end
+end

data/lib/inline-style/css_parsers.rb

@@ -0,0 +1,21 @@
+module InlineStyle
+
+  # A factory for returning a configured CSS parser. Defaults to
+  # :css_parser if not specified. Will also use ENV['CSS_PARSER'].
+  module CssParsers
+
+    # Allows you to specify the CSS parser to use.
+    def self.parser=(parser)
+      @parser = nil
+      @parser_name = parser
+    end
+
+    def self.parser
+      return @parser if @parser
+      @parser_name = ENV['CSS_PARSER'] || :css_parser unless @parser_name
+      require "inline-style/css_parsers/#{@parser_name}"
+      @parser = const_get(@parser_name.to_s.gsub(/(?:^|_)(.)/) { $1.upcase })
+    end
+
+  end
+end

data/lib/inline-style/css_parsers/css_parser.rb

@@ -0,0 +1,56 @@
+require 'css_parser'
+
+module InlineStyle::CssParsers
+  class CssParser
+
+    def initialize(css_code)
+      @parser = ::CssParser::Parser.new
+      @parser.add_block! css_code
+    end
+
+    def each_rule_set(&blk)
+      @parser.each_rule_set do |rule_set|
+        yield Ruleset.new(rule_set)
+      end
+    end
+
+    class Ruleset
+
+      def initialize(ruleset)
+        @ruleset = ruleset
+      end
+
+      def each_selector
+        @ruleset.each_selector do |sel, dec, spe|
+          normalize_for_test! dec
+          yield sel, dec, spe
+        end
+      end
+
+      private
+
+      # To make testings work for both parsers we need to conform to
+      # csspool normalizing attributes. This means all numbers have a
+      # decimal place. It also means that urls do not have quotes.
+      #
+      # NOTE: This really doesn't have anything to do with the
+      # correctness of the parser. It just makes testing easier since
+      # each parser can run against the same tests.
+      def normalize_for_test!(dec)
+
+          # Give all numbers a decimal if they do not already have it
+          dec.gsub! '0;', '0.0;'
+          dec.gsub! ' 0 ', ' 0.0 '
+          dec.gsub! /([^\.0-9]\d+)px/, '\1.0px'
+          dec.gsub! /([^\.0-9]\d+)%/, '\1.0%'
+
+          # Remove any quotes in url()
+          dec.gsub! "url('", 'url('
+          dec.gsub! "')", ')'
+
+      end
+
+    end
+
+  end
+end

data/lib/inline-style/css_parsers/csspool.rb

@@ -0,0 +1,34 @@
+gem 'maca-fork-csspool'
+require 'csspool'
+
+module InlineStyle::CssParsers
+  class Csspool
+
+    def initialize(css_code)
+      @parser = CSSPool.CSS css_code
+    end
+
+    def each_rule_set
+      @parser.rule_sets.each do |rule_set|
+        yield Ruleset.new(rule_set)
+      end
+    end
+
+    class Ruleset
+
+      def initialize(ruleset)
+        @ruleset = ruleset
+      end
+
+      def each_selector(&blk)
+        @ruleset.selectors.each do |selector|
+          yield selector.to_s,
+            selector.declarations.map{ |d| d.to_s.squeeze(' ') }.join.strip,
+            selector.specificity.inject(0) {|t, s| t+s}
+        end
+      end
+
+    end
+
+  end
+end

data/lib/inline-style/mail/interceptor.rb

@@ -0,0 +1,37 @@
+# A interceptor for +mail+ (https://github.com/mikel/mail) to
+# automatically inline the styles of outgoing e-mails. To use:
+#
+#   Mail.register_interceptor \
+#     InlineStyle::Mail::Interceptor.new(:stylesheets_path => 'public')
+#
+# Rails 3's ActionMailer wraps around the +mail+ and also supports
+# interceptors. Example usage:
+#
+#   ActionMailer::Base.register_interceptor \
+#     InlineStyle::Mail::Interceptor.new(:stylesheets_path => 'public')
+module InlineStyle
+  module Mail
+    class Interceptor
+      # The mime types we should inline. Basically HTML and XHTML.
+      # If you have something else you can just push it onto the list
+      INLINE_MIME_TYPES = %w(text/html application/xhtml+xml)
+
+      # Save the options to later pass to InlineStyle.process
+      def initialize(options={})
+        @options = options
+      end
+
+      # Mail callback where we actually inline the styles
+      def delivering_email(part)
+        if part.multipart?
+          for part in part.parts
+            delivering_email part
+          end
+        elsif INLINE_MIME_TYPES.any? {|m| part.content_type.starts_with? m}
+          part.body = InlineStyle.process(part.body.to_s, @options)
+        end
+      end
+
+    end
+  end
+end

data/lib/inline-style/rack/middleware.rb

@@ -3,8 +3,8 @@ module InlineStyle
     class Middleware
       #
       #   Options:
-      #     +document_root+
-      #       File system path for app's public directory where the stylesheets are to be found, defaults to
+      #     +stylesheets_path+
+      #       Stylesheets root path or app's public directory where the stylesheets are to be found, defaults to
       #       env['DOCUMENT_ROOT']
       #     
       #     +paths+
@@ -33,7 +33,7 @@ module InlineStyle
         response = ::Rack::Response.new '', status, headers
         body     = content.respond_to?(:body) ? content.body : content
         
-        response.write InlineStyle.process(body, {:document_root => env['DOCUMENT_ROOT']}.merge(@opts))
+        response.write InlineStyle.process(body, {:stylesheets_path => env['DOCUMENT_ROOT']}.merge(@opts))
         response.finish
       end
     end

data/lib/inline-style/version.rb

@@ -0,0 +1,5 @@
+module Inline
+  module Style
+    VERSION = '0.4.6'  
+  end
+end

data/spec/css_parsers_spec.rb

@@ -0,0 +1,55 @@
+require "#{ File.dirname __FILE__ }/spec_helper"
+require "#{ DIR }/../lib/inline-style/css_parsers/css_parser"
+require "#{ DIR }/../lib/inline-style/css_parsers/csspool"
+
+describe InlineStyle::CssParsers::CssParser do
+
+  it 'should wrap css_parser' do
+    rs_count = 0
+    sel_count = 0
+    selectors = %w(p b i)
+    decs = ['color: black;', 'color: black;', 'color: green; text-decoration: none;']
+    spes = [1, 1, 1]
+    p = InlineStyle::CssParsers::CssParser.new "p, b {color: black}\ni {color: green; text-decoration: none}"
+
+    p.each_rule_set do |rs|
+      rs_count += 1
+      rs.each_selector do |sel, dec, spe|
+        sel_count += 1
+        sel.should == selectors.shift
+        dec.should == decs.shift
+        spe.should == spes.shift
+      end
+    end
+
+    rs_count.should == 2
+    sel_count.should == 3
+  end
+
+end
+
+describe InlineStyle::CssParsers::Csspool do
+
+  it 'should wrap csspool' do
+    rs_count = 0
+    sel_count = 0
+    selectors = %w(p b i)
+    decs = ['color: black;', 'color: black;', 'color: green; text-decoration: none;']
+    spes = [1, 1, 1]
+    p = InlineStyle::CssParsers::Csspool.new "p, b {color: black}\ni {color: green; text-decoration: none}"
+
+    p.each_rule_set do |rs|
+      rs_count += 1
+      rs.each_selector do |sel, dec, spe|
+        sel_count += 1
+        sel.should == selectors.shift
+        dec.should == decs.shift
+        spe.should == spes.shift
+      end
+    end
+
+    rs_count.should == 2
+    sel_count.should == 3
+  end
+
+end

data/spec/factory_spec.rb

@@ -0,0 +1,38 @@
+require "#{ File.dirname __FILE__ }/spec_helper"
+
+describe InlineStyle::CssParsers do
+
+  before do
+    @orig_env = ENV['CSS_PARSER']
+    ENV['CSS_PARSER'] = nil
+    InlineStyle::CssParsers.parser = nil # Clear out any cached value
+  end
+  after do
+    ENV['CSS_PARSER'] = @orig_env
+    InlineStyle::CssParsers.parser = nil # Clear out any cached value
+  end
+
+  it 'should load css_parser by default' do
+    InlineStyle::CssParsers.parser.name.
+    should == 'InlineStyle::CssParsers::CssParser'
+  end
+
+  it "should obey ENV['CSS_PARSER']" do
+    ENV['CSS_PARSER'] = 'css_parser'
+    InlineStyle::CssParsers.parser.name.
+    should == 'InlineStyle::CssParsers::CssParser'
+  end
+
+  it 'should be able to load csspool' do
+    InlineStyle::CssParsers.parser = :csspool
+    InlineStyle::CssParsers.parser.name.
+    should == 'InlineStyle::CssParsers::Csspool'
+  end
+
+  it 'should be able to load css_parser' do
+    InlineStyle::CssParsers.parser = :css_parser
+    InlineStyle::CssParsers.parser.name.
+    should == 'InlineStyle::CssParsers::CssParser'
+  end
+
+end

data/spec/fixtures/inline.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta content="text/html; charset=utf-8" http-equiv="Content-type">
 <title>  Boletín CENART - November
 </title>
 <link href="/print.css?1248460539" rel="stylesheet" media="print" type="text/css">
@@ -96,7 +96,7 @@
     contacto <br style="margin: 0.0; padding: 0.0;"><a href="mailto:mail@host.org" style="margin: 0.0; padding: 0.0; color: #185d6b; font-weight: bold; font-size: 1.2em;">mail@host.org</a>
   </div>
   <div id="logos" style="margin: 0.0; padding: 0.0; width: 100.0%; margin-top: 40.0px; background-image: url(/images/boletines/Noviembre/logos_fondo.jpg);">
-    <img src="A" id="izq" alt="A" style="margin: 0.0; padding: 0.0; float: left;"><img src="B" id="der" alt="B" style="margin: 0.0; padding: 0.0; float: right;"><div class="clearer" style="margin: 0.0; padding: 0.0; clear: both;">
+    <img src="A" id="izq" alt="A" style="margin: 0.0; padding: 0.0; float: left; margin: 30.0px; padding: 10.0px; color: red;"><img src="B" id="der" alt="B" style="margin: 0.0; padding: 0.0; float: right;"><div class="clearer" style="margin: 0.0; padding: 0.0; clear: both;">
   </div>
 </div>
 

data/spec/interceptor_spec.rb

@@ -0,0 +1,63 @@
+require "#{ File.dirname __FILE__ }/spec_helper"
+
+require 'mail'
+Mail.defaults do
+  delivery_method :test
+end
+Mail.register_interceptor \
+  InlineStyle::Mail::Interceptor.new(:stylesheets_path => FIXTURES)
+
+describe InlineStyle::Mail::Interceptor do
+
+  before do
+    Mail::TestMailer.deliveries.clear
+  end
+
+  it 'should inline html e-mail' do
+    Mail.deliver do
+      to 'joe@example.com'
+      from 'joe@example.com'
+      subject 'HTML e-mail'
+      content_type 'text/html'
+      body File.read("#{ FIXTURES }/boletin.html")
+    end
+
+    Mail::TestMailer.deliveries.first.body.to_s.
+    should == File.read("#{ FIXTURES }/inline.html")
+  end
+
+  it 'should not inline non-html' do
+    Mail.deliver do
+      to 'joe@example.com'
+      from 'joe@example.com'
+      subject 'Plain text e-mail (with HTML looking content)'
+      content_type 'text/plain'
+      body File.read("#{ FIXTURES }/boletin.html")
+    end
+
+    Mail::TestMailer.deliveries.first.body.to_s.
+    should == File.read("#{ FIXTURES }/boletin.html")
+  end
+
+  it 'should inline html part of multipart/alternative' do
+    Mail.deliver do
+      to 'joe@example.com'
+      from 'joe@example.com'
+      subject 'Multipart/alternative e-mail'
+      text_part do
+        body File.read("#{ FIXTURES }/boletin.html")
+      end
+      html_part do
+        content_type 'text/html; charset=UTF-8'
+        body File.read("#{ FIXTURES }/boletin.html")
+      end
+    end
+
+    Mail::TestMailer.deliveries.first.parts[0].body.to_s.
+    should == File.read("#{ FIXTURES }/boletin.html")
+
+    Mail::TestMailer.deliveries.first.parts[1].body.to_s.
+    should == File.read("#{ FIXTURES }/inline.html")
+  end
+
+end

data/spec/{as_middleware_spec.rb → rack_middleware_spec.rb}

@@ -19,8 +19,11 @@ describe InlineStyle::Rack::Middleware do
     get_response('/', @html, :stylesheets_path => FIXTURES).should have_inline_style_for('#A')
   end
   
+  it "should use external css" do
+    get_response('/', Nokogiri.HTML(@html), :stylesheets_path => FIXTURES).css('#izq').first['style'].should =~ /margin: 30.0px/
+  end
+  
   describe 'Path inclusion' do
-    
     it "should inline style for string path" do
       paths = "/some/path"
       get_response('/some/path', @html, :stylesheets_path => FIXTURES, :paths => paths).should have_inline_style_for('#A')
@@ -54,4 +57,4 @@ describe InlineStyle::Rack::Middleware do
       get_response('/other/path', @html, :stylesheets_path => FIXTURES, :paths => paths).should_not have_inline_style_for('#A')
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,12 +1,11 @@
 require 'rubygems'
-require 'spec'
+require 'rspec'
 require "#{ DIR = File.dirname(__FILE__) }/../lib/inline-style"
 require 'rack'
 require 'rack/mock'
 
 FIXTURES = "#{ DIR }/fixtures"
 
-
 module HaveInlineStyleMatcher
   class HaveInlineStyle
     def initialize selector
@@ -32,4 +31,4 @@ module HaveInlineStyleMatcher
   end
 end
 
-Spec::Runner.configure { |config| config.include HaveInlineStyleMatcher }
+RSpec.configure { |config| config.include HaveInlineStyleMatcher }

metadata

@@ -1,85 +1,143 @@
 --- !ruby/object:Gem::Specification 
 name: inline-style
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 6
+  version: 0.4.6
 platform: ruby
 authors: 
 - Macario Ortega
+- Eric Anderson
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-10-29 00:00:00 -06:00
+date: 2011-03-07 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: rspec
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.3
-    version: 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: maca-fork-csspool
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: rack
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: newgem
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec-core
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.4.1
-    version: 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: mail
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
-    version: 
-description: |-
-  Will take all css in a page (either from linked stylesheet or from style tag) and will embed it in the style attribute for 
-  each refered element taking selector specificity and declarator order.
-  
-  Useful for html email: some clients (gmail, et all) won't render non inline styles.
-  
-  * Includes a Rack middleware for using with Rails, Sinatra, etc...
-  * It takes into account selector specificity.
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: css_parser
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: maca-fork-csspool
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id007
+description: Inlines CSS for html email delivery
 email: 
 - macarui@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
+- .gitignore
+- Gemfile
+- Gemfile.lock
 - History.txt
 - Manifest.txt
-- README.rdoc
+- README.txt
 - Rakefile
 - example.rb
+- inline-style.gemspec
 - lib/inline-style.rb
+- lib/inline-style/css_parsers.rb
+- lib/inline-style/css_parsers/css_parser.rb
+- lib/inline-style/css_parsers/csspool.rb
+- lib/inline-style/mail/interceptor.rb
 - lib/inline-style/rack/middleware.rb
-- spec/as_middleware_spec.rb
+- lib/inline-style/version.rb
 - spec/css_inlining_spec.rb
+- spec/css_parsers_spec.rb
+- spec/factory_spec.rb
 - spec/fixtures/all.css
 - spec/fixtures/boletin.html
 - spec/fixtures/box-model.html
@@ -88,35 +146,40 @@ files:
 - spec/fixtures/print.css
 - spec/fixtures/selectors.html
 - spec/fixtures/style.css
+- spec/interceptor_spec.rb
+- spec/rack_middleware_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://github.com/maca/inline-style
+homepage: ""
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --main
-- README.rdoc
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
-rubyforge_project: inline-style
-rubygems_version: 1.3.5
+rubyforge_project: 
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Will take all css in a page (either from linked stylesheet or from style tag) and will embed it in the style attribute for  each refered element taking selector specificity and declarator order
+summary: Inlines CSS for html email delivery
 test_files: []