feat: support 'has' to match element in array (#76)

The `graphql_root_fields` variable will be a table contains multiple
root fields, so we need this change.

Author: spacewander

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "t/lib/toolkit"]
+	path = t/lib/toolkit
+	url = https://github.com/api7/test-toolkit.git

README.md

@@ -172,6 +172,7 @@ local rx = radix.new({
 |<       |less than  |{"arg_age", "<", 24}|
 |~~      |Regular match|{"arg_name", "~~", "[a-z]+"}|
 |in      |find in array|{"arg_name", "in", {"1","2"}}|
+|has     |left value array has value in the right |{"graphql_root_fields", "has", "repo"}|
 
 [Back to TOC](#table-of-contents)
 

lib/resty/radixtree.lua

@@ -496,6 +496,20 @@ local function in_array(l_v, r_v)
     return false
 end
 
+local function has_element(l_v, r_v)
+    if type(l_v) == "table" then
+        for _, v in ipairs(l_v) do
+            if v == r_v then
+                return true
+            end
+        end
+
+        return false
+    end
+
+    return false
+end
+
 local compare_funcs = {
     ["=="] = function (l_v, r_v)
         if type(r_v) == "number" then
@@ -534,6 +548,7 @@ local compare_funcs = {
     end,
     ["IN"] = in_array,
     ["in"] = in_array,
+    ["has"] = has_element,
 }
 
 

t/lib/ljson.lua

@@ -36,7 +36,7 @@ metadata prefix matching with GET, matched = {}
 --- config
     location /t {
         content_by_lua_block {
-            local json = require("cjson.safe")
+            local json = require("toolkit.json")
             local radix = require("resty.radixtree")
             local rx = radix.new({
                 {
@@ -62,7 +62,7 @@ metadata prefix matching with host, matched = {}
 --- config
     location /t {
         content_by_lua_block {
-            local json = require("cjson.safe")
+            local json = require("toolkit.json")
             local radix = require("resty.radixtree")
             local rx = radix.new({
                 {
@@ -90,7 +90,7 @@ metadata prefix matching with host, matched = {}
 --- config
     location /t {
         content_by_lua_block {
-            local json = require("cjson.safe")
+            local json = require("toolkit.json")
             local radix = require("resty.radixtree")
             local rx = radix.new({
                 {
@@ -125,7 +125,7 @@ metadata prefix matching with method, host, vars, matched = {}
 --- config
     location /t {
         content_by_lua_block {
-            local json = require("cjson.safe")
+            local json = require("toolkit.json")
             local radix = require("resty.radixtree")
             local rx = radix.new({
                 {
@@ -154,4 +154,4 @@ GET /t?k=v
 --- no_error_log
 [error]
 --- response_body
-after dispatch success get matched: {"_path":"\/hello*","_method":"GET","_host":"foo.com"}
+after dispatch success get matched: {"_host":"foo.com","_method":"GET","_path":"/hello*"}

t/lib/toolkit

@@ -11,7 +11,7 @@ __DATA__
 --- config
     location /t {
         content_by_lua_block {
-            local json = require("ljson")
+            local json = require("toolkit.json")
             local radix = require("resty.radixtree")
             local rx = radix.new({
                 {
@@ -46,7 +46,7 @@ matched: {"_path":"/name/*name","name":""}
 --- config
     location /t {
         content_by_lua_block {
-            local json = require("ljson")
+            local json = require("toolkit.json")
             local radix = require("resty.radixtree")
             local rx = radix.new({
                 {
@@ -81,7 +81,7 @@ matched: {":ext":"","_path":"/name/*"}
 --- config
     location /t {
         content_by_lua_block {
-            local json = require("ljson")
+            local json = require("toolkit.json")
             local radix = require("resty.radixtree")
             local rx = radix.new({
                 {
@@ -117,7 +117,7 @@ matched: []
 --- config
     location /t {
         content_by_lua_block {
-            local json = require("ljson")
+            local json = require("toolkit.json")
             local radix = require("resty.radixtree")
             local rx = radix.new({
                 {
@@ -146,7 +146,7 @@ matched: {"_path":"/name/:name/id/:id/*other","id":"1","name":"json","other":"fo
 --- config
     location /t {
         content_by_lua_block {
-            local json = require("ljson")
+            local json = require("toolkit.json")
             local radix = require("resty.radixtree")
             local rx = radix.new({
                 {
@@ -175,7 +175,7 @@ matched: []
 --- config
     location /t {
         content_by_lua_block {
-            local json = require("ljson")
+            local json = require("toolkit.json")
             local radix = require("resty.radixtree")
             local rx = radix.new({
                 {
@@ -210,7 +210,7 @@ matched: []
 --- config
     location /t {
         content_by_lua_block {
-            local json = require("ljson")
+            local json = require("toolkit.json")
             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("ljson")
+            local json = require("toolkit.json")
             local radix = require("resty.radixtree")
             local rx = radix.new({
                 {

t/matched.t

@@ -533,3 +533,36 @@ metadata /aa
 nil
 nil
 nil
+
+
+
+=== TEST 19: operator has
+--- config
+    location /t {
+        content_by_lua_block {
+            local radix = require("resty.radixtree")
+            local rx = radix.new({
+                {
+                    paths = "/aa",
+                    metadata = "metadata /aa",
+                    vars = {
+                        {"x", "has", "a"},
+                    },
+                }
+            })
+
+            ngx.say(rx:match("/aa", {vars = {x = {'a', 'b'}}}))
+            ngx.say(rx:match("/aa", {vars = {x = {'a'}}}))
+            ngx.say(rx:match("/aa", {vars = {x = {'b'}}}))
+            ngx.say(rx:match("/aa", {vars = {x = {}}}))
+        }
+    }
+--- request
+GET /t
+--- no_error_log
+[error]
+--- response_body
+metadata /aa
+metadata /aa
+nil
+nil