mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.datamapper: Complete array building support

Browse source
This commit is contained in:
Kim Alvefur 2021-03-20 21:29:51 +01:00
parent 366edae239
commit 4f191a3239
3 changed files with 17 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

11
spec/util_datamapper_spec.lua
View file

@ -181,5 +181,16 @@ describe("util.datampper", function()
assert.equal(#x.tags-1, #u.tags)
end);
it("handles arrays", function ()
local u = map.unparse(disco_schema, disco);
assert.equal("urn:example:feature:1", u:find("{http://jabber.org/protocol/disco#info}query/feature/@var"))
local n = 0;
for child in u:get_child("query", "http://jabber.org/protocol/disco#info"):childtags("feature") do
n = n + 1;
assert.equal(string.format("urn:example:feature:%d", n), child.attr.var);
end
end);
end);
end)

15
teal-src/util/datamapper.tl
View file

@ -323,18 +323,9 @@ function unparse ( schema : json_schema_object, t : table, current_name : string
return out;
elseif schema.type == "array" then
local proptype, value_where, name, namespace = unpack_propschema(schema.items, current_name, current_ns)
-- TODO , prefix, single_attribute
if proptype == "string" then
for _, item in ipairs(t as { string }) do
if value_where == "in_text_tag" then
out:text_tag(name, item, { xmlns = namespace });
else
error "NYI"
end
end
else
error "NYI"
local proptype, value_where, name, namespace, prefix, single_attribute = unpack_propschema(schema.items, current_name, current_ns)
for _, item in ipairs(t as { string }) do
unparse_property(out, item, proptype, schema.items, value_where, name, namespace, current_ns, prefix, single_attribute)
end
return out;
end

15
util/datamapper.lua
View file

@ -290,18 +290,9 @@ function unparse(schema, t, current_name, current_ns, ctx)
return out
elseif schema.type == "array" then
local proptype, value_where, name, namespace = unpack_propschema(schema.items, current_name, current_ns)
if proptype == "string" then
for _, item in ipairs(t) do
if value_where == "in_text_tag" then
out:text_tag(name, item, {xmlns = namespace});
else
error("NYI")
end
end
else
error("NYI")
local proptype, value_where, name, namespace, prefix, single_attribute = unpack_propschema(schema.items, current_name, current_ns)
for _, item in ipairs(t) do
unparse_property(out, item, proptype, schema.items, value_where, name, namespace, current_ns, prefix, single_attribute)
end
return out
end