Add boolValue(forKey:), doubleValue(forKey:), and intValue(forKey:)

Author: atdrendel

Sources/JSON/Dictionary+JSON.swift

@@ -0,0 +1,75 @@
+import Foundation
+
+public extension [String: Any] {
+    func boolValue(forKey key: String) -> Bool? {
+        if let v = self[key] as? Bool {
+            return v
+        } else if let v = self[key] as? NSNumber, v.isBool {
+            return v.boolValue
+        } else {
+            return nil
+        }
+    }
+
+    func doubleValue(forKey key: String) -> Double? {
+        if let v = self[key] as? Double {
+            return v
+        } else if let v = self[key] as? NSNumber, !v.isBool {
+            return v.doubleValue
+        } else {
+            return nil
+        }
+    }
+
+    func intValue(forKey key: String) -> Int? {
+        if let v = self[key] as? Int {
+            return v
+        } else if let v = self[key] as? Double {
+            return Int(v)
+        } else if let v = self[key] as? NSNumber, !v.isBool {
+            return v.intValue
+        } else {
+            return nil
+        }
+    }
+}
+
+public extension [String: Any]? {
+    func boolValue(forKey key: String) -> Bool? {
+        if let v = self?[key] as? Bool {
+            return v
+        } else if let v = self?[key] as? NSNumber, v.isBool {
+            return v.boolValue
+        } else {
+            return nil
+        }
+    }
+
+    func doubleValue(forKey key: String) -> Double? {
+        if let v = self?[key] as? Double {
+            return v
+        } else if let v = self?[key] as? NSNumber, !v.isBool {
+            return v.doubleValue
+        } else {
+            return nil
+        }
+    }
+
+    func intValue(forKey key: String) -> Int? {
+        if let v = self?[key] as? Int {
+            return v
+        } else if let v = self?[key] as? Double {
+            return Int(v)
+        } else if let v = self?[key] as? NSNumber, !v.isBool {
+            return v.intValue
+        } else {
+            return nil
+        }
+    }
+}
+
+private extension NSNumber {
+    var isBool: Bool {
+        CFBooleanGetTypeID() == CFGetTypeID(self)
+    }
+}

Tests/JSONTests/Dictionary+JSONTests.swift

@@ -0,0 +1,92 @@
+import JSON
+import XCTest
+
+final class DictionaryJSONTests: XCTestCase {
+    func testValueForKey() throws {
+        let original: [String: Any] = [
+            "one": 1,
+            "oneoh": 1.0,
+            "onenum": NSNumber(value: 1),
+            "pie": 3.14,
+            "pienum": NSNumber(value: 3.14),
+            "tru": true,
+            "trunum": NSNumber(value: true),
+            "fals": false,
+            "falsnum": NSNumber(value: false),
+        ]
+
+        let json = JSON(original as [String: Any?])
+
+        let dict = try XCTUnwrap(json.dictionaryValue)
+
+        XCTAssertEqual(1, dict.intValue(forKey: "one"))
+        XCTAssertEqual(1, dict.intValue(forKey: "oneoh"))
+        XCTAssertEqual(1, dict.intValue(forKey: "onenum"))
+
+        XCTAssertEqual(3.14, dict.doubleValue(forKey: "pie"))
+        XCTAssertEqual(3.14, dict.doubleValue(forKey: "pienum"))
+
+        XCTAssertEqual(3, dict.intValue(forKey: "pie"))
+        XCTAssertEqual(3, dict.intValue(forKey: "pienum"))
+
+        XCTAssertEqual(true, dict.boolValue(forKey: "tru"))
+        XCTAssertEqual(true, dict.boolValue(forKey: "trunum"))
+
+        XCTAssertEqual(false, dict.boolValue(forKey: "fals"))
+        XCTAssertEqual(false, dict.boolValue(forKey: "falsnum"))
+
+        XCTAssertNil(dict.boolValue(forKey: "one"))
+        XCTAssertNil(dict.boolValue(forKey: "oneoh"))
+        XCTAssertNil(dict.boolValue(forKey: "onenum"))
+
+        XCTAssertNil(dict.doubleValue(forKey: "tru"))
+        XCTAssertNil(dict.doubleValue(forKey: "fals"))
+
+        XCTAssertNil(dict.intValue(forKey: "tru"))
+        XCTAssertNil(dict.intValue(forKey: "fals"))
+    }
+
+    func testValueForKeyOfOptionalDictionary() throws {
+        let original: [String: Any] = [
+            "one": 1,
+            "oneoh": 1.0,
+            "onenum": NSNumber(value: 1),
+            "pie": 3.14,
+            "pienum": NSNumber(value: 3.14),
+            "tru": true,
+            "trunum": NSNumber(value: true),
+            "fals": false,
+            "falsnum": NSNumber(value: false),
+        ]
+
+        let json = JSON(original as [String: Any?])
+
+        let dict = json.dictionaryValue
+
+        XCTAssertEqual(1, dict.intValue(forKey: "one"))
+        XCTAssertEqual(1, dict.intValue(forKey: "oneoh"))
+        XCTAssertEqual(1, dict.intValue(forKey: "onenum"))
+
+        XCTAssertEqual(3.14, dict.doubleValue(forKey: "pie"))
+        XCTAssertEqual(3.14, dict.doubleValue(forKey: "pienum"))
+
+        XCTAssertEqual(3, dict.intValue(forKey: "pie"))
+        XCTAssertEqual(3, dict.intValue(forKey: "pienum"))
+
+        XCTAssertEqual(true, dict.boolValue(forKey: "tru"))
+        XCTAssertEqual(true, dict.boolValue(forKey: "trunum"))
+
+        XCTAssertEqual(false, dict.boolValue(forKey: "fals"))
+        XCTAssertEqual(false, dict.boolValue(forKey: "falsnum"))
+
+        XCTAssertNil(dict.boolValue(forKey: "one"))
+        XCTAssertNil(dict.boolValue(forKey: "oneoh"))
+        XCTAssertNil(dict.boolValue(forKey: "onenum"))
+
+        XCTAssertNil(dict.doubleValue(forKey: "tru"))
+        XCTAssertNil(dict.doubleValue(forKey: "fals"))
+
+        XCTAssertNil(dict.intValue(forKey: "tru"))
+        XCTAssertNil(dict.intValue(forKey: "fals"))
+    }
+}

Tests/JSONTests/JSONTests.swift

@@ -84,9 +84,9 @@ final class JSONTests: XCTestCase {
             "dict": [
                 "key": "value",
                 "double": 3.14,
-            ] as [String: Any]
+            ] as [String: Any],
         ]
-        
+
         let one: Int? = object["one"]
         XCTAssertEqual(1, one)
         let notOne: String? = object["one"]