More pretty.

Author: treeform

README.md

@@ -110,7 +110,7 @@ Json can't store dates, so they are usually stored as strings. You can use
 `parseHook()` to override default parsing and parse date times as a string:
 
 ```nim
-proc parseHook(s:string, i:var int, v: var DateTime) =
+proc parseHook(s: string, i: var int, v: var DateTime) =
   var str: string
   parseHook(s, i, str)
   v = parse(str, "yyyy-MM-dd hh:mm:ss")
@@ -132,7 +132,7 @@ let data = """{
   "3": {"count":99, "filled": 99}
 }"""
 
-proc parseHook(s:string, i:var int, v: var seq[Entry]) =
+proc parseHook(s: string, i: var int, v: var seq[Entry]) =
   var table: Table[string, Entry]
   parseHook(s, i, table)
   for k, entry in table.mpairs:

src/jsony.nim

@@ -5,11 +5,11 @@ type JsonError = object of ValueError
 const whiteSpace = {' ', '\n', '\t', '\r'}
 
 proc parseHook*[T](s: string, i: var int, v: var seq[T])
-proc parseHook*[T:enum](s: string, i: var int, v: var T)
-proc parseHook*[T:object|ref object](s: string, i: var int, v: var T)
+proc parseHook*[T: enum](s: string, i: var int, v: var T)
+proc parseHook*[T: object|ref object](s: string, i: var int, v: var T)
 proc parseHook*[T](s: string, i: var int, v: var Table[string, T])
-proc parseHook*[T:tuple](s: string, i: var int, v: var T)
-proc parseHook*[T:array](s: string, i: var int, v: var T)
+proc parseHook*[T: tuple](s: string, i: var int, v: var T)
+proc parseHook*[T: array](s: string, i: var int, v: var T)
 
 template error(msg: string, i: int) =
   ## Short cut to raise an exception.
@@ -124,7 +124,7 @@ proc parseHook*[T](s: string, i: var int, v: var seq[T]) =
       break
   eatChar(s, i, ']')
 
-proc parseHook*[T:tuple](s: string, i: var int, v: var T) =
+proc parseHook*[T: tuple](s: string, i: var int, v: var T) =
   eatSpace(s, i)
   var strV: string
   eatChar(s, i, '[')
@@ -136,7 +136,7 @@ proc parseHook*[T:tuple](s: string, i: var int, v: var T) =
       inc i
   eatChar(s, i, ']')
 
-proc parseHook*[T:array](s: string, i: var int, v: var T) =
+proc parseHook*[T: array](s: string, i: var int, v: var T) =
   eatSpace(s, i)
   var strV: string
   eatChar(s, i, '[')
@@ -237,7 +237,7 @@ macro fieldsMacro(v: typed, key: string) =
   ofElseClause.add(body)
   result.add(ofElseClause)
 
-proc parseHook*[T:enum](s: string, i: var int, v: var T) =
+proc parseHook*[T: enum](s: string, i: var int, v: var T) =
   eatSpace(s, i)
   var strV: string
   if s[i] == '"':
@@ -250,7 +250,7 @@ proc parseHook*[T:enum](s: string, i: var int, v: var T) =
     strV = parseSymbol(s, i)
     v = T(parseInt(strV))
 
-proc parseHook*[T:object|ref object](s: string, i: var int, v: var T) =
+proc parseHook*[T: object|ref object](s: string, i: var int, v: var T) =
   ## Parse an object.
   eatSpace(s, i)
   if s[i] == 'n':

tests/test_objects.nim

@@ -1,4 +1,4 @@
-import jsony
+import jsony, strutils
 
 block:
   type Entry1 = object
@@ -87,7 +87,6 @@ block:
   doAssert v[0].color == ""
   doAssert v[1].color == "red"
 
-
 block:
   ## Skip extra fields
   type Entry3 = object
@@ -110,7 +109,6 @@ block:
   v = fromJson[Entry4]("""{"color_blend":"red"}""")
   doAssert v.colorBlend == "red"
 
-import strutils
 proc snakeCase(s: string): string =
   var prevCap = false
   for i, c in s:

tests/test_parseHook.nim

@@ -1,10 +1,10 @@
-import jsony, times, strutils, tables
+import jsony, strutils, tables, times
 
 type Fraction = object
   numerator: int
   denominator: int
 
-proc parseHook(s:string, i:var int, v: var Fraction) =
+proc parseHook(s: string, i: var int, v: var Fraction) =
   ## Instead of looking for fraction object look for a string.
   var str: string
   parseHook(s, i, str)
@@ -17,7 +17,7 @@ var frac = fromJson[Fraction](""" "1/3" """)
 doAssert frac.numerator == 1
 doAssert frac.denominator == 3
 
-proc parseHook(s:string, i:var int, v: var DateTime) =
+proc parseHook(s: string, i: var int, v: var DateTime) =
   var str: string
   parseHook(s, i, str)
   v = parse(str, "yyyy-MM-dd hh:mm:ss")
@@ -36,7 +36,7 @@ let data = """{
   "3": {"count":99, "filled": 99}
 }"""
 
-proc parseHook(s:string, i:var int, v: var seq[Entry]) =
+proc parseHook(s: string, i: var int, v: var seq[Entry]) =
   var table: Table[string, Entry]
   parseHook(s, i, table)
   for k, entry in table.mpairs:

tests/test_tuples.nim

@@ -15,7 +15,7 @@ block:
   doAssert v[2] == 3.5
 
 block:
-  type Entry = tuple[id:int, name:string, dist:float32]
+  type Entry = tuple[id: int, name: string, dist: float32]
   var s = """[134, "red", 13.5]"""
   var v = fromJson[Entry](s)
   doAssert v[0] == 134
@@ -26,7 +26,7 @@ block:
   doAssert v.dist == 13.5
 
 block:
-  type Vector3i = tuple[x:int, y:int, z:int]
+  type Vector3i = tuple[x: int, y: int, z: int]
   var s = """[0, 1, 2]"""
   var v = fromJson[Vector3i](s)
   doAssert v[0] == 0