inline-style 0.4.6 → 0.4.10

data/.rspec

@@ -0,0 +1 @@
+--color

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    inline-style (0.4.6)
+    inline-style (0.4.9)
       css_parser
       maca-fork-csspool
       nokogiri
@@ -12,7 +12,7 @@ GEM
     activesupport (3.0.4)
     css_parser (1.1.5)
     diff-lcs (1.1.2)
-    ffi (1.0.6)
+    ffi (1.0.7)
       rake (>= 0.8.7)
     i18n (0.5.0)
     maca-fork-csspool (2.0.2)
@@ -42,11 +42,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  css_parser
   inline-style!
-  maca-fork-csspool
   mail
-  nokogiri
   rack
   rspec
   rspec-core

data/{README.txt → README.rdoc}

@@ -2,7 +2,8 @@
 
 http://github.com/maca/inline-style
 
-== DESCRIPTION:
+
+== 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.
@@ -14,7 +15,13 @@ Useful for html email: some clients (gmail, et all) won't render non inline styl
   inline processing for both mail as well as ActionMailer.
 * It takes into account selector specificity.
 
-== USAGE
+
+== Usage
+
+    
+    gem 'maca-fork-csspool' # this is optional if csspool is required inline-style will resort to it for css parsing, otherwise it will use the pure ruby css_parser
+    require 'csspool'       # csspool should be faster because it uses librcroco written in C wich can also be an issue, use css_parser if you deploy to heroku
+                      
     require 'inline-style'
 
     html  = File.read("#{ dir }/index.html")
@@ -83,8 +90,9 @@ Will become:
         <span style='font-family: "Lucida Grande", Lucida, Verdana, sans-serif;margin: 4.0px 3.0px 2.0px 1.0px;padding: 0.0;'>4</span>
       </li>
     </ul>
+
     
-== RACK MIDDLEWARE:
+== Rack Middleware:
 
     # Process all routes:
     use InlineStyle::Rack::Middleware
@@ -95,7 +103,8 @@ Will become:
     # Restrict processing to some routes:
     use InlineStyle::Rack::Middleware, :paths => [%r(/mails/.*), "/somepath"]
 
-== MAIL INTERCEPTOR
+
+== Mail Interceptor
 
 If using the mail library the following code will work:
 
@@ -106,21 +115,26 @@ If using ActionMailer (which wraps mail):
 
    ActionMailer::Base.register_interceptor \
      InlineStyle::Mail::Interceptor.new(:stylesheets_path => 'public')
+
     
-== ISSUES:
+== 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.
 
-== REQUIREMENTS:
 
-tenderlove's nokogiri and csspool
+== Requirements:
+
+nokogiri && (css_parser || maca-fork-csspool)
+
+
+
+== Install:
 
-== INSTALL:
+    sudo gem install inline-style
 
-    sudo gem install inline-style --source http://gemcutter.org
 
-== LICENSE:
+== License:
 
 (The MIT License)
 

data/inline-style.gemspec

@@ -4,15 +4,14 @@ require "inline-style/version"
 
 Gem::Specification.new do |s|
   s.name        = "inline-style"
-  s.version     = Inline::Style::VERSION
+  s.version     = InlineStyle::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.post_install_message = %{Please read documentation for changes on the default css parser gem, specifically if you use csspool}
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/inline-style.rb

@@ -1,37 +1,49 @@
 require 'nokogiri'
 require 'open-uri'
 
-require "#{ File.dirname( __FILE__ ) }/inline-style/css_parsers"
-require "#{ File.dirname( __FILE__ ) }/inline-style/rack/middleware"
-require "#{ File.dirname( __FILE__ ) }/inline-style/mail/interceptor"
+$:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-module InlineStyle
-  #   Options:
-  #     +:stylesheets_path+
-  #       Stylesheets root path, can also be a URL
+require "inline-style/selector"
+require "inline-style/rack/middleware" # This two may be should be required by user if she needs it
+require "inline-style/mail/interceptor"
+
+class InlineStyle
+  CSSParser =
+  if const_defined? :CSSPool
+    require 'inline-style/csspool_wrapper'
+    CSSPoolWrapper
+  else
+    require 'inline-style/css_parser_wrapper'
+    CssParserWrapper
+  end
+
+  # @param [String, Nokogiri::HTML::Document] html Html or Nokogiri html to be inlined
+  # @param [Hash] opts Processing options
   #
