Merge pull request #887 from SwiftyJSON/bool-value

Add "yes" and "1" to string.boolValue array
SwiftyJSON · Sep 8, 2017 · 29957c7 · 29957c7
2 parents 6835ea4 + 50ecfbe
commit 29957c7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Source/SwiftyJSON.swift b/Source/SwiftyJSON.swift
@@ -855,9 +855,7 @@ extension JSON { // : Swift.Bool
             case .number:
                 return self.rawNumber.boolValue
             case .string:
-                return ["true", "y", "t"].contains { (truthyString) in
-                    return self.rawString.caseInsensitiveCompare(truthyString) == .orderedSame
-                }
+                return ["true", "y", "t", "yes", "1"].contains { self.rawString.caseInsensitiveCompare($0) == .orderedSame }
             default:
                 return false
             }

diff --git a/Tests/SwiftyJSONTests/SubscriptTests.swift b/Tests/SwiftyJSONTests/SubscriptTests.swift
@@ -121,7 +121,9 @@ class SubscriptTests: XCTestCase {
     }
 
     func testDictionaryAllBool() {
-        var json: JSON = ["t": true, "f": false, "false": false, "tr": true, "true": true]
+        var json: JSON = ["t": true, "f": false, "false": false, "tr": true, "true": true, "yes": true, "1": true]
+        XCTAssertTrue(json["1"] == true)
+        XCTAssertTrue(json["yes"] == true)
         XCTAssertTrue(json["t"] == true)
         XCTAssertTrue(json["f"] == false)
         XCTAssertTrue(json["false"] == false)