csspool 0.1.0 → 0.1.1

data/CHANGELOG.txt

@@ -1,3 +1,13 @@
+== 0.1.1
+
+* Added specificity to selectors.
+* Added == to selector ASTs.
+* Added =~ to selector ASTs.  The object passed in to =~ must quack like an
+  hpricot node.  It must implement the following methods: name, parent, child,
+  next_sibling, attributes.
+* Added .to_xpath to the selector AST.
+* Fixed a bug where functions as pseudo classes didn't parse.
+
 == 0.1.0
 
 * Birthday!

data/Manifest.txt

@@ -1,10 +1,18 @@
+.DS_Store
 CHANGELOG.txt
 Manifest.txt
 README.txt
 Rakefile
 lib/css/sac.rb
-lib/css/sac/attribute_condition.rb
-lib/css/sac/condition.rb
+lib/css/sac/conditions.rb
+lib/css/sac/conditions/attribute_condition.rb
+lib/css/sac/conditions/begin_hyphen_condition.rb
+lib/css/sac/conditions/class_condition.rb
+lib/css/sac/conditions/combinator_condition.rb
+lib/css/sac/conditions/condition.rb
+lib/css/sac/conditions/id_condition.rb
+lib/css/sac/conditions/one_of_condition.rb
+lib/css/sac/conditions/pseudo_class_condition.rb
 lib/css/sac/document_handler.rb
 lib/css/sac/error_handler.rb
 lib/css/sac/generated_property_parser.rb
@@ -14,19 +22,45 @@ lib/css/sac/parse_exception.rb
 lib/css/sac/parser.rb
 lib/css/sac/property_parser.rb
 lib/css/sac/selectors.rb
+lib/css/sac/selectors/child_selector.rb
+lib/css/sac/selectors/conditional_selector.rb
+lib/css/sac/selectors/descendant_selector.rb
+lib/css/sac/selectors/element_selector.rb
+lib/css/sac/selectors/selector.rb
+lib/css/sac/selectors/sibling_selector.rb
+lib/css/sac/selectors/simple_selector.rb
 lib/css/sac/token.rb
 lib/css/sac/tokenizer.rb
+lib/css/sac/visitable.rb
 lib/parser.y
 lib/property_parser.y
 lib/property_parser.y.erb
+test/condition_test_case.rb
 test/helper.rb
+test/selector_test_case.rb
 test/test_all.rb
+test/test_attribute_condition.rb
+test/test_begin_hyphen_condition.rb
+test/test_child_selector.rb
+test/test_class_condition.rb
+test/test_combinator_condition.rb
+test/test_condition.rb
+test/test_conditional_selector.rb
+test/test_descendant_selector.rb
+test/test_element_selector.rb
+test/test_id_condition.rb
 test/test_lexeme.rb
 test/test_lexical_unit.rb
+test/test_one_of_condition.rb
 test/test_parse_error.rb
 test/test_parser.rb
 test/test_property_parser.rb
+test/test_selector.rb
 test/test_selector_as_string.rb
 test/test_selector_parser.rb
+test/test_sibling_selector.rb
+test/test_simple_selector.rb
+test/test_specificity.rb
 test/test_token.rb
 test/test_tokenizer.rb
+test/test_xpath.rb

data/README.txt

@@ -32,8 +32,8 @@ This example prints out all properties from a particular CSS file.
     end
   end
   
-  token = CSS::SAC::Parser.new(DH.new)
-  token.parse(File.read(ARGV[0]))
+  parser = CSS::SAC::Parser.new(DH.new)
+  parser.parse(File.read(ARGV[0]))
 
 See CSS::SAC::DocumentHandler for callbacks to implement.
 
