feature: record which matches the current request. (#42)

fix #41

Author: membphis

lib/resty/radixtree.lua

@@ -541,6 +541,10 @@ local function match_route_opts(route, opts, ...)
         end
     end
 
+    if opts.matched ~= nil then
+        opts.matched._method = method
+    end
+
     local matcher_ins = route.matcher_ins
     if matcher_ins then
         local ok, err = matcher_ins:match(opts.remote_addr)
@@ -566,6 +570,9 @@ local function match_route_opts(route, opts, ...)
         if reverse_host then
             for i = 1, #hosts, 2 do
                 if match_host(hosts[i], hosts[i + 1], reverse_host) then
+                    if opts.matched ~= nil then
+                        opts.matched._host = hosts[i + 1]:reverse()
+                    end
                     matched = true
                     break
                 end
@@ -621,10 +628,14 @@ end
 
 
 local function _match_from_routes(routes, path, opts, ...)
+    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, ...) then
+                    if opts_matched_exists then
+                        opts.matched._path = path
+                    end
                     return route
                 end
             end
@@ -635,6 +646,9 @@ local function _match_from_routes(routes, path, opts, ...)
             -- log_info("matched route: ", require("cjson").encode(route))
             -- log_info("matched path: ", path)
             if compare_gin(path, route.path_org, opts) then
+                    if opts_matched_exists then
+                        opts.matched._path = route.path_org
+                    end
                 return route
             end
         end
@@ -652,9 +666,13 @@ local function match_route(self, path, opts, ...)
     end
 
     local routes = self.hash_path[path]
+    local opts_matched_exists = (opts.matched ~= nil)
     if routes then
         for _, route in ipairs(routes) do
             if match_route_opts(route, opts, ...) then
+                if opts_matched_exists then
+                    opts.matched._path = path
+                end
                 return route
             end
         end

t/parameter.t

@@ -36,9 +36,9 @@ GET /t
 [error]
 --- response_body
 match meta: metadata /name
-matched: {"name":"json"}
+matched: {"_path":"\/name\/*name","name":"json"}
 match meta: metadata /name
-matched: {"name":""}
+matched: {"_path":"\/name\/*name","name":""}
 
 
 
@@ -71,9 +71,9 @@ GET /t
 [error]
 --- response_body
 match meta: metadata /name
-matched: {":ext":"json\/foo\/bar"}
+matched: {"_path":"\/name\/*",":ext":"json\/foo\/bar"}
 match meta: metadata /name
-matched: {":ext":""}
+matched: {"_path":"\/name\/*",":ext":""}
 
 
 
@@ -107,7 +107,7 @@ GET /t
 [error]
 --- response_body
 match meta: metadata /name
-matched: {"id":"1","name":"json"}
+matched: {"name":"json","_path":"\/name\/:name\/id\/:id","id":"1"}
 match meta: nil
 matched: {}
 
@@ -138,7 +138,7 @@ GET /t
 [error]
 --- response_body
 match meta: metadata /name
-matched: {"other":"foo\/bar\/gloo","name":"json","id":"1"}
+matched: {"other":"foo\/bar\/gloo","name":"json","_path":"\/name\/:name\/id\/:id\/*other","id":"1"}
 
 
 
@@ -168,3 +168,35 @@ GET /t
 --- response_body
 match meta: nil
 matched: {}
+
+
+
+=== TEST 6: /name/:name/id/:id
+--- config
+    location /t {
+        content_by_lua_block {
+            local json = require("cjson.safe")
+            local radix = require("resty.radixtree")
+            local rx = radix.new({
+                {
+                    paths = {"/aa/*", "/bb/cc/*", "/dd/ee/index.html"},
+                    methods = {"GET", "POST", "PUT"},
+                    hosts = {"foo.com", "*.bar.com"},
+                    metadata = "metadata /asf",
+                },
+            })
+
+            local opts = {matched = {}, method = "GET", uri = "/bb/cc/xx", host = "foo.com"}
+            local meta = rx:match("/bb/cc/xx", opts)
+            ngx.say("match meta: ", meta)
+            ngx.say("matched: ", json.encode(opts.matched))            
+
+        }
+    }
+--- request
+GET /t
+--- no_error_log
+[error]
+--- response_body
+match meta: metadata /asf
+matched: {"_path":"\/bb\/cc\/*",":ext":"xx","_method":"GET","_host":"foo.com"}