-  #     +pseudo+
+  # @option opts [String] :stylesheets_path (env['DOCUMENT_ROOT']) 
+  #       Stylesheets root path or app's public directory where the stylesheets are to be found
+  # @option opts [boolean] :pseudo (false) 
   #       If set to true will inline style for pseudo classes according to the W3C specification:
   #       http://www.w3.org/TR/css-style-attr.
-  #       Defaults to false and should probably be left like that because at least Safari and Firefox don't seem to 
-  #       comply with the specification for pseudo class style in the style attribute.
+  #       Should probably be left as false because browsers don't seem to comply with the specification for pseudo class style in the style attribute.
   def self.process html, opts = {}
-    stylesheets_path = opts[:stylesheets_path] || ''
-    pseudo           = opts[:pseudo] || false
-    
-    nokogiri_doc_given = Nokogiri::HTML::Document === html
-    html  = nokogiri_doc_given ? html : Nokogiri.HTML(html)
-    css   = extract_css html, stylesheets_path
+    new(html, opts).process
+  end
+
+  def initialize html, opts = {}
+    @html             = html
+    @stylesheets_path = opts[:stylesheets_path] || ''
+    @pseudo           = opts[:pseudo]
+  end
+
+  def process
     nodes = {}
 
     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|
+      rule_set.each_selector do |selector|
+        dom.css(selector.search).each do |node|
           nodes[node] ||= []
-          nodes[node].push [css_selector, declarations, specificity, orig_selector]
+          nodes[node].push selector
           
           next unless node['style']
           
@@ -39,44 +51,50 @@ module InlineStyle
           path << "##{ node['id'] }" if node['id']
           path << ".#{ node['class'].scan(/\S+/).join('.') }" if node['class']
 
-          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]
+          CSSParser.new("#{path}{#{node['style']}}").each_rule_set do |rule|
+            rule.each_selector do |selector_inner|
+              nodes[node].push selector_inner
             end
           end
         end
       end
     end
 
-    nodes.each_pair do |node, style|
-      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?
+    nodes.each_pair do |node, selectors|
+      selectors = selectors.sort_by{ |sel| "#{ sel.specificity }%03d" % selectors.index(sel) }
+      selectors = selectors.reject {|sel| !@pseudo && sel.pseudo? }
+      using_pseudo = selectors.any? &:pseudo?
       
-      node['style'] = sets.collect do |selectors|
-        index = sets.index selectors
-        
-        set   = selectors.map do |(css_selector, declarations, specificity, orig_selector)|
-          index == 0 ? declarations : "\n#{ orig_selector.gsub /\w(?=:)/, '' } {#{ declarations }}"
+      node['style'] = selectors.collect do |selector|
+        if using_pseudo && !selector.pseudo?
+          "{#{selector.inline_declarations}}"
+        else
+          selector.inline_declarations
         end
-                     
-        index == 0 && sets.size > 1 ? "{#{ set }}" : set.collect(&:strip).join(' ')
-      end.join.strip
+      end.join(' ').strip
     end
     
-    nokogiri_doc_given ? html : html.to_s
+    html_already_parsed? ? @dom : @dom.to_s
+  end
+
+  private
+  def dom
+    @dom ||= html_already_parsed? ? @html : Nokogiri.HTML(@html)
   end
