Update css_parser

vendor/gems/css_parser-0.9.1/lib/css_parser.rb → vendor/gems/css_parser-1.0.0/lib/css_parser.rb

@@ -1,6 +1,6 @@
 $:.unshift File.dirname(__FILE__)
 require 'uri'
-require 'md5'
+require 'digest/md5'
 require 'zlib'
 require 'iconv'
 require 'css_parser/rule_set'

vendor/gems/css_parser-0.9.1/lib/css_parser/parser.rb → vendor/gems/css_parser-1.0.0/lib/css_parser/parser.rb

@@ -15,7 +15,7 @@ class CircularReferenceError < StandardError; end
   # [<tt>import</tt>] Follow <tt>@import</tt> rules. Boolean, default is <tt>true</tt>.
   # [<tt>io_exceptions</tt>] Throw an exception if a link can not be found. Boolean, default is <tt>true</tt>.
   class Parser
-    USER_AGENT   = "Ruby CSS Parser/#{VERSION} (http://code.dunae.ca/css_parser/)"
+    USER_AGENT   = "Ruby CSS Parser/#{RUBY_VERSION} (http://code.dunae.ca/css_parser/)"
 
     STRIP_CSS_COMMENTS_RX = /\/\*.*?\*\//m
     STRIP_HTML_COMMENTS_RX = /\<\!\-\-|\-\-\>/m

vendor/gems/css_parser-0.9.1/lib/css_parser/regexps.rb → vendor/gems/css_parser-1.0.0/lib/css_parser/regexps.rb

@@ -2,17 +2,17 @@ module CssParser
   # :stopdoc:
   # Base types
   RE_NL = Regexp.new('(\n|\r\n|\r|\f)')
-  RE_NON_ASCII = Regexp.new('([\x00-\xFF])', Regexp::IGNORECASE)  #[^\0-\177]
-  RE_UNICODE = Regexp.new('(\\\\[0-9a-f]{1,6}(\r\n|[ \n\r\t\f])*)', Regexp::IGNORECASE | Regexp::EXTENDED | Regexp::MULTILINE)
+  RE_NON_ASCII = Regexp.new('([\x00-\xFF])', Regexp::IGNORECASE, 'n')  #[^\0-\177]
+  RE_UNICODE = Regexp.new('(\\\\[0-9a-f]{1,6}(\r\n|[ \n\r\t\f])*)', Regexp::IGNORECASE | Regexp::EXTENDED | Regexp::MULTILINE, 'n')
   RE_ESCAPE = Regexp.union(RE_UNICODE, '|(\\\\[^\n\r\f0-9a-f])')
-  RE_IDENT = Regexp.new("[\-]?([_a-z]|#{RE_NON_ASCII}|#{RE_ESCAPE})([_a-z0-9\-]|#{RE_NON_ASCII}|#{RE_ESCAPE})*", Regexp::IGNORECASE)
+  RE_IDENT = Regexp.new("[\-]?([_a-z]|#{RE_NON_ASCII}|#{RE_ESCAPE})([_a-z0-9\-]|#{RE_NON_ASCII}|#{RE_ESCAPE})*", Regexp::IGNORECASE, 'n')
 
   # General strings
   RE_STRING1 = Regexp.new('(\"(.[^\n\r\f\\"]*|\\\\' + RE_NL.to_s + '|' + RE_ESCAPE.to_s + ')*\")')
   RE_STRING2 = Regexp.new('(\'(.[^\n\r\f\\\']*|\\\\' + RE_NL.to_s + '|' + RE_ESCAPE.to_s + ')*\')')
   RE_STRING = Regexp.union(RE_STRING1, RE_STRING2)
 
-  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)
+  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
 
   # Initial parsing

vendor/gems/css_parser-0.9.1/lib/css_parser/rule_set.rb → vendor/gems/css_parser-1.0.0/lib/css_parser/rule_set.rb

@@ -48,6 +48,11 @@ def get_value(property)
     #
     # If the property already exists its value will be over-written.
     def add_declaration!(property, value)
+      if value.nil? or value.empty?
+        @declarations.delete(property)
+        return
+      end
+
       value.gsub!(/;\Z/, '')
       is_important = !value.gsub!(CssParser::IMPORTANT_IN_PROPERTY_RX, '').nil?
       property = property.downcase.strip
@@ -84,13 +89,14 @@ def each_declaration # :yields: property, value, is_important
     end
 
     # Return all declarations as a string.
+    #--
+    # TODO: Clean-up regexp doesn't seem to work
+    #++
     def declarations_to_s(options = {})
      options = {:force_important => false}.merge(options)
      str = ''
-     each_declaration do |prop, val, is_important|
-       importance = (options[:force_important] || is_important) ? ' !important' : ''
-       str += "#{prop}: #{val}#{importance}; "
-     end 
+     importance = options[:force_important] ? ' !important' : ''
+     each_declaration { |prop, val| str += "#{prop}: #{val}#{importance}; " }
      str.gsub(/^[\s]+|[\n\r\f\t]*|[\s]+$/mx, '').strip
     end
 
@@ -138,6 +144,7 @@ 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:
@@ -372,9 +379,5 @@ def create_font_shorthand! # :nodoc:
       end
 
     end
-
-
-
-
   end
 end

vendor/gems/css_parser-0.9.1/test/test_css_parser_regexps.rb → vendor/gems/css_parser-1.0.0/test/test_css_parser_regexps.rb

@@ -1,3 +1,4 @@
+# coding: iso-8859-1
 require File.dirname(__FILE__) + '/test_helper'
 
 # Test cases for CSS regular expressions

vendor/gems/css_parser-0.9.1/test/test_helper.rb → vendor/gems/css_parser-1.0.0/test/test_helper.rb

@@ -1,8 +1,8 @@
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__), '../'))
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__), '../lib/'))
-require 'rubygems'
-require 'test/unit'
-require 'css_parser'
-require 'net/http'
-require 'open-uri'
-require 'WEBrick'
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__), '../'))
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__), '../lib/'))
+require 'rubygems'
+require 'test/unit'
+require 'css_parser'
+require 'net/http'
+require 'open-uri'
+require 'WEBrick'

vendor/gems/css_parser-0.9.1/test/test_rule_set.rb → vendor/gems/css_parser-1.0.0/test/test_rule_set.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/test_helper'
+require "set"
 
 # Test cases for parsing CSS blocks
 class RuleSetTests < Test::Unit::TestCase
@@ -32,7 +33,7 @@ def test_each_selector
     expected = [
        {:selector => "#content p", :declarations => "color: #fff;", :specificity => 101},
        {:selector => "a", :declarations => "color: #fff;", :specificity => 1}
-    ]    
+    ]
 
     actual = []
     rs = RuleSet.new('#content p, a', 'color: #fff;')
@@ -44,13 +45,13 @@ def test_each_selector
   end
 
   def test_each_declaration
-    expected = [
+    expected = Set.new([
        {:property => 'margin', :value => '1px -0.25em', :is_important => false},
        {:property => 'background', :value => 'white none no-repeat', :is_important => true},
        {:property => 'color', :value => '#fff', :is_important => false}
-    ]    
+    ])
 
-    actual = []
+    actual = Set.new
     rs = RuleSet.new(nil, 'color: #fff; Background: white none no-repeat !important; margin: 1px -0.25em;')
     rs.each_declaration do |prop, val, imp|
       actual << {:property => prop, :value => val, :is_important => imp}