Merge pull request #41 from timhall/null-values

Convert empty to null for json

Author: timhall

specs/Excel-REST - Specs.xlsm

@@ -133,6 +133,11 @@ Public Function Specs() As SpecSuite
 
         .Expect(Response.StatusCode).ToEqual 200
         .Expect(Response.Data("body")("a")).ToEqual 3.14
+        
+        Set Response = Client.PostJSON("/post", Array(1, 2, 3))
+        
+        .Expect(Response.StatusCode).ToEqual 200
+        .Expect(Response.Data("body")(1)).ToEqual 1
     End With
 
     With Specs.It("should include options with GET and POST json")

specs/RestClientSpecs.bas

@@ -92,9 +92,11 @@ Public Function Specs() As SpecSuite
         Obj.Add "c", "Howdy!"
         Obj.Add "d", True
         Obj.Add "e", Array(1, 2)
+        Obj.Add "f", Empty
+        Obj.Add "g", Null
 
         json = RestHelpers.ConvertToJSON(Obj)
-        .Expect(json).ToEqual "{""a"":1,""b"":3.14,""c"":""Howdy!"",""d"":true,""e"":[1,2]}"
+        .Expect(json).ToEqual "{""a"":1,""b"":3.14,""c"":""Howdy!"",""d"":true,""e"":[1,2],""f"":null,""g"":null}"
 
         Set Obj = New Dictionary
         Obj.Add "a", "Howdy!"
@@ -106,9 +108,11 @@ Public Function Specs() As SpecSuite
         Coll.Add True
         Coll.Add Array(1, 2)
         Coll.Add Obj
+        Coll.Add Empty
+        Coll.Add Null
 
         json = RestHelpers.ConvertToJSON(Coll)
-        .Expect(json).ToEqual "[1,3.14,""Howdy!"",true,[1,2],{""a"":""Howdy!""}]"
+        .Expect(json).ToEqual "[1,3.14,""Howdy!"",true,[1,2],{""a"":""Howdy!""},null,null]"
     End With
 
     With Specs.It("should url encode values")

specs/RestHelpersSpecs.bas

@@ -260,6 +260,21 @@ Public Function Specs() As SpecSuite
         .Expect(Request.Body).ToEqual "A=123&B=Howdy%21"
     End With
 
+    With Specs.It("should allow array/collection for body")
+        Set Request = New RestRequest
+        
+        Set Body = New Collection
+        Body.Add "a"
+        Body.Add "b"
+        Body.Add "c"
+        
+        Request.AddBody Body
+        .Expect(Request.Body).ToEqual "[""a"",""b"",""c""]"
+        
+        Request.AddBody Array("a", "b", "c")
+        .Expect(Request.Body).ToEqual "[""a"",""b"",""c""]"
+    End With
+    
     InlineRunner.RunSuite Specs
 End Function
 

specs/RestRequestSpecs.bas

@@ -1303,7 +1303,7 @@ Private Function json_toString(ByRef Obj As Variant) As String
         Case vbNull
             json_toString = "null"
         Case vbEmpty
-            json_toString = """"""
+            json_toString = "null"
         Case vbDate
             json_toString = """" & CStr(Obj) & """"
         Case vbString