Merge pull request #681 from aterris/master

Match pre-swift3 behavior for String -> Bool
SwiftyJSON · Oct 21, 2016 · 6a0c3a8 · 6a0c3a8
2 parents 4cbe898 + a544199
commit 6a0c3a8
Show file tree

Hide file tree

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

diff --git a/Tests/StringTests.swift b/Tests/StringTests.swift
@@ -41,6 +41,21 @@ class StringTests: XCTestCase {
         XCTAssertEqual(json.URL!, URL(string:"http://github.com")!)
     }
 
+    func testBool() {
+        let json = JSON("true")
+        XCTAssertTrue(json.boolValue)
+    }
+
+    func testBoolWithY() {
+        let json = JSON("Y")
+        XCTAssertTrue(json.boolValue)
+    }
+
+    func testBoolWithT() {
+        let json = JSON("T")
+        XCTAssertTrue(json.boolValue)
+    }
+
     func testURLPercentEscapes() {
         let emDash = "\\u2014"
         let urlString = "http://examble.com/unencoded" + emDash + "string"