Merge pull request #509 from jamesjn/exists-for-wrong-type-and-out-of…

…-bounds Allow exists method to handle out of bounds and wrong type errors
SwiftyJSON · Sep 26, 2016 · eee5bd9 · eee5bd9
2 parents 7ee9aab + 78fb831
commit eee5bd9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/Source/SwiftyJSON.swift b/Source/SwiftyJSON.swift
@@ -780,8 +780,10 @@ extension JSON {
         }
     }
     public func exists() -> Bool{
-        if let errorValue = error , errorValue.code == ErrorNotExist{
-            return false
+        if let errorValue = error, errorValue.code == ErrorNotExist ||
+            errorValue.code == ErrorIndexOutOfBounds ||
+            errorValue.code == ErrorWrongType {
+                return false
         }
         return true
     }

diff --git a/Tests/BaseTests.swift b/Tests/BaseTests.swift
@@ -214,7 +214,14 @@ class BaseTests: XCTestCase {
         let dictionary = ["number":1111]
         let json = JSON(dictionary)
         XCTAssertFalse(json["unspecifiedValue"].exists())
+        XCTAssertFalse(json[0].exists())
         XCTAssertTrue(json["number"].exists())
+
+        let array = [["number":1111]]
+        let jsonForArray = JSON(array)
+        XCTAssertTrue(jsonForArray[0].exists())
+        XCTAssertFalse(jsonForArray[1].exists())
+        XCTAssertFalse(jsonForArray["someValue"].exists())
     }
 
     func testErrorHandle() {