Merge 0.9->0.10
[prosody.git] / util / stanza.lua
index 08ef2c9aa1649deac35eca8fd38488e7982a5372..82601e630986fc4376f22c714144bba267b27212 100644 (file)
@@ -1,29 +1,24 @@
 -- Prosody IM
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
--- 
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
 
 
 local t_insert      =  table.insert;
-local t_concat      =  table.concat;
 local t_remove      =  table.remove;
 local t_concat      =  table.concat;
 local s_format      = string.format;
 local s_match       =  string.match;
 local tostring      =      tostring;
 local setmetatable  =  setmetatable;
-local getmetatable  =  getmetatable;
 local pairs         =         pairs;
 local ipairs        =        ipairs;
 local type          =          type;
-local next          =          next;
-local print         =         print;
-local unpack        =        unpack;
 local s_gsub        =   string.gsub;
-local s_char        =   string.char;
+local s_sub         =    string.sub;
 local s_find        =   string.find;
 local os            =            os;
 
@@ -44,11 +39,13 @@ module "stanza"
 
 stanza_mt = { __type = "stanza" };
 stanza_mt.__index = stanza_mt;
+local stanza_mt = stanza_mt;
 
 function stanza(name, attr)
-       local stanza = { name = name, attr = attr or {}, tags = {}, last_add = {}};
+       local stanza = { name = name, attr = attr or {}, tags = {} };
        return setmetatable(stanza, stanza_mt);
 end
+local stanza = stanza;
 
 function stanza_mt:query(xmlns)
        return self:tag("query", { xmlns = xmlns });
@@ -60,26 +57,27 @@ end
 
 function stanza_mt:tag(name, attrs)
        local s = stanza(name, attrs);
