Improved Dictionary Bridging

Sources/Bridging.swift

@@ -60,6 +60,22 @@ extension Double: _OCKBridgable {
     }
 }
 
+extension Dictionary {
+    func bridge() -> NSDictionary {
+        var newDictionary: [NSString: Any] = [:]
+
+        for (key,value) in self {
+            if let stringKey = key as? String {
+                newDictionary[stringKey.bridge()] = value
+            } else if let nsstringKey = key as? NSString {
+                newDictionary[nsstringKey] = value
+            }
+        }
+        return newDictionary._bridgeToObjectiveC()
+    }
+}
+
+
 #if !os(Linux)
 
     typealias NSErrorUserInfoType = [AnyHashable: Any]
@@ -82,12 +98,6 @@ extension Double: _OCKBridgable {
         }
     }
 
-    extension Dictionary {
-        func bridge() -> NSDictionary {
-            return self as NSDictionary
-        }
-    }
-
     extension Array {
         func bridge() -> NSArray {
             return self as NSArray
@@ -136,12 +146,7 @@ extension Double: _OCKBridgable {
         }
     }
 
-    extension Dictionary {
-        func bridge() -> NSDictionary {
-            return self._bridgeToObjectiveC()
-        }
-    }
-
+
     extension Array {
         public func bridge() -> NSArray {
             return self._bridgeToObjectiveC()

Sources/CKModifyRecordsURLRequest.swift

@@ -56,6 +56,7 @@ class CKModifyRecordsURLRequest: CKURLRequest {
         if let zoneID = zoneID {
             parameters["zoneID"] = zoneID.dictionary.bridge()
         }
+
 
         requestProperties = parameters
     }
@@ -114,7 +115,11 @@ class CKModifyRecordsURLRequest: CKURLRequest {
                         recordDictionary["parent"] = ["recordName": parent.recordID.recordName.bridge()].bridge()
                 }
 
+
                 let operationDictionary: [String: Any] = ["operationType": operationType.bridge(), "record": recordDictionary.bridge() as NSDictionary]
+
+
+
                 return operationDictionary
             })
 

Sources/CKRecord.swift

@@ -230,6 +230,9 @@ extension CKRecord {
             }
         }
 
+        print(fieldsDictionary)
+
+
         return fieldsDictionary
 
     }

Sources/CKURLRequest.swift

@@ -70,10 +70,10 @@ class CKURLRequest: NSObject {
             if let properties = requestProperties {
 
                 // While JSON Parsing doesn't support Swift Types on Linux, Use Jay
-                //let jsonData: Data = try! JSONSerialization.data(withJSONObject: properties, options: [])
+                let jsonData: Data = try! JSONSerialization.data(withJSONObject: properties, options: [])
 
-                let data = try! Jay(formatting: .prettified).dataFromJson(any: properties) // [UInt8]
-                let jsonData = Data(bytes: data)
+               // let data = try! Jay(formatting: .prettified).dataFromJson(any: properties) // [UInt8]
+               // let jsonData = Data(bytes: data)
 
                 urlRequest.httpBody = jsonData
                 urlRequest.httpMethod = "POST"