Add init? for backward compatibility

srdanrasic · srdanrasic · commit d25ca35901f3 · 2015-11-08T17:30:13.000+01:00
diff --git a/JSONCodable.xcodeproj/project.pbxproj b/JSONCodable.xcodeproj/project.pbxproj
@@ -60,7 +60,7 @@
 		9EDB390B1B59D00B00C63019 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		9EDB39231B59D01D00C63019 /* JSONCodable.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JSONCodable.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		9EDB393C1B59D0AF00C63019 /* JSONCodable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JSONCodable.swift; sourceTree = "<group>"; };
-		9EDB393D1B59D0AF00C63019 /* JSONDecodable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JSONDecodable.swift; sourceTree = "<group>"; };
+		9EDB393D1B59D0AF00C63019 /* JSONDecodable.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = JSONDecodable.swift; sourceTree = "<group>"; tabWidth = 4; };
 		9EDB393E1B59D0AF00C63019 /* JSONEncodable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JSONEncodable.swift; sourceTree = "<group>"; };
 		9EDB393F1B59D0AF00C63019 /* JSONHelpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JSONHelpers.swift; sourceTree = "<group>"; };
 		9EDB39411B59D0AF00C63019 /* JSONString.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JSONString.swift; sourceTree = "<group>"; };
diff --git a/JSONCodable/JSONDecodable.swift b/JSONCodable/JSONDecodable.swift
@@ -48,7 +48,17 @@ public enum JSONDecodableError: ErrorType, CustomStringConvertible {
 // Dictionary -> Struct
 
 public protocol JSONDecodable {
-    init(JSONDictionary: JSONObject) throws
+    init(object: JSONObject) throws
+}
+
+public extension JSONDecodable {
+    init?(JSONDictionary: JSONObject) {
+        do {
+            try self.init(object: JSONDictionary)
+        } catch {
+            return nil
+        }
+    }
 }
 
 public extension Array where Element: JSONDecodable {
@@ -57,7 +67,7 @@ public extension Array where Element: JSONDecodable {
             guard let json = $0 as? [String : AnyObject] else {
                 throw JSONDecodableError.DictionaryTypeExpectedError(key: "[inarray]", elementType: $0.dynamicType)
             }
-            return try Element(JSONDictionary: json)
+            return try Element(object: json)
             })
     }
 }
@@ -110,7 +120,7 @@ public class JSONDecoder {
         guard let object = value as? JSONObject else {
             throw JSONDecodableError.DictionaryTypeExpectedError(key: key, elementType: value.dynamicType)
         }
-        return try Decodable(JSONDictionary: object)
+        return try Decodable(object: object)
     }
     
     // JSONDecodable?
@@ -121,7 +131,7 @@ public class JSONDecoder {
         guard let object = value as? JSONObject else {
             throw JSONDecodableError.DictionaryTypeExpectedError(key: key, elementType: value.dynamicType)
         }
-        return try Decodable(JSONDictionary: object)
+        return try Decodable(object: object)
     }
     
     // Enum
@@ -182,7 +192,7 @@ public class JSONDecoder {
         guard let array = value as? [JSONObject] else {
             throw JSONDecodableError.ArrayTypeExpectedError(key: key, elementType: value.dynamicType)
         }
-        return try array.flatMap { try Element(JSONDictionary: $0)}
+        return try array.flatMap { try Element(object: $0)}
     }
     
     // [JSONDecodable]?
@@ -193,7 +203,7 @@ public class JSONDecoder {
         guard let array = value as? [JSONObject] else {
             throw JSONDecodableError.ArrayTypeExpectedError(key: key, elementType: value.dynamicType)
         }
-        return try array.flatMap { try Element(JSONDictionary: $0)}
+        return try array.flatMap { try Element(object: $0)}
     }
     
     // [Enum]
diff --git a/JSONCodable/JSONString.swift b/JSONCodable/JSONString.swift
@@ -67,7 +67,7 @@ public extension JSONDecodable {
             throw JSONDecodableError.DictionaryTypeExpectedError(key: "n/a", elementType: result.dynamicType)
         }
         
-        try self.init(JSONDictionary: converted)
+        try self.init(object: converted)
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,17 @@ public enum JSONDecodableError: ErrorType, CustomStringConvertible {`
`48`	`48`	`// Dictionary -> Struct`
`49`	`49`
`50`	`50`	`public protocol JSONDecodable {`
`51`		`- init(JSONDictionary: JSONObject) throws`
	`51`	`+ init(object: JSONObject) throws`
	`52`	`+}`
	`53`	`+`
	`54`	`+public extension JSONDecodable {`
	`55`	`+ init?(JSONDictionary: JSONObject) {`
	`56`	`+ do {`
	`57`	`+ try self.init(object: JSONDictionary)`
	`58`	`+ } catch {`
	`59`	`+ return nil`
	`60`	`+ }`
	`61`	`+ }`
`52`	`62`	`}`
`53`	`63`
`54`	`64`	`public extension Array where Element: JSONDecodable {`
`@@ -57,7 +67,7 @@ public extension Array where Element: JSONDecodable {`
`57`	`67`	`guard let json = $0 as? [String : AnyObject] else {`
`58`	`68`	`throw JSONDecodableError.DictionaryTypeExpectedError(key: "[inarray]", elementType: $0.dynamicType)`
`59`	`69`	`}`
`60`		`- return try Element(JSONDictionary: json)`
	`70`	`+ return try Element(object: json)`
`61`	`71`	`})`
`62`	`72`	`}`
`63`	`73`	`}`
`@@ -110,7 +120,7 @@ public class JSONDecoder {`
`110`	`120`	`guard let object = value as? JSONObject else {`
`111`	`121`	`throw JSONDecodableError.DictionaryTypeExpectedError(key: key, elementType: value.dynamicType)`
`112`	`122`	`}`
`113`		`- return try Decodable(JSONDictionary: object)`
	`123`	`+ return try Decodable(object: object)`
`114`	`124`	`}`
`115`	`125`
`116`	`126`	`// JSONDecodable?`
`@@ -121,7 +131,7 @@ public class JSONDecoder {`
`121`	`131`	`guard let object = value as? JSONObject else {`
`122`	`132`	`throw JSONDecodableError.DictionaryTypeExpectedError(key: key, elementType: value.dynamicType)`
`123`	`133`	`}`
`124`		`- return try Decodable(JSONDictionary: object)`
	`134`	`+ return try Decodable(object: object)`
`125`	`135`	`}`
`126`	`136`
`127`	`137`	`// Enum`
`@@ -182,7 +192,7 @@ public class JSONDecoder {`
`182`	`192`	`guard let array = value as? [JSONObject] else {`
`183`	`193`	`throw JSONDecodableError.ArrayTypeExpectedError(key: key, elementType: value.dynamicType)`
`184`	`194`	`}`
`185`		`- return try array.flatMap { try Element(JSONDictionary: $0)}`
	`195`	`+ return try array.flatMap { try Element(object: $0)}`
`186`	`196`	`}`
`187`	`197`
`188`	`198`	`// [JSONDecodable]?`
`@@ -193,7 +203,7 @@ public class JSONDecoder {`
`193`	`203`	`guard let array = value as? [JSONObject] else {`
`194`	`204`	`throw JSONDecodableError.ArrayTypeExpectedError(key: key, elementType: value.dynamicType)`
`195`	`205`	`}`
`196`		`- return try array.flatMap { try Element(JSONDictionary: $0)}`
	`206`	`+ return try array.flatMap { try Element(object: $0)}`
`197`	`207`	`}`
`198`	`208`
`199`	`209`	`// [Enum]`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public extension JSONDecodable {`
`67`	`67`	`throw JSONDecodableError.DictionaryTypeExpectedError(key: "n/a", elementType: result.dynamicType)`
`68`	`68`	`}`
`69`	`69`
`70`		`- try self.init(JSONDictionary: converted)`
	`70`	`+ try self.init(object: converted)`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`