css_parser 1.3.0 → 1.3.1

data/lib/css_parser/regexps.rb

@@ -22,17 +22,17 @@ module CssParser
 
   RE_URI = Regexp.new('(url\([\s]*([\s]*' + RE_STRING.to_s + '[\s]*)[\s]*\))|(url\([\s]*([!#$%&*\-~]|' + RE_NON_ASCII.to_s + '|' + RE_ESCAPE.to_s + ')*[\s]*)\)', Regexp::IGNORECASE | Regexp::EXTENDED  | Regexp::MULTILINE, 'n')
   URI_RX = /url\(("([^"]*)"|'([^']*)'|([^)]*))\)/im
-  RE_GRADIENT = /[a-z\-]*gradient\([a-z ,#%0-9\(\)]*\)$/im
+  RE_GRADIENT = /[-a-z]*gradient\([-a-z0-9 .,#%()]*\)/im
 
   # Initial parsing
   RE_AT_IMPORT_RULE = /\@import[\s]+(url\()?["''"]?(.[^'"\s"']*)["''"]?\)?([\w\s\,^\])]*)\)?;?/
-  
+
   #--
   #RE_AT_MEDIA_RULE = Regexp.new('(\"(.[^\n\r\f\\"]*|\\\\' + RE_NL.to_s + '|' + RE_ESCAPE.to_s + ')*\")')
-  
+
   #RE_AT_IMPORT_RULE = Regexp.new('@import[\s]*(' + RE_STRING.to_s + ')([\w\s\,]*)[;]?', Regexp::IGNORECASE) -- should handle url() even though it is not allowed
   #++
-  IMPORTANT_IN_PROPERTY_RX = /[\s]*!important[\s]*/i
+  IMPORTANT_IN_PROPERTY_RX = /[\s]*!important\b[\s]*/i
 
   RE_INSIDE_OUTSIDE = regex_possible_values 'inside', 'outside'
   RE_SCROLL_FIXED = regex_possible_values 'scroll', 'fixed'
@@ -52,8 +52,8 @@ module CssParser
   FONT_UNITS_RX = /(([x]+\-)*small|medium|large[r]*|auto|inherit|([0-9]+|[0-9]*\.[0-9]+)(e[mx]+|px|[cm]+m|p[tc+]|in|\%)*)/i
   RE_BORDER_STYLE = /([\s]*^)?(none|hidden|dotted|dashed|solid|double|dot-dash|dot-dot-dash|wave|groove|ridge|inset|outset)([\s]*$)?/imx
   RE_BORDER_UNITS = Regexp.union(BOX_MODEL_UNITS_RX, /(thin|medium|thick)/i)
-  
- 
+
+
   # Patterns for specificity calculations
   NON_ID_ATTRIBUTES_AND_PSEUDO_CLASSES_RX= /
     (\.[\w]+)                     # classes
@@ -75,7 +75,7 @@ module CssParser
   /ix
   ELEMENTS_AND_PSEUDO_ELEMENTS_RX = /
     ((^|[\s\+\>\~]+)[\w]+       # elements
-    |                   
+    |
     \:{1,2}(                    # pseudo-elements
       after|before
       |first-letter|first-line

data/lib/css_parser/rule_set.rb

@@ -466,11 +466,17 @@ module CssParser
 
       block.gsub!(/(^[\s]*)|([\s]*$)/, '')
 
+      continuation = ''
       block.split(/[\;$]+/m).each do |decs|
-        if matches = decs.match(/(.[^:]*)\:(.[^;]*)(;|\Z)/i)
+        decs = continuation + decs
+        if decs =~ /\([^)]*\Z/ # if it has an unmatched parenthesis
+          continuation = decs + ';'
+
+        elsif matches = decs.match(/(.[^:]*)\s*:\s*(.+)(;?\s*\Z)/i)
           property, value, end_of_declaration = matches.captures
 
           add_declaration!(property, value)
+          continuation = ''
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: css_parser
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -52,7 +52,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3425931588029901136
+      hash: -3236645012416092950
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -61,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3425931588029901136
+      hash: -3236645012416092950
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25