feature: supported to match var with regular expression. (#23)

Author: membphis

README.md

@@ -77,12 +77,22 @@ The attributes of each element may contain these:
 |uris      |option  |A list of client request uris, not only supports static uri, but also supports prefix uri.|{"/foo", "/bar/*"}|
 |remote_addrs|option  |A list of client remote address(IPv4 and IPv6), and we can use CIDR format, eg `192.168.1.0/24`.|{"127.0.0.1", "192.0.0.0/8", "::1", "fe80::/32"}|
 |methods    |option  |A list of method name. Here is full valid method list: "GET", "POST", "PUT", "DELETE", "PATCH", "HEAD", "OPTIONS", "CONNECT" and "TRACE".|{"GET", "POST"}|
-|vars       |option  |A list of `{var, operator, val}`. For example: {{var, operator, val}, {var, operator, val}, ...}, `{"arg_name", "==", "json"}` means the value of argument `name` expect to `json`.|{{"arg_name", "==", "json"}, {"arg_age", ">", 18}}|
+|vars       |option  |A list of `{var, operator, val}`. For example: {{var, operator, val}, {var, operator, val}, ...}, `{"arg_name", "==", "json"}` means the value of argument `name` expect to `json`. Here is the full [Operator List](#operator-list).|{{"arg_name", "==", "json"}, {"arg_age", ">", 18}}|
 |filter_fun |option  |User defined filter function, We can use it to achieve matching logic for special scenes. `radixtree` will only pass one parameter which named `vars` when matching route.|function(vars) return vars["arg_name"] == "json" end|
 |metadata   |option  |Will return this field if using `rx:match` to match route.||
 |handler    |option  |Will call this function using `rx:dispatch` to match route.||
-[Back to TOC](#table-of-contents)
 
+#### Operator List
+
+|operator|description|example|
+|--------|-----------|-------|
+|==      |equal      |{"arg_name", "==", "json"}|
+|~=      |not equal  |{"arg_name", "~=", "json"}|
+|>       |greater than|{"arg_age", ">", 24}|
+|<       |less than  |{"arg_age", "<", 24}|
+|~~      |Regular match|{"arg_name", "~~", "[a-z]+"}|
+
+[Back to TOC](#table-of-contents)
 
 match
 -----

lib/resty/radixtree.lua

@@ -24,6 +24,7 @@ local tostring    = tostring
 local cur_level   = ngx.config.subsystem == "http" and
                     require("ngx.errlog").get_sys_filter_level()
 local ngx_var     = ngx.var
+local re_find     = ngx.re.find
 
 
 local function load_shared_lib(so_name)
@@ -127,7 +128,7 @@ local mt = { __index = _M, __gc = gc_free }
 
 
 local function insert_route(self, opts)
-    local path    = opts.path
+    local path = opts.path
     opts = clone_tab(opts)
 
     if not self.disable_path_cache_opt
@@ -405,8 +406,16 @@ local compare_funcs = {
         end
         return l_v < r_v
     end,
+    ["~~"] = function (l_v, r_v)
+        local from = re_find(l_v, r_v, "jo")
+        if from then
+            return true
+        end
+        return false
+    end,
 }
 
+
 local function compare_val(l_v, op, r_v)
     local com_fun = compare_funcs[op or "=="]
     if not com_fun then

t/vars.t

@@ -406,3 +406,42 @@ GET /t?k=xxxx
 [error]
 --- response_body
 metadata /aa2
+
+
+
+=== TEST 15: uri args
+--- config
+    location /t {
+        content_by_lua_block {
+            local radix = require("resty.radixtree")
+            local routes = {}
+            for i, reg in ipairs({"[0-9]+", "^1[0-9]+", "[1-3]+", "^[1-3]+",
+                                  "^2[0-9]+", "[1-3]+$", "[a-z]+", "[0"}) do
+                routes[i] = {
+                    paths = "/" .. i,
+                    metadata = "metadata /" .. i,
+                    vars = {
+                        {"arg_k", "~~", reg},
+                    }
+                }
+            end
+            local rx = radix.new(routes)
+
+            for i =1, 8 do
+                ngx.say(rx:match("/" .. i, {vars = ngx.var}))
+            end
+        }
+    }
+--- request
+GET /t?k=1234
+--- no_error_log
+[error]
+--- response_body
+metadata /1
+metadata /2
+metadata /3
+metadata /4
+nil
+nil
+nil
+nil