little things

README.md

@@ -1,6 +1,6 @@
 <img src="docs/puppyBanner.png">
 
-# Puppy - Fetch url resources via HTTP and HTTPS.
+# Puppy - Fetch resources via HTTP and HTTPS.
 
 `nimble install puppy`
 

puppy.nimble

@@ -1,6 +1,6 @@
 version     = "1.6.0"
 author      = "Andre von Houck"
-description = "Puppy fetches HTML pages for Nim."
+description = "Puppy fetches resources via HTTP and HTTPS."
 license     = "MIT"
 
 srcDir = "src"

src/puppy.nim

@@ -13,9 +13,9 @@ else:
 export common, urlly
 
 proc addDefaultHeaders(req: Request) =
-  if req.headers["user-agent"].len == 0:
+  if req.headers["user-agent"] == "":
     req.headers["user-agent"] = "Puppy"
-  if req.headers["accept-encoding"].len == 0:
+  if req.headers["accept-encoding"] == "":
     # If there isn't a specific accept-encoding specified, enable gzip
     req.headers["accept-encoding"] = "gzip"
 

src/puppy/common.nim

@@ -16,6 +16,7 @@ type
     verb*: string
     body*: string
     when defined(puppyLibcurl) or (defined(windows) or not defined(macosx)):
+      # If you want to use this on Mac, please us -d:puppyLibcurl
       allowAnyHttpsCertificate*: bool
 
   Response* = ref object

src/puppy/platforms/linux/platform.nim

@@ -66,7 +66,7 @@ proc fetch*(req: Request): Response {.raises: [PuppyError].} =
   discard curl.easy_setopt(OPT_HEADERDATA, headerWrap.addr)
   discard curl.easy_setopt(OPT_HEADERFUNCTION, curlWriteFn)
 
-  # On windows look for cacert.pem.
+  # On Windows look for cacert.pem.
   when defined(windows):
     discard curl.easy_setopt(OPT_CAINFO, "cacert.pem".cstring)
   # Follow redirects by default.

src/puppy/platforms/macos/macdefs.nim

@@ -1,4 +1,5 @@
 import objc
+
 export objc
 
 {.passL: "-framework AppKit".}

src/puppy/platforms/macos/objc.nim

@@ -1,4 +1,4 @@
-import macros, typetraits, strutils
+import macros, strutils, typetraits
 
 type
   Class* = distinct int

src/puppy/platforms/win32/platform.nim

@@ -116,8 +116,17 @@ proc fetch*(req: Request): Response {.raises: [PuppyError].} =
     ) == 0:
 
       let error = GetLastError()
-      if error in {ERROR_WINHTTP_SECURE_FAILURE, ERROR_INTERNET_INVALID_CA, ERROR_INTERNET_SEC_CERT_DATE_INVALID, ERROR_INTERNET_SEC_INVALID_CERT, ERROR_INTERNET_SEC_CERT_CN_INVALID, ERROR_INTERNET_SEC_CERT_NO_REV, ERROR_INTERNET_SEC_CERT_REV_FAILED, ERROR_INTERNET_SEC_CERT_REVOKED, ERROR_INTERNET_SEC_CERT_ERRORS} and
-        req.allowAnyHttpsCertificate:
+      if error in {
+        ERROR_WINHTTP_SECURE_FAILURE,
+        ERROR_INTERNET_INVALID_CA,
+        ERROR_INTERNET_SEC_CERT_DATE_INVALID,
+        ERROR_INTERNET_SEC_INVALID_CERT,
+        ERROR_INTERNET_SEC_CERT_CN_INVALID,
+        ERROR_INTERNET_SEC_CERT_NO_REV,
+        ERROR_INTERNET_SEC_CERT_REV_FAILED,
+        ERROR_INTERNET_SEC_CERT_REVOKED,
+        ERROR_INTERNET_SEC_CERT_ERRORS
+      } and req.allowAnyHttpsCertificate:
         # If this is a certificate error but we should allow any HTTPS cert,
         # we need to set some options and retry sending the request.
         # https://stackoverflow.com/questions/19338395/how-do-you-use-winhttp-to-do-ssl-with-a-self-signed-cert

src/puppy/platforms/win32/utils.nim

@@ -15,7 +15,7 @@ proc wstr*(str: string): string =
     0,
     str.cstring,
     str.len.int32,
-    cast[ptr WCHAR](result[0].addr),
+    cast[ptr WCHAR](result.cstring),
     wlen
   )
 
@@ -37,7 +37,7 @@ proc `$`*(p: ptr WCHAR): string =
       0,
       p,
       -1,
-      result[0].addr,
+      result.cstring,
       len,
       nil,
       nil