Software / code / prosody
Changeset
12497:83f269db6850
Merge 0.12->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 08 May 2022 18:06:41 +0200 |
| parents | 12494:65316782862f (current diff) 12496:87c3d45208ef (diff) |
| children | 12498:c3e47a5dd30d |
| files | |
| diffstat | 3 files changed, 40 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/spec/util_jsonpointer_spec.lua Sun May 08 18:06:41 2022 +0200 @@ -0,0 +1,38 @@ +describe("util.jsonpointer", function() + local json, jp; + setup(function() + json = require "util.json"; + jp = require "util.jsonpointer"; + end) + describe("resolve()", function() + local example; + setup(function() + example = json.decode([[{ + "foo": ["bar", "baz"], + "": 0, + "a/b": 1, + "c%d": 2, + "e^f": 3, + "g|h": 4, + "i\\j": 5, + "k\"l": 6, + " ": 7, + "m~n": 8 + }]]) + end) + it("works", function() + assert.same(example, jp.resolve(example, "")); + assert.same({ "bar", "baz" }, jp.resolve(example, "/foo")); + assert.same("bar", jp.resolve(example, "/foo/0")); + assert.same(0, jp.resolve(example, "/")); + assert.same(1, jp.resolve(example, "/a~1b")); + assert.same(2, jp.resolve(example, "/c%d")); + assert.same(3, jp.resolve(example, "/e^f")); + assert.same(4, jp.resolve(example, "/g|h")); + assert.same(5, jp.resolve(example, "/i\\j")); + assert.same(6, jp.resolve(example, "/k\"l")); + assert.same(7, jp.resolve(example, "/ ")); + assert.same(8, jp.resolve(example, "/m~0n")); + end) + end) +end)
--- a/teal-src/util/jsonpointer.tl Sat May 07 13:10:27 2022 +0200 +++ b/teal-src/util/jsonpointer.tl Sun May 08 18:06:41 2022 +0200 @@ -24,7 +24,7 @@ elseif idx is integer then local i = tonumber(token) if token == "-" then i = #ref + 1 end - new_ref = ref[i] + new_ref = ref[i+1] else return nil, "invalid-table" end
