roadie 1.0.0.pre2 → 1.0.0

data/.gitignore

@@ -1,3 +1,8 @@
 .DS_Store
 pkg
-.*~
+.*~
+.yardoc
+
+.rspec
+.idea/*
+.rvmrc

data/.yardopts

@@ -0,0 +1 @@
+--no-private

data/Gemfile.lock

@@ -10,57 +10,66 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.1)
-      actionpack (= 3.0.1)
-      mail (~> 2.2.5)
-    actionpack (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
+    actionmailer (3.0.3)
+      actionpack (= 3.0.3)
+      mail (~> 2.2.9)
+    actionpack (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
+      i18n (~> 0.4)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.12)
-      rack-test (~> 0.5.4)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.6)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.1)
-      activesupport (= 3.0.1)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activesupport (3.0.1)
+      i18n (~> 0.4)
+    activesupport (3.0.3)
     builder (2.1.2)
-    css_parser (1.0.1)
+    css_parser (1.1.5)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    i18n (0.4.1)
-    mail (2.2.7)
+    i18n (0.5.0)
+    mail (2.2.15)
       activesupport (>= 2.3.6)
-      mime-types
-      treetop (>= 1.4.5)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
     mime-types (1.16)
-    nokogiri (1.4.3.1)
+    nokogiri (1.4.4)
     polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.13)
       rack (>= 1.0.0)
-    rack-test (0.5.6)
+    rack-test (0.5.7)
       rack (>= 1.0)
-    rspec (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
-      rspec-mocks (= 2.0.0)
-    rspec-core (2.0.0)
-    rspec-expectations (2.0.0)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
-    rspec-rails (2.0.1)
-      rspec (~> 2.0.0)
-    treetop (1.4.8)
+    railties (3.0.3)
+      actionpack (= 3.0.3)
+      activesupport (= 3.0.3)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
+    rake (0.8.7)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.0)
+    rspec-rails (2.5.0)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+      rspec (~> 2.5.0)
+    thor (0.14.6)
+    treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
+    tzinfo (0.3.24)
 
 PLATFORMS
   ruby

data/README.textile

@@ -73,6 +73,10 @@ You can set a special <code>data-immutable="true"</code> attribute on @style@ ta
 
 Style elements with <code>media="print"</code> are always ignored.
 
+h2. Documentation
+
+* "Online documentation for master":http://rubydoc.info/github/Mange/roadie/master/frames
+
 h2. Bugs / TODO
 
 * Improve overall performance

data/lib/roadie.rb

@@ -1,26 +1,35 @@
 module Roadie
-  class CSSFileNotFound < StandardError; end
-
-  def self.inline_css(*args);
+  # Shortcut for inlining CSS using {Inliner}
+  # @see Inliner
+  def self.inline_css(*args)
     Roadie::Inliner.new(*args).execute
   end
 
+  # Tries to load the CSS "names" specified in the +targets+ parameter inside the +root+ path.
+  #
+  # @example
+  #   Roadie.load_css(Rails.root, %w[application newsletter])
+  #
+  # @param [Pathname] root The root path of your stylesheets
+  # @param [Array<String, Symbol>] targets Stylesheet names - <b>without extensions</b>
+  # @return [String] The combined contents of the CSS files
+  # @raise [CSSFileNotFound] When a target cannot be found under +[root]/[target].css+
   def self.load_css(root, targets)
-    loaded_css = []
-    stylesheets = root.join('public', 'stylesheets')
+    css_files_from_targets(root, targets).map do |file|
+      raise CSSFileNotFound, file unless file.exist?
+      file.read
+    end.join("\n")
+  end
 
-    targets.map { |target| stylesheets.join("#{target}.css") }.each do |target_file|
-      if target_file.exist?
-        loaded_css << target_file.read
-      else
-        raise CSSFileNotFound, "Could not find #{target_file}"
-      end
+  private
+    def self.css_files_from_targets(root, targets)
+      targets.map { |target| root.join("#{target}.css") }
     end
-    loaded_css.join("\n")
-  end
 end
 
 require 'roadie/version'
+require 'roadie/css_file_not_found'
+require 'roadie/style_declaration'
 require 'roadie/inliner'
 
 require 'action_mailer'

data/lib/roadie/action_mailer_extensions.rb

@@ -3,6 +3,9 @@ require 'nokogiri'
 require 'css_parser'
 
 module Roadie
+  # This module adds the Roadie functionality to ActionMailer 3 when included in ActionMailer::Base.
+  #
+  # If you want to add Roadie to any other mail framework, take a look at how this module is implemented.
   module ActionMailerExtensions
     def self.included(base)
       base.class_eval do
@@ -14,24 +17,28 @@ module Roadie
     protected
       def mail_with_inline_styles(headers = {}, &block)
         @inline_style_css_targets = headers[:css]
-        mail_without_inline_styles(headers.except(:css), &block).tap do |email|
-          email[:css] = nil
+        mail_without_inline_styles(headers, &block).tap do |email|
+          email.header.fields.delete_if { |field| field.name == 'css' }
         end
       end
 
       def collect_responses_and_parts_order_with_inline_styles(headers, &block)
         responses, order = collect_responses_and_parts_order_without_inline_styles(headers, &block)
-        new_responses = []
-        responses.each do |response|
-          new_responses << inline_style_response(response)
-        end
-        [new_responses, order]
+        [responses.map { |response| inline_style_response(response) }, order]
       end
 
     private
+      def url_options
+        Rails.application.config.action_mailer.default_url_options
+      end
+
+      def stylesheet_root
+        Rails.root.join('public', 'stylesheets')
+      end
+
       def inline_style_response(response)
         if response[:content_type] == 'text/html'
-          response.merge :body => Roadie.inline_css(css_rules, response[:body], Rails.application.config.action_mailer.default_url_options)
+          response.merge :body => Roadie.inline_css(css_rules, response[:body], url_options)
         else
           response
         end
@@ -43,7 +50,7 @@ module Roadie
       end
 
       def css_rules
-        @css_rules ||= Roadie.load_css(Rails.root, css_targets) if css_targets.present?
+        @css_rules ||= Roadie.load_css(stylesheet_root, css_targets) if css_targets.present?
       end
   end
 end

data/lib/roadie/css_file_not_found.rb

@@ -0,0 +1,12 @@
+module Roadie
+  # Raised when a stylesheet specified for inlining is not present.
+  # You can access the target filename via #filename.
+  class CSSFileNotFound < StandardError
+    attr_reader :filename
+
+    def initialize(filename)
+      @filename = filename
+      super("Could not find #{filename}")
+    end
+  end
+end

data/lib/roadie/inliner.rb

@@ -1,5 +1,14 @@
+require 'set'
+
 module Roadie
+  # This class is the core of Roadie as it does all the actual work. You just give it
+  # the CSS rules, the HTML and the url_options for rewriting URLs and let it go on
+  # doing all the heavy lifting and building.
   class Inliner
+    # Regexp matching all the url() declarations in CSS
+    #
+    # It matches without any quotes and with both single and double quotes
+    # inside the parenthesis. There's much room for improvement, of course.
     CSS_URL_REGEXP = %r{
       url\(
         (["']?)
@@ -8,12 +17,15 @@ module Roadie
           (?:\([^)]*\))*   # Texts containing parens pairs
           [^(]+            # Texts without parens - required
         )
-        \1
+        \1                 # Closing quote
       \)
     }x
 
-    attr_reader :css, :html, :url_options
-
+    # Initialize a new Inliner with the given CSS, HTML and url_options.
+    #
+    # @param [String] css
+    # @param [String] html
+    # @param [Hash] url_options Supported keys: +:host+, +:port+ and +:protocol+
     def initialize(css, html, url_options)
       @css = css
       @inline_css = []
@@ -21,17 +33,23 @@ module Roadie
       @url_options = url_options
     end
 
+    # Start the inlining and return the final HTML output
+    # @return [String]
     def execute
       adjust_html do |document|
-        add_missing_structure(document)
-        extract_inline_style_elements(document)
-        inline_css_rules(document)
-        make_image_urls_absolute(document)
-        make_style_urls_absolute(document)
+        @document = document
+        add_missing_structure
+        extract_inline_style_elements
+        inline_css_rules
+        make_image_urls_absolute
+        make_style_urls_absolute
+        @document = nil
       end
     end
 
     private
+      attr_reader :css, :html, :url_options, :document
+
       def inline_css
         @inline_css.join("\n")
       end
@@ -49,7 +67,7 @@ module Roadie
         end.to_html
       end
 
-      def add_missing_structure(document)
+      def add_missing_structure
         html_node = document.at_css('html')
         html_node['xmlns'] ||= 'http://www.w3.org/1999/xhtml'
 
@@ -68,7 +86,7 @@ module Roadie
         end
       end
 
-      def extract_inline_style_elements(document)
+      def extract_inline_style_elements
         document.css("style").each do |style|
           next if style['media'] == 'print' or style['data-immutable']
           @inline_css << style.content
@@ -76,45 +94,60 @@ module Roadie
         end
       end
 
-      def inline_css_rules(document)
-        matched_elements = {}
-        assign_rules_to_elements(document, matched_elements)
+      def inline_css_rules
+        elements_with_declarations.each do |element, declarations|
+          ordered_declarations = []
+          seen_properties = Set.new
+          declarations.sort.reverse_each do |declaration|
+            next if seen_properties.include?(declaration.property)
+            ordered_declarations.unshift(declaration)
+            seen_properties << declaration.property
+          end
 
-        matched_elements.each do |element, rules|
-          rules_string = rules.map { |property, rule| [property, rule[:value]].join(':')  }.join('; ')
-          element['style'] = [rules_string, element['style']].compact.join('; ')
+          rules_string = ordered_declarations.map { |declaration| declaration.to_s }.join(';')
+          element['style'] = [rules_string, element['style']].compact.join(';')
         end
       end
 
-      def assign_rules_to_elements(document, matched_elements)
-        parsed_css.each_rule_set do |rules|
-          rules.selectors.reject { |selector| selector.include?(':') }.each do |selector|
-            document.css(selector.strip).each do |element|
-              register_rules_for_element(matched_elements, element, selector, rules)
+      def elements_with_declarations
+        Hash.new { |hash, key| hash[key] = [] }.tap do |element_declarations|
+          parsed_css.each_rule_set do |rule_set|
+            each_selector_without_psuedo(rule_set) do |selector, specificity|
+              each_element_in_selector(selector) do |element|
+                style_declarations_in_rule_set(specificity, rule_set) do |declaration|
+                  element_declarations[element] << declaration
+                end
+              end
             end
           end
         end
       end
 
-      def register_rules_for_element(store, element, selector, rules)
-        specificity = CssParser.calculate_specificity(selector)
-        element_rules = (store[element] ||= {})
-        rules.each_declaration do |property, value, important|
-          stored = (element_rules[property] ||= {:specificity => -1})
-          more_specific = (stored[:specificity] <= specificity)
-          if (important and not stored[:important]) or (important and stored[:important] and more_specific) or (more_specific and not stored[:important])
-            stored.merge!(:value => value, :specificity => specificity, :important => important)
-          end
+      def each_selector_without_psuedo(rules)
+        rules.selectors.reject { |selector| selector.include?(':') }.each do |selector|
+          yield selector, CssParser.calculate_specificity(selector)
+        end
+      end
+
+      def each_element_in_selector(selector)
+        document.css(selector.strip).each do |element|
+          yield element
+        end
+      end
+
+      def style_declarations_in_rule_set(specificity, rule_set)
+        rule_set.each_declaration do |property, value, important|
+          yield StyleDeclaration.new(property, value, important, specificity)
         end
       end
 
-      def make_image_urls_absolute(document)
+      def make_image_urls_absolute
         document.css('img').each do |img|
           img['src'] = ensure_absolute_url(img['src']) if img['src']
         end
       end
 
-      def make_style_urls_absolute(document)
+      def make_style_urls_absolute
         document.css('*[style]').each do |element|
           styling = element['style']
           element['style'] = styling.gsub(CSS_URL_REGEXP) { "url(#{$1}#{ensure_absolute_url($2, '/stylesheets')}#{$1})" }

data/lib/roadie/style_declaration.rb

@@ -0,0 +1,34 @@
+module Roadie
+  class StyleDeclaration
+    include Comparable
+    attr_reader :property, :value, :important, :specificity
+
+    def initialize(property, value, important, specificity)
+      @property = property
+      @value = value
+      @important = important
+      @specificity = specificity
+    end
+
+    def important?
+      @important
+    end
+
+    def <=>(other)
+      if important == other.important
+        specificity <=> other.specificity
+      else
+        important ? 1 : -1
+      end
+    end
+
+    def to_s
+      [property, value].join(':')
+    end
+
+    def inspect
+      extra = [important ? '!important' : nil, specificity].compact
+      "#{to_s} (#{extra.join(' , ')})"
+    end
+  end
+end

data/lib/roadie/version.rb

@@ -1,3 +1,3 @@
 module Roadie
-  VERSION = '1.0.0.pre2'
+  VERSION = '1.0.0'
 end

data/spec/fixtures/views/integration_mailer/marketing.html.erb

@@ -0,0 +1,2 @@
+Contact us to buy stuff!
+<a href="http://www.example.com/cheap-marketing">SPAM MASTERS</a>

data/spec/integration_spec.rb

@@ -15,6 +15,11 @@ describe "roadie integration" do
       @reason = reason
       mail(:subject => 'Notification for you', :to => to) { |format| format.html; format.text }
     end
+
+    def marketing(to)
+      headers('X-Spam' => 'No way! Trust us!')
+      mail(:subject => 'Buy cheap v1agra', :to => to)
+    end
   end
 
   before(:each) do
@@ -41,6 +46,17 @@ describe "roadie integration" do
       plain_part.body.decoded.should_not match(/<.*>/)
     end
 
+    # If we deliver mails we can catch weird problems with headers being invalid
     email.deliver
   end
+
+  it "should not add headers for the roadie options" do
+    email = IntegrationMailer.notification('doe@example.com', 'no berries left in chest')
+    email.header.fields.map(&:name).should_not include('css')
+  end
+
+  it "should keep custom headers in place" do
+    email = IntegrationMailer.marketing('everyone@inter.net')
+    email.header['X-Spam'].should be_present
+  end
 end

data/spec/lib/roadie/action_mailer_extensions_spec.rb

@@ -12,17 +12,6 @@ describe Roadie::ActionMailerExtensions, "inlining styles" do
       end
     end
 
-    # Not sure how to implement this one.
-    # TODO: Either remove or implement
-    def nested_multipart_mixed(css_file = nil)
-      raise "Nested multipart mixed is not implemented"
-      content_type "multipart/mixed"
-      part :content_type => "multipart/alternative", :content_disposition => "inline" do |p|
-        p.part :content_type => 'text/html', :body => 'Hello HTML'
-        p.part :content_type => 'text/plain', :body => 'Hello Text'
-      end
-    end
-
     def singlepart_html
       mail(:subject => "HTML email") do |format|
         format.html { render :text => 'Hello HTML' }
@@ -38,7 +27,7 @@ describe Roadie::ActionMailerExtensions, "inlining styles" do
 
   before(:each) do
     Roadie.stub!(:load_css => 'loaded css')
-    Roadie.stub!(:inline_css => 'unexpected value') # Make sure a implementation problem doesn't hurt these examples
+    Roadie.stub!(:inline_css => 'unexpected value passed to inline_css')
   end
 
   describe "for singlepart text/plain" do
@@ -63,8 +52,8 @@ describe Roadie::ActionMailerExtensions, "inlining styles" do
     it "should inline css to the email's html part" do
       Roadie.should_receive(:inline_css).with(anything, 'Hello HTML', anything).and_return('html')
       email = InliningMailer.multipart
-      email.parts.find { |part| part.mime_type == 'text/html' }.body.decoded.should == 'html'
-      email.parts.find { |part| part.mime_type == 'text/plain' }.body.decoded.should == 'Hello Text'
+      email.html_part.body.decoded.should == 'html'
+      email.text_part.body.decoded.should == 'Hello Text'
     end
   end
 end
@@ -90,13 +79,18 @@ describe Roadie::ActionMailerExtensions, "loading css files" do
     Roadie.stub!(:inline_css => 'html')
   end
 
+  it "should load css from Rails' stylesheet root" do
+    Roadie.should_receive(:load_css).with(Rails.root.join('public', 'stylesheets'), anything).and_return('')
+    CssLoadingMailer.use_default
+  end
+
   it "should load the css specified in the default mailer settings" do
-    Roadie.should_receive(:load_css).with(Rails.root, ['default_value']).and_return('')
+    Roadie.should_receive(:load_css).with(anything, ['default_value']).and_return('')
     CssLoadingMailer.use_default
   end
 
   it "should load the css specified in the specific mailer action instead of the default choice" do
-    Roadie.should_receive(:load_css).with(Rails.root, ['specific']).and_return('')
+    Roadie.should_receive(:load_css).with(anything, ['specific']).and_return('')
     CssLoadingMailer.override(:specific)
   end
 
@@ -106,7 +100,7 @@ describe Roadie::ActionMailerExtensions, "loading css files" do
   end
 
   it "should load multiple css files when given an array" do
-    Roadie.should_receive(:load_css).with(Rails.root, ['specific', 'other']).and_return('')
+    Roadie.should_receive(:load_css).with(anything, ['specific', 'other']).and_return('')
     CssLoadingMailer.override([:specific, :other])
   end
 end

data/spec/lib/roadie/css_file_not_found_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+module Roadie
+  describe CSSFileNotFound do
+    it "is initialized with a filename" do
+      CSSFileNotFound.new('file.css').filename.should == 'file.css'
+    end
+
+    it "has a message" do
+      CSSFileNotFound.new('style.css').message.should == 'Could not find style.css'
+    end
+  end
+end

data/spec/lib/roadie/inliner_spec.rb

@@ -15,19 +15,38 @@ describe Roadie::Inliner do
 
     it "should inline simple attributes" do
       use_css 'p { color: green }'
-      rendering('<p></p>').should have_styling('color' => 'green').at_selector('p')
+      rendering('<p></p>').should have_styling('color' => 'green')
+    end
+
+    it "should keep the order of the styles that was inlined" do
+      use_css 'h1 { padding: 2px; margin: 5px; }'
+      rendering('<h1></h1>').should have_styling([['padding', '2px'], ['margin', '5px']])
     end
 
     it "should combine multiple selectors into one" do
-      use_css "p { color: green; }
-              .tip { float: right; }"
-      rendering('<p class="tip"></p>').should have_styling('color' => 'green', 'float' => 'right').at_selector('p')
+      use_css 'p { color: green; }
+              .tip { float: right; }'
+      rendering('<p class="tip"></p>').should have_styling('color' => 'green', 'float' => 'right')
     end
 
     it "should use the ones attributes with the highest specificality when conflicts arises" do
       use_css "p { color: red; }
-              .safe { color: green; border: 1px solid black; }"
-      rendering('<p class="safe"></p>').should have_styling('color' => 'green', 'border' => '1px solid black').at_selector('p')
+              .safe { color: green; }"
+      rendering('<p class="safe"></p>').should have_styling('color' => 'green')
+    end
+
+    it "should sort styles by specificity order" do
+      use_css 'p      { margin: 2px; }
+               #big   { margin: 10px; }
+               .down  { margin-bottom: 5px; }'
+
+      rendering('<p class="down"></p>').should have_styling([
+        ['margin', '2px'], ['margin-bottom', '5px']
+      ])
+
+      rendering('<p class="down" id="big"></p>').should have_styling([
+        ['margin-bottom', '5px'], ['margin', '10px']
+      ])
     end
 
     it "should support multiple selectors for the same rules" do
@@ -41,27 +60,27 @@ describe Roadie::Inliner do
     it "should respect !important properties" do
       use_css "a { text-decoration: underline !important; }
                a.hard-to-spot { text-decoration: none; }"
-      rendering('<a class="hard-to-spot"></a>').should have_styling('text-decoration' => 'underline').at_selector('a')
+      rendering('<a class="hard-to-spot"></a>').should have_styling('text-decoration' => 'underline')
     end
 
     it "should combine with already present inline styles" do
       use_css "p { color: green }"
-      rendering('<p style="font-size: 1.1em"></p>').should have_styling('color' => 'green', 'font-size' => '1.1em').at_selector('p')
+      rendering('<p style="font-size: 1.1em"></p>').should have_styling([['color', 'green'], ['font-size', '1.1em']])
     end
 
-    it "should not overwrite already present inline styles" do
+    it "should not touch already present inline styles" do
       use_css "p { color: red }"
-      rendering('<p style="color: green"></p>').should have_styling('color' => 'green').at_selector('p')
+      rendering('<p style="color: green"></p>').should have_styling([['color', 'red'], ['color', 'green']])
     end
 
     it "should ignore selectors with :psuedo-classes" do
       use_css 'p:hover { color: red }'
-      rendering('<p></p>').should_not have_styling('color' => 'red').at_selector('p')
+      rendering('<p></p>').should_not have_styling('color' => 'red')
     end
 
     describe "inline <style> elements" do
       it "should be used for inlined styles" do
-        rendering(<<-HTML).should have_styling('color' => 'green', 'font-size' => '1.1em').at_selector('p')
+        rendering(<<-HTML).should have_styling([['color', 'green'], ['font-size', '1.1em']])
           <html>
             <head>
               <style type="text/css">p { color: green; }</style>
@@ -93,7 +112,7 @@ describe Roadie::Inliner do
           <p></p>
         HTML
         document.should have_selector('style[data-immutable=true]')
-        document.should_not have_styling('color' => 'red').at_selector('p')
+        document.should_not have_styling('color' => 'red')
       end
 
       it "should not be touched when media=print" do
@@ -117,41 +136,41 @@ describe Roadie::Inliner do
 
   describe "making urls absolute" do
     it "should work on image sources" do
-      rendering('<img src="/images/foo.jpg" />').should have_attribute('src' => 'http://example.com/images/foo.jpg').at_selector('img')
-      rendering('<img src="../images/foo.jpg" />').should have_attribute('src' => 'http://example.com/images/foo.jpg').at_selector('img')
-      rendering('<img src="foo.jpg" />').should have_attribute('src' => 'http://example.com/foo.jpg').at_selector('img')
+      rendering('<img src="/images/foo.jpg" />').should have_attribute('src' => 'http://example.com/images/foo.jpg')
+      rendering('<img src="../images/foo.jpg" />').should have_attribute('src' => 'http://example.com/images/foo.jpg')
+      rendering('<img src="foo.jpg" />').should have_attribute('src' => 'http://example.com/foo.jpg')
     end
 
     it "should not touch image sources that are already absolute" do
-      rendering('<img src="http://other.example.org/images/foo.jpg" />').should have_attribute('src' => 'http://other.example.org/images/foo.jpg').at_selector('img')
+      rendering('<img src="http://other.example.org/images/foo.jpg" />').should have_attribute('src' => 'http://other.example.org/images/foo.jpg')
     end
 
     it "should work on inlined style attributes" do
-      rendering('<p style="background: url(/paper.png)"></p>').should have_styling('background' => 'url(http://example.com/paper.png)').at_selector('p')
-      rendering('<p style="background: url(&quot;/paper.png&quot;)"></p>').should have_styling('background' => 'url("http://example.com/paper.png")').at_selector('p')
+      rendering('<p style="background: url(/paper.png)"></p>').should have_styling('background' => 'url(http://example.com/paper.png)')
+      rendering('<p style="background: url(&quot;/paper.png&quot;)"></p>').should have_styling('background' => 'url("http://example.com/paper.png")')
     end
 
     it "should work on external style declarations" do
       use_css "p { background-image: url(/paper.png); }
                table { background-image: url('/paper.png'); }
                div { background-image: url(\"/paper.png\"); }"
-      rendering('<p></p>').should have_styling('background-image' => 'url(http://example.com/paper.png)').at_selector('p')
-      rendering('<table></table>').should have_styling('background-image' => "url('http://example.com/paper.png')").at_selector('table')
-      rendering('<div></div>').should have_styling('background-image' => 'url("http://example.com/paper.png")').at_selector('div')
+      rendering('<p></p>').should have_styling('background-image' => 'url(http://example.com/paper.png)')
+      rendering('<table></table>').should have_styling('background-image' => "url('http://example.com/paper.png')")
+      rendering('<div></div>').should have_styling('background-image' => 'url("http://example.com/paper.png")')
     end
 
     it "should not touch style urls that are already absolute" do
       external_url = 'url(http://other.example.org/paper.png)'
       use_css "p { background-image: #{external_url}; }"
-      rendering('<p></p>').should have_styling('background-image' => external_url).at_selector('p')
-      rendering(%(<div style="background-image: #{external_url}"></div>)).should have_styling('background-image' => external_url).at_selector('div')
+      rendering('<p></p>').should have_styling('background-image' => external_url)
+      rendering(%(<div style="background-image: #{external_url}"></div>)).should have_styling('background-image' => external_url)
     end
 
     it "should not touch the urls when no url options are defined" do
       use_css "img { background: url(/a.jpg); }"
       rendering('<img src="/b.jpg" />', :url_options => nil).tap do |document|
         document.should have_attribute('src' => '/b.jpg').at_selector('img')
-        document.should have_styling('background' => 'url(/a.jpg)').at_selector('img')
+        document.should have_styling('background' => 'url(/a.jpg)')
       end
     end
 
@@ -159,13 +178,13 @@ describe Roadie::Inliner do
       use_css "img { background: url(/a.jpg); }"
       rendering('<img src="/b.jpg" />', :url_options => {:host => 'example.com', :protocol => 'https', :port => '8080'}).tap do |document|
         document.should have_attribute('src' => 'https://example.com:8080/b.jpg').at_selector('img')
-        document.should have_styling('background' => 'url(https://example.com:8080/a.jpg)').at_selector('img')
+        document.should have_styling('background' => 'url(https://example.com:8080/a.jpg)')
       end
     end
 
     it "should not touch data: URIs" do
       use_css "div { background: url(data:abcdef); }"
-      rendering('<div></div>').should have_styling('background' => 'url(data:abcdef)').at_selector('div')
+      rendering('<div></div>').should have_styling('background' => 'url(data:abcdef)')
     end
   end
 

data/spec/lib/roadie/style_declaration_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+module Roadie
+  describe StyleDeclaration do
+    it "should be initialized with a property, value, if it is marked as important, and the specificity" do
+      StyleDeclaration.new('color', 'green', true, 45).tap do |declaration|
+        declaration.property.should == 'color'
+        declaration.value.should == 'green'
+        declaration.should be_important
+        declaration.specificity.should == 45
+      end
+    end
+
+    describe "string representation" do
+      it "should be the property and the value joined with a colon" do
+        StyleDeclaration.new('color', 'green', false, 1).to_s.should == 'color:green'
+        StyleDeclaration.new('font-size', '1.1em', false, 1).to_s.should == 'font-size:1.1em'
+      end
+    end
+
+    describe "comparing" do
+      def declaration(specificity, important = false)
+        StyleDeclaration.new('color', 'green', important, specificity)
+      end
+
+      it "should compare on specificity" do
+        declaration(5).should be == declaration(5)
+        declaration(4).should be < declaration(5)
+        declaration(6).should be > declaration(5)
+      end
+
+      context "with an important declaration" do
+        it "should be less than the important declaration regardless of the specificity" do
+          declaration(99, false).should be < declaration(1, true)
+        end
+
+        it "should compare like normal when both declarations are important" do
+          declaration(5, true).should be == declaration(5, true)
+          declaration(4, true).should be < declaration(5, true)
+          declaration(6, true).should be > declaration(5, true)
+        end
+      end
+    end
+  end
+end

data/spec/lib/roadie_spec.rb

@@ -9,7 +9,7 @@ describe Roadie do
   end
 
   describe ".load_css(root, targets)" do
-    let(:fixtures_root) { Pathname.new(__FILE__).dirname.join('..', 'fixtures') }
+    let(:fixtures_root) { Pathname.new(__FILE__).dirname.join('..', 'fixtures', 'public', 'stylesheets') }
 
     it "should load files matching the target names under root/public/stylesheets" do
       Roadie.load_css(fixtures_root, ['foo']).should == 'contents of foo'

data/spec/spec_helper.rb

@@ -13,6 +13,9 @@ rescue Bundler::BundlerError => e
 end
 
 require 'rspec'
+
+Dir['./spec/support/**/*'].each { |file| require file }
+
 require 'action_mailer'
 require 'roadie'
 
