Merge pull request #20 from srdanrasic/master

Moving commits to develop branch

Author: matthewcheok

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>"; };

JSONCodable/JSONDecodable.swift

@@ -48,16 +48,26 @@ public enum JSONDecodableError: ErrorType, CustomStringConvertible {
 // Dictionary -> Struct
 
 public protocol JSONDecodable {
-    init?(JSONDictionary: JSONObject)
+    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 {
-    init(JSONArray: [AnyObject]) {
-        self.init(JSONArray.flatMap {
+    init(JSONArray: [AnyObject]) throws {
+        self.init(try JSONArray.flatMap {
             guard let json = $0 as? [String : AnyObject] else {
-                return nil
+                throw JSONDecodableError.DictionaryTypeExpectedError(key: "n/a", elementType: $0.dynamicType)
             }
-            return Element(JSONDictionary: json)
+            return try Element(object: json)
             })
     }
 }
@@ -110,10 +120,7 @@ public class JSONDecoder {
         guard let object = value as? JSONObject else {
             throw JSONDecodableError.DictionaryTypeExpectedError(key: key, elementType: value.dynamicType)
         }
-        guard let decodable = Decodable(JSONDictionary: object) else {
-            throw JSONDecodableError.IncompatibleTypeError(key: key, elementType: value.dynamicType, expectedType: Decodable.self)
-        }
-        return decodable
+        return try Decodable(object: object)
     }
 
     // JSONDecodable?
@@ -124,7 +131,7 @@ public class JSONDecoder {
         guard let object = value as? JSONObject else {
             throw JSONDecodableError.DictionaryTypeExpectedError(key: key, elementType: value.dynamicType)
         }
-        return Decodable(JSONDictionary: object)
+        return try Decodable(object: object)
     }
 
     // Enum
@@ -185,7 +192,7 @@ public class JSONDecoder {
         guard let array = value as? [JSONObject] else {
             throw JSONDecodableError.ArrayTypeExpectedError(key: key, elementType: value.dynamicType)
         }
-        return array.flatMap {Element(JSONDictionary: $0)}
+        return try array.flatMap { try Element(object: $0)}
     }
 
     // [JSONDecodable]?
@@ -196,7 +203,7 @@ public class JSONDecoder {
         guard let array = value as? [JSONObject] else {
             throw JSONDecodableError.ArrayTypeExpectedError(key: key, elementType: value.dynamicType)
         }
-        return array.flatMap {Element(JSONDictionary: $0)}
+        return try array.flatMap { try Element(object: $0)}
     }
 
     // [Enum]
@@ -270,4 +277,4 @@ public class JSONDecoder {
         }
         return result
     }
-}
+}

JSONCodable/JSONString.swift

@@ -56,45 +56,33 @@ public extension Optional where Wrapped: JSONEncodable {
 }
 
 public extension JSONDecodable {
-    init?(JSONString: String) {
+    init(JSONString: String) throws {
         guard let data = JSONString.dataUsingEncoding(NSUTF8StringEncoding) else {
-            return nil
-        }
-        
-        let result: AnyObject
-        do {
-            result = try NSJSONSerialization.JSONObjectWithData(data, options: NSJSONReadingOptions(rawValue: 0))
-        }
-        catch {
-            return nil
+            throw JSONDecodableError.IncompatibleTypeError(key: "n/a", elementType: JSONString.dynamicType, expectedType: String.self)
         }
 
+        let result: AnyObject = try NSJSONSerialization.JSONObjectWithData(data, options: NSJSONReadingOptions(rawValue: 0))
+
         guard let converted = result as? [String: AnyObject] else {
-            return nil
+            throw JSONDecodableError.DictionaryTypeExpectedError(key: "n/a", elementType: result.dynamicType)
         }
 
-        self.init(JSONDictionary: converted)
+        try self.init(object: converted)
     }
 }
 
 public extension Array where Element: JSONDecodable {
-    init?(JSONString: String) {
+    init(JSONString: String) throws {
         guard let data = JSONString.dataUsingEncoding(NSUTF8StringEncoding) else {
-            return nil
-        }
-        
-        let result: AnyObject
-        do {
-            result = try NSJSONSerialization.JSONObjectWithData(data, options: NSJSONReadingOptions(rawValue: 0))
-        }
-        catch {
-            return nil
+            throw JSONDecodableError.IncompatibleTypeError(key: "n/a", elementType: JSONString.dynamicType, expectedType: String.self)
         }
 
+        let result: AnyObject  = try NSJSONSerialization.JSONObjectWithData(data, options: NSJSONReadingOptions(rawValue: 0))
+
         guard let converted = result as? [AnyObject] else {
-            return nil
+            throw JSONDecodableError.ArrayTypeExpectedError(key: "n/a", elementType: result.dynamicType)
         }
 
-        self.init(JSONArray: converted)
+        try self.init(JSONArray: converted)
     }
 }