test: use ljson to encode lua table, we can got same encode result. (#71)

Author: membphis

lib/resty/radixtree.lua

@@ -652,18 +652,6 @@ local function _match_from_routes(routes, path, opts, args)
 
     local opts_matched_exists = (opts.matched ~= nil)
     for _, route in ipairs(routes) do
-        if route.path_op == "=" then
-            if route.path == path then
-                if match_route_opts(route, opts, args) then
-                    if opts_matched_exists then
-                        opts.matched._path = path
-                    end
-                    return route
-                end
-            end
-            goto continue
-        end
-
         if match_route_opts(route, opts, args) then
             -- log_info("matched route: ", require("cjson").encode(route))
             -- log_info("matched path: ", path)
@@ -674,8 +662,6 @@ local function _match_from_routes(routes, path, opts, args)
                 return route
             end
         end
-
-        ::continue::
     end
 
     return nil

t/lib/ljson.lua

@@ -1,3 +1,5 @@
+local new_tab  = require("table.new")
+local isarray  = require("table.isarray")
 local ngx_null = ngx.null
 local tostring = tostring
 local gsub     = string.gsub
@@ -6,9 +8,6 @@ local pairs    = pairs
 local ipairs   = ipairs
 local concat   = table.concat
 local type     = type
-local new_tab  = require("table.new")
-
-local _M = {version = 0.1}
 
 local metachars = {
     ['\t'] = '\\t',
@@ -17,27 +16,15 @@ local metachars = {
     ['\r'] = '\\r',
     ['\n'] = '\\n',
 }
+local _M = {}
+
 
 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)
+local function encode(v)
     if v == nil or v == ngx_null then
         return "null"
     end
@@ -52,8 +39,8 @@ encode = function (v)
     end
 
     if typ == 'table' then
-        local n = is_arr(v)
-        if n then
+        if isarray(v) then
+            local n = #v
             local bits = new_tab(n, 0)
             for i, elem in ipairs(v) do
                 bits[i] = encode(elem)
@@ -82,4 +69,5 @@ encode = function (v)
 end
 _M.encode = encode
 
+
 return _M

t/parameter.t

@@ -11,7 +11,7 @@ __DATA__
 --- config
     location /t {
         content_by_lua_block {
-            local json = require("cjson.safe")
+            local json = require("ljson")
             local radix = require("resty.radixtree")
             local rx = radix.new({
                 {
@@ -36,17 +36,17 @@ GET /t
 [error]
 --- response_body
 match meta: metadata /name
-matched: {"_path":"\/name\/*name","name":"json"}
+matched: {"_path":"/name/*name","name":"json"}
 match meta: metadata /name
-matched: {"_path":"\/name\/*name","name":""}
+matched: {"_path":"/name/*name","name":""}
 
 
 
 === TEST 2: /name/* in path
 --- config
     location /t {
         content_by_lua_block {
-            local json = require("cjson.safe")
+            local json = require("ljson")
             local radix = require("resty.radixtree")
             local rx = radix.new({
                 {
@@ -71,17 +71,17 @@ GET /t
 [error]
 --- response_body
 match meta: metadata /name
-matched: {"_path":"\/name\/*",":ext":"json\/foo\/bar"}
+matched: {":ext":"json/foo/bar","_path":"/name/*"}
 match meta: metadata /name
-matched: {"_path":"\/name\/*",":ext":""}
+matched: {":ext":"","_path":"/name/*"}
 
 
 
 === TEST 3: /name/:name/id/:id
 --- config
     location /t {
         content_by_lua_block {
-            local json = require("cjson.safe")
+            local json = require("ljson")
             local radix = require("resty.radixtree")
             local rx = radix.new({
                 {
@@ -107,17 +107,17 @@ GET /t
 [error]
 --- response_body
 match meta: metadata /name
-matched: {"name":"json","_path":"\/name\/:name\/id\/:id","id":"1"}
+matched: {"_path":"/name/:name/id/:id","id":"1","name":"json"}
 match meta: nil
-matched: {}
+matched: []
 
 
 
 === TEST 4: /name/:name/id/:id/*other
 --- config
     location /t {
         content_by_lua_block {
-            local json = require("cjson.safe")
+            local json = require("ljson")
             local radix = require("resty.radixtree")
             local rx = radix.new({
                 {
@@ -138,15 +138,15 @@ GET /t
 [error]
 --- response_body
 match meta: metadata /name
-matched: {"other":"foo\/bar\/gloo","name":"json","_path":"\/name\/:name\/id\/:id\/*other","id":"1"}
+matched: {"_path":"/name/:name/id/:id/*other","id":"1","name":"json","other":"foo/bar/gloo"}
 
 
 
 === TEST 5: /name/:name/id/:id (not match)
 --- config
     location /t {
         content_by_lua_block {
-            local json = require("cjson.safe")
+            local json = require("ljson")
             local radix = require("resty.radixtree")
             local rx = radix.new({
                 {
@@ -167,15 +167,15 @@ GET /t
 [error]
 --- response_body
 match meta: nil
-matched: {}
+matched: []
 
 
 
 === TEST 6: /name/:name/foo (cached parameter)
 --- config
     location /t {
         content_by_lua_block {
-            local json = require("cjson.safe")
+            local json = require("ljson")
             local radix = require("resty.radixtree")
             local rx = radix.new({
                 {
@@ -200,17 +200,17 @@ GET /t
 [error]
 --- response_body
 match meta: metadata /name
-matched: {"_path":"\/name\/:name\/foo","name":"json"}
+matched: {"_path":"/name/:name/foo","name":"json"}
 match meta: nil
-matched: {}
+matched: []
 
 
 
 === TEST 7: /name/:name/foo (no cached parameter)
 --- config
     location /t {
         content_by_lua_block {
-            local json = require("cjson.safe")
+            local json = require("ljson")
             local radix = require("resty.radixtree")
             local rx = radix.new({
                 {
@@ -242,7 +242,7 @@ pcre pat:
 --- config
     location /t {
         content_by_lua_block {
-            local json = require("cjson.safe")
+            local json = require("ljson")
             local radix = require("resty.radixtree")
             local rx = radix.new({
                 {