-  
-  # Returns CSSPool::Document
-  def self.extract_css html, stylesheets_path = ''
-    InlineStyle::CssParsers.parser.new html.css('style, link').collect { |e|
+
+  def html_already_parsed?
+    @html.respond_to? :css
+  end
+
+  # Returns parsed CSS
+  def css
+    @css ||= CSSParser.new dom.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
       
-      uri = %r{^https?://} === e['href'] ? e['href'] : File.join(stylesheets_path, e['href'].sub(/\?\d+$/,''))
+      uri = %r{^https?://} === e['href'] ? e['href'] : File.join(@stylesheets_path, e['href'].sub(/\?.+$/,'')) 
       open(uri).read rescue nil
     }.join("\n")
   end

data/lib/inline-style/css_parser_wrapper.rb

@@ -0,0 +1,28 @@
+require 'css_parser'
+
+class InlineStyle
+  class CssParserWrapper
+    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|
+          yield InlineStyle::Selector.new(sel, dec, spe)
+        end
+      end
+    end
+  end
+end

data/lib/inline-style/{css_parsers/csspool.rb → csspool_wrapper.rb}

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

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

@@ -9,29 +9,27 @@
 #
 #   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)
+module InlineStyle::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
+    # 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)
+    # 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

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

@@ -1,42 +1,33 @@
-module InlineStyle
-  module Rack
-    class Middleware
-      #
-      #   Options:
-      #     +stylesheets_path+
-      #       Stylesheets root path or app's public directory where the stylesheets are to be found, defaults to
-      #       env['DOCUMENT_ROOT']
-      #     
-      #     +paths+
-      #       Limit processing to the passed absolute paths
-      #       Can be an array of strings or regular expressions, a single string or regular expression
-      #       If not passed will process output for every path.
-      #       Regexps and strings must comence with '/'
-      #
-      #     +pseudo+
-      #       If set to true will inline style for pseudo classes according to the W3C specification:
-      #       http://www.w3.org/TR/css-style-attr.
-      #       Defaults to false and should probably be left like that because at least Safari and Firefox don't seem to 
-      #       comply with the specification for pseudo class style in the style attribute.
-      #
-      def initialize app, opts = {}
-        @app   = app
-        @opts  = opts
-        @paths = /^(?:#{ [*opts[:paths]].join('|') })/
-      end
+module InlineStyle::Rack
+  class Middleware
+    # @param [Hash] opts Middlewar options
+    #
+    # @option opts [String] :stylesheets_path (env['DOCUMENT_ROOT']) 
+    #       Stylesheets root path or app's public directory where the stylesheets are to be found
+    # @option opts [Regexp, Array, String] :paths
+    #       Limit processing to the passed absolute paths
+    #       Can be an array of strings or regular expressions, a single string or regular expression
+    #       If not passed will process output for every path.
+    #       Regexps and strings must comence with '/'
+    # @option opts [Boolean] :pseudo (false) 
+    #       If set to true will inline style for pseudo classes according to the W3C specification:
+    #       http://www.w3.org/TR/css-style-attr.
+    #       Should probably be left as false because browsers don't seem to comply with the specification for pseudo class style in the style attribute.
+    def initialize app, opts = {}
+      @app   = app
+      @opts  = opts
+      @paths = /^(?:#{ [*opts[:paths]].join('|') })/
+    end
 
-      def call env
-        response = @app.call env
-        return response unless @paths === env['PATH_INFO']
-        
-        status, headers, content = response
-        response = ::Rack::Response.new '', status, headers
-        body     = content.respond_to?(:body) ? content.body : content
-        
-        response.write InlineStyle.process(body, {:stylesheets_path => env['DOCUMENT_ROOT']}.merge(@opts))
-        response.finish
-      end
+    def call env
+      response = @app.call env
+      return response unless @paths === env['PATH_INFO']
+      
+      status, headers, body = response
+      
+      body = InlineStyle.process(body.first, {:stylesheets_path => env['DOCUMENT_ROOT']}.merge(@opts))
+      [status, headers, [body]]
     end
   end
 end
-  
+  

data/lib/inline-style/selector.rb

@@ -0,0 +1,41 @@
+
+
+# A simple abstraction of the data we get back from the parsers. CSSPool
+# actually already does this for us but CSSParser does not so we need
+# to create the abstraction ourselves.
+class InlineStyle
+  class Selector < Struct.new :selector_text, :declarations, :specificity
+    # A slightly adjusted version of the selector_text that should be
+    # used for finding nodes. Will remove the pseudo selector and prepend
+    # 'body '.
+    def search
+      selector_text.dup.tap do |s|
+        state_based_pseudo_selectors.each {|p| s.gsub! /:#{p}$/, ''}
+          s.insert(0, 'body ') unless s =~ /^body/
+      end
+    end
+
+    # For the most part is just declarations unless a pseudo selector.
+    # Then it uses the inline pseudo declarations 
+    def inline_declarations
+      if pseudo?
+        "\n#{ selector_text.gsub /\w(?=:)/, '' } {#{ declarations }}"
+      else
+        declarations
+      end
+    end
+
+    # Is this selector using a pseudo class?
+    def pseudo?
+      state_based_pseudo_selectors.any? {|p| selector_text.end_with? ":#{p}"} 
+    end
+
+    # A list of state based pseudo selectors (like hover) that should
+    # be handled based on the pseudo option. Unlike position-based
+    # pseudo selectors (like :first-child) which once resolved to the
+    # correct node effectively get inlined like a normal selector.
+    def state_based_pseudo_selectors
+      %w(link visited active hover focus target enabled disabled checked)
+    end
+  end
+end

data/lib/inline-style/version.rb

@@ -1,5 +1,3 @@
-module Inline
-  module Style
-    VERSION = '0.4.6'  
-  end
+class InlineStyle
+  VERSION = '0.4.10'
 end

data/spec/css_inlining_spec.rb

@@ -1,72 +1,91 @@
-require "#{ File.dirname __FILE__ }/spec_helper"
+require "spec_helper"
 
 describe InlineStyle do
-  before do
-    @processed = InlineStyle.process Nokogiri.HTML(File.read("#{ FIXTURES }/boletin.html")), 
-      :pseudo => false,
-      :stylesheets_path => FIXTURES
-  end
+  shared_examples_for 'inlines styles' do
+    before do
+      processed  = InlineStyle.process File.read("#{FIXTURES}/boletin.html"), :pseudo => false, :stylesheets_path => FIXTURES
+      @processed = Nokogiri.HTML(processed)
+    end
 
-  it "should extract from linked stylesheet" do
-    @processed.css('#izq').first['style'].should =~ /margin: 30.0px;/
-  end
-  
-  it "should extract styles from linked stylesheet with no media specified" do
-    @processed.css('#izq').first['style'].should =~ /color: red;/
-  end
-  
-  it "should extract styles from linked stylesheet with media 'all'" do
-    @processed.css('#izq').first['style'].should =~ /padding: 10.0px;/
-  end
-  
-  it "should ignore styles from linked stylesheet with media other than screen" do
-    @processed.css('#izq').first['style'].should_not =~ /display: none;/
-  end
+    it "should extract from linked stylesheet" do
+      @processed.css('#izq').first['style'].should match_style /margin: 30.0px;/
+    end
 
-  it "should not process pseudo classes" do
-    @processed.to_s.should_not =~ /:hover/
-    @processed.to_s.should_not =~ /\{/
-  end
-  
-  it "should should process pseudo classes" do
-    processed = InlineStyle.process Nokogiri.HTML(File.read("#{ FIXTURES }/boletin.html")), :pseudo => true
-    processed.css('a').first['style'].should =~ /:hover/
-    processed.css('a').first['style'].should =~ /\{/
-  end
+    it "should extract styles from linked stylesheet with no media specified" do
+      @processed.css('#izq').first['style'].should match_style /color: red;/
+    end
 
-  it 'should apply to #A #B' do
-    @processed.css('#logos #der').first['style'].should =~ /float: right;/
-  end
-  
-  # it 'should order selectors by specificity'
-  # it 'should order selectors by specificity and defininition order'
-  # it 'should overwrite rule with less specificity'
-  # it 'should overwrite rule previously defined'
-  # it 'should not overwrite rules defined inline'
-  
-  describe 'Box model' do
-    before do
-      @processed = InlineStyle.process( Nokogiri.HTML(File.read("#{ FIXTURES }/box-model.html")) )
+    it "should extract styles from linked stylesheet with media 'all'" do
+      @processed.css('#izq').first['style'].should match_style /padding: 10.0px;/
     end
 
-    it "should inline style for selector ul" do
-      @processed.css('ul').first['style'].should == "background: yellow; margin: 12.0px 12.0px 12.0px 12.0px; padding: 3.0px 3.0px 3.0px 3.0px;"
+    it "should ignore styles from linked stylesheet with media other than screen" do
+      @processed.css('#izq').first['style'].should_not match_style /display: none;/
     end
 
-    it "should inline style for selector li" do
-      @processed.css('li').each do |li|
-        li['style'].should =~ /^color: white; background: blue; margin: 12.0px 12.0px 12.0px 12.0px; padding: 12.0px 0.0px 12.0px 12.0px; list-style: none/
-      end
+    it "should not process pseudo classes" do
+      @processed.css('a').first['style'].should_not match_style /^:hover \{background-color: #8ae0ea; color: #126b5d;\}$/
     end
 
-    it "should inline style for selector li.withborder" do
-      @processed.css('li.withborder').first['style'].
-      should == "color: white; background: blue; margin: 12.0px 12.0px 12.0px 12.0px; padding: 12.0px 0.0px 12.0px 12.0px; list-style: none; border-style: dashed; border-width: medium; border-color: lime;"    
+    it "should should process pseudo classes" do
+      processed = InlineStyle.process Nokogiri.HTML(File.read("#{FIXTURES}/boletin.html")), :pseudo => true
+      processed.css('a').first['style'].should match_style /^:hover \{background-color: #8ae0ea; color: #126b5d;\}$/
     end
-  end
-end
 
+    it 'should process location-based pseudo classes' do
+      @processed.at_css('#izq')['style'].should match_style /padding: 1.0px;/
+    end
 
+    it 'should apply to #A #B' do
+      @processed.css('#logos #der').first['style'].should match_style /float: right;/
+    end
 
+    # it 'should overwrite rule with less specificity'
+    # it 'should overwrite rule previously defined'
+    # it 'should not overwrite rules defined inline'
 
+    describe 'Box model' do
+      before do
+        @processed = InlineStyle.process(Nokogiri.HTML(File.read("#{FIXTURES}/box-model.html")))
+      end
 
+      it "should inline style for selector ul" do
+        @processed.css('ul').first['style'].should match_style /^background: yellow; margin: 12.0px 12.0px 12.0px 12.0px; padding: 3.0px 3.0px 3.0px 3.0px;$/
+      end
+
+      it "should inline style for selector li" do
+        @processed.css('li').each do |li|
+          li['style'].should match_style /^color: white; background: blue; margin: 12.0px 12.0px 12.0px 12.0px; padding: 12.0px 0.0px 12.0px 12.0px; list-style: none/
+        end
+      end
+
+      it "should inline style for selector li.withborder" do
+        @processed.css('li.withborder').first['style'].
+          should match_style /^color: white; background: blue; margin: 12.0px 12.0px 12.0px 12.0px; padding: 12.0px 0.0px 12.0px 12.0px; list-style: none; border-style: dashed; border-width: medium; border-color: lime;$/    
+      end
+    end
+  end
+
+  describe CssParser do
+    it { InlineStyle::CSSParser.should == InlineStyle::CssParserWrapper }
+    it_should_behave_like 'inlines styles'
+  end
+
+  describe CSSPool do
+    before do
+      class InlineStyle
+        remove_const :CSSParser
+        CSSParser = InlineStyle::CSSPoolWrapper 
+      end
+    end
+
+    after do
+      class InlineStyle
+        remove_const :CSSParser
+        CSSParser = InlineStyle::CssParserWrapper 
+      end
+    end
+    it { InlineStyle::CSSParser.should == InlineStyle::CSSPoolWrapper }
+    it_should_behave_like 'inlines styles'
+  end
+end

data/spec/css_parsers_spec.rb

@@ -1,8 +1,6 @@
-require "#{ File.dirname __FILE__ }/spec_helper"
-require "#{ DIR }/../lib/inline-style/css_parsers/css_parser"
-require "#{ DIR }/../lib/inline-style/css_parsers/csspool"
+require "spec_helper"
 
-describe InlineStyle::CssParsers::CssParser do
+describe InlineStyle::CssParserWrapper do
 
   it 'should wrap css_parser' do
     rs_count = 0
@@ -10,15 +8,15 @@ describe InlineStyle::CssParsers::CssParser do
     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 = InlineStyle::CssParserWrapper.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|
+      rs.each_selector do |sel|
         sel_count += 1
-        sel.should == selectors.shift
-        dec.should == decs.shift
-        spe.should == spes.shift
+        sel.selector_text.should == selectors.shift
+        sel.declarations.should == decs.shift
+        sel.specificity.should == spes.shift
       end
     end
 
@@ -28,7 +26,7 @@ describe InlineStyle::CssParsers::CssParser do
 
 end
 
-describe InlineStyle::CssParsers::Csspool do
+describe InlineStyle::CSSPoolWrapper do
 
   it 'should wrap csspool' do
     rs_count = 0
@@ -36,15 +34,15 @@ describe InlineStyle::CssParsers::Csspool do
     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 = InlineStyle::CSSPoolWrapper.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|
+      rs.each_selector do |sel|
         sel_count += 1
-        sel.should == selectors.shift
-        dec.should == decs.shift
-        spe.should == spes.shift
+        sel.selector_text.should == selectors.shift
+        sel.declarations.should == decs.shift
+        sel.specificity.should == spes.shift
       end
     end
 

data/spec/fixtures/boletin.html

@@ -124,6 +124,10 @@ div#contacto a {
   background-image: url('/images/boletines/Noviembre/logos_fondo.jpg');
 }
 
+#logos img:first-child {
+  padding: 1px;
+}
+
 #izq {
     float: left;
 }
@@ -253,4 +257,4 @@ div#contacto a {
 </div></body>
 
 
-</html>
+</html>

data/spec/fixtures/inline.html

@@ -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; 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;">
+    <img src="A" id="izq" alt="A" style="margin: 0.0; padding: 0.0; float: left; margin: 30.0px; padding: 10.0px; color: red; padding: 1.0px;"><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

@@ -1,16 +1,27 @@
-require "#{ File.dirname __FILE__ }/spec_helper"
+require "spec_helper"
+require "inline-style/mail/interceptor"
+require "mail"
 
-require 'mail'
 Mail.defaults do
   delivery_method :test
 end
-Mail.register_interceptor \
-  InlineStyle::Mail::Interceptor.new(:stylesheets_path => FIXTURES)
 
-describe InlineStyle::Mail::Interceptor do
+Mail.register_interceptor InlineStyle::Mail::Interceptor.new(:stylesheets_path => FIXTURES)
 
+describe InlineStyle::Mail::Interceptor do
   before do
     Mail::TestMailer.deliveries.clear
+    class InlineStyle
+      remove_const :CSSParser
+      CSSParser = InlineStyle::CSSPoolWrapper 
+    end
+  end
+
+  after do
+    class InlineStyle
+      remove_const :CSSParser
+      CSSParser = InlineStyle::CssParserWrapper 
+    end
   end
 
   it 'should inline html e-mail' do
@@ -59,5 +70,4 @@ describe InlineStyle::Mail::Interceptor do
     Mail::TestMailer.deliveries.first.parts[1].body.to_s.
     should == File.read("#{ FIXTURES }/inline.html")
   end
-
 end

data/spec/rack_middleware_spec.rb

@@ -1,12 +1,12 @@
-require "#{ File.dirname __FILE__ }/spec_helper"
+require "spec_helper"
+require "inline-style/rack/middleware"
 
 describe InlineStyle::Rack::Middleware do
-
   def get_response path, body, opts = {}
     content_type = opts.delete(:content_type) || 'text/html'
     app = Rack::Builder.new do
       use InlineStyle::Rack::Middleware, opts
-      run lambda { |env| env['DOCUMENT_ROOT'] = FIXTURES; [200, {'Content-Type' => content_type}, body ] }
+      run lambda { |env| env['DOCUMENT_ROOT'] = FIXTURES; [200, {'Content-Type' => content_type}, [body]] }
     end    
     Nokogiri.HTML Rack::MockRequest.new(app).get(path).body
   end
@@ -20,7 +20,7 @@ describe InlineStyle::Rack::Middleware do
   end
   
   it "should use external css" do
-    get_response('/', Nokogiri.HTML(@html), :stylesheets_path => FIXTURES).css('#izq').first['style'].should =~ /margin: 30.0px/
+    get_response('/', @html, :stylesheets_path => FIXTURES).css('#izq').first['style'].should match_style /margin: 30.0px/
   end
   
   describe 'Path inclusion' do

data/spec/spec_helper.rb

@@ -1,12 +1,15 @@
 require 'rubygems'
 require 'rspec'
-require "#{ DIR = File.dirname(__FILE__) }/../lib/inline-style"
 require 'rack'
 require 'rack/mock'
 
-FIXTURES = "#{ DIR }/fixtures"
+require "inline-style"
+require "inline-style/csspool_wrapper"
+require "csspool"
 
-module HaveInlineStyleMatcher
+FIXTURES = "#{File.dirname __FILE__}/fixtures"
+
+module InlineStyleMatchers
   class HaveInlineStyle
     def initialize selector
       @selector = selector
@@ -18,17 +21,40 @@ module HaveInlineStyleMatcher
     end
 
     def failure_message
-      "expected elements with selector #{ @selector } style attribute not to be nil"
+      "expected elements with selector #{@selector} style attribute not to be nil"
+    end
+
+    def negative_failure_message
+      "expected elements with selector #{@selector} style attribute to be nil"
+    end
+  end
+
+  class MatchStyle
+    def initialize style
+      @style = style  
+    end
+
+    def matches? actual
+      @actual = actual.gsub(/([^\.0-9]\d+)(px|;|%|\s)/, '\1.0\2')
+      @actual =~ @style
+    end
+
+    def failure_message
+      "expected #{@style} to match #{@actual}"
     end
 
     def negative_failure_message
-      "expected elements with selector #{ @selector } style attribute to be nil"
+      "expected #{@style} not to match #{@actual}"
     end
   end
 
   def have_inline_style_for selector
     HaveInlineStyle.new selector
   end
+
+  def match_style style
+    MatchStyle.new style
+  end
 end
 
-RSpec.configure { |config| config.include HaveInlineStyleMatcher }
+RSpec.configure { |config| config.include InlineStyleMatchers }

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inline-style
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 0
   - 4
-  - 6
-  version: 0.4.6
+  - 10
+  version: 0.4.10
 platform: ruby
 authors: 
 - Macario Ortega
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-07 00:00:00 -06:00
+date: 2011-03-23 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,6 +27,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -39,6 +41,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -52,6 +55,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -65,6 +69,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -78,6 +83,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -91,6 +97,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -104,6 +111,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -120,24 +128,24 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .rspec
 - Gemfile
 - Gemfile.lock
 - History.txt
 - Manifest.txt
-- README.txt
+- README.rdoc
 - 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/css_parser_wrapper.rb
+- lib/inline-style/csspool_wrapper.rb
 - lib/inline-style/mail/interceptor.rb
 - lib/inline-style/rack/middleware.rb
+- lib/inline-style/selector.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
@@ -153,7 +161,7 @@ has_rdoc: true
 homepage: ""
 licenses: []
 
-post_install_message: 
+post_install_message: Please read documentation for changes on the default css parser gem, specifically if you use csspool
 rdoc_options: []
 
 require_paths: 
@@ -163,6 +171,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -171,13 +180,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Inlines CSS for html email delivery

data/lib/inline-style/css_parsers.rb

@@ -1,21 +0,0 @@
-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

@@ -1,56 +0,0 @@
-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/spec/factory_spec.rb

@@ -1,38 +0,0 @@
-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