@@ -31,71 +34,3 @@ else
   end
 end
 
-RSpec::Matchers.define :have_styling do |rules|
-  chain :at_selector do |selector|
-    @selector = selector
-  end
-
-  match do |document|
-    styles = parsed_styles(document)
-    if rules.nil?
-      styles.blank?
-    else
-      rules.stringify_keys.should == parsed_styles(document)
-    end
-  end
-
-  describe { "have styles #{rules.inspect} at selector #{@selector.inspect}" }
-  failure_message_for_should { |document| "expected styles at #{@selector.inspect} to be #{rules.inspect} but was #{parsed_styles(document).inspect}" }
-  failure_message_for_should_not { "expected styles at #{@selector.inspect} to not be #{rules.inspect}" }
-
-  def element_styles(document)
-    node = document.css(@selector).first
-    node && node['style']
-  end
-
-  def parsed_styles(document)
-    return @parsed_styles if defined?(@parsed_styles)
-    if (styles = element_styles(document)).present?
-      @parsed_styles = styles.split(';').inject({}) do |styles, item|
-        attribute, value = item.split(':', 2)
-        styles.merge!(attribute.strip => value.strip)
-      end
-    else
-      @parsed_styles = nil
-    end
-  end
-end
-
-RSpec::Matchers.define :have_attribute do |attribute|
-  chain :at_selector do |selector|
-    @selector = selector
-  end
-
-  match do |document|
-    name, expected = attribute.first
-    expected == attribute(document, name)
-  end
-
-  describe { "have attribute #{attribute.inspect} at selector #{@selector.inspect}" }
-  failure_message_for_should do |document|
-    name, expected = attribute.first
-    "expected #{name} attribute at #{@selector.inspect} to be #{expected.inspect} but was #{attribute(document, name).inspect}"
-  end
-  failure_message_for_should_not do |document|
-    name, expected = attribute.first
-    "expected #{name} attribute at #{@selector.inspect} to not be #{expected.inspect}"
-  end
-
-  def attribute(document, attribute_name)
-    node = document.css(@selector).first
-    node && node[attribute_name]
-  end
-end
-
-RSpec::Matchers.define :have_selector do |selector|
-  match { |document| document.css(selector).present? }
-  failure_message_for_should { "expected document to #{name_to_sentence}#{expected_to_sentence}"}
-  failure_message_for_should_not { "expected document to not #{name_to_sentence}#{expected_to_sentence}"}
-end
-

