Merge pull request #11 from ysugimoto/fix-test-and-contributors

fix test, add contributor

Author: ysugimoto

.circleci/config.yml

@@ -7,6 +7,7 @@ jobs:
       - checkout
       - run: luarocks install luaunit
       - run: luarocks install lua-protobuf
+      - run: luarocks install penlight
       - run: make test
 
   publish:

Makefile

@@ -1,4 +1,4 @@
 .PHONY: test
 
 test:
-	LUAUNIT=1 lua test.lua
+	LUAUNIT=1 lua tests/test.lua

README.md

@@ -325,8 +325,9 @@ By calling `polyfill()` , grpc-web-text mode will be succeed to proxy to backend
 
 MIT
 
-## Author
+## Contributors
 
-Yoshiaki Sugimoto
+- [ysugimoto](https://github.com/ysugimoto)
+- [kgoguevgoget](https://github.com/kgoguevgoget)
 
 

grpc-gateway/util.lua

@@ -74,7 +74,7 @@ _M.map_message = function(field, default_values)
       -- Its easier to work with the data, if the default_values was already populated with the inital JSON request. 
       -- This could be moved completely outside the map_message function because we should only populate this once throughout the lifecycle of the request
       -- Due to to the recursive calls, We check if the size of the table is empty or 0 in order to populate the data once.
-      if isempty(default_values) then
+      if isempty(default_values or {}) then
         if ngx.req.get_method() == "POST" then
           if string.find(ngx.req.get_headers()["Content-Type"] or "", "application/json") then
             default_values = json.decode(ngx.req.get_body_data())

tests/table/isempty.lua

@@ -0,0 +1,10 @@
+local tablex = require('pl.tablex')
+
+-- This file is fixure for luajit2's table.isempty function.
+-- This function might not be same as original table.isempty implementation,
+-- but it'ss OK beucase our function will use as just checking table size is zero or not
+local function isempty(tbl)
+  return tablex.size(tbl) == 0
+end
+
+return isempty

test.lua tests/test.luatest.lua renamed to tests/test.lua

@@ -1,4 +1,5 @@
 package.path = package.path .. ";./?.lua"
+package.path = package.path .. ";./tests/?.lua"
 
 local lu = require("luaunit")
 local util = require("grpc-gateway.util")