CiaranG/lua-xmlrpc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Alteracao nos nomes das funcoes e em alguns arquivos.

Browse Source 
Melhorias no manual.
This commit is contained in:
Tomas Guisasola 2004-01-09 10:41:55 +00:00
parent 200831a1a6
commit fb3fef4f28
7 changed files with 92 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -3,7 +3,7 @@ PKG= luaxmlrpc-$(VERSION)
TAR_FILE= $(PKG).tar.gz TAR_FILE= $(PKG).tar.gz
ZIP_FILE= $(PKG).zip ZIP_FILE= $(PKG).zip
SRCS= README Makefile \ SRCS= README Makefile \
xmlrpc.lua xrh.lua xrc.lua test.lua \ xmlrpc.lua xmlrpc.http.lua xmlrpc.cgi.lua test.lua \
index.html manual.html license.html luaxmlrpc.png index.html manual.html license.html luaxmlrpc.png
dist: dist:

4
README
View File

@ -13,7 +13,7 @@ Here goes a small description of the files in the distribution
README -- This file README -- This file
test.lua -- Overall API test script test.lua -- Overall API test script
xmlrpc.lua -- Source file xmlrpc.lua -- Source file
xrc.lua -- Extension server library over CGI xmlrpc.http.lua -- Extension library over HTTP
xrh.lua -- Extension server library over HTTP xmlrpc.cgi.lua -- Server implementation over CGI
$Id$ $Id$

105
doc/manual.html
View File

