Merge 0.10->trunk

diff --git a/tests/test_util_stanza.lua b/tests/test_util_stanza.lua
index 20cc827413b852f8d3080285f139f3e1a178bdd1..e5c96425c250a002e681dcb134dc579152e26e56 100644 (file)
--- a/tests/test_util_stanza.lua
+++ b/tests/test_util_stanza.lua
@@ -25,3 +25,118 @@ function deserialize(deserialize, st)
        assert_equal(stanza2.attr.a, "a", "Deserialized stanza retains attributes");
        assert_table(getmetatable(stanza2), "Deserialized stanza has metatable");
 end
+
+function stanza(stanza)
+       local s = stanza("foo", { xmlns = "myxmlns", a = "attr-a" });
+       assert_equal(s.name, "foo");
+       assert_equal(s.attr.xmlns, "myxmlns");
+       assert_equal(s.attr.a, "attr-a");
+
+       local s1 = stanza("s1");
+       assert_equal(s1.name, "s1");
+       assert_equal(s1.attr.xmlns, nil);
+       assert_equal(#s1, 0);
+       assert_equal(#s1.tags, 0);
+       
+       s1:tag("child1");
+       assert_equal(#s1.tags, 1);
+       assert_equal(s1.tags[1].name, "child1");
+
+       s1:tag("grandchild1"):up();
+       assert_equal(#s1.tags, 1);
+       assert_equal(s1.tags[1].name, "child1");
+       assert_equal(#s1.tags[1], 1);
+       assert_equal(s1.tags[1][1].name, "grandchild1");
+       
+       s1:up():tag("child2");
+       assert_equal(#s1.tags, 2, tostring(s1));
+       assert_equal(s1.tags[1].name, "child1");
+       assert_equal(s1.tags[2].name, "child2");
+       assert_equal(#s1.tags[1], 1);
+       assert_equal(s1.tags[1][1].name, "grandchild1");
+
+       s1:up():text("Hello world");
+       assert_equal(#s1.tags, 2);
+       assert_equal(#s1, 3);
+       assert_equal(s1.tags[1].name, "child1");
+       assert_equal(s1.tags[2].name, "child2");
+       assert_equal(#s1.tags[1], 1);
+       assert_equal(s1.tags[1][1].name, "grandchild1");
+end
+
+function message(message)
+       local m = message();
+       assert_equal(m.name, "message");
+end
+
+function iq(iq)
+       local i = iq();
+       assert_equal(i.name, "iq");
+end
+
+function presence(presence)
+       local p = presence();
+       assert_equal(p.name, "presence");
+end
+
+function reply(reply, _M)
+       -- Test stanza
+       local s = _M.stanza("s", { to = "touser", from = "fromuser", id = "123" })
+               :tag("child1");
+       -- Make reply stanza
+       local r = reply(s);
+       assert_equal(r.name, s.name);
+       assert_equal(r.id, s.id);
+       assert_equal(r.attr.to, s.attr.from);
+       assert_equal(r.attr.from, s.attr.to);
+       assert_equal(#r.tags, 0, "A reply should not include children of the original stanza");
+
+       -- Test stanza
+       local s = _M.stanza("iq", { to = "touser", from = "fromuser", id = "123", type = "get" })
+               :tag("child1");
+       -- Make reply stanza
+       local r = reply(s);
+       assert_equal(r.name, s.name);
+       assert_equal(r.id, s.id);
+       assert_equal(r.attr.to, s.attr.from);
+       assert_equal(r.attr.from, s.attr.to);
+       assert_equal(r.attr.type, "result");
+       assert_equal(#r.tags, 0, "A reply should not include children of the original stanza");
+
+       -- Test stanza
+       local s = _M.stanza("iq", { to = "touser", from = "fromuser", id = "123", type = "set" })
+               :tag("child1");
+       -- Make reply stanza
+       local r = reply(s);
+       assert_equal(r.name, s.name);
+       assert_equal(r.id, s.id);
+       assert_equal(r.attr.to, s.attr.from);
+       assert_equal(r.attr.from, s.attr.to);
+       assert_equal(r.attr.type, "result");
+       assert_equal(#r.tags, 0, "A reply should not include children of the original stanza");
+end
+
+function error_reply(error_reply, _M)
+       -- Test stanza
+       local s = _M.stanza("s", { to = "touser", from = "fromuser", id = "123" })
+               :tag("child1");
+       -- Make reply stanza
+       local r = error_reply(s);
+       assert_equal(r.name, s.name);
+       assert_equal(r.id, s.id);
+       assert_equal(r.attr.to, s.attr.from);
+       assert_equal(r.attr.from, s.attr.to);
+       assert_equal(#r.tags, 1);
+       
+       -- Test stanza
+       local s = _M.stanza("iq", { to = "touser", from = "fromuser", id = "123", type = "get" })
+               :tag("child1");
+       -- Make reply stanza
+       local r = error_reply(s);
+       assert_equal(r.name, s.name);
+       assert_equal(r.id, s.id);
+       assert_equal(r.attr.to, s.attr.from);
+       assert_equal(r.attr.from, s.attr.to);
+       assert_equal(r.attr.type, "error");
+       assert_equal(#r.tags, 1);
+end

diff --git a/util/stanza.lua b/util/stanza.lua
index c682f8333653a9a37e73cdbdf67dedbfe97a76dd..a598a81ecd1e35c8f18688734194776c2adb5113 100644 (file)
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -40,11 +40,10 @@ local _ENV = nil;
 local stanza_mt = { __type = "stanza" };
 stanza_mt.__index = stanza_mt;
 
-local function stanza(name, attr, namespaces)
+local function new_stanza(name, attr, namespaces)
        local stanza = { name = name, attr = attr or {}, namespaces = namespaces, tags = {} };
        return setmetatable(stanza, stanza_mt);
 end
-local stanza = stanza;
 
 function stanza_mt:query(xmlns)
        return self:tag("query", { xmlns = xmlns });
@@ -55,7 +54,7 @@ function stanza_mt:body(text, attr)
 end
 
 function stanza_mt:tag(name, attr, namespaces)
-       local s = stanza(name, attr, namespaces);
+       local s = new_stanza(name, attr, namespaces);
        local last_add = self.last_add;
        if not last_add then last_add = {}; self.last_add = last_add; end
        (last_add[#last_add] or self):add_direct_child(s);
@@ -202,7 +201,7 @@ end
 local escape_table = { ["'"] = "&apos;", ["\""] = "&quot;", ["<"] = "&lt;", [">"] = "&gt;", ["&"] = "&amp;" };
 local function xml_escape(str) return (s_gsub(str, "['&<>\"]", escape_table)); end
 
-local function _dostring(t, buf, self, xml_escape, parentns)
+local function _dostring(t, buf, self, _xml_escape, parentns)
        local nsid = 0;
        local name = t.name
        t_insert(buf, "<"..name);
@@ -210,9 +209,9 @@ local function _dostring(t, buf, self, xml_escape, parentns)
                if s_find(k, "\1", 1, true) then
                        local ns, attrk = s_match(k, "^([^\1]*)\1?(.*)$");
                        nsid = nsid + 1;
-                       t_insert(buf, " xmlns:ns"..nsid.."='"..xml_escape(ns).."' ".."ns"..nsid..":"..attrk.."='"..xml_escape(v).."'");
+                       t_insert(buf, " xmlns:ns"..nsid.."='".._xml_escape(ns).."' ".."ns"..nsid..":"..attrk.."='".._xml_escape(v).."'");
                elseif not(k == "xmlns" and v == parentns) then
-                       t_insert(buf, " "..k.."='"..xml_escape(v).."'");
+                       t_insert(buf, " "..k.."='".._xml_escape(v).."'");
                end
        end
        local len = #t;
@@ -223,9 +222,9 @@ local function _dostring(t, buf, self, xml_escape, parentns)
                for n=1,len do
                        local child = t[n];
                        if child.name then
-                               self(child, buf, self, xml_escape, t.attr.xmlns);
+                               self(child, buf, self, _xml_escape, t.attr.xmlns);
                        else
-                               t_insert(buf, xml_escape(child));
+                               t_insert(buf, _xml_escape(child));
                        end
                end
                t_insert(buf, "</"..name..">");
@@ -252,13 +251,13 @@ function stanza_mt.get_text(t)
 end
 
 function stanza_mt.get_error(stanza)
-       local type, condition, text;
+       local error_type, condition, text;
 
        local error_tag = stanza:get_child("error");
        if not error_tag then
                return nil, nil, nil;
        end
-       type = error_tag.attr.type;
+       error_type = error_tag.attr.type;
 
        for _, child in ipairs(error_tag.tags) do
                if child.attr.xmlns == xmlns_stanzas then
@@ -272,7 +271,7 @@ function stanza_mt.get_error(stanza)
                        end
                end
        end
-       return type, condition or "undefined-condition", text;
+       return error_type, condition or "undefined-condition", text;
 end
 
 local id = 0;
@@ -352,32 +351,32 @@ end
 
 local function message(attr, body)
        if not body then
-               return stanza("message", attr);
+               return new_stanza("message", attr);
        else
-               return stanza("message", attr):tag("body"):text(body):up();
+               return new_stanza("message", attr):tag("body"):text(body):up();
        end
 end
 local function iq(attr)
        if attr and not attr.id then attr.id = new_id(); end
-       return stanza("iq", attr or { id = new_id() });
+       return new_stanza("iq", attr or { id = new_id() });
 end
 
 local function reply(orig)
-       return stanza(orig.name, orig.attr and { to = orig.attr.from, from = orig.attr.to, id = orig.attr.id, type = ((orig.name == "iq" and "result") or orig.attr.type) });
+       return new_stanza(orig.name, orig.attr and { to = orig.attr.from, from = orig.attr.to, id = orig.attr.id, type = ((orig.name == "iq" and "result") or orig.attr.type) });
 end
 
 local xmpp_stanzas_attr = { xmlns = xmlns_stanzas };
-local function error_reply(orig, type, condition, message)
+local function error_reply(orig, error_type, condition, error_message)
        local t = reply(orig);
        t.attr.type = "error";
-       t:tag("error", {type = type}) --COMPAT: Some day xmlns:stanzas goes here
+       t:tag("error", {type = error_type}) --COMPAT: Some day xmlns:stanzas goes here
        :tag(condition, xmpp_stanzas_attr):up();
-       if (message) then t:tag("text", xmpp_stanzas_attr):text(message):up(); end
+       if error_message then t:tag("text", xmpp_stanzas_attr):text(error_message):up(); end
        return t; -- stanza ready for adding app-specific errors
 end
 
 local function presence(attr)
-       return stanza("presence", attr);
+       return new_stanza("presence", attr);
 end
 
 if do_pretty_printing then
@@ -392,7 +391,7 @@ if do_pretty_printing then
        local tag_format = top_tag_format.."%s"..getstring(style_punc, "</")..getstring(style_tagname, "%s")..getstring(style_punc, ">");
        function stanza_mt.pretty_print(t)
                local children_text = "";
-               for n, child in ipairs(t) do
+               for _, child in ipairs(t) do
                        if type(child) == "string" then
                                children_text = children_text .. xml_escape(child);
                        else
@@ -422,7 +421,7 @@ end
 
 return {
        stanza_mt = stanza_mt;
-       stanza = stanza;
+       stanza = new_stanza;
        new_id = new_id;
        preserialize = preserialize;
        deserialize = deserialize;