diff options
| -rw-r--r-- | spec/util_datamapper_spec.lua | 63 | ||||
| -rw-r--r-- | teal-src/util/datamapper.tl | 30 | ||||
| -rw-r--r-- | util/datamapper.lua | 22 |
3 files changed, 85 insertions, 30 deletions
diff --git a/spec/util_datamapper_spec.lua b/spec/util_datamapper_spec.lua index 6d75facf..cbb579dc 100644 --- a/spec/util_datamapper_spec.lua +++ b/spec/util_datamapper_spec.lua @@ -9,6 +9,7 @@ end); describe("util.datampper", function() local s, x, d + local disco, disco_info, disco_schema setup(function() local function attr() return {type = "string"; xml = {attribute = true}} end @@ -91,12 +92,74 @@ describe("util.datampper", function() }; }; }; + + disco_schema = { + type = "object"; + xml = { + name = "iq"; + namespace = "jabber:client" + }; + properties = { + to = attr(); + from = attr(); + type = attr(); + id = attr(); + disco = { + type = "object"; + xml = { + name = "query"; + namespace = "http://jabber.org/protocol/disco#info" + }; + properties = { + features = { + type = "array"; + items = { + type = "string"; + xml = { + name = "feature"; + x_single_attribute = "var"; + }; + }; + }; + }; + }; + }; + }; + + disco_info = xml.parse[[ + <iq type="result" id="disco1" from="example.com"> + <query xmlns="http://jabber.org/protocol/disco#info"> + <feature var="urn:example:feature:1">wrong</feature> + <feature var="urn:example:feature:2"/> + <feature var="urn:example:feature:3"/> + <unrelated var="urn:example:feature:not"/> + </query> + </iq> + ]]; + + disco = { + type="result"; + id="disco1"; + from="example.com"; + disco = { + features = { + "urn:example:feature:1"; + "urn:example:feature:2"; + "urn:example:feature:3"; + }; + }; + }; end); describe("parse", function() it("works", function() assert.same(d, map.parse(s, x)); end); + + it("handles arrays", function () + assert.same(disco, map.parse(disco_schema, disco_info)); + end); + end); describe("unparse", function() diff --git a/teal-src/util/datamapper.tl b/teal-src/util/datamapper.tl index 54ecdacf..b5c07f71 100644 --- a/teal-src/util/datamapper.tl +++ b/teal-src/util/datamapper.tl @@ -60,7 +60,7 @@ end local function unpack_propschema( propschema : schema_t, propname : string, current_ns : string ) : json_type_name, value_goes, string, string, string, string, { any } local proptype : json_type_name = "string" - local value_where : value_goes = "in_text_tag" + local value_where : value_goes = propname and "in_text_tag" or "in_text" local name = propname local namespace = current_ns local prefix : string @@ -191,21 +191,17 @@ function parse_object (schema : schema_t, s : st.stanza_t) : { string : any } end function parse_array (schema : json_schema_object, s : st.stanza_t) : { any } - local proptype, value_where, child_name, namespace = unpack_propschema(schema.items, nil, s.attr.xmlns) + local proptype, value_where, child_name, namespace, prefix, single_attribute, enums = unpack_propschema(schema.items, nil, s.attr.xmlns) + local attr_name : string + if value_where == "in_single_attribute" then -- FIXME this shouldn't be needed + value_where = "in_attribute"; + attr_name = single_attribute; + end local out : { any } = {} for c in s:childtags(child_name, namespace) do - local value : string; - if value_where == "in_text_tag" then - value = c:get_text(); - else - error "NYI" - end - - value = totype(proptype, value) + local value : string = extract_value (c, value_where, proptype, attr_name or child_name, namespace, prefix, single_attribute, enums) - if value ~= nil then - table.insert(out, value); - end + table.insert(out, totype(proptype, value)); end return out; end @@ -329,10 +325,10 @@ local function unparse ( schema : json_schema_object, t : table, current_name : 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 + out:text_tag(name, item, { xmlns = namespace }); + else + error "NYI" + end end else error "NYI" diff --git a/util/datamapper.lua b/util/datamapper.lua index 32d01050..943daee1 100644 --- a/util/datamapper.lua +++ b/util/datamapper.lua @@ -27,7 +27,7 @@ local value_goes = {} local function unpack_propschema(propschema, propname, current_ns) local proptype = "string" - local value_where = "in_text_tag" + local value_where = propname and "in_text_tag" or "in_text" local name = propname local namespace = current_ns local prefix @@ -158,21 +158,17 @@ function parse_object(schema, s) end function parse_array(schema, s) - local proptype, value_where, child_name, namespace = unpack_propschema(schema.items, nil, s.attr.xmlns) + local proptype, value_where, child_name, namespace, prefix, single_attribute, enums = unpack_propschema(schema.items, nil, s.attr.xmlns) + local attr_name + if value_where == "in_single_attribute" then + value_where = "in_attribute"; + attr_name = single_attribute; + end local out = {} for c in s:childtags(child_name, namespace) do - local value; - if value_where == "in_text_tag" then - value = c:get_text(); - else - error("NYI") - end - - value = totype(proptype, value) + local value = extract_value(c, value_where, proptype, attr_name or child_name, namespace, prefix, single_attribute, enums) - if value ~= nil then - table.insert(out, value); - end + table.insert(out, totype(proptype, value)); end return out end |