added support for regex filters \n added support for . keyword

Author: dlacher

jsonpath_ng/ext/filter.py

@@ -13,9 +13,15 @@
 
 import operator
 from six import moves
+import re
 
 from .. import JSONPath, DatumInContext, Index
 
+def contains(a,b):
+    if re.search(b,a):
+       return True
+    return False
+    
 
 OPERATOR_MAP = {
     '!=': operator.ne,
@@ -25,6 +31,7 @@
     '<': operator.lt,
     '>=': operator.ge,
     '>': operator.gt,
+    '~=': contains
 }
 
 def eval_exp(expressions,val):

jsonpath_ng/ext/iterable.py

@@ -90,3 +90,29 @@ def __str__(self):
 
     def __repr__(self):
         return 'Len()'
+
+class Keys(JSONPath):
+    """The JSONPath referring to the keys of the current object.
+
+    Concrete syntax is '`keys`'.
+    """
+
+    def find(self, datum):
+        datum = DatumInContext.wrap(datum)
+        try:
+            value = datum.value.keys()
+        except Exception as e:
+            return []
+        else:
+            return [DatumInContext(value[i],
+                                               context=None,
+                                               path=Keys()) for i in range (0, len(datum.value))]
+
+    def __eq__(self, other):
+        return isinstance(other, Keys)
+
+    def __str__(self):
+        return '`keys`'
+
+    def __repr__(self):
+        return 'Keys()'

jsonpath_ng/ext/parser.py

@@ -22,12 +22,12 @@
 
 class ExtendedJsonPathLexer(lexer.JsonPathLexer):
     """Custom LALR-lexer for JsonPath"""
-    literals = lexer.JsonPathLexer.literals + ['?', '@', '+', '*', '/', '-']
+    literals = lexer.JsonPathLexer.literals + ['?', '@', '+', '*', '/', '-', '!','~']
     tokens = (['BOOL'] +
               parser.JsonPathLexer.tokens +
               ['FILTER_OP', 'SORT_DIRECTION', 'FLOAT'])
-
-    t_FILTER_OP = r'==?|<=|>=|!=|<|>'
+    print "tokens {}".format(tokens)
+    t_FILTER_OP = r'==?|<=|>=|!=|<|>|~='
 
     def t_BOOL(self, t):
         r'true|false'
@@ -93,6 +93,8 @@ def p_jsonpath_named_operator(self, p):
         "jsonpath : NAMED_OPERATOR"
         if p[1] == 'len':
             p[0] = _iterable.Len()
+        elif p[1] == 'keys':
+            p[0] = _iterable.Keys()
         elif p[1] == 'sorted':
             p[0] = _iterable.SortedThis()
         elif p[1].startswith("split("):

jsonpath_ng/lexer.py

@@ -48,7 +48,7 @@ def tokenize(self, string):
     #
     # Anyhow, it is pythonic to give some rope to hang oneself with :-)
 
-    literals = ['*', '.', '[', ']', '(', ')', '$', ',', ':', '|', '&', '!']
+    literals = ['*', '.', '[', ']', '(', ')', '$', ',', ':', '|', '&']
 
     reserved_words = { 'where': 'WHERE' }
 

tests/test_jsonpath_rw_ext.py

@@ -96,12 +96,21 @@ class Testjsonpath_ng_ext(testscenarios.WithScenarios,
         ('len_list', dict(string='objects.`len`',
                           data={'objects': ['alpha', 'gamma', 'beta']},
                           target=3)),
+        ('keys_list', dict(string='objects.`keys`',
+                          data={'objects': ['alpha', 'gamma', 'beta']},
+                          target=[])),
         ('len_dict', dict(string='objects.`len`',
                           data={'objects': {'cow': 'moo', 'cat': 'neigh'}},
                           target=2)),
+        ('keys_dict', dict(string='objects.`keys`',
+                          data={'objects': {'cow': 'moo', 'cat': 'neigh'}},
+                          target=['cow','cat'])),
         ('len_str', dict(string='objects[0].`len`',
                          data={'objects': ['alpha', 'gamma']},
                          target=5)),
+        ('contains_filter', dict(string='objects[?id ~= "v.*[1-9]"].id',
+                          data={'objects': [{'id':'vasll1'},{'id':'v2'},{'id':'vaal3'},{'id':'other'},{'id':'val'}]},
+                          target=['vasll1','v2','vaal3'])),
 
         ('filter_exists_syntax1', dict(string='objects[?cow]',
                                        data={'objects': [{'cow': 'moo'},