data/spec/support/have_attribute_matcher.rb

@@ -0,0 +1,28 @@
+RSpec::Matchers.define :have_attribute do |attribute|
+  @selector = 'body > *:first'
+
+  chain :at_selector do |selector|
+    @selector = selector
+  end
+
+  match do |document|
+    name, expected = attribute.first
+    expected == attribute(document, name)
+  end
+
+  describe { "have attribute #{attribute.inspect} at selector #{@selector.inspect}" }
+  failure_message_for_should do |document|
+    name, expected = attribute.first
+    "expected #{name} attribute at #{@selector.inspect} to be #{expected.inspect} but was #{attribute(document, name).inspect}"
+  end
+  failure_message_for_should_not do |document|
+    name, expected = attribute.first
+    "expected #{name} attribute at #{@selector.inspect} to not be #{expected.inspect}"
+  end
+
+  def attribute(document, attribute_name)
+    node = document.css(@selector).first
+    node && node[attribute_name]
+  end
+end
+

data/spec/support/have_selector_matcher.rb

@@ -0,0 +1,6 @@
+RSpec::Matchers.define :have_selector do |selector|
+  match { |document| document.css(selector).present? }
+  failure_message_for_should { "expected document to #{name_to_sentence}#{expected_to_sentence}"}
+  failure_message_for_should_not { "expected document to not #{name_to_sentence}#{expected_to_sentence}"}
+end
+

