Ver Fonte

small fix.

SakiKawasaki há 5 anos atrás
pai
commit
dfc3fe15be
2 ficheiros alterados com 10 adições e 38 exclusões
  1. 6 32
      akane/akane.nim
  2. 4 6
      tests/test8/main.nim

+ 6 - 32
akane/akane.nim

@@ -435,13 +435,13 @@ macro send*(request, message: untyped, http_code = Http200,
   ##
   ## .. code-block:: nim
   ##
-  ##    request.respond(Http200, message, headers)
+  ##    request.respond(Http200, $message, headers)
   ##
   ## ## Example
   ## .. code-block:: nim
   ##
   ##    await request.send("hello!")
-  result = newCall("respond", request, http_code, message, headers)
+  result = newCall("respond", request, http_code, newCall("$", message), headers)
 
 
 macro answer*(request, message: untyped, http_code = Http200,
@@ -503,21 +503,8 @@ macro sendJson*(request, message: untyped, http_code = Http200): untyped =
   ## .. code-block:: nim
   ##
   ##    await request.sendJson(%*{"response": "error", "msg": "oops :("})
-  result = newCall(
-    "respond",
-    request,
-    http_code,
-    newCall("$", message),
-    newCall(
-      "newHttpHeaders",
-      newNimNode(nnkBracket).add(
-        newNimNode(nnkPar).add(
-          newLit("Content-Type"),
-          newLit("application/json")
-        )
-      )
-    )
-  )
+  quote do:
+    `request`.respond(`http_code`, $`message`, newHttpHeaders([("Content-Type","application/json")]))
 
 
 macro sendPlaintext*(request, message: untyped, http_code = Http200): untyped =
@@ -533,21 +520,8 @@ macro sendPlaintext*(request, message: untyped, http_code = Http200): untyped =
   ## .. code-block:: nim
   ##
   ##    await request.sendPlaintext(%*{"response": "error", "msg": "oops :("})
-  result = newCall(
-    "respond",
-    request,
-    http_code,
-    newCall("$", message),
-    newCall(
-      "newHttpHeaders",
-      newNimNode(nnkBracket).add(
-        newNimNode(nnkPar).add(
-          newLit("Content-Type"),
-          newLit("plain/text")
-        )
-      )
-    )
-  )
+  quote do:
+    `request`.respond(`http_code`, $`message`, newHttpHeaders([("Content-Type","plain/text")]))
 
 
 macro start*(server: ServerRef): untyped =

+ 4 - 6
tests/test8/main.nim

@@ -8,19 +8,17 @@ proc main {.gcsafe.} =
   server.pages:
     "/":  # http://127.0.0.1:5000/
       if request.reqMethod == HttpGet:
-        await request.sendPlaintext("")
+        await request.send("")
       else:
         await request.error("not GET :(")
 
     "/user":  # http://127.0.0.1:5000/user
-      if request.reqMethod == HttpGet:
-        await request.sendPlaintext("")
-      else:
-        await request.error("not GET :(")
+      await request.send("")
 
     regex(re"\A/user/id(\d+)\Z"):  # http://127.0.0.1:5000/user/id123456 -> {"id": 123456}
+      echo url
       if request.reqMethod == HttpPost:
-        await request.sendPlaintext(%*{"id": url[0]})
+        await request.send(%*{"id": url[0]})
       else:
         await request.error("not POST :(")