Software `/` code `/` prosody

Annotate

util/stanza.lua @ 948:4aff205cc4cd 0.4.0

Tagging VERSION

author	Matthew Wild <mwild1@gmail.com>
date	Tue, 31 Mar 2009 20:15:33 +0100
parent	896:2c0b9e3c11c3
child	964:3296db2ad4a0

rev	line source
896 2c0b9e3c11c3 0.3->0.4 Matthew Wild <mwild1@gmail.com> parents: 829 diff changeset	1 -- Prosody IM v0.4
760 90ce865eebd8 Update copyright notices for 2009 Matthew Wild <mwild1@gmail.com> parents: 759 diff changeset	2 -- Copyright (C) 2008-2009 Matthew Wild
90ce865eebd8 Update copyright notices for 2009 Matthew Wild <mwild1@gmail.com> parents: 759 diff changeset	3 -- Copyright (C) 2008-2009 Waqas Hussain
519 cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 373 diff changeset	4 --
758 b1885732e979 GPL->MIT! Matthew Wild <mwild1@gmail.com> parents: 689 diff changeset	5 -- This project is MIT/X11 licensed. Please see the
b1885732e979 GPL->MIT! Matthew Wild <mwild1@gmail.com> parents: 689 diff changeset	6 -- COPYING file in the source package for more information.
519 cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 373 diff changeset	7 --
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 373 diff changeset	8
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 373 diff changeset	9
1 b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	10 local t_insert = table.insert;
626 cf1d26fd4d6f Optimized stanza_mt.__tostring (called when doing tostring(stanza)) Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	11 local t_concat = table.concat;
1 b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	12 local t_remove = table.remove;
613 6c09127b50fb New, faster, stanza serialization Matthew Wild <mwild1@gmail.com> parents: 519 diff changeset	13 local t_concat = table.concat;
23 236375777f8c Some docs written by Thorns. Need reviewing. bt@silverblade parents: 6 diff changeset	14 local s_format = string.format;
829 b01fd698495e util/stanza: Added clone function Waqas Hussain <waqas20@gmail.com> parents: 776 diff changeset	15 local s_match = string.match;
1 b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	16 local tostring = tostring;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	17 local setmetatable = setmetatable;
829 b01fd698495e util/stanza: Added clone function Waqas Hussain <waqas20@gmail.com> parents: 776 diff changeset	18 local getmetatable = getmetatable;
1 b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	19 local pairs = pairs;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	20 local ipairs = ipairs;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	21 local type = type;
145 fbb3a4ff9cf1 dialback keys now verified Matthew Wild <mwild1@gmail.com> parents: 91 diff changeset	22 local next = next;
626 cf1d26fd4d6f Optimized stanza_mt.__tostring (called when doing tostring(stanza)) Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	23 local print = print;
90 da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	24 local unpack = unpack;
4 09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	25 local s_gsub = string.gsub;
613 6c09127b50fb New, faster, stanza serialization Matthew Wild <mwild1@gmail.com> parents: 519 diff changeset	26 local os = os;
145 fbb3a4ff9cf1 dialback keys now verified Matthew Wild <mwild1@gmail.com> parents: 91 diff changeset	27
262 8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	28 local do_pretty_printing = not os.getenv("WINDIR");
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	29 local getstyle, getstring = require "util.termcolours".getstyle, require "util.termcolours".getstring;
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	30
145 fbb3a4ff9cf1 dialback keys now verified Matthew Wild <mwild1@gmail.com> parents: 91 diff changeset	31 local log = require "util.logger".init("stanza");
fbb3a4ff9cf1 dialback keys now verified Matthew Wild <mwild1@gmail.com> parents: 91 diff changeset	32
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	33 module "stanza"
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	34
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	35 stanza_mt = {};
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	36 stanza_mt.__index = stanza_mt;
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	37
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	38 function stanza(name, attr)
1 b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	39 local stanza = { name = name, attr = attr or {}, tags = {}, last_add = {}};
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	40 return setmetatable(stanza, stanza_mt);
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	41 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	42
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	43 function stanza_mt:query(xmlns)
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	44 return self:tag("query", { xmlns = xmlns });
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	45 end
373 dd0345edeaf4 Add helper function for adding message bodies to stanzas Matthew Wild <mwild1@gmail.com> parents: 338 diff changeset	46
dd0345edeaf4 Add helper function for adding message bodies to stanzas Matthew Wild <mwild1@gmail.com> parents: 338 diff changeset	47 function stanza_mt:body(text, attr)
dd0345edeaf4 Add helper function for adding message bodies to stanzas Matthew Wild <mwild1@gmail.com> parents: 338 diff changeset	48 return self:tag("body", attr):text(text);
dd0345edeaf4 Add helper function for adding message bodies to stanzas Matthew Wild <mwild1@gmail.com> parents: 338 diff changeset	49 end
dd0345edeaf4 Add helper function for adding message bodies to stanzas Matthew Wild <mwild1@gmail.com> parents: 338 diff changeset	50
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	51 function stanza_mt:tag(name, attrs)
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	52 local s = stanza(name, attrs);
180 d8b9a19d70eb Make add_child() behave as expected. Old add_child() is now add_direct_child() Matthew Wild <mwild1@gmail.com> parents: 145 diff changeset	53 (self.last_add[#self.last_add] or self):add_direct_child(s);
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	54 t_insert(self.last_add, s);
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	55 return self;
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	56 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	57
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	58 function stanza_mt:text(text)
180 d8b9a19d70eb Make add_child() behave as expected. Old add_child() is now add_direct_child() Matthew Wild <mwild1@gmail.com> parents: 145 diff changeset	59 (self.last_add[#self.last_add] or self):add_direct_child(text);
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	60 return self;
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	61 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	62
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	63 function stanza_mt:up()
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	64 t_remove(self.last_add);
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	65 return self;
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	66 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	67
180 d8b9a19d70eb Make add_child() behave as expected. Old add_child() is now add_direct_child() Matthew Wild <mwild1@gmail.com> parents: 145 diff changeset	68 function stanza_mt:add_direct_child(child)
1 b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	69 if type(child) == "table" then
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	70 t_insert(self.tags, child);
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	71 end
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	72 t_insert(self, child);
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	73 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	74
180 d8b9a19d70eb Make add_child() behave as expected. Old add_child() is now add_direct_child() Matthew Wild <mwild1@gmail.com> parents: 145 diff changeset	75 function stanza_mt:add_child(child)
d8b9a19d70eb Make add_child() behave as expected. Old add_child() is now add_direct_child() Matthew Wild <mwild1@gmail.com> parents: 145 diff changeset	76 (self.last_add[#self.last_add] or self):add_direct_child(child);
d8b9a19d70eb Make add_child() behave as expected. Old add_child() is now add_direct_child() Matthew Wild <mwild1@gmail.com> parents: 145 diff changeset	77 return self;
d8b9a19d70eb Make add_child() behave as expected. Old add_child() is now add_direct_child() Matthew Wild <mwild1@gmail.com> parents: 145 diff changeset	78 end
d8b9a19d70eb Make add_child() behave as expected. Old add_child() is now add_direct_child() Matthew Wild <mwild1@gmail.com> parents: 145 diff changeset	79
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	80 function stanza_mt:child_with_name(name)
689 94b043fbaf33 Add child_with_ns() method to stanza elements, and fix child_with_name() to iterate tags rather than all children Matthew Wild <mwild1@gmail.com> parents: 680 diff changeset	81 for _, child in ipairs(self.tags) do
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	82 if child.name == name then return child; end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	83 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	84 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	85
689 94b043fbaf33 Add child_with_ns() method to stanza elements, and fix child_with_name() to iterate tags rather than all children Matthew Wild <mwild1@gmail.com> parents: 680 diff changeset	86 function stanza_mt:child_with_ns(ns)
94b043fbaf33 Add child_with_ns() method to stanza elements, and fix child_with_name() to iterate tags rather than all children Matthew Wild <mwild1@gmail.com> parents: 680 diff changeset	87 for _, child in ipairs(self.tags) do
94b043fbaf33 Add child_with_ns() method to stanza elements, and fix child_with_name() to iterate tags rather than all children Matthew Wild <mwild1@gmail.com> parents: 680 diff changeset	88 if child.attr.xmlns == ns then return child; end
94b043fbaf33 Add child_with_ns() method to stanza elements, and fix child_with_name() to iterate tags rather than all children Matthew Wild <mwild1@gmail.com> parents: 680 diff changeset	89 end
94b043fbaf33 Add child_with_ns() method to stanza elements, and fix child_with_name() to iterate tags rather than all children Matthew Wild <mwild1@gmail.com> parents: 680 diff changeset	90 end
94b043fbaf33 Add child_with_ns() method to stanza elements, and fix child_with_name() to iterate tags rather than all children Matthew Wild <mwild1@gmail.com> parents: 680 diff changeset	91
1 b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	92 function stanza_mt:children()
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	93 local i = 0;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	94 return function (a)
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	95 i = i + 1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	96 local v = a[i]
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	97 if v then return v; end
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	98 end, self, i;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	99
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	100 end
2 9bb397205f26 Working presence! matthew parents: 1 diff changeset	101 function stanza_mt:childtags()
9bb397205f26 Working presence! matthew parents: 1 diff changeset	102 local i = 0;
9bb397205f26 Working presence! matthew parents: 1 diff changeset	103 return function (a)
9bb397205f26 Working presence! matthew parents: 1 diff changeset	104 i = i + 1
9bb397205f26 Working presence! matthew parents: 1 diff changeset	105 local v = self.tags[i]
9bb397205f26 Working presence! matthew parents: 1 diff changeset	106 if v then return v; end
9bb397205f26 Working presence! matthew parents: 1 diff changeset	107 end, self.tags[1], i;
9bb397205f26 Working presence! matthew parents: 1 diff changeset	108
9bb397205f26 Working presence! matthew parents: 1 diff changeset	109 end
1 b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	110
4 09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	111 do
09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	112 local xml_entities = { ["'"] = "'", ["\""] = """, ["<"] = "<", [">"] = ">", ["&"] = "&" };
09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	113 function xml_escape(s) return s_gsub(s, "['&<>\"]", xml_entities); end
09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	114 end
09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	115
09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	116 local xml_escape = xml_escape;
09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	117
613 6c09127b50fb New, faster, stanza serialization Matthew Wild <mwild1@gmail.com> parents: 519 diff changeset	118 local function dostring(t, buf, self, xml_escape)
776 89eb9f59993c util.stanza: Temporary fix for serializing attributes with namespaces Matthew Wild <mwild1@gmail.com> parents: 760 diff changeset	119 local nsid, ns, attrk = 0;
626 cf1d26fd4d6f Optimized stanza_mt.__tostring (called when doing tostring(stanza)) Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	120 t_insert(buf, "<");
cf1d26fd4d6f Optimized stanza_mt.__tostring (called when doing tostring(stanza)) Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	121 t_insert(buf, t.name);
613 6c09127b50fb New, faster, stanza serialization Matthew Wild <mwild1@gmail.com> parents: 519 diff changeset	122 for k, v in pairs(t.attr) do if type(k) == "string" then
6c09127b50fb New, faster, stanza serialization Matthew Wild <mwild1@gmail.com> parents: 519 diff changeset	123 t_insert(buf, " ");
776 89eb9f59993c util.stanza: Temporary fix for serializing attributes with namespaces Matthew Wild <mwild1@gmail.com> parents: 760 diff changeset	124 ns, attrk = s_match(k, "^([^\|]+)\|(.+)$");
89eb9f59993c util.stanza: Temporary fix for serializing attributes with namespaces Matthew Wild <mwild1@gmail.com> parents: 760 diff changeset	125 if ns then
89eb9f59993c util.stanza: Temporary fix for serializing attributes with namespaces Matthew Wild <mwild1@gmail.com> parents: 760 diff changeset	126 nsid = (nsid or -1) + 1;
89eb9f59993c util.stanza: Temporary fix for serializing attributes with namespaces Matthew Wild <mwild1@gmail.com> parents: 760 diff changeset	127 t_insert(buf, "xmlns:ns"..nsid);
89eb9f59993c util.stanza: Temporary fix for serializing attributes with namespaces Matthew Wild <mwild1@gmail.com> parents: 760 diff changeset	128 t_insert(buf, "='");
89eb9f59993c util.stanza: Temporary fix for serializing attributes with namespaces Matthew Wild <mwild1@gmail.com> parents: 760 diff changeset	129 t_insert(buf, (xml_escape(tostring(ns))));
89eb9f59993c util.stanza: Temporary fix for serializing attributes with namespaces Matthew Wild <mwild1@gmail.com> parents: 760 diff changeset	130 t_insert(buf, "' ");
89eb9f59993c util.stanza: Temporary fix for serializing attributes with namespaces Matthew Wild <mwild1@gmail.com> parents: 760 diff changeset	131 t_insert(buf, "ns"..nsid..":"..attrk);
89eb9f59993c util.stanza: Temporary fix for serializing attributes with namespaces Matthew Wild <mwild1@gmail.com> parents: 760 diff changeset	132 else
89eb9f59993c util.stanza: Temporary fix for serializing attributes with namespaces Matthew Wild <mwild1@gmail.com> parents: 760 diff changeset	133 t_insert(buf, k);
89eb9f59993c util.stanza: Temporary fix for serializing attributes with namespaces Matthew Wild <mwild1@gmail.com> parents: 760 diff changeset	134 end
613 6c09127b50fb New, faster, stanza serialization Matthew Wild <mwild1@gmail.com> parents: 519 diff changeset	135 t_insert(buf, "='");
6c09127b50fb New, faster, stanza serialization Matthew Wild <mwild1@gmail.com> parents: 519 diff changeset	136 t_insert(buf, (xml_escape(tostring(v))));
6c09127b50fb New, faster, stanza serialization Matthew Wild <mwild1@gmail.com> parents: 519 diff changeset	137 t_insert(buf, "'");
6c09127b50fb New, faster, stanza serialization Matthew Wild <mwild1@gmail.com> parents: 519 diff changeset	138 end end
626 cf1d26fd4d6f Optimized stanza_mt.__tostring (called when doing tostring(stanza)) Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	139 t_insert(buf, ">");
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	140 for n, child in ipairs(t) do
626 cf1d26fd4d6f Optimized stanza_mt.__tostring (called when doing tostring(stanza)) Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	141 if child.name then
613 6c09127b50fb New, faster, stanza serialization Matthew Wild <mwild1@gmail.com> parents: 519 diff changeset	142 self(child, buf, self, xml_escape);
4 09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	143 else
626 cf1d26fd4d6f Optimized stanza_mt.__tostring (called when doing tostring(stanza)) Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	144 t_insert(buf, (xml_escape(child)));
4 09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	145 end
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	146 end
626 cf1d26fd4d6f Optimized stanza_mt.__tostring (called when doing tostring(stanza)) Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	147 t_insert(buf, "</");
cf1d26fd4d6f Optimized stanza_mt.__tostring (called when doing tostring(stanza)) Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	148 t_insert(buf, t.name);
cf1d26fd4d6f Optimized stanza_mt.__tostring (called when doing tostring(stanza)) Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	149 t_insert(buf, ">");
cf1d26fd4d6f Optimized stanza_mt.__tostring (called when doing tostring(stanza)) Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	150 end
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	151
626 cf1d26fd4d6f Optimized stanza_mt.__tostring (called when doing tostring(stanza)) Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	152 function stanza_mt.__tostring(t)
cf1d26fd4d6f Optimized stanza_mt.__tostring (called when doing tostring(stanza)) Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	153 local buf = {};
613 6c09127b50fb New, faster, stanza serialization Matthew Wild <mwild1@gmail.com> parents: 519 diff changeset	154 dostring(t, buf, dostring, xml_escape);
626 cf1d26fd4d6f Optimized stanza_mt.__tostring (called when doing tostring(stanza)) Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	155 return t_concat(buf);
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	156 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	157
613 6c09127b50fb New, faster, stanza serialization Matthew Wild <mwild1@gmail.com> parents: 519 diff changeset	158
242 f15afbcbc55c Add new top_tag() method to stanzas Matthew Wild <mwild1@gmail.com> parents: 209 diff changeset	159 function stanza_mt.top_tag(t)
f15afbcbc55c Add new top_tag() method to stanzas Matthew Wild <mwild1@gmail.com> parents: 209 diff changeset	160 local attr_string = "";
f15afbcbc55c Add new top_tag() method to stanzas Matthew Wild <mwild1@gmail.com> parents: 209 diff changeset	161 if t.attr then
338 804f5e62a41f Don't forget to escape XML in attributes. Thanks to the Postgres Q&A room on conference.jabber.org :) Matthew Wild <mwild1@gmail.com> parents: 262 diff changeset	162 for k, v in pairs(t.attr) do if type(k) == "string" then attr_string = attr_string .. s_format(" %s='%s'", k, xml_escape(tostring(v))); end end
242 f15afbcbc55c Add new top_tag() method to stanzas Matthew Wild <mwild1@gmail.com> parents: 209 diff changeset	163 end
f15afbcbc55c Add new top_tag() method to stanzas Matthew Wild <mwild1@gmail.com> parents: 209 diff changeset	164 return s_format("<%s%s>", t.name, attr_string);
f15afbcbc55c Add new top_tag() method to stanzas Matthew Wild <mwild1@gmail.com> parents: 209 diff changeset	165 end
f15afbcbc55c Add new top_tag() method to stanzas Matthew Wild <mwild1@gmail.com> parents: 209 diff changeset	166
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	167 function stanza_mt.__add(s1, s2)
180 d8b9a19d70eb Make add_child() behave as expected. Old add_child() is now add_direct_child() Matthew Wild <mwild1@gmail.com> parents: 145 diff changeset	168 return s1:add_direct_child(s2);
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	169 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	170
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	171
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	172 do
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	173 local id = 0;
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	174 function new_id()
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	175 id = id + 1;
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	176 return "lx"..id;
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	177 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	178 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	179
90 da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	180 function preserialize(stanza)
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	181 local s = { name = stanza.name, attr = stanza.attr };
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	182 for _, child in ipairs(stanza) do
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	183 if type(child) == "table" then
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	184 t_insert(s, preserialize(child));
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	185 else
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	186 t_insert(s, child);
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	187 end
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	188 end
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	189 return s;
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	190 end
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	191
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	192 function deserialize(stanza)
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	193 -- Set metatable
91 6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	194 if stanza then
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	195 setmetatable(stanza, stanza_mt);
90 da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	196 for _, child in ipairs(stanza) do
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	197 if type(child) == "table" then
91 6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	198 deserialize(child);
90 da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	199 end
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	200 end
91 6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	201 if not stanza.tags then
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	202 -- Rebuild tags
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	203 local tags = {};
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	204 for _, child in ipairs(stanza) do
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	205 if type(child) == "table" then
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	206 t_insert(tags, child);
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	207 end
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	208 end
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	209 stanza.tags = tags;
680 734994b61907 Restore fix for missing last_add on deserialized stanzas. Thanks to tsing for discovering. Matthew Wild <mwild1@gmail.com> parents: 627 diff changeset	210 if not stanza.last_add then
734994b61907 Restore fix for missing last_add on deserialized stanzas. Thanks to tsing for discovering. Matthew Wild <mwild1@gmail.com> parents: 627 diff changeset	211 stanza.last_add = {};
734994b61907 Restore fix for missing last_add on deserialized stanzas. Thanks to tsing for discovering. Matthew Wild <mwild1@gmail.com> parents: 627 diff changeset	212 end
91 6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	213 end
90 da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	214 end
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	215
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	216 return stanza;
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	217 end
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	218
829 b01fd698495e util/stanza: Added clone function Waqas Hussain <waqas20@gmail.com> parents: 776 diff changeset	219 function clone(stanza)
b01fd698495e util/stanza: Added clone function Waqas Hussain <waqas20@gmail.com> parents: 776 diff changeset	220 local lookup_table = {};
b01fd698495e util/stanza: Added clone function Waqas Hussain <waqas20@gmail.com> parents: 776 diff changeset	221 local function _copy(object)
b01fd698495e util/stanza: Added clone function Waqas Hussain <waqas20@gmail.com> parents: 776 diff changeset	222 if type(object) ~= "table" then
b01fd698495e util/stanza: Added clone function Waqas Hussain <waqas20@gmail.com> parents: 776 diff changeset	223 return object;
b01fd698495e util/stanza: Added clone function Waqas Hussain <waqas20@gmail.com> parents: 776 diff changeset	224 elseif lookup_table[object] then
b01fd698495e util/stanza: Added clone function Waqas Hussain <waqas20@gmail.com> parents: 776 diff changeset	225 return lookup_table[object];
b01fd698495e util/stanza: Added clone function Waqas Hussain <waqas20@gmail.com> parents: 776 diff changeset	226 end
b01fd698495e util/stanza: Added clone function Waqas Hussain <waqas20@gmail.com> parents: 776 diff changeset	227 local new_table = {};
b01fd698495e util/stanza: Added clone function Waqas Hussain <waqas20@gmail.com> parents: 776 diff changeset	228 lookup_table[object] = new_table;
b01fd698495e util/stanza: Added clone function Waqas Hussain <waqas20@gmail.com> parents: 776 diff changeset	229 for index, value in pairs(object) do
b01fd698495e util/stanza: Added clone function Waqas Hussain <waqas20@gmail.com> parents: 776 diff changeset	230 new_table[_copy(index)] = _copy(value);
b01fd698495e util/stanza: Added clone function Waqas Hussain <waqas20@gmail.com> parents: 776 diff changeset	231 end
b01fd698495e util/stanza: Added clone function Waqas Hussain <waqas20@gmail.com> parents: 776 diff changeset	232 return setmetatable(new_table, getmetatable(object));
b01fd698495e util/stanza: Added clone function Waqas Hussain <waqas20@gmail.com> parents: 776 diff changeset	233 end
b01fd698495e util/stanza: Added clone function Waqas Hussain <waqas20@gmail.com> parents: 776 diff changeset	234 return _copy(stanza)
b01fd698495e util/stanza: Added clone function Waqas Hussain <waqas20@gmail.com> parents: 776 diff changeset	235 end
b01fd698495e util/stanza: Added clone function Waqas Hussain <waqas20@gmail.com> parents: 776 diff changeset	236
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	237 function message(attr, body)
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	238 if not body then
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	239 return stanza("message", attr);
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	240 else
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	241 return stanza("message", attr):tag("body"):text(body);
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	242 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	243 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	244 function iq(attr)
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	245 if attr and not attr.id then attr.id = new_id(); end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	246 return stanza("iq", attr or { id = new_id() });
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	247 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	248
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	249 function reply(orig)
209 e9de0803676d Part one of internal component support Matthew Wild <mwild1@gmail.com> parents: 181 diff changeset	250 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) });
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	251 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	252
60 44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: 30 diff changeset	253 function error_reply(orig, type, condition, message, clone)
70 a6c00467a3f8 Fixed typo in variable name Waqas Hussain <waqas20@gmail.com> parents: 62 diff changeset	254 local t = reply(orig);
60 44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: 30 diff changeset	255 t.attr.type = "error";
44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: 30 diff changeset	256 -- TODO use clone
44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: 30 diff changeset	257 t:tag("error", {type = type})
44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: 30 diff changeset	258 :tag(condition, {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"}):up();
44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: 30 diff changeset	259 if (message) then t:tag("text"):text(message):up(); end
44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: 30 diff changeset	260 return t; -- stanza ready for adding app-specific errors
44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: 30 diff changeset	261 end
44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: 30 diff changeset	262
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	263 function presence(attr)
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	264 return stanza("presence", attr);
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	265 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	266
262 8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	267 if do_pretty_printing then
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	268 local style_attrk = getstyle("yellow");
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	269 local style_attrv = getstyle("red");
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	270 local style_tagname = getstyle("red");
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	271 local style_punc = getstyle("magenta");
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	272
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	273 local attr_format = " "..getstring(style_attrk, "%s")..getstring(style_punc, "=")..getstring(style_attrv, "'%s'");
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	274 local top_tag_format = getstring(style_punc, "<")..getstring(style_tagname, "%s").."%s"..getstring(style_punc, ">");
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	275 --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, ">");
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	276 local tag_format = top_tag_format.."%s"..getstring(style_punc, "</")..getstring(style_tagname, "%s")..getstring(style_punc, ">");
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	277 function stanza_mt.pretty_print(t)
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	278 local children_text = "";
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	279 for n, child in ipairs(t) do
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	280 if type(child) == "string" then
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	281 children_text = children_text .. xml_escape(child);
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	282 else
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	283 children_text = children_text .. child:pretty_print();
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	284 end
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	285 end
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	286
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	287 local attr_string = "";
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	288 if t.attr then
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	289 for k, v in pairs(t.attr) do if type(k) == "string" then attr_string = attr_string .. s_format(attr_format, k, tostring(v)); end end
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	290 end
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	291 return s_format(tag_format, t.name, attr_string, children_text, t.name);
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	292 end
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	293
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	294 function stanza_mt.pretty_top_tag(t)
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	295 local attr_string = "";
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	296 if t.attr then
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	297 for k, v in pairs(t.attr) do if type(k) == "string" then attr_string = attr_string .. s_format(attr_format, k, tostring(v)); end end
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	298 end
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	299 return s_format(top_tag_format, t.name, attr_string);
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	300 end
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	301 else
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	302 -- Sorry, fresh out of colours for you guys ;)
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	303 stanza_mt.pretty_print = stanza_mt.__tostring;
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	304 stanza_mt.pretty_top_tag = stanza_mt.top_tag;
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	305 end
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	306
90 da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	307 return _M;

prosody

0.4.0

util/stanza.lua

Software / code / prosody

Annotate

util/stanza.lua @ 948:4aff205cc4cd 0.4.0

Software `/` code `/` prosody