expand tests on relative selectors

Author: annbgn

cssselect/parser.py

@@ -270,7 +270,9 @@ def canonical(self):
 
     def specificity(self):
         a1, b1, c1 = self.selector.specificity()
-        a2, b2, c2 = self.subselector.specificity()
+        a2 = b2 = c2 = 0
+        if self.subselector:
+            a2, b2, c2 = self.subselector[-1].specificity()
         return a1 + a2, b1 + b2, c1 + c2
 
 

cssselect/xpath.py

@@ -14,6 +14,7 @@
 
 import sys
 import re
+import copy
 
 from cssselect.parser import parse, parse_series, SelectorError
 
@@ -76,13 +77,13 @@ def add_star_prefix(self):
         """
         self.path += '*/'
 
-    def join(self, combiner, other):
+    def join(self, combiner, other, closing_combiner=None):
         path = _unicode(self) + combiner
         # Any "star prefix" is redundant when joining.
         if other.path != '*/':
             path += other.path
         self.path = path
-        self.element = other.element
+        self.element = other.element + closing_combiner if closing_combiner else other.element
         self.condition = other.condition
         return self
 
@@ -274,9 +275,14 @@ def xpath_negation(self, negation):
 
     def xpath_relation(self, relation):
         xpath = self.xpath(relation.selector)
-        combinator, subselector = relation.subselector
-        method = getattr(self, 'xpath_%s_combinator' % self.combinator_mapping[combinator.value])
-        return method(xpath, self.xpath(subselector))
+        combinator, *subselector = relation.subselector
+        if not subselector:
+            combinator.value = ' '
+            right = self.xpath(combinator)
+        else:
+            right = self.xpath(subselector[0])
+        method = getattr(self, 'xpath_relation_%s_combinator' % self.combinator_mapping[combinator.value])
+        return method(xpath, right)
 
     def xpath_function(self, function):
         """Translate a functional pseudo-class."""
@@ -375,6 +381,29 @@ def xpath_indirect_adjacent_combinator(self, left, right):
         """right is a sibling after left, immediately or not"""
         return left.join('/following-sibling::', right)
 
+    def xpath_relation_descendant_combinator(self, left, right):
+        """right is a child, grand-child or further descendant of left; select left"""
+        return left.join('/descendant-or-self::', right, closing_combiner='/ancestor-or-self::' + left.element)
+
+    def xpath_relation_child_combinator(self, left, right):
+        """right is an immediate child of left; select left"""
+        return left.join('[./', right, closing_combiner=']')
+
+    def xpath_relation_direct_adjacent_combinator(self, left, right):
+        """right is a sibling immediately after left; select left"""
+        left_copy = copy.copy(left)
+        xpath = left.join('/following-sibling::', right)
+        xpath.add_name_test()
+        xpath.add_condition('position() = 1')
+
+        xpath = xpath.join('/preceding-sibling::', left_copy)
+        xpath.add_name_test()
+        return xpath.add_condition('position() = 1')
+
+    def xpath_relation_indirect_adjacent_combinator(self, left, right):
+        """right is a sibling after left, immediately or not; select left"""
+        return left.join('/following-sibling::', right, closing_combiner='/preceding-sibling::'+left.element)
+
 
     # Function: dispatch by function/pseudo-class name
 

tests/test_cssselect.py

@@ -266,12 +266,10 @@ def specificity(css):
         assert specificity(':not(:empty)') == (0, 1, 0)
         assert specificity(':not(#foo)') == (1, 0, 0)
 
-        # assert specificity(':has(*)') == (0, 0, 0)
-        # assert specificity(':has(foo)') == (0, 0, 1)
-        # assert specificity(':has(.foo)') == (0, 1, 0)
-        # assert specificity(':has([foo])') == (0, 1, 0)
-        # assert specificity(':has(:empty)') == (0, 1, 0)
-        # assert specificity(':has(#foo)') == (1, 0, 0)
+        assert specificity(':has(*)') == (0, 0, 0)
+        assert specificity(':has(foo)') == (0, 0, 1)
+        assert specificity(':has(> foo)') == (0, 0, 1)
+
 
         assert specificity('foo:empty') == (0, 1, 1)
         assert specificity('foo:before') == (0, 0, 2)
@@ -504,8 +502,11 @@ def xpath(css):
         assert xpath('e:not(:nth-child(odd))') == (
             "e[not(count(preceding-sibling::*) mod 2 = 0)]")
         assert xpath('e:nOT(*)') == (
-            "e[0]")  # never matches
-        assert xpath('e:has(> f)') == 'e/f'
+            "e[0]")  # never matches        
+        assert xpath('e:has(> f)') == 'e[./f]'
+        assert xpath('e:has(f)') == 'e/descendant-or-self::f/ancestor-or-self::e'
+        assert xpath('e:has(~ f)') == 'e/following-sibling::f/preceding-sibling::e'
+        assert xpath('e:has(+ f)') == "e/following-sibling::*[(name() = 'f') and (position() = 1)]/preceding-sibling::*[(name() = 'e') and (position() = 1)]"
         assert xpath('e f') == (
             "e/descendant-or-self::*/f")
         assert xpath('e > f') == (