ext classes support all examples

Author: kaapstorm

jsonpath_ng/ext/filter.py

@@ -64,7 +64,11 @@ def update(self, data, val):
                     else:
                         data[index] = val
         return data
-    
+
+    def __eq__(self, other):
+        return (isinstance(other, Filter) and
+                self.expressions == other.expressions)
+
     def __repr__(self):
         return '%s(%r)' % (self.__class__.__name__, self.expressions)
 
@@ -108,7 +112,7 @@ def find(self, datum):
         return found
 
     def __eq__(self, other):
-        return (isinstance(other, Filter) and
+        return (isinstance(other, Expression) and
                 self.target == other.target and
                 self.op == other.op and
                 self.value == other.value)

tests/test_parser.py

@@ -9,9 +9,12 @@
 
 import pytest
 
+from jsonpath_ng.ext.filter import Filter, Expression
+from jsonpath_ng.ext.parser import (
+    ExtendedJsonPathLexer,
+    ExtentedJsonPathParser,
+)
 from jsonpath_ng.jsonpath import *
-from jsonpath_ng.lexer import JsonPathLexer
-from jsonpath_ng.parser import JsonPathParser
 
 
 # TODO: This will be much more effective with a few regression tests and `arbitrary` parse . pretty testing
@@ -22,11 +25,11 @@ def setup_module():
 
 
 def check_parse_case(string, parsed):
-    parser = JsonPathParser(
+    parser = ExtentedJsonPathParser(
         debug=True,
         # Note that just manually passing token streams avoids this
         # dep, but that sucks
-        lexer_class=lambda: JsonPathLexer(debug=False),
+        lexer_class=lambda: ExtendedJsonPathLexer(debug=False),
     )
     assert parser.parse(string) == parsed
 
@@ -91,10 +94,14 @@ def test_nested(string, parsed):
      Child(Descendants(Root(), Fields('book')), Slice(end=2))),
 
     # Filter all books with ISBN number
-    # ("$..book[?(@.isbn)]", None),  # Not implemented
+    ("$..book[?(@.isbn)]",
+     Child(Descendants(Root(), Fields('book')),
+           Filter([Expression(Child(This(), Fields('isbn')), None, None)]))),
 
     # Filter all books cheaper than 10
-    # ("$..book[?(@.price<10)]", None),  # Not implemented
+    ("$..book[?(@.price<10)]",
+     Child(Descendants(Root(), Fields('book')),
+           Filter([Expression(Child(This(), Fields('price')), '<', 10)]))),
 
     # All members of JSON structure
     ("$..*", Descendants(Root(), Fields('*'))),