data/spec/support/have_styling_matcher.rb

@@ -0,0 +1,36 @@
+RSpec::Matchers.define :have_styling do |rules|
+  @selector = 'body > *:first'
+
+  chain :at_selector do |selector|
+    @selector = selector
+  end
+
+  match do |document|
+    if rules.nil?
+      parsed_styles(document).blank?
+    else
+      rules.to_a.should == parsed_styles(document)
+    end
+  end
+
+  describe { "have styles #{rules.inspect} at selector #{@selector.inspect}" }
+  failure_message_for_should { |document| "expected styles at #{@selector.inspect} to be #{rules.inspect} but was #{parsed_styles(document).inspect}" }
+  failure_message_for_should_not { "expected styles at #{@selector.inspect} to not be #{rules.inspect}" }
+
+  def parsed_styles(document)
+    parse_styles(element_style(document))
+  end
+
+  def element_style(document)
+    node = document.css(@selector).first
+    node && node['style']
+  end
+
+  def parse_styles(styles)
+    return [] if styles.blank?
+    styles.split(';').inject([]) do |array, item|
+      array << item.split(':', 2).map(&:strip)
+    end
+  end
+end
+

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: roadie
 version: !ruby/object:Gem::Version 
-  hash: 270495473
-  prerelease: true
+  hash: 23
+  prerelease: false
   segments: 
   - 1
   - 0
   - 0
