util.set: Rename private items container, optimise set.difference() and add set.inter...

[prosody.git] / util / stanza.lua

diff --git a/util/stanza.lua b/util/stanza.lua
index 14a8f395774530aa918d14ca220021db8c03199a..1ad3679ba84579bc92122d18146272bdc9730ad7 100644 (file)
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -1,20 +1,9 @@
--- Prosody IM v0.2
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
+-- Prosody IM v0.4
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
 -- 
--- This program is free software; you can redistribute it and/or
--- modify it under the terms of the GNU General Public License
--- as published by the Free Software Foundation; either version 2
--- of the License, or (at your option) any later version.
--- 
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
--- 
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
 --
 
 
@@ -23,8 +12,10 @@ 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;
@@ -125,11 +116,22 @@ end
 local xml_escape = xml_escape;
 
 local function dostring(t, buf, self, xml_escape)
+       local nsid, ns, attrk = 0;
        t_insert(buf, "<");
        t_insert(buf, t.name);
        for k, v in pairs(t.attr) do if type(k) == "string" then
                t_insert(buf, " ");
-               t_insert(buf, k);
+               ns, attrk = s_match(k, "^([^|]+)|(.+)$");
+               if ns then
+                       nsid = (nsid or -1) + 1;
+                       t_insert(buf, "xmlns:ns"..nsid);
+                       t_insert(buf, "='");
+                       t_insert(buf, (xml_escape(tostring(ns))));
+                       t_insert(buf, "' ");
+                       t_insert(buf, "ns"..nsid..":"..attrk);
+               else
+                       t_insert(buf, k);
+               end
                t_insert(buf, "='");
                t_insert(buf, (xml_escape(tostring(v))));
                t_insert(buf, "'");
@@ -214,6 +216,24 @@ function deserialize(stanza)
        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);
+        end
+        return setmetatable(new_table, getmetatable(object));
+    end
+    return _copy(stanza)
+end
+
 function message(attr, body)
        if not body then
                return stanza("message", attr);