csspool 0.1.1 → 0.2.0

data/CHANGELOG.txt

@@ -1,3 +1,19 @@
+== 0.2.0
+
+* Added CSS::SAC::Parser#parse_rule to parse a single rule.
+* Added CSS::StyleSheet#find_rule for finding a particular rule.
+* Added CSS::StyleSheet#rules_matching for finding all rules matching a node.
+* Added CSS::StyleSheet#create_rule for creating a new rule.
+* Added CSS::StyleSheet#find_all_rules_matching for finding all rules that match
+  any node in the passed in document.
+* Added .eql? to selector AST
+* Added .hash to selector AST 
+* Added .eql? to LexicalUnits 
+* Added .hash to LexicalUnits 
+* Added CSS::StyleSheet#to_css
+* Added CSS::StyleSheet#reduce!
+* CSS::StyleSheet is now the default document handler
+
 == 0.1.1
 
 * Added specificity to selectors.

data/Manifest.txt

@@ -32,6 +32,10 @@ lib/css/sac/selectors/simple_selector.rb
 lib/css/sac/token.rb
 lib/css/sac/tokenizer.rb
 lib/css/sac/visitable.rb
+lib/css/stylesheet.rb
+lib/css/stylesheet/rule.rb
+lib/css/stylesheet/stylesheet.rb
+lib/csspool.rb
 lib/parser.y
 lib/property_parser.y
 lib/property_parser.y.erb
@@ -50,7 +54,13 @@ test/test_descendant_selector.rb
 test/test_element_selector.rb
 test/test_id_condition.rb
 test/test_lexeme.rb
+test/test_lexical_color.rb
+test/test_lexical_function.rb
+test/test_lexical_ident.rb
+test/test_lexical_number.rb
+test/test_lexical_string.rb
 test/test_lexical_unit.rb
+test/test_lexical_uri.rb
 test/test_one_of_condition.rb
 test/test_parse_error.rb
 test/test_parser.rb
@@ -61,6 +71,7 @@ test/test_selector_parser.rb
 test/test_sibling_selector.rb
 test/test_simple_selector.rb
 test/test_specificity.rb
+test/test_stylesheet.rb
 test/test_token.rb
 test/test_tokenizer.rb
 test/test_xpath.rb

data/README.txt

@@ -18,7 +18,15 @@ Building CSSpool requires:
 
   - rubygems, hoe, flexmock
 
-== Example
+== Examples
+
+=== Tidy a stylesheet
+
+  parser = CSS::SAC::Parser.new
+  doc = parser.parse(File.read(ARGV[0]))
+  puts doc.to_css
+
+=== Find custom attributes
 
 This example prints out all properties from a particular CSS file.
 
