supporting :has() selectors. closes #172

sparklemotion · Nov 30, 2009 · af2856a · af2856a
1 parent c0fbd68
commit af2856a
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 2 deletions.
diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
@@ -9,6 +9,7 @@
   * XML::NodeSet#reverse added
   * Added fragment support to Node#add_child, Node#add_next_sibling,
     Node#add_previous_sibling, and Node#replace.
+  * Ths CSS selector engine now supports :has()
 
 * Bugfixes
 

diff --git a/lib/nokogiri/css/parser.y b/lib/nokogiri/css/parser.y
@@ -2,7 +2,7 @@ class Nokogiri::CSS::GeneratedParser
 
 token FUNCTION INCLUDES DASHMATCH LBRACE HASH PLUS GREATER S STRING IDENT
 token COMMA NUMBER PREFIXMATCH SUFFIXMATCH SUBSTRINGMATCH TILDE NOT_EQUAL
-token SLASH DOUBLESLASH NOT EQUAL RPAREN LSQUARE RSQUARE
+token SLASH DOUBLESLASH NOT EQUAL RPAREN LSQUARE RSQUARE HAS
 
 rule
   selector
@@ -112,6 +112,9 @@ rule
     | NOT expr RPAREN {
         result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
       }
+    | HAS selector RPAREN {
+        result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
+      }
     ;
   expr
     : NUMBER COMMA expr { result = [val.first, val.last] }

diff --git a/lib/nokogiri/css/tokenizer.rex b/lib/nokogiri/css/tokenizer.rex
@@ -22,7 +22,8 @@ rule
 
 # [:state]  pattern  [actions]
 
-            {ident}\(\s*     { [:FUNCTION, text] }
+            \has\({w}        { [:HAS, text] }
+            {ident}\({w}     { [:FUNCTION, text] }
             {ident}          { [:IDENT, text] }
             \#{name}         { [:HASH, text] }
             {w}~={w}         { [:INCLUDES, text] }

diff --git a/lib/nokogiri/css/xpath_visitor.rb b/lib/nokogiri/css/xpath_visitor.rb
@@ -31,6 +31,8 @@ def visit_function node
           "last() = 1"
         when /^comment\(/
           "comment()"
+        when /^has\(/
+          node.value[1].accept(self)
         else
           args = ['.'] + node.value[1..-1]
           "#{node.value.first}#{args.join(', ')})"

diff --git a/test/css/test_parser.rb b/test/css/test_parser.rb
@@ -54,6 +54,11 @@ def test_to_a
         )
       end
 
+      def test_has
+        assert_xpath  "//a[b]", @parser.parse("a:has(b)")
+        assert_xpath  "//a[b/c]", @parser.parse("a:has(b > c)")
+      end
+
       def test_dashmatch
         assert_xpath  "//a[@class = 'bar' or starts-with(@class, concat('bar', '-'))]",
                       @parser.parse("a[@class|='bar']")

diff --git a/test/css/test_tokenizer.rb b/test/css/test_tokenizer.rb
@@ -10,6 +10,13 @@ def setup
         @scanner = Nokogiri::CSS::Tokenizer.new
       end
 
+      def test_has
+        @scanner.scan("a:has(b)")
+        assert_tokens(
+          [[:IDENT, "a"], [":", ":"], [:HAS, "has("], [:IDENT, "b"], [:RPAREN, ")"]],
+          @scanner)
+      end
+
       def test_unicode
         @scanner.scan("a日本語")
         assert_tokens([[:IDENT, 'a日本語']], @scanner)