added decode using the type

Author: renep

Main/Source/Decoder.swift

@@ -44,6 +44,13 @@ extension Decoder {
 		return nil
 	}
 
+	public func decode<T: Encodable>(forKey key: String, type: T.Type) -> T? {
+		if let decoder = self.decoder(forKey: key) {
+			return T(decoder: decoder)
+		}
+		return nil
+	}
+
 	public func decodeArray<T: Encodable>(forKey key: String, type: T.Type) -> [T]? {
 		return self.decodeArray(forKey: key) { decoder in
 			return T(decoder: decoder)

Main/Source/JSON/JSONDecoder.swift

@@ -5,9 +5,9 @@
 
 import Foundation
 
-open class JSONDecoder : Decoder {
+open class JSONDecoder: Decoder {
 
-	var data : [String: Any]
+	var data: [String: Any]
 
 	public convenience init(jsonString: String) {
 		self.init(jsonString: jsonString, defaultValues: [:])
@@ -37,24 +37,24 @@ open class JSONDecoder : Decoder {
 	}
 
 
-	public func decode<T:Encodable>(type: T.Type) -> T? {
+	public func decode<T: Encodable>(type: T.Type) -> T? {
 		return T(decoder: self)
 	}
 
 
 	public func decoder(forKey key: String) -> Decoder? {
-		if let value = data[key] as? [String : Any]{
-			let decoder = JSONDecoder(data:value)
+		if let value = data[key] as? [String: Any] {
+			let decoder = JSONDecoder(data: value)
 			return decoder
 		}
 		return nil
 	}
 
 	public func decodeArray<T>(forKey key: String, closure: DecodeClosure<T>) -> [T]? {
-		if let dataArray = data[key] as? [[String : Any]] {
+		if let dataArray = data[key] as? [[String: Any]] {
 			var resultArray = [T]()
 			for data in dataArray {
-				let decoder = JSONDecoder(data:data)
+				let decoder = JSONDecoder(data: data)
 				if let object = closure(decoder) {
 					resultArray.append(object)
 				}
@@ -130,7 +130,7 @@ open class JSONDecoder : Decoder {
 		}
 		return nil
 	}
-	
+
 	public func dictionary(forKey key: String) -> [String: Any]? {
 		if let result = data[key] as? [String: Any] {
 			return result

Test/Source/JSON/JSONDecoderTest.swift

@@ -166,6 +166,19 @@ class JSONDecoderTest: XCTestCase {
 		assertThat(result?.topLeft.y, presentAnd(equalTo(1)))
 	}
 
+	func test_decode_encodeable_() {
+		let quadrilateral = Quadrilateral(topLeft: CGPoint(x: 1, y: 1), topRight: CGPoint(x: 5, y: 1), bottomLeft: CGPoint(x: 2, y: 5), bottomRight: CGPoint(x: 6, y: 6))
+		let coder = JSONCoder()
+		coder.encode(quadrilateral, forKey: "crop")
+
+		let decoder = JSONDecoder(jsonString: coder.jsonString)
+
+		let result = decoder.decode(forKey: "crop", type: Quadrilateral.self)
+
+		assertThat(result, present())
+		assertThat(result?.topLeft.x, equalTo(1))
+		assertThat(result?.topLeft.y, equalTo(1))
+	}
 
 	func test_decode_with_default_values() {
 		let decoder = OBCoder.JSONDecoder(jsonString: "{}", defaultValues: ["string": "Test"])