fixing psuedo selectors and element selectors inside a not() function. …

…closes #205

CHANGELOG.rdoc

@@ -22,6 +22,7 @@
   * XML::Node#namespace= takes nil as a parameter
   * XML::Node#xpath returns things other than NodeSet objects. GH #208
   * XSLT::StyleSheet#transform accepts hashes for parameters. GH #223
+  * Psuedo selectors inside not() work. GH #205
 
 === 1.4.1 / 2009/12/10
 

lib/nokogiri/css/parser.y

@@ -222,7 +222,9 @@ rule
       }
     ;
   negation_arg
-    : hcap_1toN
+    : element_name
+    | element_name hcap_1toN
+    | hcap_1toN
     ;
 end
 

lib/nokogiri/css/xpath_visitor.rb

@@ -40,7 +40,12 @@ def visit_function node
       end
 
       def visit_not node
-        'not(' + node.value.first.accept(self) + ')'
+        child = node.value.first
+        if :ELEMENT_NAME == child.type
+          "not(self::#{child.accept(self)})"
+        else
+          "not(#{child.accept(self)})"
+        end
       end
 
       def visit_preceding_selector node
@@ -100,8 +105,8 @@ def visit_pseudo_class node
           return self.send(msg, node) if self.respond_to?(msg)
 
           case node.value.first
-          when "first" then "position() = 1"
-          when "last" then "position() = last()"
+          when "first", "first-child" then "position() = 1"
+          when "last", "last-child" then "position() = last()"
           when "first-of-type" then "position() = 1"
           when "last-of-type" then "position() = last()"
           when "only-of-type" then "last() = 1"

test/css/test_xpath_visitor.rb

@@ -8,6 +8,15 @@ def setup
         @parser = Nokogiri::CSS::Parser.new
       end
 
+      def test_not_simple_selector
+        assert_xpath('//ol/*[not(self::li)]', @parser.parse('ol > *:not(li)'))
+      end
+
+      def test_not_last_child
+        assert_xpath('//ol/*[not(position() = last())]',
+          @parser.parse('ol > *:not(:last-child)'))
+      end
+
       def test_function_calls_allow_at_params
         assert_xpath("//a[foo(., @href)]", @parser.parse('a:foo(@href)'))
         assert_xpath("//a[foo(., @a, b)]", @parser.parse('a:foo(@a, b)'))