css_parser 1.1.6 → 1.1.7

data/lib/css_parser.rb

@@ -7,7 +7,7 @@ require 'stringio'
 require 'iconv'
 
 module CssParser
-  VERSION = '1.1.6'
+  VERSION = '1.1.7''
 
   # 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).

data/lib/css_parser/parser.rb

@@ -215,6 +215,7 @@ module CssParser
       block.scan(/([\\]?[{}\s"]|(.[^\s"{}\\]*))/).each do |matches|
       #block.scan(/((.[^{}"\n\r\f\s]*)[\s]|(.[^{}"\n\r\f]*)\{|(.[^{}"\n\r\f]*)\}|(.[^{}"\n\r\f]*)\"|(.*)[\s]+)/).each do |matches|
         token = matches[0]
+
         #puts "TOKEN: #{token}" unless token =~ /^[\s]*$/
         if token =~ /\A"/ # found un-escaped double quote
           in_string = !in_string
@@ -277,6 +278,11 @@ module CssParser
           end
         end
       end
+
+      # check for unclosed braces          
+      if in_declarations > 0
+        add_rule!(current_selectors, current_declarations, media_types)
+      end        
     end
 
     # Load a remote CSS file.

data/lib/css_parser/rule_set.rb

@@ -125,31 +125,6 @@ module CssParser
       create_font_shorthand!
     end
 
-private
-    def parse_declarations!(block) # :nodoc:
-      @declarations = {}
-
-      return unless block
-
-      block.gsub!(/(^[\s]*)|([\s]*$)/, '')
-
-      block.split(/[\;$]+/m).each do |decs|
-        if matches = decs.match(/(.[^:]*)\:(.[^;]*)(;|\Z)/i)
-          property, value, end_of_declaration = matches.captures
-
-          add_declaration!(property, value)
-        end
-      end
-    end
-
-    #--
-    # TODO: way too simplistic
-    #++
-    def parse_selectors!(selectors) # :nodoc:
-      @selectors = selectors.split(',') 
-    end
-
-public
     # Split shorthand dimensional declarations (e.g. <tt>margin: 0px auto;</tt>)
     # into their constituent parts.
     def expand_dimensions_shorthand! # :nodoc:
@@ -390,5 +365,29 @@ public
       end
 
     end
+
+  private
+    def parse_declarations!(block) # :nodoc:
+      @declarations = {}
+
+      return unless block
+
+      block.gsub!(/(^[\s]*)|([\s]*$)/, '')
+
+      block.split(/[\;$]+/m).each do |decs|
+        if matches = decs.match(/(.[^:]*)\:(.[^;]*)(;|\Z)/i)
+          property, value, end_of_declaration = matches.captures
+
+          add_declaration!(property, value)
+        end
+      end
+    end
+
+    #--
+    # TODO: way too simplistic
+    #++
+    def parse_selectors!(selectors) # :nodoc:
+      @selectors = selectors.split(',') 
+    end
   end
 end

data/test/test_css_parser_basic.rb

@@ -27,6 +27,11 @@ class CssParserBasicTests < Test::Unit::TestCase
     assert_equal 'margin: 0px;', @cp.find_by_selector('body').join
   end
 
+  def test_adding_block_without_closing_brace
+    @cp.add_block!('p { color: red;')
+    assert_equal 'color: red;', @cp.find_by_selector('p').join
+  end
+
   def test_adding_a_rule
     @cp.add_rule!('div', 'color: blue;')
     assert_equal 'color: blue;', @cp.find_by_selector('div').join(' ')

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 6
-  version: 1.1.6
+  - 7
+  version: 1.1.7
 platform: ruby
 authors: 
 - Alex Dunae
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-25 00:00:00 -07:00
+date: 2011-03-29 00:00:00 -07:00
 default_executable: 
 dependencies: []