Fix nesting (matthewcheok#40)

Nadohs · matthewcheok · commit 822a0bd7f037 · 2016-05-12T20:23:24.000-07:00
* update readme

1) remove unnecessary JSON example
2) re-order Enconding/Decoding sections
3) added section on enconding nested arrays/dictionaries
4) added note on extending initialiers into Classes

* added decode cases and tests for handling double nested array items. i.e. [[Double]]

* expanded test for [[JSONDecodable]] examples
diff --git a/JSONCodable.xcodeproj/project.pbxproj b/JSONCodable.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		5211CD0A1CE2EBFB0097F255 /* NestItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5211CD091CE2EBFB0097F255 /* NestItem.swift */; };
 		52E8F44F1C9087D200F40F7F /* UtilityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52E8F44E1C9087D200F40F7F /* UtilityTests.swift */; };
 		9E455BFA1BCE185B00070A4F /* EnumTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E455BF91BCE185B00070A4F /* EnumTests.swift */; };
 		9E455BFC1BCE185B00070A4F /* JSONCodable.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9EDB39231B59D01D00C63019 /* JSONCodable.framework */; };
@@ -45,6 +46,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		5211CD091CE2EBFB0097F255 /* NestItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NestItem.swift; sourceTree = "<group>"; };
 		52E8F44E1C9087D200F40F7F /* UtilityTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UtilityTests.swift; sourceTree = "<group>"; };
 		9E455BF71BCE185B00070A4F /* JSONCodableTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = JSONCodableTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		9E455BF91BCE185B00070A4F /* EnumTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnumTests.swift; sourceTree = "<group>"; };
@@ -108,6 +110,7 @@
 		9E455C061BCE1D0B00070A4F /* Models */ = {
 			isa = PBXGroup;
 			children = (
+				5211CD091CE2EBFB0097F255 /* NestItem.swift */,
 				9E455C021BCE1C1E00070A4F /* Fruit.swift */,
 				9E8E07231BD3F15800F98421 /* Food.swift */,
 				9E455C041BCE1D0700070A4F /* User.swift */,
@@ -315,6 +318,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				52E8F44F1C9087D200F40F7F /* UtilityTests.swift in Sources */,
+				5211CD0A1CE2EBFB0097F255 /* NestItem.swift in Sources */,
 				9ECF00C41BCF82F5008D557C /* HelperTests.swift in Sources */,
 				9ECF00C21BCF6E43008D557C /* ImageAsset.swift in Sources */,
 				9E455C031BCE1C1E00070A4F /* Fruit.swift in Sources */,
diff --git a/JSONCodable/JSONDecodable.swift b/JSONCodable/JSONDecodable.swift
@@ -234,6 +234,39 @@ public class JSONDecoder {
         }
         return try array.flatMap { try Element(object: $0)}
     }
+
+    // [[JSONDecodable]]
+    public func decode<Element: JSONDecodable>(key: String) throws -> [[Element]] {
+        guard let value = get(key) else {
+            return []
+        }
+        guard let array = value as? [[JSONObject]] else {
+            throw JSONDecodableError.ArrayTypeExpectedError(key: key, elementType: value.dynamicType)
+        }
+        var res:[[Element]] = []
+
+        for x in array {
+            let nested = try x.flatMap { try Element(object: $0)}
+            res.append(nested)
+        }
+        return res
+    }
+
+    // [[JSONCompatible]]
+    public func decode<Element: JSONCompatible>(key: String) throws -> [[Element]] {
+        guard let value = get(key) else {
+            return []
+        }
+        guard let array = value as? [[Element]] else {
+            throw JSONDecodableError.IncompatibleTypeError(key: key, elementType: value.dynamicType, expectedType: [Element].self)
+        }
+        var res:[[Element]] = []
+
+        for x in array {
+            res.append(x)
+        }
+        return res
+    }
     
     // [Enum]
     public func decode<Enum: RawRepresentable>(key: String) throws -> [Enum] {
diff --git a/JSONCodableTests/NestItem.swift b/JSONCodableTests/NestItem.swift
@@ -0,0 +1,33 @@
+//
+//  NestItem.swift
+//  JSONCodable
+//
+//  Created by FoxRichard on 5/9/16.
+//
+//
+
+import Foundation
+import JSONCodable
+
+struct NestItem {
+    let areas: [[Float]]
+    var places: [[String]]?
+    var business: [[Company]]
+    var assets: [[ImageAsset]]?
+}
+
+extension NestItem: JSONDecodable {
+    init(object: JSONObject) throws {
+        do {
+            let decoder = JSONDecoder(object: object)
+            areas = try decoder.decode("areas")
+            places = try decoder.decode("places")
+            business = try decoder.decode("business")
+            assets = try decoder.decode("assets")
+        }catch{
+            fatalError("\(error)")
+        }
+    }
+
+}
+
diff --git a/JSONCodableTests/RegularTests.swift b/JSONCodableTests/RegularTests.swift
@@ -9,6 +9,25 @@
 import XCTest
 
 class RegularTests: XCTestCase {
+
+    let nestedCodableArray = ["areas" : [[10.0,10.5,12.5]],
+                              "places":[["Tokyo","New York", "El Cerrito"]],
+                              "business" : [[
+                                [ "name": "Apple",
+                                  "address": "1 Infinite Loop, Cupertino, CA"
+                                ],
+                                [ "name": "Propeller",
+                                  "address": "1212 broadway, Oakland, CA"
+                                ]
+                              ]],
+                              "assets": [[
+                                [ "name": "image-name",
+                                  "uri": "http://www.example.com/image.png"
+                                ],
+                                [ "name": "image2-name",
+                                  "uri": "http://www.example.com/image2.png"
+                                ]
+                               ]]]
     
     let encodedNestedArray = [
         "id": 99,
@@ -47,6 +66,32 @@ class RegularTests: XCTestCase {
         friendsLookup: ["Bob Jefferson":  User(id: 27, likes:0, name: "Bob Jefferson", email: nil, company: nil, friends: [], friendsLookup: nil)]
     )
 
+    func testDecodeNestedCodableArray() {
+        guard let nested = try? NestItem(object: nestedCodableArray) else {
+            XCTFail()
+            return
+        }
+        print("nested=",nested)
+        let places = nested.places ?? [[]]
+        let areas = nested.areas
+        let business = nested.business
+        let assets = nested.assets ?? [[]]
+        XCTAssert(places == [["Tokyo","New York", "El Cerrito"]], "\(nestedCodableArray))")
+        XCTAssert(areas == [[10.0,10.5,12.5]], "\(nestedCodableArray))")
+
+        XCTAssert(business.map{ $0.map{ $0.name } } == [[try! Company(object:["name": "Apple",
+                                "address": "1 Infinite Loop, Cupertino, CA"]),
+                              try! Company(object:[ "name": "Propeller",
+                                "address": "1212 broadway, Oakland, CA"])].map{ $0.name }],
+        "\(nestedCodableArray))")
+
+        XCTAssert(assets.map{ $0.map{ $0.name } } == [[try! ImageAsset(object:[ "name": "image-name",
+            "uri": "http://www.example.com/image.png"]),
+            try! ImageAsset(object: ["name": "image2-name",
+                "uri": "http://www.example.com/image2.png"])].map{ $0.name }],
+        "\(nestedCodableArray))")
+    }
+    
     func testDecodingNestedArray() {
         guard let user = try? User(object: encodedNestedArray) else {
             XCTFail()