@@ -41,8 +49,8 @@ See SAC[http://www.w3.org/Style/CSS/SAC/] for more information on SAC.
 
 == Authors
 
-* {Aaron Patterson}[http://tenderlovemaking.com] <aaronp@rubyforge.com>
-* {John Barnette}[http://geeksomnia.com] <jbarnette@rubyforge.com>
+* {Aaron Patterson}[http://tenderlovemaking.com] <aaronp@rubyforge.org>
+* {John Barnette}[http://geeksomnia.com] <jbarnette@rubyforge.org>
 
 == LICENSE
 

data/Rakefile

@@ -7,14 +7,14 @@ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), "lib")
 GENERATED_PARSER = "lib/css/sac/generated_parser.rb"
 GENERATED_PROPERTY_PARSER = "lib/css/sac/generated_property_parser.rb"
 
-Hoe.new('csspool', '0.1.1') do |p|
+Hoe.new('csspool', '0.2.0') do |p|
   p.rubyforge_name  = 'csspool'
   p.author          = 'Aaron Patterson'
   p.email           = 'aaronp@rubyforge.org'
   p.summary         = "Parses CSS"
   p.description     = p.paragraphs_of('README.txt', 3).join("\n\n")
   p.url             = p.paragraphs_of('README.txt', 1).first.strip
-  p.changes         = p.paragraphs_of('CHANGELOG.txt', 0..2).join("\n\n")
+  p.changes         = p.paragraphs_of('CHANGELOG.txt', 0..1).join("\n\n")
   p.clean_globs     = [GENERATED_PARSER]
 end
 

data/lib/css/sac/conditions/attribute_condition.rb

@@ -46,6 +46,10 @@ module CSS
           super && local_name == other.local_name && value == other.value &&
             specified == other.specified
         end
+
+        def hash
+          [local_name, value, specified].hash
+        end
       end
     end
   end

data/lib/css/sac/conditions/combinator_condition.rb

@@ -30,6 +30,10 @@ module CSS
         def ==(other)
           super && first == other.first && second == other.second
         end
+
+        def hash
+          [first, second].hash
+        end
       end
     end
   end

data/lib/css/sac/conditions/condition.rb

@@ -14,6 +14,14 @@ module CSS
           self.class === other && condition_type == other.condition_type
         end
 
+        def hash
+          condition_type.hash
+        end
+
+        def eql?(other)
+          self == other
+        end
+
         def to_css
           nil
         end

data/lib/css/sac/lexical_unit.rb

@@ -9,6 +9,14 @@ module CSS
                     :parameters,
                     :function_name
 
+      def ==(other)
+        self.class === other && self.lexical_unit_type == other.lexical_unit_type
+      end
+
+      def eql?(other)
+        self == other
+      end
+
       alias :to_s :string_value
     end
 
@@ -25,22 +33,51 @@ module CSS
         self.parameters = params
         self.lexical_unit_type = FUNCTIONS[self.function_name] || :SAC_FUNCTION
       end
+
+      def ==(other)
+        super && %w{ function_name parameters }.all? { |x|
+          self.send(x.to_sym) == other.send(x.to_sym)
+        }
+      end
+
+      def hash
+        ([self.function_name] + parameters).hash
+      end
     end
 
     class Color < LexicalUnit
       def initialize(value)
         self.string_value = value
         self.lexical_unit_type = :SAC_RGBCOLOR
-        if value =~ /^#(\d{1,2})(\d{1,2})(\d{1,2})$/
-          self.parameters = [
-            Number.new($1.hex, '', :SAC_INTEGER),
-            Number.new($2.hex, '', :SAC_INTEGER),
-            Number.new($3.hex, '', :SAC_INTEGER)
-          ]
+        if value =~ /^#([A-F\d]{1,2})([A-F\d]{1,2})([A-F\d]{1,2})$/
+          self.parameters = [$1, $2, $3].map { |x|
+            x.length == 1 ? (x * 2).hex : x.hex
+          }.map { |x|
+            Number.new(x, '', :SAC_INTEGER)
+          }
         else
           self.parameters = [LexicalIdent.new(value)]
         end
       end
+
+      def ==(other)
+        super && self.parameters == other.parameters
+      end
+
+      def hash
+        self.parameters.hash
+      end
+
+      def to_s
+        if self.parameters.length < 3
+          super
+        else
+          hex = self.parameters.map { |x|
+            sprintf("%02X", x.integer_value).split('').uniq
+          }.flatten
+          hex.length != 3 ? super : "##{hex.join()}"
+        end
+      end
     end
 
     class LexicalString < LexicalUnit
@@ -48,6 +85,14 @@ module CSS
         self.string_value = value
         self.lexical_unit_type = :SAC_STRING_VALUE
       end
+
+      def ==(other)
+        super && self.string_value == other.string_value
+      end
+
+      def hash
+        self.string_value.hash
+      end
     end
 
     class LexicalIdent < LexicalUnit
@@ -55,6 +100,14 @@ module CSS
         self.string_value = value
         self.lexical_unit_type = :SAC_IDENT
       end
+
+      def ==(other)
+        super && self.string_value == other.string_value
+      end
+
+      def hash
+        self.string_value.hash
+      end
     end
 
     class LexicalURI < LexicalUnit
@@ -62,6 +115,18 @@ module CSS
         self.string_value = value.gsub(/^url\(/, '').gsub(/\)$/, '')
         self.lexical_unit_type = :SAC_URI
       end
+
+      def ==(other)
+        super && self.string_value == other.string_value
+      end
+
+      def hash
+        self.string_value.hash
+      end
+
+      def to_s
+        "url(#{string_value})"
+      end
     end
 
     class Number < LexicalUnit
@@ -106,6 +171,33 @@ module CSS
         self.lexical_unit_type = UNITS[self.dimension_unit_text] ||
           (value =~ /\./ ? :SAC_NUMBER : :SAC_INTEGER)
       end
+
+      def ==(other)
+        return true if self.float_value == 0 && other.float_value == 0
+        return false unless super
+        
+        %w{ float_value integer_value dimension_unit_text }.all? { |x|
+          self.send(x.to_sym) == other.send(x.to_sym)
+        }
+      end
+
+      def hash
+        if self.float_value == 0
+          self.float_value.hash
+        else
+          %w{ float_value integer_value dimension_unit_text }.map { |x|
+            self.send(x.to_sym)
+          }.hash
+        end
+      end
+
+      def to_s
+        if self.float_value == 0
+          "0"
+        else
+          super
+        end
+      end
     end
   end
 end

data/lib/css/sac/parser.rb

@@ -14,15 +14,15 @@ module CSS
   module SAC
     class Parser < CSS::SAC::GeneratedParser
       # The version of CSSPool you're using
-      VERSION = '0.1.1'
+      VERSION = '0.2.0'
 
       TOKENIZER = Tokenizer.new
       
       attr_accessor :document_handler, :error_handler, :logger
 
-      def initialize(document_handler = nil)
+      def initialize(document_handler = StyleSheet.new(self))
         @error_handler = ErrorHandler.new
-        @document_handler = document_handler || DocumentHandler.new()
+        @document_handler = document_handler
         @property_parser = PropertyParser.new()
         @tokenizer = TOKENIZER
         @logger = nil
@@ -40,7 +40,18 @@ module CSS
       end
 
       alias :parse :parse_style_sheet
-      alias :parse_rule :parse_style_sheet
+
+      def parse_rule(rule)
+        returner = Class.new(DocumentHandler) {
+          attr_accessor :selector
+          alias :start_selector :selector=
+        }.new
+        old_document_handler = self.document_handler
+        self.document_handler = returner
+        self.parse("#{rule} { }")
+        self.document_handler = old_document_handler
+        returner.selector
+      end
 
       # Returns the parser version.  We return CSS2, but its actually
       # CSS2.1.  No font-face tags.  Sorry.

data/lib/css/sac/selectors/child_selector.rb

@@ -30,6 +30,10 @@ module CSS
         def ==(other)
           super && parent == other.parent && selector == other.selector
         end
+
+        def hash
+          [parent, selector].hash
+        end
       end
     end
   end

data/lib/css/sac/selectors/conditional_selector.rb

@@ -37,6 +37,10 @@ module CSS
         def ==(other)
           super && condition == other.condition && selector == other.selector
         end
+
+        def hash
+          [condition, selector].hash
+        end
       end
     end
   end

data/lib/css/sac/selectors/descendant_selector.rb

@@ -30,6 +30,10 @@ module CSS
         def ==(other)
           super && selector == other.selector && ancestor == other.ancestor
         end
+        
+        def hash
+          [selector, ancestor].hash
+        end
       end
     end
   end

data/lib/css/sac/selectors/element_selector.rb

@@ -29,6 +29,10 @@ module CSS
         def ==(other)
           super && name == other.name
         end
+
+        def hash
+          name.hash
+        end
       end
     end
   end

data/lib/css/sac/selectors/selector.rb

@@ -14,6 +14,14 @@ module CSS
           self.class === other && selector_type == other.selector_type
         end
         
+        def hash
+          selector_type.hash
+        end
+
+        def eql?(other)
+          self == other
+        end
+        
         def =~(node)
           MatchesVisitor.new(node).accept(self)
         end

data/lib/css/sac/selectors/sibling_selector.rb

@@ -29,6 +29,10 @@ module CSS
         def ==(other)
           super && selector == other.selector && sibling == other.sibling
         end
+
+        def hash
+          [selector, sibling].hash
+        end
       end
     end
   end

data/lib/css/sac.rb

@@ -1,4 +1,5 @@
 require "css/sac/parser"
+require "css/stylesheet"
 
 module CSS
   module SAC

data/lib/css/stylesheet/rule.rb

@@ -0,0 +1,12 @@
+require 'set'
+module CSS
+  class StyleSheet
+    class Rule
+      attr_accessor :selector, :properties
+      def initialize(selector, properties = [])
+        @selector = selector
+        @properties = Set.new(properties)
+      end
+    end
+  end
+end

data/lib/css/stylesheet/stylesheet.rb

@@ -0,0 +1,94 @@
+module CSS
+  class StyleSheet < CSS::SAC::DocumentHandler
+    attr_reader :rules
+
+    def initialize(sac)
+      @sac   = sac
+      @rules = []
+      @current_rules = []
+    end
+
+    def start_selector(selectors)
+      selectors.each { |selector|
+        @current_rules << Rule.new(selector)
+      }
+    end
+
+    def end_selector(selectors)
+      @rules += @current_rules
+      @current_rules = []
+      reduce!
+    end
+
+    def find_rule(rule)
+      rule = self.create_rule(rule) if rule.is_a?(String)
+      rules.find { |x| x.selector == rule.selector }
+    end
+    alias :[] :find_rule
+
+    # Find all rules used in +hpricot_document+
+    def find_all_rules_matching(hpricot_document)
+      used_rules = []
+      hpricot_document.search('//').each do |node|
+        if matching = (rules_matching(node))
+          used_rules += matching
+        end
+      end
+      used_rules.uniq
+    end
+
+    # Find all rules that match +node+.  +node+ must quack like an Hpricot
+    # node.
+    def rules_matching(node)
+      rules.find_all { |rule|
+        rule.selector =~ node
+      }
+    end
+    alias :=~ :rules_matching
+
+    def create_rule(rule)
+      Rule.new(@sac.parse_rule(rule).first)
+    end
+
+    def property(name, value, important)
+      @current_rules.each { |selector|
+        selector.properties << [name, value, important]
+      }
+    end
+
+    # Get a hash of rules by property
+    def rules_by_property
+      rules_by_property = Hash.new { |h,k| h[k] = [] }
+      @rules.each { |sel|
+        props = sel.properties.to_a.sort_by { |x| x.hash } # HACK?
+        rules_by_property[props] << sel
+      }
+      rules_by_property
+    end
+
+    def to_css
+      rules_by_property.map do |properties, rules|
+        rules.map { |rule| rule.selector.to_css }.sort.join(', ') + " {\n" +
+          properties.map { |key,value,important|
+            # Super annoying.  If the property is font-family, its supposed to
+            # be commas
+            join_val = ('font-family' == key) ? ', ' : ' '
+            values = [value].flatten.join(join_val)
+            "#{key}:#{values}#{important ? ' !important' : ''};"
+          }.join("\n") + "\n}"
+      end.sort.join("\n")
+    end
+
+    private
+    # Remove duplicate rules
+    def reduce!
+      unique_rules = {}
+      @rules.each do |rule|
+        (unique_rules[rule.selector] ||= rule).properties += rule.properties
+      end
+      @rules = unique_rules.values
+      self
+    end
+  end
+end
+

data/lib/css/stylesheet.rb

@@ -0,0 +1,3 @@
+require "css/stylesheet/stylesheet"
+require "css/stylesheet/rule"
+

data/lib/csspool.rb

@@ -0,0 +1 @@
+require 'css/sac'

data/lib/parser.y

@@ -203,7 +203,7 @@ rule
     |
     ;
   expr
-    : term operator expr { result = [val[0], val.last] }
+    : term operator expr { result = val }
     | term
     ;
   term
@@ -227,7 +227,7 @@ rule
     ;
   function
     : FUNCTION s_0toN expr ')' s_0toN {
-        result = Function.new(val[0], val[2].flatten)
+        result = Function.new(val[0], val[2].flatten.select { |x| x !~ /,/ })
       }
     | FUNCTION s_0toN expr error ')' s_0toN { yyerrok; result = [val[0], val[2], val[3]] }
     ;

data/test/test_attribute_condition.rb

@@ -1,6 +1,15 @@
 require File.dirname(__FILE__) + "/helper"
 
 class AttributeConditionTest < ConditionTestCase
+  def test_hash
+    first = AttributeCondition.new(1, 1, 1)
+    second = AttributeCondition.new(1, 1, 1)
+    assert_equal first.hash, second.hash
+
+    third = AttributeCondition.new(2, 1, 1)
+    assert_not_equal first.hash, third.hash
+  end
+
   def test_equals2
     first = AttributeCondition.new(1, 1, 1)
     second = AttributeCondition.new(1, 1, 1)

data/test/test_child_selector.rb

@@ -1,6 +1,18 @@
 require File.dirname(__FILE__) + "/helper"
 
 class ChildSelectorTest < SelectorTestCase
+  def test_hash
+    first = ChildSelector.new(1,1)
+    second = ChildSelector.new(1,1)
+    assert_equal first.hash, second.hash
+
+    third = ChildSelector.new(1,2)
+    assert_not_equal first.hash, third.hash
+
+    fourth = ChildSelector.new(2,1)
+    assert_not_equal first.hash, fourth.hash
+  end
+
   def test_equals2
     first = ChildSelector.new(1,1)
     second = ChildSelector.new(1,1)

data/test/test_combinator_condition.rb

@@ -10,6 +10,15 @@ class CombinatorConditionTest < ConditionTestCase
     assert_not_equal first, third
   end
 
+  def test_hash
+    first = CombinatorCondition.new(1,1)
+    second = CombinatorCondition.new(1,1)
+    assert_equal first.hash, second.hash
+
+    third = CombinatorCondition.new(1,2)
+    assert_not_equal first.hash, third.hash
+  end
+
   def test_equals_tilde
     first = ClassCondition.new('foo')
     second = AttributeCondition.new('name', 'aaron', true)

data/test/test_condition.rb

@@ -10,4 +10,22 @@ class ConditionTest < ConditionTestCase
     assert_not_equal first, third
     assert_not_equal first, 1
   end
+
+  def test_eql?
+    first = Condition.new(1)
+    second = Condition.new(1)
+    assert first.eql?(second)
+
+    third = Condition.new(2)
+    assert !first.eql?(third)
+  end
+
+  def test_hash
+    first = Condition.new(1)
+    second = Condition.new(1)
+    assert_equal first.hash, second.hash
+
+    third = Condition.new(2)
+    assert_not_equal first.hash, third.hash
+  end
 end

data/test/test_conditional_selector.rb

@@ -1,6 +1,18 @@
 require File.dirname(__FILE__) + "/helper"
 
 class ConditionalSelectorTest < SelectorTestCase
+  def test_hash
+    first = ConditionalSelector.new(1,1)
+    second = ConditionalSelector.new(1,1)
+    assert_equal first.hash, second.hash
+
+    third = ConditionalSelector.new(1,2)
+    assert_not_equal first.hash, third.hash
+
+    fourth = ConditionalSelector.new(2,1)
+    assert_not_equal first.hash, fourth.hash
+  end
+
   def test_equals2
     first = ConditionalSelector.new(1,1)
     second = ConditionalSelector.new(1,1)

data/test/test_descendant_selector.rb

@@ -1,6 +1,18 @@
 require File.dirname(__FILE__) + "/helper"
 
 class DescendantSelectorTest < SelectorTestCase
+  def test_hash
+    first = DescendantSelector.new(1,1)
+    second = DescendantSelector.new(1,1)
+    assert_equal first.hash, second.hash
+
+    third = DescendantSelector.new(1,2)
+    assert_not_equal first.hash, third.hash
+
+    fourth = DescendantSelector.new(2,1)
+    assert_not_equal first.hash, fourth.hash
+  end
+
   def test_equals2
     first = DescendantSelector.new(1,1)
     second = DescendantSelector.new(1,1)

data/test/test_element_selector.rb

@@ -1,6 +1,15 @@
 require File.dirname(__FILE__) + "/helper"
 
 class ElementSelectorTest < SelectorTestCase
+  def test_hash
+    first = ElementSelector.new(1)
+    second = ElementSelector.new(1)
+    assert_equal first.hash, second.hash
+
+    third = ElementSelector.new(2)
+    assert_not_equal first.hash, third.hash
+  end
+
   def test_equals2
     first = ElementSelector.new(1)
     second = ElementSelector.new(1)

data/test/test_lexical_color.rb

@@ -0,0 +1,49 @@
+require File.dirname(__FILE__) + "/helper"
+
+class LexicalColorTest < Test::Unit::TestCase
+  include CSS::SAC
+
+  def test_to_s
+    first = Color.new('#FFFFFF')
+    assert_equal('#FFF', first.to_s)
+
+    second = Color.new('#FEFEFE')
+    assert_equal('#FEFEFE', second.to_s)
+
+    third = Color.new('red')
+    assert_equal('red', third.to_s)
+
+    fourth = Color.new('#0066FF')
+    assert_equal('#06F', fourth.to_s)
+  end
+
+  def test_hash
+    first = Color.new('#FFFFFF')
+    second = Color.new('#FFFFFF')
+    assert_equal first.hash, second.hash
+
+    third = Color.new('red')
+    assert_not_equal first.hash, third.hash
+  end
+
+  def test_equals2
+    first = Color.new('#FFFFFF')
+    second = Color.new('#FFFFFF')
+    assert_equal(first, second)
+
+    third = Color.new('#FFF')
+    assert_equal(first, third)
+
+    fourth = Color.new('#FFA')
+    assert_not_equal(first, fourth)
+  end
+
+  def test_equals2_string
+    first = Color.new('red')
+    second = Color.new('red')
+    assert_equal(first, second)
+
+    third = Color.new('#FFF')
+    assert_not_equal(first, third)
+  end
+end

data/test/test_lexical_function.rb

@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + "/helper"
+
+class LexicalFunctionTest < Test::Unit::TestCase
+  include CSS::SAC
+
+  def test_to_s
+    first = Function.new('counter(', %w{ 1 2 3 4 })
+    assert_equal('counter(1, 2, 3, 4)', first.to_s)
+  end
+
+  def test_equals2
+    first = Function.new('counter(', %w{ 1 2 3 4 })
+    second = Function.new('counter(', %w{ 1 2 3 4 })
+    assert_equal(first, second)
+
+    third = Function.new('rect(', %w{ 1 2 3 4 })
+    assert_not_equal(first, third)
+
+    fourth = Function.new('counter(', %w{ 1 2 3 5 })
+    assert_not_equal(first, fourth)
+  end
+
+  def test_hash
+    first = Function.new('counter(', %w{ 1 2 3 4 })
+    second = Function.new('counter(', %w{ 1 2 3 4 })
+    assert_equal first.hash, second.hash
+
+    third = Function.new('counter(', %w{ 1 2 4 4 })
+    assert_not_equal first.hash, third.hash
+  end
+end

data/test/test_lexical_ident.rb

@@ -0,0 +1,30 @@
+require File.dirname(__FILE__) + "/helper"
+
+class LexicalIdentTest < Test::Unit::TestCase
+  include CSS::SAC
+
+  def test_equals2
+    first = LexicalIdent.new('one')
+    second = LexicalIdent.new('one')
+    assert_equal first, second
+
+    third = LexicalIdent.new('two')
+    assert_not_equal first, third
+  end
+
+  def test_eql?
+    first = LexicalIdent.new('one')
+    second = LexicalIdent.new('one')
+
+    assert first.eql?(second)
+  end
+
+  def test_hash
+    first = LexicalIdent.new('one')
+    second = LexicalIdent.new('one')
+    assert_equal first.hash, second.hash
+
+    third = LexicalIdent.new('two')
+    assert_not_equal first.hash, third.hash
+  end
+end

data/test/test_lexical_number.rb

@@ -0,0 +1,68 @@
+require File.dirname(__FILE__) + "/helper"
+
+class LexicalNumberTest < Test::Unit::TestCase
+  def test_to_s
+    first = CSS::SAC::Number.new('10', 'px')
+    assert_equal('10px', first.to_s)
+
+    second = CSS::SAC::Number.new('0', 'em')
+    assert_equal('0', second.to_s)
+  end
+
+  def test_hash
+    first = CSS::SAC::Number.new('10', 'px')
+    second = CSS::SAC::Number.new('10', 'px')
+    assert_equal first.hash, second.hash
+
+    third = CSS::SAC::Number.new('11', 'px')
+    assert_not_equal first.hash, third.hash
+
+    fourth = CSS::SAC::Number.new('10', 'em')
+    assert_not_equal first.hash, fourth.hash
+  end
+
+  def test_hash_0_unit
+    first = CSS::SAC::Number.new('0', 'px')
+    second = CSS::SAC::Number.new('0', 'px')
+    assert_equal first.hash, second.hash
+
+    third = CSS::SAC::Number.new('0', 'em')
+    assert_equal first.hash, third.hash
+  end
+
+  def test_equals2
+    first = CSS::SAC::Number.new('10', 'px')
+    second = CSS::SAC::Number.new('10', 'px')
+    assert_equal first, second
+
+    third = CSS::SAC::Number.new('10', 'ex')
+    assert_not_equal first, third
+
+    fourth = CSS::SAC::Number.new('11', 'px')
+    assert_equal(11, fourth.integer_value)
+    assert_not_equal first, fourth
+  end
+
+  def test_equals2_zero
+    first = CSS::SAC::Number.new('0', 'px')
+    second = CSS::SAC::Number.new('0', 'em')
+    assert_equal first, second
+
+    first_float = CSS::SAC::Number.new('0.0', 'px')
+    second_float = CSS::SAC::Number.new('0.0', 'em')
+    assert_equal first_float, second_float
+
+    third_float = CSS::SAC::Number.new('0.1', 'em')
+    assert_equal 0.1, third_float.float_value
+    assert_not_equal first_float, third_float
+  end
+
+  def test_equals2_type
+    first = CSS::SAC::Number.new(10, '', :SAC_INTEGER)
+    second = CSS::SAC::Number.new(10, '', :SAC_INTEGER)
+    assert_equal first, second
+
+    third = CSS::SAC::Number.new(11, '', :SAC_INTEGER)
+    assert_not_equal first, third
+  end
+end

data/test/test_lexical_string.rb

@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + "/helper"
+
+class LexicalStringTest < Test::Unit::TestCase
+  include CSS::SAC
+
+  def test_equals2
+    first = LexicalString.new('hey bro')
+    second = LexicalString.new('hey bro')
+    assert_equal(first, second)
+
+    third = LexicalString.new('hey bro again')
+    assert_not_equal(first, third)
+  end
+
+  def test_hash
+    first = LexicalString.new('hey bro')
+    second = LexicalString.new('hey bro')
+    assert_equal(first.hash, second.hash)
+
+    third = LexicalString.new('hey bro!')
+    assert_not_equal(first.hash, third.hash)
+  end
+end

data/test/test_lexical_unit.rb

@@ -1,6 +1,8 @@
 require File.dirname(__FILE__) + "/helper"
 
 class LexicalUnitTest < Test::Unit::TestCase
+  include CSS::SAC
+
   def setup
     @sac = CSS::SAC::Parser.new()
   end
@@ -13,6 +15,14 @@ class LexicalUnitTest < Test::Unit::TestCase
     flexmock_verify
   end
 
+  def test_equals2
+    first = LexicalUnit.new
+    second = LexicalUnit.new
+    assert_equal(first, second)
+    second.lexical_unit_type = 'asdfadsf'
+    assert_not_equal(first, second)
+  end
+
   def test_color
     flexmock(@sac.document_handler).
       should_receive(:property).with('background-color', on { |list|
@@ -20,7 +30,7 @@ class LexicalUnitTest < Test::Unit::TestCase
         list.first.lexical_unit_type == :SAC_RGBCOLOR &&
         list.first.string_value == "#345" &&
         list.first.parameters.length == 3 &&
-        list.first.parameters.map { |x| x.integer_value } == [3,4,5] &&
+        list.first.parameters.map { |x| x.integer_value } == [51,68,85] &&
         list.first.integer_value.nil?
     }, false).once
 

data/test/test_lexical_uri.rb

@@ -0,0 +1,28 @@
+require File.dirname(__FILE__) + "/helper"
+
+class LexicalURITest < Test::Unit::TestCase
+  include CSS::SAC
+
+  def test_to_s
+    first = LexicalURI.new('url(http://tenderlovemaking.com/)')
+    assert_equal('url(http://tenderlovemaking.com/)', first.to_s)
+  end
+
+  def test_hash
+    first = LexicalURI.new('url(http://tenderlovemaking.com/)')
+    second = LexicalURI.new('url(http://tenderlovemaking.com/)')
+    assert_equal first.hash, second.hash
+
+    third = LexicalURI.new('url(http://www.tenderlovemaking.com/)')
+    assert_not_equal first.hash, third.hash
+  end
+
+  def test_equals2
+    first = LexicalURI.new('url(http://tenderlovemaking.com/)')
+    second = LexicalURI.new('url(http://tenderlovemaking.com/)')
+    assert_equal first, second
+
+    third = LexicalURI.new('url(http://www.tenderlovemaking.com/)')
+    assert_not_equal first, third
+  end
+end

data/test/test_parser.rb

@@ -10,6 +10,22 @@ class ParserTest < Test::Unit::TestCase
     flexmock_close
   end
 
+  def test_parse_rule
+    class << @sac.document_handler
+      attr_accessor :selector
+      alias :start_selector :selector=
+    end
+    @sac.parse('h1 > div { }')
+
+    expected_rule = @sac.document_handler.selector
+    assert expected_rule
+
+    rule = @sac.parse_rule('h1 > div')
+    assert rule
+    assert_equal 1, rule.length
+    assert_equal expected_rule, rule
+  end
+
   def test_page
     flexmock(@sac.document_handler).
       should_receive(:start_page).ordered.

data/test/test_selector.rb

@@ -3,12 +3,20 @@ require File.dirname(__FILE__) + "/helper"
 class SelectorTest < SelectorTestCase
   class MySelector < Selector; end
 
+  def test_hash
+    first = Selector.new(1)
+    second = Selector.new(1)
+    assert_equal first.hash, second.hash
+
+    third = Selector.new(2)
+    assert_not_equal first.hash, third.hash
+  end
+
   def test_equals2
     first = Selector.new(1)
     second = Selector.new(1)
     assert_equal first, second
 
-
     third = Selector.new(2)
     assert_not_equal first, third
 
@@ -16,4 +24,13 @@ class SelectorTest < SelectorTestCase
     assert_equal first, fourth
     assert_not_equal first, 1
   end
+
+  def test_eql?
+    first = Selector.new(1)
+    second = Selector.new(1)
+    assert first.eql?(second)
+
+    third = Selector.new(2)
+    assert !first.eql?(third)
+  end
 end

data/test/test_selector_parser.rb

@@ -17,6 +17,14 @@ class SelectorParserTest < Test::Unit::TestCase
     assert_equal(2, selectors.length)
   end
 
+  def test_eql?
+    @sac.parse('h1, h1 { }')
+    selectors = @sac.document_handler.selectors
+    assert_equal(2, selectors.length)
+    assert_equal selectors[0], selectors[1]
+    assert selectors[0].eql?(selectors[1])
+  end
+
   def test_adjacent
     @sac.parse('h1 + h2 { }')
     selectors = @sac.document_handler.selectors

data/test/test_sibling_selector.rb

@@ -1,6 +1,15 @@
 require File.dirname(__FILE__) + "/helper"
 
 class SiblingSelectorTest < SelectorTestCase
+  def test_hash
+    first = SiblingSelector.new(1,1)
+    second = SiblingSelector.new(1,1)
+    assert_equal first.hash, second.hash
+
+    third = SiblingSelector.new(1,2)
+    assert_not_equal first.hash, third.hash
+  end
+
   def test_equals2
     first = SiblingSelector.new(1,1)
     second = SiblingSelector.new(1,1)

data/test/test_stylesheet.rb

@@ -0,0 +1,95 @@
+require File.dirname(__FILE__) + "/helper"
+
+class StyleSheetTest < SelectorTestCase
+  def setup
+    @sac = CSS::SAC::Parser.new
+  end
+
+  def test_rules_matching
+    doc = @sac.parse("div > p { letter-spacing: 1px; }")
+    node = parent_child_tree('div', 'p')
+    expected = doc.rules.first
+
+    found = doc.rules_matching(node)
+    assert_equal 1, found.length
+    assert_equal expected.selector, found.first.selector
+
+    found2 = (doc =~ node)
+    assert_equal 1, found2.length
+    assert_equal expected.selector, found2.first.selector
+  end
+
+  def test_find_rule
+    doc = @sac.parse("h1 { letter-spacing: 1px; }")
+    expected = doc.rules.first
+    assert_equal expected, doc.find_rule('h1')
+    assert_equal expected, doc['h1']
+    assert_equal expected, doc[expected]
+  end
+
+  def test_create_rule
+    doc = @sac.parse("h1 { letter-spacing: 1px; }")
+    rule = doc.create_rule('h1')
+    assert_equal doc.rules.first.selector, rule.selector
+  end
+
+  def test_reduce!
+    doc = @sac.parse(<<END
+  h1 {
+    background-color: red;
+    border-color: green;
+  }
+  h1 { letter-spacing: 1px; }
+END
+    )
+    assert_equal(1, doc.rules.length)
+  end
+
+  def test_rules_by_property
+    doc = @sac.parse(<<END
+  h1 {
+    background-color: red;
+    padding: 100px;
+    border-color: green;
+  }
+  div {
+    border-color: green;
+    background-color: red;
+    padding: 100px;
+  }
+END
+    )
+    assert_equal(2, doc.rules.length)
+    assert_equal(doc.rules[0].properties, doc.rules[1].properties)
+    assert_equal(1, doc.rules_by_property.keys.length)
+    assert_equal(2, doc.rules_by_property.values.first.length)
+  end
+
+  def test_to_css
+    doc = @sac.parse(<<END
+  h1 {
+    background-color: red;
+    padding: 100px;
+    border-color: green;
+  }
+  div {
+    border-color: green;
+    background-color: red;
+    padding: 100px;
+  }
+  .marquee { background: url(images/sfx1_bg.gif) bottom repeat-x;}
+  SELECT {font-family: Arial, Verdana, Geneva, sans-serif; font-size: small; }
+END
+    )
+    css = doc.to_css
+    assert_match('div, h1 {', css)
+
+    [ 'border-color:green;',
+      'background-color:red;',
+      'url(images/sfx1_bg.gif',
+      'Arial, Verdana, Geneva, sans-serif;',
+      'padding:100px;'].each do |attribute|
+      assert_match(attribute, css)
+    end
+  end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: csspool
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2007-11-17 00:00:00 -08:00
+  version: 0.2.0
+date: 2007-11-28 00:00:00 -08:00
 summary: Parses CSS
 require_paths: 
 - lib
@@ -63,6 +63,10 @@ files:
 - lib/css/sac/token.rb
 - lib/css/sac/tokenizer.rb
 - lib/css/sac/visitable.rb
+- lib/css/stylesheet.rb
+- lib/css/stylesheet/rule.rb
+- lib/css/stylesheet/stylesheet.rb
+- lib/csspool.rb
 - lib/parser.y
 - lib/property_parser.y
 - lib/property_parser.y.erb
@@ -81,7 +85,13 @@ files:
 - test/test_element_selector.rb
 - test/test_id_condition.rb
 - test/test_lexeme.rb
+- test/test_lexical_color.rb
+- test/test_lexical_function.rb
+- test/test_lexical_ident.rb
+- test/test_lexical_number.rb
+- test/test_lexical_string.rb
 - test/test_lexical_unit.rb
+- test/test_lexical_uri.rb
 - test/test_one_of_condition.rb
 - test/test_parse_error.rb
 - test/test_parser.rb
@@ -92,6 +102,7 @@ files:
 - test/test_sibling_selector.rb
 - test/test_simple_selector.rb
 - test/test_specificity.rb
+- test/test_stylesheet.rb
 - test/test_token.rb
 - test/test_tokenizer.rb
 - test/test_xpath.rb