@ -53,31 +53,15 @@ It enables a Lua program to:
<p> <p>
LuaXMLRPC provides a simple API and an abstraction layer over XML LuaXMLRPC provides a simple API and an abstraction layer over XML
avoiding manipulation of string representation of data structures. avoiding manipulation of string representation of data structures.
It also offers ways to express everything when needed. <!--It also offers ways to express everything when needed.-->
<p> <p>
<!--
The distribution contains a set of Lua files:
<ul>
<li> <b><code>xmlrpc.lua</code></b> basic support:
encode and decode messages from both client and server
<li> <b><code>xrh.lua</code></b> XML-RPC over HTTP:
provides higher level functions that work over HTTP protocol
<li> <b><code>xrc.lua</code></b> XML-RPC over CGI:
a CGI script that implements a XML-RPC server
</ul>
<p>
-->
LuaXMLRPC is based on LuaXMLRPC is based on
<a href="http://www.keplerproject.org/luaexpat">LuaExpat</a> <a href="http://www.keplerproject.org/luaexpat">LuaExpat</a>
and on and on
<a href="http://www.lua.org">Lua 5.0</a>.<br> <a href="http://www.lua.org">Lua 5.0</a>.<br>
The abstraction layer over HTTP (<code>xrh.lua</code>) depends on The abstraction layer over HTTP depends on
<a href="http://www.tecgraf.puc-rio.br/luasocket">LuaSocket 2.0</a>.<br> <a href="http://www.tecgraf.puc-rio.br/luasocket">LuaSocket 2.0</a>.<br>
<!--
The abstraction over CGI (<code>xrc.lua</code>) depends on
POST parser...........
-->
<a name="data_types"></a> <a name="data_types"></a>
@ -169,8 +153,10 @@ the resulting struct will have the string representation of these numbers
as keys (e.g. <code>"1"</code> instead of <code>1</code>). as keys (e.g. <code>"1"</code> instead of <code>1</code>).
The library tries to convert integral numbers to integer types, The library tries to convert integral numbers to integer types,
otherwise converting them to floating point numbers. otherwise converting them to floating point numbers.
<!--
Explicit conversions can be forced by the creation of <i>typed values</i> Explicit conversions can be forced by the creation of <i>typed values</i>
(see function <code><a href="#createtypedvalue">createTypedValue</a></code>). (see function <code><a href="#newtypedvalue">newTypedValue</a></code>).
-->
<a name="basic"></a> <a name="basic"></a>
@ -181,15 +167,15 @@ and decoding XML-RPC messages and for transforming data types between the
two representations. two representations.
Following is the list of functions. Following is the list of functions.
<ul> <ul>
<a name="client_encode"></a> <a name="clEncode"></a>
<li> <b><code>client_encode (method_name, params*) => method_call</code></b> <br> <li> <b><code>clEncode (method_name, params*) => method_call</code></b> <br>
Build a XML-RPC document containing a <code>methodCall</code> element. Build a XML-RPC document containing a <code>methodCall</code> element.
It receives a string with the method's name and an optional list of It receives a string with the method's name and an optional list of
parameters. parameters.
The result is a string containing the XML-RPC document. The result is a string containing the XML-RPC document.
<a name="client_decode"></a> <a name="clDecode"></a>
<li> <b><code>client_decode (method_response) => ok, results</code></b> <br> <li> <b><code>clDecode (method_response) => ok, results</code></b> <br>
Disassemble the server response into a Lua object. Disassemble the server response into a Lua object.
It receives a string containing the XML-RPC document representing It receives a string containing the XML-RPC document representing
the <code>methodResponse</code> element. the <code>methodResponse</code> element.
@ -200,8 +186,8 @@ Following is the list of functions.
<i>faultString</i> and the <i>faultCode</i>. <i>faultString</i> and the <i>faultCode</i>.
This values are extracted from the <code>fault</code> element. This values are extracted from the <code>fault</code> element.
<a name="server_decode"></a> <a name="srvDecode"></a>
<li> <b><code>server_decode (method_call) => method_name, list_params</code></b> <br> <li> <b><code>srvDecode (method_call) => method_name, list_params</code></b> <br>
Disassemble the client request into a method's name and a table with Disassemble the client request into a method's name and a table with
the list of parameters. the list of parameters.
It receives a string containing the XML-RPC document representing It receives a string containing the XML-RPC document representing
@ -209,8 +195,8 @@ Following is the list of functions.
The result is a string with the name of the method to be called The result is a string with the name of the method to be called
and a Lua table with the arguments to the call. and a Lua table with the arguments to the call.
<a name="server_encode"></a> <a name="srvEncode"></a>
<li> <b><code>server_encode (object, is_fault) => method_response</code></b> <br> <li> <b><code>srvEncode (object, is_fault) => method_response</code></b> <br>
Build a XML-RPC document containing a <code>methodResponse</code> element. Build a XML-RPC document containing a <code>methodResponse</code> element.
It receives a Lua object (a number, a string, a table, a "created typed It receives a Lua object (a number, a string, a table, a "created typed
value" etc.) with the return value of the call. value" etc.) with the return value of the call.
@ -223,21 +209,23 @@ Following is the list of functions.
In this case, the Lua object must be a table with the members In this case, the Lua object must be a table with the members
<code>faultCode</code> and <code>faultString</code>. <code>faultCode</code> and <code>faultString</code>.
<a name="createtypedvalue"></a> <!--
<li> <b><code>createTypedValue (object, type) => object</code></b> <br> <a name="newtypedvalue"></a>
<li> <b><code>newTypedValue (object, type) => object</code></b> <br>
Build a Lua object with the XML-RPC representation of the Lua Build a Lua object with the XML-RPC representation of the Lua
<code>object</code> given according to the given <code>type</code>. <code>object</code> given according to the given <code>type</code>.
<a name="createarray"></a> <a name="newarray"></a>
<li> <b><code>createArray (elemtype) => type</code></b> <br> <li> <b><code>newArray (elemtype) => type</code></b> <br>
Build an array type for use with Build an array type for use with
<a href="createtypedvalue">createTypedValue</a> <a href="newtypedvalue">newTypedValue</a>
function. function.
The <code>elemtype</code> can be one of the basic XML-RPC types or The <code>elemtype</code> can be one of the basic XML-RPC types or
a constructed one. a constructed one.
-->
<a name="server_methods"></a> <a name="srvMethods"></a>
<li> <b><code>server_methods (tab_or_func)</code></b> <br> <li> <b><code>srvMethods (tab_or_func)</code></b> <br>
Register the methods on the server. Register the methods on the server.
The parameter can be a table or a dispatching function. The parameter can be a table or a dispatching function.
If a <i>table</i> is given it can have one level of objects with the If a <i>table</i> is given it can have one level of objects with the
@ -256,7 +244,7 @@ Following is the list of functions.
<a name="client"></a> <a name="client"></a>
<h2>Client side</h2> <h2>Client side</h2>
<p> <p>
The file <code>xrh.lua</code> implements a simple client side library The file <code>xmlrpc.http.lua</code> implements a simple stand-alone client
based on <a href="http://www.tecgraf.puc-rio.br/luasocket">LuaSocket 2.0</a>. based on <a href="http://www.tecgraf.puc-rio.br/luasocket">LuaSocket 2.0</a>.
The following function is provided: The following function is provided:
<ul> <ul>
@ -264,9 +252,20 @@ The following function is provided:
<li> <b><code>call (url, method, params*)</code></b> <br> <li> <b><code>call (url, method, params*)</code></b> <br>
Execute the call to <code>method</code> at location <code>url</code> Execute the call to <code>method</code> at location <code>url</code>
with the given <code>params</code> (if any). with the given <code>params</code> (if any).
The <code>method</code> and <code>params</code> parameters will be just
passed to
<a href="#clEncode">clEncode</a>
function.
The result is the same as
<a href="#clDecode">clDecode</a>
function: a boolean indicating whether the call was successful or not,
followed by the response value (if successful) or by the <i>faultString</i>
and the <i>faultCode</i> (if the call fails).
<!--
The result is a boolean indicating whether the call was successful or The result is a boolean indicating whether the call was successful or
not, followed by the response value (if successful) or by the faultString not, followed by the response value (if successful) or by the faultString
and the faultCode (if the call fails). and the faultCode (if the call fails).
-->
</ul> </ul>
@ -280,7 +279,7 @@ This launcher just have to offer a way to decode POST data and to
send data back to the client. send data back to the client.
</p> </p>
<p> <p>
The file <code>xrc.lua</code> implements a simple XML-RPC server The file <code>xmlrpc.cgi.lua</code> implements a simple XML-RPC server
using the package <code>post</code> that can parse incoming POST data using the package <code>post</code> that can parse incoming POST data
from the http server. from the http server.
An appropriate environment for writing Lua functions is implemented; An appropriate environment for writing Lua functions is implemented;
@ -305,9 +304,9 @@ Below is a small sample code displaying the use of the library
in a client application. in a client application.
<blockquote> <blockquote>
<pre>require "xrh" <pre>require "xmlrpc.http"
local ok, res = xrh.call ("http://www.oreillynet.com/meerkat/xml-rpc/server.php", "system.listMethods") local ok, res = xmlrpc.http.call ("http://www.oreillynet.com/meerkat/xml-rpc/server.php", "system.listMethods")
print (ok) print (ok)
for i, v in pairs(res) do print ('\t', i, v) end for i, v in pairs(res) do print ('\t', i, v) end
</pre> </pre>
@ -322,11 +321,11 @@ XML-RPC.
<blockquote> <blockquote>
<pre>require "xmlrpc" <pre>require "xmlrpc"
double_array_type = xmlrpc.createArray ("double") double_array_type = xmlrpc.newArray ("double")
double_array = xmlrpc.createTypedValue ( { 1.1, 2, 3, 4 }, double_array_type) double_array = xmlrpc.newTypedValue ( { 1.1, 2, 3, 4 }, double_array_type)
double_array_array_type = xmlrpc.createArray (double_array_type) double_array_array_type = xmlrpc.newArray (double_array_type)
double_array_array = xmlrpc.createTypedValue ( double_array_array = xmlrpc.newTypedValue (
{ {
{ 11, 12, 13, }, { 11, 12, 13, },
{ 21, 22, 23, }, { 21, 22, 23, },
@ -378,7 +377,7 @@ The table <code>double_array_array</code> will be:
Follow a small example of a server based on a cgi launcher. Follow a small example of a server based on a cgi launcher.
<blockquote> <blockquote>
<pre>require "xrc" <pre>require "xmlrpc.cgi"
local kepler_home = "http://www.keplerproject.org" local kepler_home = "http://www.keplerproject.org"
local kepler_products = { "luasql", "lualdap", "luaexpat", "luaxmlrpc", } local kepler_products = { "luasql", "lualdap", "luaexpat", "luaxmlrpc", }
@ -389,7 +388,7 @@ local kepler_sites = {
luaxmlrpc = kepler_home.."/luaxmlrpc", luaxmlrpc = kepler_home.."/luaxmlrpc",
} }
-- Register methods -- Register methods
xmlrpc.server_methods { xmlrpc.srvMethods {
kepler = { kepler = {
products = function (self) return kepler_products end, products = function (self) return kepler_products end,
site = function (self, prod) return kepler_sites[prod] end, site = function (self, prod) return kepler_sites[prod] end,
@ -399,13 +398,13 @@ xmlrpc.server_methods {
local doc = {} local doc = {}
post.parsedata (doc) post.parsedata (doc)
-- Decode method call -- Decode method call
local method, arg_table = xmlrpc.server_decode (doc[1]) local method, arg_table = xmlrpc.srvDecode (doc[1])
local func = xmlrpc.dispatch (method) local func = xmlrpc.dispatch (method)
local ok, result, err = pcall (func, unpack (arg_table or {})) local ok, result, err = pcall (func, unpack (arg_table or {}))
if ok then if ok then
result = { code = 3, message = result, } result = { code = 3, message = result, }
end end
respond (xmlrpc.server_encode (result, not ok) respond (xmlrpc.srvEncode (result, not ok)
</pre> </pre>
</blockquote> </blockquote>
Note that the package <code>post</code> and the function <code>respond</code> Note that the package <code>post</code> and the function <code>respond</code>
@ -433,13 +432,13 @@ Here is a list of related documentation:
</ul> </ul>
<li> <a href="#basic">Basic support</a> <li> <a href="#basic">Basic support</a>
<ul> <ul>
<li> <a href="#client_encode">client_encode</a> <li> <a href="#clEncode">clEncode</a>
<li> <a href="#client_decode">client_decode</a> <li> <a href="#clDecode">clDecode</a>
<li> <a href="#server_encode">server_encode</a> <li> <a href="#srvEncode">srvEncode</a>
<li> <a href="#server_decode">server_decode</a> <li> <a href="#srvDecode">srvDecode</a>
<li> <a href="#createtypedvalue">createTypedValue</a> <li> <a href="#newtypedvalue">newTypedValue</a>
<li> <a href="#createarray">createArray</a> <li> <a href="#newarray">newArray</a>
<li> <a href="#server_methods">server_methods</a> <li> <a href="#srvMethods">srvMethods</a>
<li> <a href="#dispatch">dispatch</a> <li> <a href="#dispatch">dispatch</a>
</ul> </ul>
<li> <a href="#client">Client side</a> <li> <a href="#client">Client side</a>

16
src/xmlrpc.lua
View File

@ -491,14 +491,14 @@ end
--------------------------------------------------------------------- ---------------------------------------------------------------------
-- Create a representation of an array with the given element type. -- Create a representation of an array with the given element type.
--------------------------------------------------------------------- ---------------------------------------------------------------------
function createArray (elemtype) function newArray (elemtype)
return { type = "array", elemtype = elemtype, } return { type = "array", elemtype = elemtype, }
end end
--------------------------------------------------------------------- ---------------------------------------------------------------------
-- Create a representation of a structure with the given members. -- Create a representation of a structure with the given members.
--------------------------------------------------------------------- ---------------------------------------------------------------------
function createStruct (members) function newStruct (members)
return { type = "struct", elemtype = members, } return { type = "struct", elemtype = members, }
end end
@ -507,7 +507,7 @@ end
-- @param val Any Lua value. -- @param val Any Lua value.
-- @param typ A XML-RPC type. -- @param typ A XML-RPC type.
--------------------------------------------------------------------- ---------------------------------------------------------------------
function createTypedValue (val, typ) function newTypedValue (val, typ)
return { ["*type"] = typ, ["*value"] = val } return { ["*type"] = typ, ["*value"] = val }
end end
@ -517,7 +517,7 @@ end
-- @param ... Parameters to the call. -- @param ... Parameters to the call.
-- @return String with the XML string/document. -- @return String with the XML string/document.
--------------------------------------------------------------------- ---------------------------------------------------------------------
function client_encode (method, ...) function clEncode (method, ...)
return toxml.methodCall (method, arg) return toxml.methodCall (method, arg)
end end
@ -527,7 +527,7 @@ end
-- @return Boolean indicating whether the call was successful or not; -- @return Boolean indicating whether the call was successful or not;
-- and a Lua object with the converted response element. -- and a Lua object with the converted response element.
--------------------------------------------------------------------- ---------------------------------------------------------------------
function client_decode (meth_resp) function clDecode (meth_resp)
local d = parse (meth_resp) local d = parse (meth_resp)
if type(d) ~= "table" then if type(d) ~= "table" then
error ("Not an XML document: "..meth_resp) error ("Not an XML document: "..meth_resp)
@ -541,7 +541,7 @@ end
-- @param request String with XML document. -- @param request String with XML document.
-- @return String with method's name AND the table of arguments. -- @return String with method's name AND the table of arguments.
--------------------------------------------------------------------- ---------------------------------------------------------------------
function server_decode (request) function srvDecode (request)
local d = parse (request) local d = parse (request)
if type(d) ~= "table" then if type(d) ~= "table" then
error ("Not an XML document: "..request) error ("Not an XML document: "..request)
@ -556,7 +556,7 @@ end
-- a `fault' element (default = false). -- a `fault' element (default = false).
-- @return String with XML-RPC response. -- @return String with XML-RPC response.
--------------------------------------------------------------------- ---------------------------------------------------------------------
function server_encode (obj, is_fault) function srvEncode (obj, is_fault)
local ok = not (is_fault or false) local ok = not (is_fault or false)
return toxml.methodResponse (ok, obj) return toxml.methodResponse (ok, obj)
end end
@ -570,7 +570,7 @@ end
-- The given function should return a Lua function that implements. -- The given function should return a Lua function that implements.
--------------------------------------------------------------------- ---------------------------------------------------------------------
dispatch = error dispatch = error
function server_methods (tab_or_func) function srvMethods (tab_or_func)
local t = type (tab_or_func) local t = type (tab_or_func)
if t == "function" then if t == "function" then
dispatch = tab_or_func dispatch = tab_or_func

27
tests/test.lua
View File

@ -2,7 +2,6 @@
-- See Copyright Notice in license.html -- See Copyright Notice in license.html
require "xmlrpc" require "xmlrpc"
require "xrh"
function table._print (tab, indent, spacing) function table._print (tab, indent, spacing)
spacing = spacing or "" spacing = spacing or ""
@ -116,14 +115,14 @@ function call_test (xml_call, method, ...)
arg.n = nil arg.n = nil
-- client enconding test -- client enconding test
local meth_call = xmlrpc.client_encode (method, unpack (arg)) local meth_call = xmlrpc.clEncode (method, unpack (arg))
meth_call = string.gsub (meth_call, "%s*", "") meth_call = string.gsub (meth_call, "%s*", "")
local s = string.gsub (meth_call, xc, "") local s = string.gsub (meth_call, xc, "")
s = string.gsub (s, "%s*", "") s = string.gsub (s, "%s*", "")
assert (s == "", s.."\n!!!\n"..xc) assert (s == "", s.."\n!!!\n"..xc)
-- server decoding test -- server decoding test
local meth_call, param = xmlrpc.server_decode (xml_call) local meth_call, param = xmlrpc.srvDecode (xml_call)
assert (meth_call == method, meth_call) assert (meth_call == method, meth_call)
arg = remove_type (arg) arg = remove_type (arg)
assert (table.equal (arg, param)) assert (table.equal (arg, param))
@ -131,12 +130,12 @@ end
function response_test (xml_resp, lua_obj) function response_test (xml_resp, lua_obj)
-- client decoding test -- client decoding test
local ok, obj = xmlrpc.client_decode (xml_resp) local ok, obj = xmlrpc.clDecode (xml_resp)
-- server encoding test -- server encoding test
xml_resp = string.gsub (xml_resp, "(%p)", "%%%1") xml_resp = string.gsub (xml_resp, "(%p)", "%%%1")
xml_resp = string.gsub (xml_resp, "\r?\n%s*", "%%s*") xml_resp = string.gsub (xml_resp, "\r?\n%s*", "%%s*")
local meth_resp = xmlrpc.server_encode (lua_obj) local meth_resp = xmlrpc.srvEncode (lua_obj)
if type (obj) == "table" then if type (obj) == "table" then
lua_obj = remove_type (lua_obj) lua_obj = remove_type (lua_obj)
@ -151,14 +150,14 @@ end
function fault_test (xml_resp, message, code) function fault_test (xml_resp, message, code)
-- client decoding test -- client decoding test
local ok, str, n = xmlrpc.client_decode (xml_resp) local ok, str, n = xmlrpc.clDecode (xml_resp)
assert (str == message) assert (str == message)
assert (n == code) assert (n == code)
-- server encoding test -- server encoding test
xml_resp = string.gsub (xml_resp, "(%p)", "%%%1") xml_resp = string.gsub (xml_resp, "(%p)", "%%%1")
xml_resp = string.gsub (xml_resp, "\r?\n%s*", "%%s*") xml_resp = string.gsub (xml_resp, "\r?\n%s*", "%%s*")
local meth_resp = xmlrpc.server_encode ({ message = message, code = code }, true) local meth_resp = xmlrpc.srvEncode ({ message = message, code = code }, true)
local s = string.gsub (meth_resp, xml_resp, "") local s = string.gsub (meth_resp, xml_resp, "")
s = string.gsub (s, "%s*", "") s = string.gsub (s, "%s*", "")
assert (s == "", s) assert (s == "", s)
@ -177,7 +176,7 @@ call_test ([[<?xml version="1.0"?>
</params> </params>
</methodCall>]], "examples.getStateName", 41) </methodCall>]], "examples.getStateName", 41)
local double_139 = xmlrpc.createTypedValue (139, "double") local double_139 = xmlrpc.newTypedValue (139, "double")
call_test ([[<?xml version="1.0"?> call_test ([[<?xml version="1.0"?>
<methodCall> <methodCall>
<methodName>examples.getSomething</methodName> <methodName>examples.getSomething</methodName>
@ -199,7 +198,7 @@ call_test ([[<?xml version="1.0"?>
</params> </params>
</methodCall>]], "examples.getSomething", { lowerBound = 18.2, upperBound = double_139 }) </methodCall>]], "examples.getSomething", { lowerBound = 18.2, upperBound = double_139 })
local double_array = xmlrpc.createArray ("double") local double_array = xmlrpc.newArray ("double")
call_test ([[<?xml version="1.0"?> call_test ([[<?xml version="1.0"?>
<methodCall> <methodCall>
<methodName>test</methodName> <methodName>test</methodName>
@ -213,10 +212,10 @@ call_test ([[<?xml version="1.0"?>
</params> </params>
</methodCall>]], </methodCall>]],
"test", "test",
xmlrpc.createTypedValue ({ 1, 2, 3, 4, }, double_array) xmlrpc.newTypedValue ({ 1, 2, 3, 4, }, double_array)
) )
local double_array_array = xmlrpc.createArray (double_array) local double_array_array = xmlrpc.newArray (double_array)
call_test ([[<?xml version="1.0"?> call_test ([[<?xml version="1.0"?>
<methodCall> <methodCall>
<methodName>test</methodName> <methodName>test</methodName>
@ -244,7 +243,7 @@ call_test ([[<?xml version="1.0"?>
</params> </params>
</methodCall>]], </methodCall>]],
"test", "test",
xmlrpc.createTypedValue ( xmlrpc.newTypedValue (
{ {
{ 1, 2, 3, 4, }, { 1, 2, 3, 4, },
{ 11, 12, 13, 14, }, { 11, 12, 13, 14, },
@ -304,13 +303,13 @@ call_test ([[<?xml version="1.0"?>
</methodCall>]], </methodCall>]],
"insertTable", "insertTable",
"people", "people",
xmlrpc.createTypedValue ( xmlrpc.newTypedValue (
{ {
{ name = "Fulano", email = "fulano@nowhere.world", }, { name = "Fulano", email = "fulano@nowhere.world", },
{ name = "Beltrano", email = "beltrano@nowhere.world", }, { name = "Beltrano", email = "beltrano@nowhere.world", },
{ name = "Cicrano", email = "cicrano@nowhere.world", }, { name = "Cicrano", email = "cicrano@nowhere.world", },
}, },
xmlrpc.createArray ("struct") xmlrpc.newArray ("struct")
) )
) )

8
xrc.lua → xmlrpc.cgi.lua
View File

@ -22,7 +22,7 @@ end
local _assert = assert local _assert = assert
function assert (cond, msg) function assert (cond, msg)
if not cond then if not cond then
respond (xmlrpc.server_encode ( respond (xmlrpc.srvEncode (
{ code = 2, message = msg, }, { code = 2, message = msg, },
true true
)) ))
@ -43,7 +43,7 @@ local kepler_sites = {
luaxmlrpc = kepler_home.."/luaxmlrpc", luaxmlrpc = kepler_home.."/luaxmlrpc",
} }
xmlrpc.server_methods { xmlrpc.srvMethods {
system = { system = {
listMethods = function (self) return { "system.listMethods" } end, listMethods = function (self) return { "system.listMethods" } end,
}, },
@ -56,7 +56,7 @@ xmlrpc.server_methods {
local doc = {} local doc = {}
post.parsedata (doc) post.parsedata (doc)
local method, arg_table = xmlrpc.server_decode (doc[1]) local method, arg_table = xmlrpc.srvDecode (doc[1])
assert (type(method) == "string", "Invalid `method': string expected") assert (type(method) == "string", "Invalid `method': string expected")
local t = type(arg_table) local t = type(arg_table)
assert (t == "table" or t == "nil", "Invalid table of arguments: not a table nor nil") assert (t == "table" or t == "nil", "Invalid table of arguments: not a table nor nil")
@ -76,5 +76,5 @@ else
end end
end end
local r = xmlrpc.server_encode (result, not ok) local r = xmlrpc.srvEncode (result, not ok)
respond (r) respond (r)

8
xrh.lua → xmlrpc.http.lua
View File

@ -9,7 +9,7 @@ require"xmlrpc"
local post = socket.http.post local post = socket.http.post
xrh = {} xmlrpc.http = {}
--------------------------------------------------------------------- ---------------------------------------------------------------------
-- Call a remote method. -- Call a remote method.
@ -18,17 +18,17 @@ xrh = {}
-- @return Table with the response (could be a `fault' or a `params' -- @return Table with the response (could be a `fault' or a `params'
-- XML-RPC element). -- XML-RPC element).
--------------------------------------------------------------------- ---------------------------------------------------------------------
function xrh.call (url, method, ...) function xmlrpc.http.call (url, method, ...)
local body, headers, code, err = post { local body, headers, code, err = post {
url = url, url = url,
body = xmlrpc.client_encode (method, unpack (arg)), body = xmlrpc.clEncode (method, unpack (arg)),
headers = { headers = {
["User-agent"] = "LuaXMLRPC", ["User-agent"] = "LuaXMLRPC",
["Content-type"] = "text/xml", ["Content-type"] = "text/xml",
}, },
} }
if tonumber (code) == 200 then if tonumber (code) == 200 then
return xmlrpc.client_decode (body) return xmlrpc.clDecode (body)
else else
error (err or code) error (err or code)
end end