JSON-related methods return JsonNodes instead of strings.

.gitignore

@@ -1,2 +1,3 @@
 .*.sw?
 nimcache/
+test/runner

buffoonery.nimble

@@ -1,6 +1,6 @@
 # Package
 
-version       = "0.1.0"
+version       = "0.2.0"
 author        = "Jonathan Bernard"
 description   = "JDB Software's opinionated extensions and auth layer for Jester."
 license       = "MIT"

src/buffoonery/apiutils.nim

@@ -29,8 +29,8 @@ template halt*(
   break allRoutes
 
 template sendJsonResp*(
-    code: HttpCode,
-    body: string = "",
+    body: JsonNode,
+    code: HttpCode = Http200,
     knownOrigins: seq[string],
     headersToSend: RawHeaders) =
   ## Immediately send a JSON response and stop processing the request.
@@ -47,7 +47,7 @@ template sendJsonResp*(
         "Access-Control-Allow-Headers": "Authorization,X-CSRF-TOKEN"
       }
     else:
-      log().warn "Unrecognized Origin '" & reqOrigin & "', excluding CORS headers."
+      log().debug "Unrecognized Origin '" & reqOrigin & "', excluding CORS headers."
       @{:}
 
   halt(
@@ -56,16 +56,16 @@ template sendJsonResp*(
       "Content-Type": CONTENT_TYPE_JSON,
       "Cache-Control": "no-cache"
     },
-    body
+    $body
   )
 
-proc makeDataBody*(data: JsonNode): string = $(%*{"details":"","data":data })
-proc makeStatusBody*(details: string): string = $(%*{"details":details})
+proc makeDataBody*(data: JsonNode): JsonNode = %*{"details":"","data":data}
+proc makeStatusBody*(details: string): JsonNode = %*{"details":details}
 
 template sendErrorResp*(err: ref ApiError, knownOrigins: seq[string]): void =
   log().debug err.respMsg & ( if err.msg.len > 0: ": " & err.msg else: "")
   if not err.parent.isNil: log().debug "    original exception: " & err.parent.msg
-  sendJsonResp(err.respCode, makeStatusBody(err.respMsg), knownOrigins, @{:})
+  sendJsonResp(makeStatusBody(err.respMsg), err.respCode, knownOrigins, @{:})
 
 ## CORS support
 template sendOptionsResp*(
@@ -85,7 +85,7 @@ template sendOptionsResp*(
         "Access-Control-Allow-Headers": "DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization,X-CSRF-TOKEN"
       }
     else:
-      log().warn "Unrecognized Origin '" & reqOrigin & "', excluding CORS headers."
+      log().debug "Unrecognized Origin '" & reqOrigin & "', excluding CORS headers."
       log().debug "Valid origins: " & knownOrigins.join(", ")
       @{:}
 

test/runner.nim

@@ -1,3 +1,3 @@
 import unittest
 
-import ./tauth, ./tjson_util
+import ./tauth, ./tjsonutils