-       (self.last_add[#self.last_add] or self):add_direct_child(s);
-       t_insert(self.last_add, s);
+       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);
+       t_insert(last_add, s);
        return self;
 end
 
 function stanza_mt:text(text)
-       (self.last_add[#self.last_add] or self):add_direct_child(text);
+       local last_add = self.last_add;
+       (last_add and last_add[#last_add] or self):add_direct_child(text);
        return self;
 end
 
 function stanza_mt:up()
-       t_remove(self.last_add);
+       local last_add = self.last_add;
+       if last_add then t_remove(last_add); end
        return self;
 end
 
 function stanza_mt:reset()
-       local last_add = self.last_add;
-       for i = 1,#last_add do
-               last_add[i] = nil;
-       end
+       self.last_add = nil;
        return self;
 end
 
@@ -91,7 +89,8 @@ function stanza_mt:add_direct_child(child)
 end
 
 function stanza_mt:add_child(child)
-       (self.last_add[#self.last_add] or self):add_direct_child(child);
+       local last_add = self.last_add;
+       (last_add and last_add[#last_add] or self):add_direct_child(child);
        return self;
 end
 
@@ -100,12 +99,20 @@ function stanza_mt:get_child(name, xmlns)
                if (not name or child.name == name)
                        and ((not xmlns and self.attr.xmlns == child.attr.xmlns)
                                or child.attr.xmlns == xmlns) then
-                       
+
                        return child;
                end
        end
 end
 
+function stanza_mt:get_child_text(name, xmlns)
+       local tag = self:get_child(name, xmlns);
+       if tag then
+               return tag:get_text();
+       end
+       return nil;
+end
+
 function stanza_mt:child_with_name(name)
        for _, child in ipairs(self.tags) do
                if child.name == name then return child; end
@@ -122,19 +129,77 @@ function stanza_mt:children()
        local i = 0;
        return function (a)
                        i = i + 1
-                       local v = a[i]
-                       if v then return v; end
+                       return a[i];
                end, self, i;
 end
-function stanza_mt:childtags()
-       local i = 0;
-       return function (a)
-                       i = i + 1
-                       local v = self.tags[i]
-                       if v then return v; end
-               end, self.tags[1], i;
+
+function stanza_mt:childtags(name, xmlns)
+       local tags = self.tags;
+       local start_i, max_i = 1, #tags;
+       return function ()
+               for i = start_i, max_i do
+                       local v = tags[i];
+                       if (not name or v.name == name)
+                       and ((not xmlns and self.attr.xmlns == v.attr.xmlns)
+                               or v.attr.xmlns == xmlns) then
+                               start_i = i+1;
+                               return v;
+                       end
+               end
+       end;
+end
+
+function stanza_mt:maptags(callback)
+       local tags, curr_tag = self.tags, 1;
+       local n_children, n_tags = #self, #tags;
+
+       local i = 1;
+       while curr_tag <= n_tags and n_tags > 0 do
+               if self[i] == tags[curr_tag] then
+                       local ret = callback(self[i]);
+                       if ret == nil then
+                               t_remove(self, i);
+                               t_remove(tags, curr_tag);
+                               n_children = n_children - 1;
+                               n_tags = n_tags - 1;
+                               i = i - 1;
+                               curr_tag = curr_tag - 1;
+                       else
+                               self[i] = ret;
+                               tags[curr_tag] = ret;
+                       end
+                       curr_tag = curr_tag + 1;
+               end
+               i = i + 1;
+       end
+       return self;
+end
+
+function stanza_mt:find(path)
+       local pos = 1;
+       local len = #path + 1;
+
+       repeat
+               local xmlns, name, text;
+               local char = s_sub(path, pos, pos);
+               if char == "@" then
+                       return self.attr[s_sub(path, pos + 1)];
+               elseif char == "{" then
+                       xmlns, pos = s_match(path, "^([^}]+)}()", pos + 1);
+               end
+               name, text, pos = s_match(path, "^([^@/#]*)([/#]?)()", pos);
+               name = name ~= "" and name or nil;
+               if pos == len then
+                       if text == "#" then
+                               return self:get_child_text(name, xmlns);
+                       end
+                       return self:get_child(name, xmlns);
+               end
+               self = self:get_child(name, xmlns);
+       until not self
 end
 
+
 local xml_escape
 do
        local escape_table = { ["'"] = "&apos;", ["\""] = "&quot;", ["<"] = "&lt;", [">"] = "&gt;", ["&"] = "&amp;" };
@@ -193,14 +258,14 @@ end
 
 function stanza_mt.get_error(stanza)
        local 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;
-       
-       for child in error_tag:children() do
+
+       for _, child in ipairs(error_tag.tags) do
                if child.attr.xmlns == xmlns_stanzas then
                        if not text and child.name == "text" then
                                text = child:get_text();
@@ -212,14 +277,9 @@ function stanza_mt.get_error(stanza)
                        end
                end
        end
-       return type, condition or "undefined-condition", text or "";
+       return type, condition or "undefined-condition", text;
 end
 
-function stanza_mt.__add(s1, s2)
-       return s1:add_direct_child(s2);
-end
-
-
 do
        local id = 0;
        function new_id()
@@ -271,39 +331,33 @@ function deserialize(stanza)
                                end
                        end
                        stanza.tags = tags;
-                       if not stanza.last_add then
-                               stanza.last_add = {};
-                       end
                end
        end
-       
+
        return stanza;
 end
 
-function clone(stanza)
-       local lookup_table = {};
-       local function _copy(object)
-               if type(object) ~= "table" then
-                       return object;
-               elseif lookup_table[object] then
-                       return lookup_table[object];
-               end
-               local new_table = {};
-               lookup_table[object] = new_table;
-               for index, value in pairs(object) do
-                       new_table[_copy(index)] = _copy(value);
+local function _clone(stanza)
+       local attr, tags = {}, {};
+       for k,v in pairs(stanza.attr) do attr[k] = v; end
+       local new = { name = stanza.name, attr = attr, tags = tags };
+       for i=1,#stanza do
+               local child = stanza[i];
+               if child.name then
+                       child = _clone(child);
+                       t_insert(tags, child);
                end
-               return setmetatable(new_table, getmetatable(object));
+               t_insert(new, child);
        end
-       
-       return _copy(stanza)
+       return setmetatable(new, stanza_mt);
 end
+clone = _clone;
 
 function message(attr, body)
        if not body then
                return stanza("message", attr);
        else
-               return stanza("message", attr):tag("body"):text(body);
+               return stanza("message", attr):tag("body"):text(body):up();
        end
 end
 function iq(attr)
@@ -336,7 +390,7 @@ if do_pretty_printing then
        local style_attrv = getstyle("red");
        local style_tagname = getstyle("red");
        local style_punc = getstyle("magenta");
-       
+
        local attr_format = " "..getstring(style_attrk, "%s")..getstring(style_punc, "=")..getstring(style_attrv, "'%s'");
        local top_tag_format = getstring(style_punc, "<")..getstring(style_tagname, "%s").."%s"..getstring(style_punc, ">");
        --local tag_format = getstring(style_punc, "<")..getstring(style_tagname, "%s").."%s"..getstring(style_punc, ">").."%s"..getstring(style_punc, "</")..getstring(style_tagname, "%s")..getstring(style_punc, ">");
@@ -357,7 +411,7 @@ if do_pretty_printing then
                end
                return s_format(tag_format, t.name, attr_string, children_text, t.name);
        end
-       
+
        function stanza_mt.pretty_top_tag(t)
                local attr_string = "";
                if t.attr then