css_parser 0.9.1 → 1.0.0

data/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'

data/lib/css_parser/parser.rb

@@ -15,7 +15,7 @@ module CssParser
   # [<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

data/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

data/lib/css_parser/rule_set.rb

@@ -14,6 +14,7 @@ module CssParser
       @selectors = []
       @specificity = specificity
       @declarations = {}
+      @order = 0
       parse_selectors!(selectors) if selectors
       parse_declarations!(block)
     end
@@ -48,11 +49,18 @@ module CssParser
     #
     # 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
       #puts "SAVING #{property}  #{value} #{is_important.inspect}"
-      @declarations[property] = {:value => value, :is_important => is_important}
+      @declarations[property] = {
+        :value => value, :is_important => is_important, :order => @order += 1
+      }
     end
     alias_method :[]=, :add_declaration!
 
@@ -76,7 +84,8 @@ module CssParser
 
     # Iterate through declarations.
     def each_declaration # :yields: property, value, is_important
-      @declarations.each do |property, data|
+      decs = @declarations.sort { |a,b| a[1][:order] <=> b[1][:order] }
+      decs.each do |property, data|
         value = data[:value]
         #value += ' !important' if data[:is_important]
         yield property.downcase.strip, value.strip, data[:is_important]
@@ -84,13 +93,14 @@ module CssParser
     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 +148,7 @@ private
       @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:
@@ -147,6 +158,7 @@ private
         
         value = @declarations[property][:value]
         is_important = @declarations[property][:is_important]
+        order = @declarations[property][:order]
         t, r, b, l = nil
 
         matches = value.scan(CssParser::BOX_MODEL_UNITS_RX)
@@ -168,10 +180,11 @@ private
             l = matches[3][0]
         end
 
-        @declarations["#{property}-top"] = {:value => t.to_s, :is_important => is_important}
-        @declarations["#{property}-right"] = {:value => r.to_s, :is_important => is_important}
-        @declarations["#{property}-bottom"] = {:value => b.to_s, :is_important => is_important}
-        @declarations["#{property}-left"] = {:value => l.to_s, :is_important => is_important}
+        values = { :is_important => is_important, :order => order }
+        @declarations["#{property}-top"]    = values.merge(:value => t.to_s)
+        @declarations["#{property}-right"]  = values.merge(:value => r.to_s)
+        @declarations["#{property}-bottom"] = values.merge(:value => b.to_s)
+        @declarations["#{property}-left"]   = values.merge(:value => l.to_s)
         @declarations.delete(property)
       end
     end
@@ -191,6 +204,7 @@ private
 
       value = @declarations['font'][:value]
       is_important = @declarations['font'][:is_important]
+      order = @declarations['font'][:order]
 
       in_fonts = false
 
@@ -225,7 +239,7 @@ private
         end
       end
 
-      font_props.each { |font_prop, font_val| @declarations[font_prop] = {:value => font_val, :is_important => is_important} }
+      font_props.each { |font_prop, font_val| @declarations[font_prop] = {:value => font_val, :is_important => is_important, :order => order} }
 
       @declarations.delete('font')
     end
@@ -240,6 +254,7 @@ private
 
       value = @declarations['background'][:value]
       is_important = @declarations['background'][:is_important]
+      order = @declarations['background'][:order]
 
       bg_props = {}
 
@@ -276,7 +291,7 @@ private
         end
       end
 
-      bg_props.each { |bg_prop, bg_val| @declarations[bg_prop] = {:value => bg_val, :is_important => is_important} }
+      bg_props.each { |bg_prop, bg_val| @declarations[bg_prop] = {:value => bg_val, :is_important => is_important, :order => order} }
 
       @declarations.delete('background')
     end
@@ -372,9 +387,5 @@ private
       end
 
     end
-
-
-
-
   end
-end
+end

data/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

data/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'

data/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 @@ class RuleSetTests < Test::Unit::TestCase
     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 @@ class RuleSetTests < Test::Unit::TestCase
   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}
@@ -59,6 +60,15 @@ class RuleSetTests < Test::Unit::TestCase
     assert_equal(expected, actual)
   end
 
+  def test_each_declaration_respects_order
+    css_fragment = "margin: 0; padding: 20px; margin-bottom: 28px;"
+    rs           = RuleSet.new(nil, css_fragment)
+    expected     = %w(margin padding margin-bottom)
+    actual       = []
+    rs.each_declaration { |prop, val, imp| actual << prop }
+    assert_equal(expected, actual)
+  end
+
   def test_declarations_to_s
     declarations = 'color: #fff; font-weight: bold;'
     rs = RuleSet.new('#content p, a', declarations)

metadata

