Fixed a ton of bugs an problems encountered by trying to use json4lua

README.md

@@ -1,52 +1,22 @@
-# json4lua
-JSON and JSONRPC for Lua
+# jsonrpc4lua
+JSON RPC over HTTP Lua module.  Fork of [json4lua](https://github.com/craigmj/json4lua), refactored to use [CJSON](http://www.kyne.com.au/~mark/software/lua-cjson.php).
 
-# Installation #
-```
-luarocks install --server=http://rocks.moonscript.org/manifests/amrhassan --local json4Lua
-```
-
-# JSON Usage #
+## Dependencies
+* lua >= 5.1
+* luasocket
+* cgilua (patch required)
+* lua-cjson
 
-## Encoding ##
+Optional requirement to run the server-side example:
+* xavante
 
-```lua
-json = require('json')
-print(json.encode({ 1, 2, 'fred', {first='mars',second='venus',third='earth'} }))
+## Installation
 ```
-```json
-[1,2,"fred", {"first":"mars","second":"venus","third","earth"}] 
+luarocks --local install jsonrpc4lua
 ```
 
-## Decoding ##
-
-```lua
-json = require("json")
-testString = [[ { "one":1 , "two":2, "primes":[2,3,5,7] } ]]
-decoded = json.decode(testString)
-table.foreach(decoded, print)
-print ("Primes are:")
-table.foreach(o.primes,print)
-```
-```
-one		1
-two		2
-primes		table: 0032B928
-Primes are:
-1		2
-2		3
-3		5
-4		7
-```
+## Required CGILua Fix
+See https://github.com/pdxmeshnet/cgilua/commit/1b35d812c7d637b91f2ac0a8d91f9698ba84d8d9
 
-# JSONRPC Usage #
-```lua
-json = require('json')
-require("json.rpc")
-server = json.rpc.proxy("http://jsolait.net/testj.py")
-result, error = server.echo('Test echo!')
-print(result)
-```
-```
-Test echo!
-```
+## Usage
+See examples directory.

doc/VERSION.txt

@@ -1,4 +1,4 @@
-JSON4Lua and JSONRPC4Lua
+JSONRPC4Lua
 Version 1.0.0
-4 March 2015
-http://github.com/craigmj/json4lua/
+31 July 2015
+http://github.com/pdxmeshnet/jsonrpc4lua/

doc/cgilua_patch.html

@@ -160,19 +160,24 @@ <h1>JSON</h1>
       <div class="titleBar">Patching CGILua to handle <code>text/plain</code></div>
 
       <!-- cgilua_patch.html -->
-JSON RPC (both the JSONRPC4Lua implementation and the <a href="http://www.jsolait.net/">jsolait Javascript</a> implementation) send the http request with a Content-Type of <code>text/plain</code>.<p/>
+JSON RPC (both the JSONRPC4Lua implementation and the <a href="http://www.jsolait.net/">jsolait Javascript</a> implementation) send the http request with a Content-Type of <code>application/json-rpc</code>.<p/>
 
-CGILua 5.0 does not accept <code>text/plain</code> content, and will generate an error of 'Unsupported Media Type: text/plain'.<p/>
+CGILua does not accept <code>application/json-rpc</code> content, and will generate 'Unsupported Media Type' error.<p/>
 
-This is easily patched in CGILua 5.0 by making the following change to <code>cgilua/post.lua</code>, line 286:<p/>
+This is easily patched in CGILua by making the following change to <code>cgilua/post.lua</code>, line 289:<p/>
 Change:<pre>
-	elseif strfind (contenttype, "text/xml") then
+   elseif strfind (contenttype, "application/xml", 1, true) or strfind (contenttype, "text/xml", 1, true) or strfind (contenttype, "text/plain", 1, true) then
+     tinsert (defs.args, read (inputsize))
+   else
+     error("Unsupported Media Type: "..contenttype)
 </pre>
 to
 <pre>
-	elseif strfind (contenttype, "text/xml") or strfind (contenttype, "text/plain") then
+   else
+     local input = read(inputsize)
+     tinsert (defs.args, input)
 </pre>
-This makes CGILua handle <code>text/plain</code> as it does <code>text/xml</code>, without parsing the incoming POST data.<p/>
+This makes CGILua handle all unsupported content types as <code>text/plain</code>, without parsing the incoming POST data.<p/>
 
 <b>Please note:</b> I have requested the maintainers of CGILua to make this change to CGILua, whereafter this patch will no longer be required.
 

examples/rpcclient.lua

@@ -0,0 +1,12 @@
+
+-- this example will work only if cgilua module has this fix https://github.com/pdxmeshnet/cgilua/commit/1b35d812c7d637b91f2ac0a8d91f9698ba84d8d9
+
+local rpc = require("json.rpc")
+
+server = rpc.proxy("http://localhost:8080/jsonrpc")
+result, error = server.average(10,15,23)
+if error then
+  print(error)
+else
+  table.foreach(result, print)
+end

examples/rpcserver/rpcserver.lua

@@ -0,0 +1,52 @@
+
+local xavante = require "xavante"
+local filehandler = require "xavante.filehandler"
+local cgiluahandler = require "xavante.cgiluahandler"
+local redirecthandler = require "xavante.redirecthandler"
+
+
+-- Define here where Xavante HTTP documents scripts are located
+local webDir = "./www"
+
+local rules = {
+
+	-- redirect
+    {
+      match = "^[^%./]*/$",
+      with = redirecthandler,
+      params = {"index.lua"}
+    }, 
+    {
+      match = "^[^%./]*/jsonrpc/?$",
+      with = redirecthandler,
+      params = {"jsonrpc.lua"}
+    }, 
+
+	-- cgi
+    {
+      match = {"%.lp$", "%.lp/.*$", "%.lua$", "%.lua/.*$" },
+      with = cgiluahandler.makeHandler (webDir)
+    },
+
+	-- static content
+    {
+      match = ".",
+      with = filehandler,
+      params = {baseDir = webDir}
+    },
+} 
+
+xavante.HTTP{
+    server = {host = "*", port = 8080},
+
+    defaultHost = {
+    	rules = rules
+    },
+}
+
+print "\nStarting server...\n";
+
+xavante.start();
+
+print "exiting...\n"
+

examples/rpcserver/www/index.lua

@@ -0,0 +1 @@
+print "index"

examples/jsonrpc.lua → examples/rpcserver/www/jsonrpc.lua

@@ -2,7 +2,8 @@
 -- jsonrpc.lua
 -- Installed in a CGILua webserver environment (with necessary CGI Lua 5.0 patch)
 --
-require ('json.rpcserver')
+
+local rpcserver = require('json.rpcserver')
 
 -- The Lua class that is to serve JSON RPC requests
 local myServer = {
@@ -18,4 +19,4 @@ local myServer = {
   end
 }
 
-json.rpcserver.serve(myServer)
+rpcserver.serve(myServer)