css_parser 1.2.1 → 1.2.2

data/lib/css_parser.rb

@@ -8,7 +8,7 @@ require 'stringio'
 require 'iconv'
 
 module CssParser
-  VERSION = '1.2.0'
+  VERSION = '1.2.2'
 
   # 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).
@@ -78,16 +78,14 @@ module CssParser
         # 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)
           properties[property] = {:value => value, :specificity => specificity, :is_important => is_important}
+        elsif is_important and not properties[property][:is_important]
+          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
     end
 
     merged = RuleSet.new(nil, nil)

data/test/test_merging.rb

@@ -93,6 +93,13 @@ class MergingTests < Test::Unit::TestCase
     assert_equal 'black !important;', merged['color']    
   end
 
+  def test_merging_multiple_important
+    rs1 = RuleSet.new(nil, 'color: black !important;', 1000)
+    rs2 = RuleSet.new(nil, 'color: red !important;', 1)
+    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;')

data/test/test_rule_set_creating_shorthand.rb

@@ -59,6 +59,15 @@ class RuleSetCreatingShorthandTests < Test::Unit::TestCase
     assert_equal '', combined['margin']
     assert_equal '', combined['padding']
   end
+  
+# ==== Dimensions shorthand, auto property
+  def test_combining_dimensions_into_shorthand_with_auto
+    rs = RuleSet.new('#page', "margin: 0; margin-left: auto; margin-right: auto;")
+    rs.expand_shorthand!
+    assert_equal('auto;', rs['margin-left'])
+    rs.create_shorthand!
+    assert_equal('0 auto;', rs['margin'])
+  end
 
 # ==== Font shorthand
   def test_combining_font_into_shorthand

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: css_parser
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &2154706420 !ruby/object:Gem::Requirement
+  requirement: &2155990880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154706420
+  version_requirements: *2155990880
 description: A set of classes for parsing CSS in Ruby.
 email: code@dunae.ca
 executables: []