@@ -1,44 +1,35 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
-specification_version: 1
 name: css_parser
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
-date: 2008-11-12 00:00:00 -08:00
-summary: A set of classes for parsing CSS.
-require_paths: 
-- lib
-email: 
-homepage: http://code.dunae.ca/css_parser
-rubyforge_project: 
-description: 
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 1.0.0
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Alex Dunae
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2009-12-21 00:00:00 -08:00
+default_executable: 
+dependencies: []
+
+description: A set of classes for parsing CSS in Ruby.
+email: code@dunae.ca
+executables: []
+
+extensions: []
+
+extra_rdoc_files: []
+
 files: 
 - lib/css_parser.rb
 - lib/css_parser/parser.rb
 - lib/css_parser/regexps.rb
 - lib/css_parser/rule_set.rb
-- test/fixtures
 - test/fixtures/import-circular-reference.css
 - test/fixtures/import-with-media-types.css
 - test/fixtures/import1.css
 - test/fixtures/simple.css
-- test/fixtures/subdir
 - test/fixtures/subdir/import2.css
 - test/test_css_parser_basic.rb
 - test/test_css_parser_downloading.rb
@@ -50,9 +41,38 @@ files:
 - test/test_rule_set.rb
 - test/test_rule_set_creating_shorthand.rb
 - test/test_rule_set_expanding_shorthand.rb
-- README
-- CHANGELOG
-- LICENSE
+has_rdoc: true
+homepage: http://github.com/alexdunae/css_parser
+licenses: []
+
+post_install_message: 
+rdoc_options: 
+- --all
+- --inline-source
+- --line-numbers
+- --charset
+- utf-8
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 1.3.5
+signing_key: 
+specification_version: 3
+summary: Ruby CSS parser.
 test_files: 
 - test/test_css_parser_basic.rb
 - test/test_css_parser_downloading.rb
@@ -64,19 +84,3 @@ test_files:
 - test/test_rule_set.rb
 - test/test_rule_set_creating_shorthand.rb
 - test/test_rule_set_expanding_shorthand.rb
-rdoc_options: 
-- --all
-- --inline-source
-- --line-numbers
-extra_rdoc_files: 
-- README
-- CHANGELOG
-- LICENSE
-executables: []
-
-extensions: []
-
-requirements: []
-
-dependencies: []
-

data/CHANGELOG

@@ -1,13 +0,0 @@
-=== Ruby CSS Parser CHANGELOG
-
-==== Version 0.9.1
- * Fixed RuleSet#declaration_to_s so it would respect <tt>!important</tt> 
-   rules (thanks to Dana - http://github.com/DanaDanger)
-
-==== Version 0.9
- * Initial version forked from Premailer project
-
-==== TODO: Future
- * border shorthand/folding support
- * re-implement caching on CssParser.merge
- * correctly parse http://www.webstandards.org/files/acid2/test.html

data/LICENSE

@@ -1,21 +0,0 @@
-=== Ruby CSS Parser License
-
-Copyright (c) 2007 Alex Dunae
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

data/README

@@ -1,58 +0,0 @@
-=== Ruby CSS Parser
-
-Load, parse and cascade CSS rule sets in Ruby.
-
-==== Setup
-
-Install the gem from RubyGems.
-
-   gem install css_parser
-
-Done.
-
-==== An example
-  require 'css_parser'
-  include CssParser
-
-  parser = CssParser::Parser.new
-  parser.load_file!('http://example.com/styles/style.css')
-
-  # lookup a rule by a selector
-  parser.find('#content')
-  #=> 'font-size: 13px; line-height: 1.2;'
-
-  # lookup a rule by a selector and media type
-  parser.find('#content', [:screen, :handheld])
-
-  # iterate through selectors by media type
-  parser.each_selector(:screen) do |selector, declarations, specificity|
-    ...
-  end
-
-  # add a block of CSS
-  css = <<-EOT
-    body { margin: 0 1em; }
-  EOT
-
-  parser.add_block!(css)
-
-  # output all CSS rules in a single stylesheet
-  parser.to_s
-  => #content { font-size: 13px; line-height: 1.2; }
-     body { margin: 0 1em; }
-
-==== Testing
-
-You can run the suite of unit tests using <tt>rake test</tt>.
-
-The download/import tests require that WEBrick is installed.  The tests set up
-a temporary server on port 12000 and pull down files from the <tt>test/fixtures/</tt> 
-directory.
-
-==== Credits and code
-
-By Alex Dunae (dunae.ca, e-mail 'code' at the same domain), 2007-08.
-
-Thanks to Dana (http://github.com/DanaDanger) for the 0.9.1 update.
-
-Made on Vancouver Island.