@@ -41,8 +41,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
+* {Aaron Patterson}[http://tenderlovemaking.com] <aaronp@rubyforge.com>
+* {John Barnette}[http://geeksomnia.com] <jbarnette@rubyforge.com>
 
 == LICENSE
 

data/Rakefile

@@ -7,7 +7,7 @@ $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.0') do |p|
+Hoe.new('csspool', '0.1.1') do |p|
   p.rubyforge_name  = 'csspool'
   p.author          = 'Aaron Patterson'
   p.email           = 'aaronp@rubyforge.org'

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

@@ -0,0 +1,52 @@
+require "css/sac/conditions"
+
+module CSS
+  module SAC
+    module Conditions
+      class AttributeCondition < Condition
+        attr_accessor :local_name, :value, :specified
+        alias :specified? :specified
+        
+        class << self
+          def build(name, raw)
+            condition, value = raw
+
+            case condition
+            when "~="
+              OneOfCondition.new(name, value)
+            when "|="
+              BeginHyphenCondition.new(name, value)
+            else
+              AttributeCondition.new(name, value, true)
+            end
+          end
+        end
+
+        def initialize(local_name, value, specified, condition_type=:SAC_ATTRIBUTE_CONDITION)
+          super(condition_type)
+        
+          @local_name = local_name
+          @value = value
+          @specified = specified
+        end
+
+        def to_css
+          "[#{local_name}#{value && "=#{value}"}]"
+        end
+      
+        def to_xpath
+          "[@#{local_name}#{value && "='#{value}'"}]"
+        end
+
+        def specificity
+          10
+        end
+
+        def ==(other)
+          super && local_name == other.local_name && value == other.value &&
+            specified == other.specified
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+require "css/sac/conditions"
+
+module CSS
+  module SAC
+    module Conditions
+      class BeginHyphenCondition < AttributeCondition
+        
+        def initialize(local_name, value)
+          super(local_name, value, true, :SAC_BEGIN_HYPHEN_ATTRIBUTE_CONDITION)
+        end
+        
+        def to_css
+          "[#{local_name}|=#{value}]"
+        end
+
+        def to_xpath
+          "[contains(@#{local_name}, '#{value}')]"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+require "css/sac/conditions"
+
+module CSS
+  module SAC
+    module Conditions
+      class ClassCondition < AttributeCondition
+        
+        def initialize(klass)
+          super("class", klass, true, :SAC_CLASS_CONDITION)
+        end
+        
+        def to_css
+          ".#{value}"
+        end
+
+        def to_xpath
+          "[contains(@#{local_name}, '#{value}')]"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+require "css/sac/conditions"
+
+module CSS
+  module SAC
+    module Conditions
+      class CombinatorCondition < Condition
+        attr_accessor :first_condition, :second_condition
+        alias :first :first_condition
+        alias :second :second_condition
+
+        def initialize(first, second)
+          super(:SAC_AND_CONDITION)
+          
+          @first_condition = first
+          @second_condition = second
+        end
+
+        def to_css
+          "#{first.to_css}#{second.to_css}"
+        end
+
+        def to_xpath
+          "#{first.to_xpath}#{second.to_xpath}"        
+        end
+
+        def specificity
+          first.specificity + second.specificity
+        end
+
+        def ==(other)
+          super && first == other.first && second == other.second
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+module CSS
+  module SAC
+    module Conditions
+      class Condition
+        include CSS::SAC::Visitable
+
+        attr_accessor :condition_type
+        
+        def initialize(condition_type)
+          @condition_type = condition_type
+        end
+
+        def ==(other)
+          self.class === other && condition_type == other.condition_type
+        end
+
+        def to_css
+          nil
+        end
+
+        def =~(node)
+          MatchesVisitor.new(node).accept(self)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+require "css/sac/conditions"
+
+module CSS
+  module SAC
+    module Conditions
+      class IDCondition < AttributeCondition
+        
+        def initialize(id)
+          id = id[1..id.size] if id[0] == ?#
+          super("id", id, true, :SAC_ID_CONDITION)
+        end
+        
+        def to_css
+          "##{value}"
+        end
+
+        def to_xpath
+          "[@id='#{value}']"
+        end
+
+        def specificity
+          100
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+require "css/sac/conditions"
+
+module CSS
+  module SAC
+    module Conditions
+      class OneOfCondition < AttributeCondition
+        
+        def initialize(local_name, value)
+          super(local_name, value, true, :SAC_ONE_OF_ATTRIBUTE_CONDITION)
+        end
+        
+        def to_css
+          "[#{local_name}~=#{value}]"
+        end
+
+        def to_xpath
+          "[contains(@#{local_name}, '#{value}')]"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+require "css/sac/conditions"
+
+module CSS
+  module SAC
+    module Conditions
+      class PseudoClassCondition < AttributeCondition
+        def initialize(pseudo_class)
+          super(nil, pseudo_class, false, :SAC_PSEUDO_CLASS_CONDITION)
+        end
+        
+        def to_css
+          ":#{value}"
+        end
+        
+        def to_xpath
+        end
+
+        def specificity
+          0
+        end
+      end
+    end
+  end
+end

data/lib/css/sac/conditions.rb

@@ -0,0 +1,5 @@
+require "css/sac/conditions/condition"
+
+%w(attribute begin_hyphen class combinator id one_of pseudo_class).each do |type|
+  require "css/sac/conditions/#{type}_condition"
+end

data/lib/css/sac/document_handler.rb

@@ -1,6 +1,6 @@
 module CSS
   module SAC
-    class CSS::SAC::DocumentHandler
+    class DocumentHandler
       def initialize
       end
 

data/lib/css/sac/parser.rb

@@ -1,3 +1,4 @@
+require "css/sac/visitable"
 require "css/sac/document_handler"
 require "css/sac/error_handler"
 require "css/sac/generated_parser"
@@ -5,15 +6,15 @@ require "css/sac/lexical_unit"
 require "css/sac/parse_exception"
 require "css/sac/tokenizer"
 require "css/sac/property_parser"
-require "css/sac/condition"
-require "css/sac/attribute_condition"
+
+require "css/sac/conditions"
 require "css/sac/selectors"
 
 module CSS
   module SAC
     class Parser < CSS::SAC::GeneratedParser
       # The version of CSSPool you're using
-      VERSION = '0.1.0'
+      VERSION = '0.1.1'
 
       TOKENIZER = Tokenizer.new
       
@@ -35,6 +36,7 @@ module CSS
         self.document_handler.start_document(string)
         do_parse
         self.document_handler.end_document(string)
+        self.document_handler
       end
 
       alias :parse :parse_style_sheet

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

@@ -0,0 +1,36 @@
+require "css/sac/selectors"
+
+module CSS
+  module SAC
+    module Selectors
+      class ChildSelector < SimpleSelector
+        attr_accessor :ancestor_selector, :simple_selector
+        alias :parent :ancestor_selector
+        alias :selector :simple_selector
+
+        def initialize(parent, selector)
+          super(:SAC_CHILD_SELECTOR)
+          
+          @ancestor_selector = parent
+          @simple_selector = selector
+        end
+
+        def to_css
+          "#{parent.to_css} > #{selector.to_css}"
+        end
+
+        def to_xpath(prefix=true)
+          "#{parent.to_xpath(prefix)}/#{selector.to_xpath(false)}"
+        end
+
+        def specificity
+          parent.specificity + selector.specificity
+        end
+
+        def ==(other)
+          super && parent == other.parent && selector == other.selector
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+require "css/sac/selectors"
+
+module CSS
+  module SAC
+    module Selectors
+      class ConditionalSelector < SimpleSelector
+        attr_accessor :condition, :simple_selector
+        alias :selector :simple_selector
+
+        def initialize(selector, condition)
+          super(:SAC_CONDITIONAL_SELECTOR)
+
+          @condition = condition
+          @simple_selector = selector
+        end
+
+        def to_css
+          [selector, condition].map { |x|
+            x ? x.to_css : ''
+          }.join('')
+        end
+
+        def to_xpath(prefix=true)
+          atoms = []
+          atoms << "//" if prefix
+          atoms << (selector ? selector.to_xpath(false) : "*")
+          atoms << condition.to_xpath
+
+          atoms.join("")
+        end
+
+        def specificity
+          (selector ? selector.specificity : 0) +
+            (condition ? condition.specificity : 0)
+        end
+
+        def ==(other)
+          super && condition == other.condition && selector == other.selector
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+require "css/sac/selectors"
+
+module CSS
+  module SAC
+    module Selectors
+      class DescendantSelector < SimpleSelector
+        attr_accessor :ancestor_selector, :simple_selector
+        alias :ancestor :ancestor_selector
+        alias :selector :simple_selector
+
+        def initialize(ancestor, selector)
+          super(:SAC_DESCENDANT_SELECTOR)
+
+          @ancestor_selector = ancestor
+          @simple_selector = selector
+        end
+
+        def to_css
+          "#{ancestor.to_css} #{selector.to_css}"
+        end
+
+        def to_xpath(prefix=true)
+          "#{ancestor.to_xpath(prefix)}//#{selector.to_xpath(false)}"
+        end
+
+        def specificity
+          ancestor.specificity + selector.specificity
+        end
+
+        def ==(other)
+          super && selector == other.selector && ancestor == other.ancestor
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+require "css/sac/selectors"
+
+module CSS
+  module SAC
+    module Selectors
+      class ElementSelector < SimpleSelector
+        attr_reader :local_name
+        alias :name :local_name
+
+        def initialize(name)
+          super(:SAC_ELEMENT_NODE_SELECTOR)
+          @local_name = name
+        end
+
+        def to_css
+          local_name
+        end
+
+        def to_xpath(prefix=true)
+          atoms = [local_name]
+          atoms.unshift("//") if prefix
+          atoms.join
+        end
+
+        def specificity
+          1
+        end
+
+        def ==(other)
+          super && name == other.name
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+module CSS
+  module SAC
+    module Selectors
+      class Selector
+        include CSS::SAC::Visitable
+
+        attr_reader :selector_type
+        
+        def initialize(selector_type)
+          @selector_type = selector_type
+        end
+
+        def ==(other)
+          self.class === other && selector_type == other.selector_type
+        end
+        
+        def =~(node)
+          MatchesVisitor.new(node).accept(self)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+require "css/sac/selectors"
+
+module CSS
+  module SAC
+    module Selectors
+      class SiblingSelector < SimpleSelector
+        attr_accessor :selector, :sibling_selector
+        alias :sibling :sibling_selector
+        
+        def initialize(selector, sibling)
+          super(:SAC_DIRECT_ADJACENT_SELECTOR)
+          
+          @selector = selector
+          @sibling_selector = sibling
+        end
+
+        def to_css
+          "#{selector.to_css} + #{sibling.to_css}"
+        end
+
+        def to_xpath(prefix=true)
+          "#{selector.to_xpath(prefix)}/following-sibling::#{sibling.to_xpath(false)}"
+        end
+
+        def specificity
+          selector.specificity + sibling.specificity
+        end
+
+        def ==(other)
+          super && selector == other.selector && sibling == other.sibling
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+require "css/sac/selectors"
+
+module CSS
+  module SAC
+    module Selectors
+      class SimpleSelector < Selector
+        def initialize(selector_type=:SAC_ANY_NODE_SELECTOR)
+          super(selector_type)
+        end
+
+        def to_css
+          '*'
+        end
+
+        def to_xpath
+          "//*"
+        end
+
+        def specificity
+          0
+        end
+      end
+    end
+  end
+end