Added negative and * indecies and quotes to Split parameters

Author: smartycope

README.rst

@@ -215,6 +215,8 @@ To use the extensions below you must import from `jsonpath_ng.ext`.
 | | - ``$.field.`sub(/regex/, replacement)``` |
 +--------------+-----------------------------------------------+
 | split | - ``$.field.`split(+, 2, -1)``` |
+| | - ``$.field.`split(",", *, -1)``` |
+| | - ``$.field.`split(' ', -1, -1)``` |
 | | - ``$.field.`split(sep, segement, maxsplit)```|
 +--------------+-----------------------------------------------+
 | sorted | - ``$.objects.`sorted``` |

jsonpath_ng/ext/string.py

@@ -16,7 +16,7 @@
 
 
 SUB = re.compile(r"sub\(/(.*)/,\s+(.*)\)")
-SPLIT = re.compile(r"split\((.),\s+(\d+),\s+(\d+|-1)\)")
+SPLIT = re.compile(r"split(?:\s+)?\((?:\s+)?(?P<j>(?:(?:'|\"))?)(.+)(?P=j)(?:\s+)?,(?:\s+)?((?:(?:\-)?\d+|\*))(?:\s+)?,(?:\s+)?((?:\-)?\d+)(?:\s+)?\)")
 STR = re.compile(r"str\(\)")
 
 
@@ -60,23 +60,29 @@ def __str__(self):
 class Split(This):
  """String splitter
 
- Concrete syntax is '`split(char, segment, max_split)`'
+ Concrete syntax is '`split(chars, segment, max_split)`'
+ `chars` can optionally be surrounded by quotes, to specify things like commas or spaces
+ `segment` can be `*` to select all
+ `max_split` can be negative, to indicate no limit
  """
 
  def __init__(self, method=None):
  m = SPLIT.match(method)
  if m is None:
  raise DefintionInvalid("%s is not valid" % method)
- self.char = m.group(1)
- self.segment = int(m.group(2))
- self.max_split = int(m.group(3))
+ self.chars = m.group(2)
+ self.segment = m.group(3)
+ self.max_split = int(m.group(4))
  self.method = method
 
  def find(self, datum):
  datum = DatumInContext.wrap(datum)
  try:
- value = datum.value.split(self.char, self.max_split)[self.segment]
- except Exception:
+ if self.segment == '*':
+ value = datum.value.split(self.chars, self.max_split)
+ else:
+ value = datum.value.split(self.chars, self.max_split)[int(self.segment)]
+ except:
  return []
  return [DatumInContext.wrap(value)]
 

tests/test_jsonpath_rw_ext.py

@@ -400,6 +400,36 @@
  ["cat-bow"],
  id="split2",
  ),
+ pytest.param(
+ "payload.`split(',', 2, -1)`",
+ {"payload": "foo,bar,baz"},
+ ["baz"],
+ id="split3",
+ ),
+ pytest.param(
+ 'payload.`split(", ", 2, -1)`',
+ {"payload": "foo, bar, baz"},
+ ["baz"],
+ id="split4",
+ ),
+ pytest.param(
+ 'payload.`split(", ", *, -1)`',
+ {"payload": "foo, bar, baz"},
+ [["foo", "bar", "baz"]],
+ id="split5",
+ ),
+ pytest.param(
+ 'payload.`split(", ", -1, -1)`',
+ {"payload": "foo, bar, baz"},
+ ["baz"],
+ id="split6",
+ ),
+ pytest.param(
+ "payload.`split(|, -1, 1)`",
+ {"payload": "foo|bar|baz"},
+ ["bar|baz"],
+ id="split7",
+ ),
  pytest.param(
  "foo[?(@.baz==1)]",
  {"foo": [{"baz": 1}, {"baz": 2}]},