Merge pull request #9 from kreeger/feature/clearer-null-nil-checks

Add check for null value using hasValue; rename isNil to hasKey.

Author: jlandon

ModelRocket/JSON.swift

@@ -70,9 +70,17 @@ public struct JSON {
         }
     }
 
-    public var isNil: Bool {
+    @available(*, deprecated=1.2, message="Use !hasKey instead.") public var isNil: Bool {
         return (object == nil)
     }
+    
+    public var hasKey: Bool {
+        return object != nil
+    }
+    
+    public var hasValue: Bool {
+        return object != nil && !(object is NSNull)
+    }
 }
 
 // MARK: - CustomStringConvertible

ModelRocketTests/JSONTests.swift

@@ -55,7 +55,8 @@ class JSONTests: XCTestCase {
 
         // No data
         let emptyJSON = JSON(data: nil)
-        XCTAssertTrue(emptyJSON.isNil, "JSON not nil")
+        XCTAssertFalse(emptyJSON.hasKey, "JSON is not nil")
+        XCTAssertFalse(emptyJSON.hasValue, "JSON has a value")
 
         // String
         XCTAssertEqual(vehicleJSON["make"].stringValue, "BMW")
@@ -436,6 +437,16 @@ class JSONTests: XCTestCase {
         XCTAssertEqual(json["array"][0].intValue, 1)
     }
 
+    // MARK: - NSNull (from loaded data)
+    
+    func testNSNull() {
+        let jsonPath = NSBundle(forClass: self.dynamicType).pathForResource("Tests", ofType: "json")
+        let jsonData = NSData(contentsOfFile: jsonPath!)
+        let json = JSON(data: jsonData)
+        
+        XCTAssertFalse(json["driver"].hasValue)
+    }
+    
     // MARK: - Dictionary
 
     func testDictionaryLiteralConvertible() {

ModelRocketTests/Tests.json

@@ -6,6 +6,7 @@
 	"number_of_doors" : 4,
 	"zero_to_sixty_time" : 4.7,
 	"nav_system_standard" : true,
+	"driver": null,
 	"manufacturer" : {
 		"company_name" : "Bayerische Motoren Werke AG",
 		"headquarters" : "Munich, Bavaria, Germany",
@@ -22,4 +23,4 @@
     	"sedan" : 1024,
     	"gran_coupe" : 512
     }
-}
+}