Merge pull request #90 from treeform/guzba

use webby

README.md

@@ -46,37 +46,40 @@ Need a more complex API?
 * headers: User-Agent, Content-Type..
 * response code: 200, 404, 500..
 * response headers: Content-Type..
-* error: timeout, DNS fail ...
 
-Use request/response instead.
+Use these instead.
 
 ```nim
-Request* = ref object
-  url*: Url
-  headers*: seq[Header]
-  timeout*: float32
-  verb*: string
-  body*: string
-
 Response* = ref object
-  url*: Url
-  headers*: seq[Header]
+  headers*: HttpHeaders
   code*: int
   body*: string
 ```
 
-Usage example:
+Usage examples:
+
+```nim
+import puppy
+
+let response = get("http://www.istrolid.com", @[("Auth", "1")])
+echo response.code
+echo response.headers
+echo response.body.len
+```
 
 ```nim
-let req = Request(
-  url: parseUrl("http://www.istrolid.com"),
-  verb: "get",
-  headers: @[Header(key: "Auth", value: "1")]
+import puppy
+
+let body = "{\"json\":true}"
+
+let response = post(
+    "http://api.website.com",
+    @[("Content-Type", "application/json")],
+    body
 )
-let res = fetch(req)
-echo res.code
-echo res.headers
-echo res.body.len
+echo response.code
+echo response.headers
+echo response.body.len
 ```
 
 ## Always use Libcurl

puppy.nimble

@@ -1,11 +1,11 @@
-version     = "1.6.2"
+version     = "2.0.0"
 author      = "Andre von Houck"
 description = "Puppy fetches resources via HTTP and HTTPS."
 license     = "MIT"
 
 srcDir = "src"
 
 requires "nim >= 1.2.2"
-requires "urlly >= 1.1.0"
 requires "libcurl >= 1.0.0"
 requires "zippy >= 0.10.0"
+requires "webby >= 0.1.3"

src/puppy.nim

@@ -1,4 +1,4 @@
-import puppy/common, urlly
+import puppy/common
 
 when defined(windows) and not defined(puppyLibcurl):
   # WinHTTP Windows
@@ -10,7 +10,7 @@ else:
   # LIBCURL Linux
   import puppy/platforms/linux/platform
 
-export common, urlly
+export common
 
 proc addDefaultHeaders(req: Request) =
   if req.headers["user-agent"] == "":
@@ -35,7 +35,7 @@ proc fetch*(req: Request): Response {.raises: [PuppyError].} =
 proc newRequest*(
   url: string,
   verb = "get",
-  headers = newSeq[Header](),
+  headers = emptyHttpHeaders(),
   timeout: float32 = 60
 ): Request =
   ## Allocates a new request object with defaults.