-  - pre2
-  version: 1.0.0.pre2
+  version: 1.0.0
 platform: ruby
 authors: 
 - Magnus Bergmark
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-06 00:00:00 +01:00
+date: 2011-03-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -91,29 +90,36 @@ extra_rdoc_files:
 files: 
 - .autotest
 - .gitignore
-- .rspec
+- .yardopts
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
 - README.textile
 - Rakefile
-- VERSION
 - autotest/discover.rb
 - lib/roadie.rb
 - lib/roadie/action_mailer_extensions.rb
+- lib/roadie/css_file_not_found.rb
 - lib/roadie/inliner.rb
+- lib/roadie/style_declaration.rb
 - lib/roadie/version.rb
 - roadie.gemspec
 - spec/fixtures/public/stylesheets/bar.css
 - spec/fixtures/public/stylesheets/foo.css
 - spec/fixtures/public/stylesheets/integration.css
+- spec/fixtures/views/integration_mailer/marketing.html.erb
 - spec/fixtures/views/integration_mailer/notification.html.erb
 - spec/fixtures/views/integration_mailer/notification.text.erb
 - spec/integration_spec.rb
 - spec/lib/roadie/action_mailer_extensions_spec.rb
+- spec/lib/roadie/css_file_not_found_spec.rb
 - spec/lib/roadie/inliner_spec.rb
