Output no unneeded whitespace in JSON

orlandos-nl · Sep 2, 2016 · 26c0d2d · 26c0d2d
1 parent be503fd
commit 26c0d2d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/Sources/ExtendedJSON.swift b/Sources/ExtendedJSON.swift
@@ -46,34 +46,34 @@ extension Value {
         case .binary(let subtype, let data):
             let base64 = Data(bytes: data).base64EncodedString()
             let subtype = String(subtype.rawValue, radix: 16).uppercased()
-            return "{\"$binary\": \"\(base64)\", \"$type\": \"0x\(subtype)\"}"
+            return "{\"$binary\":\"\(base64)\",\"$type\":\"0x\(subtype)\"}"
         case .objectId(let id):
-            return "{\"$oid\": \"\(id.hexString)\"}"
+            return "{\"$oid\":\"\(id.hexString)\"}"
         case .boolean(let val):
             return val ? "true" : "false"
         case .dateTime(let date):
             let dateString = isoDateFormatter.string(from: date)
-            return "{\"$date\": \"\(dateString)\"}"
+            return "{\"$date\":\"\(dateString)\"}"
         case .null:
             return "null"
         case .regularExpression(let pattern, let options):
-            return "{\"$regex\": \"\(escape(pattern))\", \"$options\": \"\(escape(options))\"}"
+            return "{\"$regex\":\"\(escape(pattern))\",\"$options\":\"\(escape(options))\"}"
         case .javascriptCode(let code):
-            return "{\"$code\": \"\(escape(code))\"}"
+            return "{\"$code\":\"\(escape(code))\"}"
         case .javascriptCodeWithScope(let code, let scope):
-            return "{\"$code\": \"\(escape(code))\", \"$scope\": \(scope.makeExtendedJSON())}"
+            return "{\"$code\":\"\(escape(code))\",\"$scope\":\(scope.makeExtendedJSON())}"
         case .int32(let val):
             return String(val)
         case .timestamp(let t, let i):
-            return "{\"$timestamp\": {\"t\": \(t), \"i\": \(i)}}"
+            return "{\"$timestamp\":{\"t\":\(t),\"i\":\(i)}}"
         case .int64(let val):
-            return "{\"$numberLong\": \"\(val)\"}"
+            return "{\"$numberLong\":\"\(val)\"}"
         case .minKey:
-            return "{\"$minKey\": 1}"
+            return "{\"$minKey\":1}"
         case .maxKey:
-            return "{\"$maxKey\": 1}"
+            return "{\"$maxKey\":1}"
         case .nothing:
-            return "{\"$undefined\": true}"
+            return "{\"$undefined\":true}"
         }
     }
 }
@@ -109,7 +109,7 @@ extension Document {
                 }.reduce("[") { "\($0),\($1)" } + "]"
         } else {
             str = self.makeIterator().map { pair in
-                return "\"\(pair.key)\": \(pair.value.makeExtendedJSON())"
+                return "\"\(pair.key)\":\(pair.value.makeExtendedJSON())"
                 }.reduce("{") { "\($0),\($1)" } + "}"
         }
 

diff --git a/Tests/BSONTests/BSONPublicTests.swift b/Tests/BSONTests/BSONPublicTests.swift
@@ -326,7 +326,7 @@ class BSONPublicTests: XCTestCase {
 
     func testExtendedJSON() throws {
 
-        let simpleJson = "{\"kaas\": 4.2}"
+        let simpleJson = "{\"kaas\":       4.2}"
         let simpleDocument = try Document(extendedJSON: simpleJson)
         XCTAssertEqual(simpleDocument["kaas"], ~4.2)
 
@@ -337,7 +337,7 @@ class BSONPublicTests: XCTestCase {
 
         XCTAssertEqual(kittenDocument, otherDocument)
 
-        XCTAssertEqual(Value.nothing.makeExtendedJSON(), "{\"$undefined\": true}")
+        XCTAssertEqual(Value.nothing.makeExtendedJSON(), "{\"$undefined\":true}")
     }
 
     func testDocumentIndexes() {