@@ -45,10 +45,56 @@ proc newRequest*(
   result.headers = headers
   result.timeout = timeout
 
-proc fetch*(url: string, headers = newSeq[Header]()): string =
-  let
-    req = newRequest(url, "get", headers)
-    res = req.fetch()
+proc get*(
+  url: string,
+  headers = emptyHttpHeaders(),
+  timeout: float32 = 60
+): Response =
+  fetch(newRequest(url, "GET", headers, timeout))
+
+proc post*(
+  url: string,
+  headers = emptyHttpHeaders(),
+  body: sink string = "",
+  timeout: float32 = 60
+): Response =
+  let request = newRequest(url, "POST", headers, timeout)
+  request.body = move body
+  fetch(request)
+
+proc put*(
+  url: string,
+  headers = emptyHttpHeaders(),
+  body: sink string = "",
+  timeout: float32 = 60
+): Response =
+  let request = newRequest(url, "PUT", headers, timeout)
+  request.body = move body
+  fetch(request)
+
+proc patch*(
+  url: string,
+  headers = emptyHttpHeaders(),
+  body: sink string = "",
+  timeout: float32 = 60
+): Response =
+  let request = newRequest(url, "PATCH", headers, timeout)
+  request.body = move body
+  fetch(request)
+
+proc delete*(
+  url: string,
+  headers = emptyHttpHeaders(),
+  timeout: float32 = 60
+): Response =
+  fetch(newRequest(url, "DELETE", headers, timeout))
+
+proc fetch*(url: string, headers = emptyHttpHeaders()): string =
+  ## Simple fetch that directly returns the GET response body.
+  ## Raises an exception if anything goes wrong or if the response code
+  ## is not 200. See get, post, put etc for similar calls that return
+  ## a response object.
+  let res = get(url, headers)
   if res.code == 200:
     return res.body
   raise newException(PuppyError,

src/puppy/common.nim

@@ -1,17 +1,13 @@
-import std/strutils, urlly
+import std/strutils, webby
 
-export urlly
+export webby
 
 const CRLF* = "\r\n"
 
 type
-  Header* = object
-    key*: string
-    value*: string
-
   Request* = ref object
     url*: Url
-    headers*: seq[Header]
+    headers*: HttpHeaders
     timeout*: float32
     verb*: string
     body*: string
@@ -20,27 +16,21 @@ type
       allowAnyHttpsCertificate*: bool
 
   Response* = ref object
-    headers*: seq[Header]
+    headers*: HttpHeaders
     code*: int
     body*: string
 
   PuppyError* = object of IOError ## Raised if an operation fails.
 
-proc `[]`*(headers: seq[Header], key: string): string =
-  ## Get a key out of headers. Not case sensitive.
-  ## Use a for loop to get multiple keys.
-  for header in headers:
-    if cmpIgnorecase(header.key, key) == 0:
-      return header.value
-
-proc `[]=`*(headers: var seq[Header], key, value: string) =
-  ## Sets a key in the headers. Not case sensitive.
-  ## If key is not there appends a new key-value pair at the end.
-  for header in headers.mitems:
-    if cmpIgnorecase(header.key, key) == 0:
-      header.value = value
-      return
-  headers.add(Header(key: key, value: value))
+  Header* = object
+    key*: string
+    value*: string
 
 proc `$`*(req: Request): string =
   req.verb.toUpperAscii & " " & $req.url
+
+converter toWebby*(headers: seq[Header]): HttpHeaders =
+  cast[HttpHeaders](headers)
+
+converter toWebby*(header: Header): (string, string) =
+  (header.key, header.value)

src/puppy/platforms/linux/platform.nim

@@ -28,8 +28,8 @@ proc fetch*(req: Request): Response {.raises: [PuppyError].} =
   var strings: seq[string]
   strings.add $req.url
   strings.add req.verb.toUpperAscii()
-  for header in req.headers:
-    strings.add header.key & ": " & header.value
+  for (k, v) in req.headers:
+    strings.add k & ": " & v
 
   let curl = easy_init()
 
@@ -89,7 +89,7 @@ proc fetch*(req: Request): Response {.raises: [PuppyError].} =
     for headerLine in headerData.split(CRLF):
       let arr = headerLine.split(":", 1)
       if arr.len == 2:
-        result.headers.add(Header(key: arr[0].strip(), value: arr[1].strip()))
+        result.headers.add((arr[0].strip(), arr[1].strip()))
     result.body = bodyWrap.str
     if result.headers["Content-Encoding"] == "gzip":
       try:

src/puppy/platforms/macos/platform.nim

@@ -12,8 +12,8 @@ proc fetch*(req: Request): Response {.raises: [PuppyError].} =
 
     request.setHTTPMethod(@(req.verb.toUpperAscii()))
 
-    for header in req.headers:
-      request.setValue(@(header.value), @(header.key))
+    for (k, v) in req.headers:
+      request.setValue(@(v), @(k))
 
     if req.body.len > 0:
       request.setHTTPBody(NSData.dataWithBytes(req.body[0].addr, req.body.len))
@@ -38,7 +38,7 @@ proc fetch*(req: Request): Response {.raises: [PuppyError].} =
         if key.int == 0:
           break
         let value = dictionary.objectForKey(key)
-        result.headers[$(key.NSString)] = $(value.NSString)
+        result.headers.add(($(key.NSString), $(value.NSString)))
 
       if data.length > 0:
         result.body.setLen(data.length)

src/puppy/platforms/win32/platform.nim

@@ -90,8 +90,8 @@ proc fetch*(req: Request): Response {.raises: [PuppyError].} =
       )
 
     var requestHeaderBuf: string
-    for header in req.headers:
-      requestHeaderBuf &= header.key & ": " & header.value & CRLF
+    for (k, v) in req.headers:
+      requestHeaderBuf &= k & ": " & v & CRLF
 
     let wideRequestHeaderBuf = requestHeaderBuf.wstr()
 
@@ -226,9 +226,9 @@ proc fetch*(req: Request): Response {.raises: [PuppyError].} =
       if line != "":
         let parts = line.split(":", 1)
         if parts.len == 2:
-          result.headers.add(Header(
-            key: parts[0].strip(),
-            value: parts[1].strip()
+          result.headers.add((
+            parts[0].strip(),
+            parts[1].strip()
           ))
 
     var i: int

tests/test.nim

@@ -49,6 +49,14 @@ block:
   doAssert res.headers.len > 0
   doAssert res.body != ""
 
+block:
+  discard fetch(Request(
+    url: parseUrl("https://www.google.com"),
+    verb: "get",
+    headers: @[Header(key: "User-Agent", value: "Puppy")]
+    )
+  )
+
 when defined(windows):
   block:
     let httpsServer = startProcess(
@@ -153,13 +161,7 @@ try:
 
     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")
+      let res = post("http://localhost:8080/post")
       doAssert res.code == 200
       doAssert res.body == ""