Merge pull request kennknowles#26 from guandalf/contains_operator

Contains operator

Author: h2non

.gitignore

@@ -18,3 +18,4 @@ build
 /jsonpath_rw/VERSION
 
 .idea
+.vscode/

README.rst

@@ -203,6 +203,7 @@ Extensions
 +--------------+----------------------------------------------+
 | filter       | - $.objects[?(@some_field > 5)]              |
 |              | - $.objects[?some_field = "foobar")]         |
+|              | - $.objects[?some_field =~ "foobar")]        |
 |              | - $.objects[?some_field > 5 & other < 2)]    |
 +--------------+----------------------------------------------+
 | arithmetic   | - $.foo + "_" + $.bar                        |

jsonpath_ng/ext/filter.py

@@ -25,6 +25,7 @@
     '<': operator.lt,
     '>=': operator.ge,
     '>': operator.gt,
+    '=~': operator.contains,
 }
 
 

jsonpath_ng/ext/parser.py

@@ -28,7 +28,7 @@ class ExtendedJsonPathLexer(lexer.JsonPathLexer):
               parser.JsonPathLexer.tokens +
               ['FILTER_OP', 'SORT_DIRECTION', 'FLOAT'])
 
-    t_FILTER_OP = r'==?|<=|>=|!=|<|>'
+    t_FILTER_OP = r'=~|==?|<=|>=|!=|<|>'
 
     def t_BOOL(self, t):
         r'true|false'

jsonpath_ng/jsonpath.py

@@ -376,7 +376,7 @@ def match_recursively(datum):
                 for left_match in left_matches
                 for submatch in match_recursively(left_match)]
 
-    def is_singular():
+    def is_singular(self):
         return False
 
     def update(self, data, val):

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' }