css_parser 1.2.4 → 1.2.5

data/lib/css_parser.rb

@@ -8,7 +8,7 @@ require 'stringio'
 require 'iconv'
 
 module CssParser
-  VERSION = '1.2.4'
+  VERSION = '1.2.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).
@@ -78,8 +78,10 @@ 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 is_important
+          if not properties[property][:is_important] or properties[property][:specificity] <= specificity
+            properties[property] = {:value => value, :specificity => specificity, :is_important => is_important}      
+          end
         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}            

data/test/test_merging.rb

@@ -98,6 +98,12 @@ class MergingTests < Test::Unit::TestCase
     rs2 = RuleSet.new(nil, 'color: red !important;', 1)
     merged = CssParser.merge(rs1, rs2)
     assert_equal 'black !important;', merged['color']    
+
+    rs3 = RuleSet.new(nil, 'color: blue !important;', 1000)
+    merged = CssParser.merge(rs1, rs2, rs3)
+    assert_equal 'blue !important;', merged['color']    
+
+
   end
 
   def test_merging_shorthand_important

metadata

@@ -1,45 +1,33 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: css_parser
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 1.2.5
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 4
-  version: 1.2.4
 platform: ruby
-authors: 
+authors:
 - Alex Dunae
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-07 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-07 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: addressable
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153617080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *2153617080
 description: A set of classes for parsing CSS in Ruby.
 email: code@dunae.ca
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/css_parser.rb
 - lib/css_parser/parser.rb
 - lib/css_parser/regexps.rb
@@ -61,42 +49,34 @@ files:
 - test/test_rule_set_expanding_shorthand.rb
 homepage: https://github.com/alexdunae/css_parser
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --all
 - --inline-source
 - --line-numbers
 - --charset
 - utf-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby CSS parser.
-test_files: 
+test_files:
 - test/test_css_parser_basic.rb
 - test/test_css_parser_loading.rb
 - test/test_css_parser_media_types.rb