Merge pull request #1138 from torhve/lapis

Lapis: Fix object inside of array

frameworks/Lua/lapis/benchmark_config

@@ -5,7 +5,7 @@
       "setup_file": "setup",
       "json_url": "/",
       "db_url": "/db",
-      "query_url": "/db?queries=",
+      "query_url": "/queries?queries=",
       "fortune_url": "/fortunes",
       "update_url": "/update?queries=",
       "plaintext_url": "/plaintext",

frameworks/Lua/lapis/web.lua

@@ -105,13 +105,24 @@ do
       }
     end,
     ["/db"] = function(self)
+      local w = World:find(random(1, 10000))
+      return {
+        json = {
+          id = w.id,
+          randomNumber = w.randomnumber
+        }
+      }
+    end,
+    ["/queries"] = function(self)
       local num_queries = tonumber(self.params.queries) or 1
       if num_queries < 2 then
         local w = World:find(random(1, 10000))
         return {
           json = {
-            id = w.id,
-            randomNumber = w.randomnumber
+            {
+              id = w.id,
+              randomNumber = w.randomnumber
+            }
           }
         }
       end
@@ -191,7 +202,9 @@ do
       end
       if num_queries < 2 then
         return {
-          json = worlds[1]
+          json = {
+            worlds[1]
+          }
         }
       end
       return {

frameworks/Lua/lapis/web.moon

@@ -15,10 +15,14 @@ class Benchmark extends lapis.Application
     json: {message: "Hello, World!"}
 
   "/db": =>
+      w = World\find random(1, 10000)
+      return json: {id:w.id,randomNumber:w.randomnumber}
+
+  "/queries": =>
     num_queries = tonumber(@params.queries) or 1
     if num_queries < 2 
       w = World\find random(1, 10000)
-      return json: {id:w.id,randomNumber:w.randomnumber}
+      return json: {{id:w.id,randomNumber:w.randomnumber}}
 
     worlds = {}
     num_queries = min(500, num_queries)
@@ -64,7 +68,7 @@ class Benchmark extends lapis.Application
       world\update "randomnumber"
       insert worlds, {id:world.id,randomNumber:world.randomnumber} 
     if num_queries < 2
-      return json: worlds[1]
+      return json: {worlds[1]}
     json: worlds
 
   "/plaintext": =>