Merge pull request #57 from guzba/master

1.5.1

puppy.nimble

@@ -1,4 +1,4 @@
-version     = "1.5.0"
+version     = "1.5.1"
 author      = "Andre von Houck"
 description = "Puppy fetches HTML pages for Nim."
 license     = "MIT"

src/puppy.nim

@@ -305,9 +305,7 @@ proc fetch*(req: Request): Response =
       discard WinHttpCloseHandle(hSession)
 
   elif defined(macosx) and not defined(puppyLibcurl):
-    let pool = NSAutoreleasePool.allocInit()
-
-    try:
+    autoreleasepool:
       let request = NSMutableURLRequest.requestWithURL(
         NSURL.URLWithString(@($req.url)),
         NSURLRequestReloadIgnoringLocalCacheData,
@@ -344,15 +342,13 @@ proc fetch*(req: Request): Response =
           let value = dictionary.objectForKey(key)
           result.headers[$(key.NSString)] = $(value.NSString)
 
-        result.body.setLen(data.length)
-        copyMem(result.body[0].addr, data.bytes, result.body.len)
+        if data.length > 0:
+          result.body.setLen(data.length)
+          copyMem(result.body[0].addr, data.bytes, result.body.len)
 
       if error.int != 0 and error.code != NSURLErrorUserCancelledAuthentication:
         raise newException(PuppyError, $error)
 
-    finally:
-      pool.release()
-
   else:
     type
       StringWrap = object
@@ -405,7 +401,7 @@ proc fetch*(req: Request): Response =
 
     discard curl.easy_setopt(OPT_HTTPHEADER, headerList)
 
-    if req.body.len > 0:
+    if req.verb.toUpperAscii() == "POST" or req.body.len > 0:
       discard curl.easy_setopt(OPT_POSTFIELDSIZE, req.body.len)
       discard curl.easy_setopt(OPT_POSTFIELDS, req.body.cstring)
 

src/puppy/macdefs.nim

@@ -49,7 +49,7 @@ const
   NSURLRequestReloadRevalidatingCacheData* = 5.NSURLRequestCachePolicy
   NSURLErrorUserCancelledAuthentication* = -1012
 
-proc allocInit*(_: typedesc[NSAutoreleasePool]): NSAutoreleasePool =
+proc new*(_: typedesc[NSAutoreleasePool]): NSAutoreleasePool =
   objc_msgSend(
     objc_getClass("NSAutoreleasePool".cstring).ID,
     sel_registerName("new".cstring)
@@ -61,6 +61,13 @@ proc release*(pool: NSAutoreleasePool) =
     sel_registerName("release".cstring)
   )
 
+template autoreleasepool*(body: untyped) =
+  let pool = NSAutoreleasePool.new()
+  try:
+    body
+  finally:
+    pool.release()
+
 proc `@`*(s: string): NSString =
   objc_msgSend(
     objc_getClass("NSString".cstring).ID,

tests/test.nim

@@ -118,6 +118,18 @@ try:
       doAssert res.code == 200
       doAssert res.body == "some data"
 
+    block:
+      # test empty post
+      let req = Request(
+        url: parseUrl("http://localhost:8080/post"),
+        verb: "post",
+        body: ""
+      )
+      let res = fetch(req)
+      doAssert ($req).startsWith("POST http://localhost:8080/post")
+      doAssert res.code == 200
+      doAssert res.body == ""
+
     block:
       # test post + gzip
       let res = fetch(Request(