openstack
/
deb-python-jsonpath-rw-ext
Code Issues Proposed changes

Merge pull request #5 from 0xdecaf/bugfix/filtering-with-floats 

Added support for floating point types in filter predicates
This commit is contained in:
Mehdi ABAAKOUK 2016-03-10 10:33:25 +01:00
parent da3e74d4ff 741ddbeed6
commit 55a69d4219
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jsonpath_rw_ext/parser.py
View File

@ -33,7 +33,7 @@ class ExtendedJsonPathLexer(lexer.JsonPathLexer):
"""Custom LALR-lexer for JsonPath"""
literals = lexer.JsonPathLexer.literals + ['?', '@', '+', '*', '/', '-']
tokens = (parser.JsonPathLexer.tokens +
['FILTER_OP', 'SORT_DIRECTION'])
['FILTER_OP', 'SORT_DIRECTION', 'FLOAT'])
t_FILTER_OP = r'==?|<=|>=|!=|<|>'
@ -49,6 +49,10 @@ class ExtendedJsonPathLexer(lexer.JsonPathLexer):
t.type = self.reserved_words.get(t.value, 'ID')
return t
def t_FLOAT(self, t):
r'-?\d+\.\d+'
t.value = float(t.value)
return t
class ExtentedJsonPathParser(parser.JsonPathParser):
"""Custom LALR-parser for JsonPath"""
@ -61,9 +65,12 @@ class ExtentedJsonPathParser(parser.JsonPathParser):
def p_jsonpath_operator_jsonpath(self, p):
"""jsonpath : NUMBER operator NUMBER
| FLOAT operator FLOAT
| ID operator ID
| NUMBER operator jsonpath
| FLOAT operator jsonpath
| jsonpath operator NUMBER
| jsonpath operator FLOAT
| jsonpath operator jsonpath
"""
@ -101,6 +108,7 @@ class ExtentedJsonPathParser(parser.JsonPathParser):
def p_expression(self, p):
"""expression : jsonpath
| jsonpath FILTER_OP ID
| jsonpath FILTER_OP FLOAT
| jsonpath FILTER_OP NUMBER
"""
if len(p) == 2:

13
jsonpath_rw_ext/tests/test_jsonpath_rw_ext.py
View File

@ -93,7 +93,18 @@ class TestJsonpath_rw_ext(testscenarios.WithScenarios,
{'cow': 8, 'cat': 3}]},
target=[{'cow': 8, 'cat': 2},
{'cow': 7, 'cat': 2}])),
('filter_float_gt', dict(
string='objects[?confidence>=0.5].prediction',
data={
'objects': [
{'confidence': 0.42,
'prediction': 'Good'},
{'confidence': 0.58,
'prediction': 'Bad'},
]
},
target=['Bad']
)),
('sort1', dict(string='objects[/cow]',
data={'objects': [{'cat': 1, 'cow': 2},
{'cat': 2, 'cow': 1},