css_parser 1.1.4 → 1.1.5

data/lib/css_parser/rule_set.rb

@@ -300,11 +300,13 @@ public
 
     # Looks for long format CSS background properties (e.g. <tt>background-color</tt>) and 
     # converts them into a shorthand CSS <tt>background</tt> property.
+    #
+    # Leaves properties declared !important alone.
     def create_background_shorthand! # :nodoc:
       new_value = ''
       ['background-color', 'background-image', 'background-repeat', 
        'background-position', 'background-attachment'].each do |property|
-        if @declarations.has_key?(property)
+        if @declarations.has_key?(property) and not @declarations[property][:is_important]
           new_value += @declarations[property][:value] + ' '
           @declarations.delete(property)
         end

data/lib/css_parser.rb

@@ -7,7 +7,7 @@ require 'stringio'
 require 'iconv'
 
 module CssParser
-  VERSION = '1.1.4'
+  VERSION = '1.1.5'
 
   # Merge multiple CSS RuleSets by cascading according to the CSS 2.1 cascading rules 
   # (http://www.w3.org/TR/REC-CSS2/cascade.html#cascading-order).
@@ -75,20 +75,28 @@ module CssParser
 
       rule_set.each_declaration do |property, value, is_important|
         # Add the property to the list to be folded per http://www.w3.org/TR/CSS21/cascade.html#cascading-order
-        if not properties.has_key?(property) or
-               is_important or # step 2
-               properties[property][:specificity] < specificity or # step 3
-               properties[property][:specificity] == specificity # step 4    
-          properties[property] = {:value => value, :specificity => specificity, :is_important => is_important}            
+        if not properties.has_key?(property)
+          properties[property] = {:value => value, :specificity => specificity, :is_important => is_important}
+        elsif properties[property][:specificity] < specificity or properties[property][:specificity] == specificity
+          unless properties[property][:is_important]
+            properties[property] = {:value => value, :specificity => specificity, :is_important => is_important}            
+          end
         end
+
+        if is_important
+            properties[property] = {:value => value, :specificity => specificity, :is_important => is_important}            
+        end        
       end
     end
 
     merged = RuleSet.new(nil, nil)
 
-    # TODO: what about important
     properties.each do |property, details|
-      merged[property.strip] = details[:value].strip
+      if details[:is_important]
+        merged[property.strip] = details[:value].strip.gsub(/\;\Z/, '') + '!important' 
+      else
+        merged[property.strip] = details[:value].strip
+      end
     end
 
     merged.create_shorthand!

data/test/test_css_parser_basic.rb

@@ -10,6 +10,7 @@ class CssParserBasicTests < Test::Unit::TestCase
       html, body, p { margin: 0px; }
       p { padding: 0px; }
       #content { font: 12px/normal sans-serif; }
+      .content { color: red; }
     EOT
   end
 
@@ -17,6 +18,8 @@ class CssParserBasicTests < Test::Unit::TestCase
     @cp.add_block!(@css)
     assert_equal 'margin: 0px;', @cp.find_by_selector('body').join(' ')
     assert_equal 'margin: 0px; padding: 0px;', @cp.find_by_selector('p').join(' ')
+    assert_equal 'font: 12px/normal sans-serif;', @cp.find_by_selector('#content').join(' ')
+    assert_equal 'color: red;', @cp.find_by_selector('.content').join(' ')
   end
 
   def test_adding_block

data/test/test_merging.rb

@@ -85,4 +85,19 @@ class MergingTests < Test::Unit::TestCase
     merged = CssParser.merge(rs)
     assert_equal rs.object_id, merged.object_id
   end
+  
+  def test_merging_important
+    rs1 = RuleSet.new(nil, 'color: black !important;')
+    rs2 = RuleSet.new(nil, 'color: red;')
+    merged = CssParser.merge(rs1, rs2)
+    assert_equal 'black !important;', merged['color']    
+  end
+
+  def test_merging_shorthand_important
+    rs1 = RuleSet.new(nil, 'background: black none !important;')
+    rs2 = RuleSet.new(nil, 'background-color: red;')
+    merged = CssParser.merge(rs1, rs2)
+    assert_equal 'black !important;', merged['background-color']
+  end
+
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 4
-  version: 1.1.4
+  - 5
+  version: 1.1.5
 platform: ruby
 authors: 
 - Alex Dunae
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-11 00:00:00 -08:00
+date: 2011-01-21 00:00:00 -08:00
 default_executable: 
 dependencies: []