added ljson.lua for the test suite so that we can have sorted keys in the JSON encoded output.

This commit is contained in:
Yichun Zhang (agentzh) 2013-11-17 17:20:45 -08:00
Родитель 9401a60cbd
Коммит 98f9420bf7
2 изменённых файлов: 96 добавлений и 7 удалений

Просмотреть файл

@ -63,7 +63,7 @@ qq{
package.loaded["socket"] = ngx.socket
local Redis = require "Redis"
local cjson = require "cjson"
local ljson = require "ljson"
local r1 = Redis.connect("127.0.0.1", $TEST_NGINX_REDIS_PORT)
@ -75,14 +75,14 @@ qq{
ngx.say("abort: ", type(abort))
if msg then
ngx.say("msg: ", cjson.encode(msg))
ngx.say("msg: ", ljson.encode(msg))
end
for i = 1, 3 do
r1:publish("foo", "test " .. i)
msg, abort = loop()
if msg then
ngx.say("msg: ", cjson.encode(msg))
ngx.say("msg: ", ljson.encode(msg))
end
ngx.say("abort: ", type(abort))
end
@ -173,12 +173,12 @@ F(ngx_http_lua_ngx_exit) { println("exit") }
--- response_body
msg type: table
abort: function
msg: {"payload":1,"channel":"foo","kind":"subscribe"}
msg: {"payload":"test 1","channel":"foo","kind":"message"}
msg: {"channel":"foo","kind":"subscribe","payload":1}
msg: {"channel":"foo","kind":"message","payload":"test 1"}
abort: function
msg: {"payload":"test 2","channel":"foo","kind":"message"}
msg: {"channel":"foo","kind":"message","payload":"test 2"}
abort: function
msg: {"payload":"test 3","channel":"foo","kind":"message"}
msg: {"channel":"foo","kind":"message","payload":"test 3"}
abort: function
msg type: nil
--- no_error_log

89
t/lib/ljson.lua Normal file
Просмотреть файл

@ -0,0 +1,89 @@
local ngx_null = ngx.null
local tostring = tostring
local byte = string.byte
local gsub = string.gsub
local sort = table.sort
local pairs = pairs
local ipairs = ipairs
local concat = table.concat
local ok, new_tab = pcall(require, "table.new")
if not ok then
new_tab = function (narr, nrec) return {} end
end
local _M = {}
local metachars = {
['\t'] = '\\t',
["\\"] = "\\\\",
['"'] = '\\"',
['\r'] = '\\r',
['\n'] = '\\n',
}
local function encode_str(s)
-- XXX we will rewrite this when string.buffer is implemented
-- in LuaJIT 2.1 because string.gsub cannot be JIT compiled.
return gsub(s, '["\\\r\n\t]', metachars)
end
local function is_arr(t)
local exp = 1
for k, _ in pairs(t) do
if k ~= exp then
return nil
end
exp = exp + 1
end
return exp - 1
end
local encode
encode = function (v)
if v == nil or v == ngx_null then
return "null"
end
local typ = type(v)
if typ == 'string' then
return '"' .. encode_str(v) .. '"'
end
if typ == 'number' or typ == 'boolean' then
return tostring(v)
end
if typ == 'table' then
local n = is_arr(v)
if n then
local bits = new_tab(n, 0)
for i, elem in ipairs(v) do
bits[i] = encode(elem)
end
return "[" .. concat(bits, ",") .. "]"
end
local keys = {}
local i = 0
for key, _ in pairs(v) do
i = i + 1
keys[i] = key
end
sort(keys)
local bits = new_tab(0, i)
i = 0
for _, key in ipairs(keys) do
i = i + 1
bits[i] = encode(key) .. ":" .. encode(v[key])
end
return "{" .. concat(bits, ",") .. "}"
end
return '"<' .. typ .. '>"'
end
_M.encode = encode
return _M