+- spec/lib/roadie/style_declaration_spec.rb
 - spec/lib/roadie_spec.rb
 - spec/spec_helper.rb
+- spec/support/have_attribute_matcher.rb
+- spec/support/have_selector_matcher.rb
+- spec/support/have_styling_matcher.rb
 has_rdoc: true
 homepage: http://github.com/Mange/roadie
 licenses: []
@@ -135,14 +141,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
@@ -154,10 +158,16 @@ test_files:
 - spec/fixtures/public/stylesheets/bar.css
 - spec/fixtures/public/stylesheets/foo.css
 - spec/fixtures/public/stylesheets/integration.css
+- spec/fixtures/views/integration_mailer/marketing.html.erb
 - spec/fixtures/views/integration_mailer/notification.html.erb
 - spec/fixtures/views/integration_mailer/notification.text.erb
 - spec/integration_spec.rb
 - spec/lib/roadie/action_mailer_extensions_spec.rb
+- spec/lib/roadie/css_file_not_found_spec.rb
 - spec/lib/roadie/inliner_spec.rb
+- spec/lib/roadie/style_declaration_spec.rb
 - spec/lib/roadie_spec.rb
 - spec/spec_helper.rb
+- spec/support/have_attribute_matcher.rb
+- spec/support/have_selector_matcher.rb
+- spec/support/have_styling_matcher.rb

data/.rspec

@@ -1,2 +0,0 @@
---colour
---format progress

data/VERSION

@@ -1 +0,0 @@
-1.0.0.pre1