Merge pull request #25 from joshdholtz/json-api-v1.0-final

Json api v1.0 final

Author: Josh Holtz

Classes/JSONAPIResourceParser.m

@@ -268,24 +268,31 @@ + (void)link:(NSObject <JSONAPIResource>*)resource withIncluded:(JSONAPI*)jsonAP
     // Loops through all keys to map to properties
     NSDictionary *properties = [descriptor properties];
     for (NSString *key in properties) {
-        JSONAPIPropertyDescriptor *property = [properties objectForKey:key];
-        if (property.resourceType) {
-            id value = [resource valueForKey:key];
-            if (value) {
-                if ([value isKindOfClass:[NSArray class]]) {
-                    for (NSObject <JSONAPIResource> *element in value) {
-                        id include = included[property.resourceType][element.ID];
-                        if (include) {
-                            [self set:element withDictionary:include];
-                        }
-                    }
-                } else {
-                    NSObject <JSONAPIResource> *attribute = value;
-                    id include = included[property.resourceType][attribute.ID];
-                    if (include) {
-                        [self set:attribute withDictionary:include];
-                    }
+        JSONAPIPropertyDescriptor *propertyDescriptor = [properties objectForKey:key];
+        id value = [resource valueForKey:key];
+        id includedValue = included[[[propertyDescriptor.resourceType descriptor] type]];
+        
+        // ordinary attribute
+        if (propertyDescriptor.resourceType == nil) {
+            continue;
+        // has many
+        } else if ([value isKindOfClass:[NSArray class]]) {
+            NSMutableArray *matched = [value mutableCopy];
+            [value enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
+                NSObject <JSONAPIResource> *res = obj;
+                id v = includedValue[res.ID];
+                if (v != nil) {
+                    matched[idx] = v;
                 }
+            }];
+
+            [resource setValue:matched forKey:key];
+        // has one
+        } else if (value != nil) {
+            NSObject <JSONAPIResource> *res = value;
+            id v = includedValue[res.ID];
+            if (v != nil) {
+                [resource setValue:v forKey:key];
             }
         }
     }

Project/JSONAPITests/JSONAPITests.m

@@ -69,11 +69,16 @@ - (void)testIncludedPeopleAndComments {
 - (void)testDataArticleAuthorAndComments {
     NSDictionary *json = [self mainExampleJSON];
     JSONAPI *jsonAPI = [JSONAPI jsonAPIWithDictionary:json];
-    
+	
     ArticleResource *article = jsonAPI.resource;
-    XCTAssertNotNil(article.author, @"Article author should not be nil");
-    XCTAssertNotNil(article.comments, @"Article comments should not be nil");
+    CommentResource *firstComment = article.comments.firstObject;
+    
+    XCTAssertNotNil(article.author, @"Article's author should not be nil");
+    XCTAssertNotNil(article.comments, @"Article's comments should not be nil");
     XCTAssertEqual(article.comments.count, 2, @"Article should contain 2 comments");
+    XCTAssertEqualObjects(article.author.firstName, @"Dan", @"Article's author firstname should be 'Dan'");
+    XCTAssertEqualObjects(firstComment.text, @"First!", @"Article's first comment should be 'First!'");
+    XCTAssertEqualObjects(firstComment.author.firstName, @"Dan", @"Article's first comment author should be 'Dan'");
 }
 
 - (void)testIncludedCommentIsLinked {
@@ -82,7 +87,7 @@ - (void)testIncludedCommentIsLinked {
 
     CommentResource *comment = [jsonAPI includedResource:@"5" withType:@"comments"];
     XCTAssertNotNil(comment.author, @"Comment's author should not be nil");
-    XCTAssertEqualObjects(comment.author.ID, @"2", @"Comment's author's ID should be 2");
+    XCTAssertEqualObjects(comment.author.ID, @"9", @"Comment's author's ID should be 2");
 }
 
 - (void)testNoError {

Project/JSONAPITests/main_example.json

@@ -55,7 +55,7 @@
 				 },
 				 "relationships": {
 				 "author": {
-				 "data": { "type": "people", "id": "2" }
+				 "data": { "type": "people", "id": "9" }
 				 }
 				 },
 				 "links": {