fix: routing

Author: Olivier Bonnaure

.init.lua

@@ -5,7 +5,6 @@ package.path = package.path .. ";config/?.lua;/zip/config/?.lua"
 -- OTP = require("otp") -- OTP functions
 require("utilities")
 require("routes")
-print(EncodeJson(Routes))
 
 ProgramMaxPayloadSize(10485760) -- 10 MB
 

.lua/db2rest.lua

@@ -1,7 +1,6 @@
 RestApiUrl = ""
 
 local function init(db_config)
-  print(EncodeJson(db_config))
   RestApiUrl = db_config["url"] .. db_config["db_name"] .. "/"
 end
 

.lua/luaonbeans.lua

@@ -181,20 +181,25 @@ function DefineRoutes(path, method)
   local route_found = false
   local final_route = false
 
+  local last_route_found = nil
+
   Splat = {}
   if path == "/" then
     recognized_route = recognized_route[""]
   else
     for _, value in pairs(string.split(path, "/")) do
+
       if final_route == false then
         if recognized_route[value] or recognized_route[value .. "*"] then
           if recognized_route[value .. "*"] then final_route = true end
           recognized_route = recognized_route[value] or recognized_route[value .. "*"]
+          if recognized_route[""] then last_route_found = recognized_route[""] end
           route_found = true
         else
           route_found = false
           if recognized_route[":var"] then
             recognized_route = recognized_route[":var"]
+            if recognized_route[""] then last_route_found = recognized_route[""] end
             local parser = Re.compile(recognized_route[":regex"])
             local matcher = { parser:search(value) }
             for i, match in ipairs(matcher) do
@@ -219,6 +224,8 @@ function DefineRoutes(path, method)
     Splat = tableSplat(Splat)
   end
 
+  if recognized_route == nil and last_route_found ~= nil then recognized_route = last_route_found end
+
   if recognized_route ~= nil then
     recognized_route = string.split(recognized_route, "#")
     Params = table.merge(

config/routes.lua

@@ -3,7 +3,7 @@ Routes = { ["GET"] = { [""] = "welcome#index" } } --define root
 CustomRoute("POST", "/upload/:collection/:key/:field", "uploads#upload")
 CustomRoute("GET", "/o/:uuid/:format", "uploads#original_image")
 CustomRoute("GET", "/r/:uuid/:width/:format", "uploads#resized_image_x", { [":width"] = "([0-9]+)" })
-CustomRoute("GET", "/r/:uuid/:width/:height/:format", "uploads#resized_image_x_y", { [":width"] = "([0-9]+)", [":height"] = "([0-9]+)" })
+CustomRoute("GET", "/xy/:uuid/:width/:height/:format", "uploads#resized_image_x_y", { [":width"] = "([0-9]+)", [":height"] = "([0-9]+)" })
 
 -- CustomRoute("GET", "demo/with/:id/nested/:demo/route", "welcome#ban", {
 --  [":demo"] = "([0-9]+)" -- you can define regex per params

specs/router_spec.lua

@@ -42,6 +42,79 @@ return {
         expect.equal(Params.controller, "customers")
         expect.equal(Params.action, "index")
 
+        Params = {}
+        DefineRoutes("/customers", "POST")
+        expect.equal(Params.controller, "customers")
+        expect.equal(Params.action, "create")
+
+        Params = {}
+        DefineRoutes("/customers/new", "GET")
+        expect.equal(Params.controller, "customers")
+        expect.equal(Params.action, "new")
+
+        Params = {}
+        DefineRoutes("/customers/1", "GET")
+        expect.equal(Params.controller, "customers")
+        expect.equal(Params.action, "show")
+        expect.equal(Params.customer_id, "1")
+
+        Params = {}
+        DefineRoutes("/customers/1", "DELETE")
+        expect.equal(Params.controller, "customers")
+        expect.equal(Params.action, "delete")
+        expect.equal(Params.customer_id, "1")
+
+        Params = {}
+        DefineRoutes("/customers/1/edit", "GET")
+        expect.equal(Params.controller, "customers")
+        expect.equal(Params.action, "edit")
+        expect.equal(Params.customer_id, "1")
+
+        Params = {}
+        DefineRoutes("/customers/1", "PUT")
+        expect.equal(Params.controller, "customers")
+        expect.equal(Params.action, "update")
+        expect.equal(Params.customer_id, "1")
+
+        Params = {}
+        DefineRoutes("/customers/1/comments", "GET")
+        expect.equal(Params.controller, "comments")
+        expect.equal(Params.action, "index")
+        expect.equal(Params.customer_id, "1")
+
+        Params = {}
+        DefineRoutes("/customers/1/comments", "GET")
+        expect.equal(Params.controller, "comments")
+        expect.equal(Params.action, "index")
+        expect.equal(Params.customer_id, "1")
+
+        Params = {}
+        DefineRoutes("/customers/1/comments/1", "GET")
+        expect.equal(Params.controller, "comments")
+        expect.equal(Params.action, "show")
+        expect.equal(Params.customer_id, "1")
+        expect.equal(Params.comment_id, "1")
+
+        Params = {}
+        DefineRoutes("/customers/1/comments/1", "PUT")
+        expect.equal(Params.controller, "comments")
+        expect.equal(Params.action, "update")
+        expect.equal(Params.customer_id, "1")
+        expect.equal(Params.comment_id, "1")
+
+        Params = {}
+        DefineRoutes("/customers/1/comments", "POST")
+        expect.equal(Params.controller, "comments")
+        expect.equal(Params.action, "create")
+        expect.equal(Params.customer_id, "1")
+
+        Params = {}
+        DefineRoutes("/customers/1/comments/1", "DELETE")
+        expect.equal(Params.controller, "comments")
+        expect.equal(Params.action, "delete")
+        expect.equal(Params.customer_id, "1")
+        expect.equal(Params.comment_id, "1")
+
         expect.equal(Routes["GET"]["customers"][""], "customers#index")
         expect.equal(Routes["GET"]["customers"]["new"], "customers#new")
         expect.equal(Routes["GET"]["customers"]["refresh"], "customers#refresh")