Merge pull request #2 from joshdholtz/links-in-linked

Josh Holtz · Josh Holtz · commit fab6b40c5b83 · 2014-01-12T20:25:10.000-08:00
Links in linked
diff --git a/Classes/JSONAPI.m b/Classes/JSONAPI.m
@@ -101,6 +101,8 @@ - (void)inflateWithDictionary:(NSDictionary*)dictionary {
     NSDictionary *rawLinked = [dictionary objectForKey:@"linked"];
     if ([rawLinked isKindOfClass:[NSDictionary class]] == YES) {
         
+        NSMutableArray *linkedToLinkWithLinked = [NSMutableArray array];
+        
         // Loops through linked arrays
         for (NSString *key in rawLinked.allKeys) {
             NSArray *value = [rawLinked objectForKey:key];
@@ -111,14 +113,22 @@ - (void)inflateWithDictionary:(NSDictionary*)dictionary {
                     Class c = [JSONAPIResourceModeler resourceForLinkedType:[JSONAPIResourceLinker linkedType:key]];
                     JSONAPIResource *resource = [JSONAPIResource jsonAPIResource:resourceDictionary withLinked:nil withClass:c];
                     [resources setObject:resource forKey:resource.ID];
+                    
+                    [linkedToLinkWithLinked addObject:resource];
                 }
                 [creatingLinked setObject:resources forKey:key];
                 
             }
             
         }
         
+        // Linked the linked
+        for (JSONAPIResource *resource in linkedToLinkWithLinked) {
+            [resource linkLinks:creatingLinked];
+        }
+        
     }
+    
     _linked = creatingLinked;
 }
 
diff --git a/Classes/JSONAPIResource.h b/Classes/JSONAPIResource.h
@@ -23,4 +23,6 @@
 - (id)objectForKey:(NSString*)key;
 - (id)linkedResourceForKey:(NSString*)key;
 
+- (void)linkLinks:(NSDictionary*)linked;
+
 @end
diff --git a/Classes/JSONAPIResource.m b/Classes/JSONAPIResource.m
@@ -62,7 +62,7 @@ - (id)initWithDictionary:(NSDictionary*)dict withLinked:(NSDictionary*)linked {
     self = [self init];
     if (self) {
         [self setWithDictionary:dict];
-        [self setWithLinks:linked];
+        [self linkLinks:linked];
     }
     return self;
 }
@@ -104,28 +104,9 @@ - (void)setWithDictionary:(NSDictionary*)dict {
             
             @try {
                 if (inflateRange.location != NSNotFound) {
-//                    NSString *object = [property substringToIndex:inflateRange.location];
-//                    property = [property substringFromIndex:(inflateRange.location+1)];
-//                    
-//                    Class class = NSClassFromString(object);
-//                    if ([[dict objectForKey:key] isKindOfClass:[NSDictionary class]]) {
-//                        ProtocolModel *obj = [[class alloc] initWithDictionary:[dict objectForKey:key]];
-//                        [obj setParentModel:self];
-//                        
-//                        [self setValue:obj forKey:property];
-//                    } else if ([[dict objectForKey:key] isKindOfClass:[NSArray class]]) {
-//                        NSArray *array = [ProtocolModel protocolModels:[dict objectForKey:key] withClass:class];
-//                        for (ProtocolModel *model in array) {
-//                            [model setParentModel:self];
-//                        }
-//                        
-//                        [self setValue:array forKey:property];
-//                    }
+
                 } else if (formatRange.location != NSNotFound) {
-//                    NSString *formatFunction = [property substringToIndex:formatRange.location];
-//                    property = [property substringFromIndex:(formatRange.location+1)];
-//                    
-//                    [self setValue:[[ProtocolModel sharedInstance] performFormatBlock:[dict objectForKey:key] withKey:formatFunction] forKey:property ];
+  
                 } else {
                     [self setValue:[dict objectForKey:key] forKey:property ];
                 }
@@ -141,7 +122,7 @@ - (void)setWithDictionary:(NSDictionary*)dict {
     }
 }
 
-- (void)setWithLinks:(NSDictionary*)linked {
+- (void)linkLinks:(NSDictionary*)linked {
     // Loops through links of resources
     for (NSString *linkTypeUnmapped in self.links.allKeys) {
         
@@ -155,7 +136,9 @@ - (void)setWithLinks:(NSDictionary*)linked {
         if ([linksTo isKindOfClass:[NSNumber class]] == YES) {
             JSONAPIResource *linkedResource = [[linked objectForKey:linkType] objectForKey:linksTo];
             
-            [self.__resourceLinks setObject:linkedResource forKey:linkTypeUnmapped];
+            if (linkedResource != nil) {
+                [self.__resourceLinks setObject:linkedResource forKey:linkTypeUnmapped];
+            }
             
         } else if ([linksTo isKindOfClass:[NSArray class]] == YES) {
             NSMutableArray *linkedResources = [NSMutableArray array];
diff --git a/Project/JSONAPITests/JSONAPITests.m b/Project/JSONAPITests/JSONAPITests.m
@@ -27,6 +27,8 @@ - (void)setUp
     [JSONAPIResourceLinker link:@"author" toLinkedType:@"authors"];
     [JSONAPIResourceLinker link:@"authors" toLinkedType:@"authors"]; // Don't NEED this but why not be explicit
     [JSONAPIResourceLinker link:@"person" toLinkedType:@"people"];
+    [JSONAPIResourceLinker link:@"chapter" toLinkedType:@"chapters"];
+    [JSONAPIResourceLinker link:@"book" toLinkedType:@"books"];
     
     [JSONAPIResourceModeler useResource:[CommentResource class] toLinkedType:@"comment"];
     [JSONAPIResourceModeler useResource:[PeopleResource class] toLinkedType:@"authors"];
@@ -50,8 +52,7 @@ - (void)testMeta
     NSDictionary *json = @{ @"meta" : meta, @"linked" : linked, @"posts" : @[ @{ @"id" : @1, @"name" : @"Josh is awesome", @"links" : @{ @"author" : @9 } } ] };
     
     JSONAPI *jsonAPI = [[JSONAPI alloc] initWithDictionary:json];
-    NSAssert([meta isEqualToDictionary:jsonAPI.meta], @"Meta does not equal %@", meta);
-    //    @"No implementation for \"%s\"", __PRETTY_FUNCTION__
+    XCTAssert([meta isEqualToDictionary:jsonAPI.meta], @"Meta does not equal %@", meta);
     
 }
 
@@ -62,7 +63,7 @@ - (void)testBadMeta
     NSDictionary *json = @{ @"meta" : meta, @"linked" : linked, @"posts" : @[ @{ @"id" : @1, @"name" : @"Josh is awesome", @"links" : @{ @"author" : @9 } } ] };
     
     JSONAPI *jsonAPI = [[JSONAPI alloc] initWithDictionary:json];
-    NSAssert(jsonAPI.meta == nil, @"Meta is not nil");
+    XCTAssertNil(jsonAPI.meta, @"Meta is not nil");
     
 }
 
@@ -73,7 +74,7 @@ - (void)testLinkedCount
     NSDictionary *json = @{ @"meta" : meta, @"linked" : linked, @"posts" : @[ @{ @"id" : @1, @"name" : @"Josh is awesome", @"links" : @{ @"author" : @9 } } ] };
     
     JSONAPI *jsonAPI = [[JSONAPI alloc] initWithDictionary:json];
-    NSAssert(linked.count == jsonAPI.linked.count, @"Linked count does not equal %d", linked.count);
+    XCTAssert(linked.count == jsonAPI.linked.count, @"Linked count does not equal %d", linked.count);
     
 }
 
@@ -85,8 +86,8 @@ - (void)testLinkedResource {
     
     JSONAPI *jsonAPI = [[JSONAPI alloc] initWithDictionary:json];
     JSONAPIResource *linkedAuthorResource = [[jsonAPI.linked objectForKey:@"authors"] objectForKey:@9];
-    NSAssert([[linkedAuthor9 objectForKey:@"id"] isEqualToNumber:linkedAuthorResource.ID] , @"Author resource ID does not equal %@", [linkedAuthor9 objectForKey:@"id"]);
-    NSAssert([[linkedAuthor9 objectForKey:@"name"] isEqualToString:[linkedAuthorResource objectForKey:@"name"]] , @"Author resource name does not equal %@", [linkedAuthor9 objectForKey:@"name"]);
+    XCTAssertEqualObjects([linkedAuthor9 objectForKey:@"id"], linkedAuthorResource.ID , @"Author resource ID does not equal %@", [linkedAuthor9 objectForKey:@"id"]);
+    XCTAssertEqualObjects([linkedAuthor9 objectForKey:@"name"], [linkedAuthorResource objectForKey:@"name"] , @"Author resource name does not equal %@", [linkedAuthor9 objectForKey:@"name"]);
 }
 
 - (void)testBadLinked
@@ -96,7 +97,8 @@ - (void)testBadLinked
     NSDictionary *json = @{ @"meta" : meta, @"linked" : linked, @"posts" : @[ @{ @"id" : @1, @"name" : @"Josh is awesome", @"links" : @{ @"author" : @9 } } ] };
     
     JSONAPI *jsonAPI = [[JSONAPI alloc] initWithDictionary:json];
-    NSAssert(jsonAPI.linked.count == 0, @"Linked is not 0");
+    NSLog(@"%d HRM %d", jsonAPI.linked.count, 0);
+    XCTAssert(jsonAPI.linked.count == 0, @"Linked is not 0");
     
 }
 
@@ -109,7 +111,7 @@ - (void)testResourcesCount {
     NSDictionary *json = @{ @"meta" : meta, @"linked" : linked, @"posts" : posts };
     
     JSONAPI *jsonAPI = [[JSONAPI alloc] initWithDictionary:json];
-    NSAssert(posts.count == [jsonAPI resourcesForKey:@"posts"].count, @"Posts count does not equal %d", posts.count);
+    XCTAssert(posts.count == [jsonAPI resourcesForKey:@"posts"].count, @"Posts count does not equal %d", posts.count);
 }
 
 - (void)testResourcesObject {
@@ -123,8 +125,8 @@ - (void)testResourcesObject {
     JSONAPI *jsonAPI = [[JSONAPI alloc] initWithDictionary:json];
     JSONAPIResource *resource = [jsonAPI resourceForKey:@"posts"];
 
-    NSAssert([[post objectForKey:@"id"] isEqualToNumber:resource.ID] , @"Posts ID does not equal %@", [post objectForKey:@"id"]);
-    NSAssert([[post objectForKey:@"name"] isEqualToString:[resource objectForKey:@"name"]] , @"Posts name does not equal %@", [post objectForKey:@"name"]);
+    XCTAssertEqualObjects([post objectForKey:@"id"], resource.ID, @"Posts ID does not equal %@", [post objectForKey:@"id"]);
+    XCTAssertEqualObjects([post objectForKey:@"name"], [resource objectForKey:@"name"], @"Posts name does not equal %@", [post objectForKey:@"name"]);
 }
 
 - (void)testResourceLinkSameTypeName {
@@ -141,9 +143,9 @@ - (void)testResourceLinkSameTypeName {
     
     JSONAPIResource *linkedAuthor = [resource linkedResourceForKey:@"author"];
     
-    NSAssert(linkedAuthor != nil, @"Linked author is nil");
-    NSAssert([[linkedAuthor objectForKey:@"name"] isEqualToString:[linkedAuthor9 objectForKey:@"name"]], @"Linked author's name is not equal to %@", [linkedAuthor9 objectForKey:@"name"]);
-    NSAssert([[linkedAuthor objectForKey:@"name"] isEqualToString:[linkedAuthor9 objectForKey:@"name"]], @"Linked author's name is not equal to %@", [linkedAuthor9 objectForKey:@"name"]);
+    XCTAssertNotNil(linkedAuthor, @"Linked author is nil");
+    XCTAssertEqualObjects([linkedAuthor objectForKey:@"name"], [linkedAuthor9 objectForKey:@"name"], @"Linked author's name is not equal to %@", [linkedAuthor9 objectForKey:@"name"]);
+    XCTAssertEqualObjects([linkedAuthor objectForKey:@"name"], [linkedAuthor9 objectForKey:@"name"], @"Linked author's name is not equal to %@", [linkedAuthor9 objectForKey:@"name"]);
     
 }
 
@@ -171,13 +173,13 @@ - (void)testResourceLinksSameTypeName {
         }
     }
     
-    NSAssert(linkedAuthorsResources.count == linkedAuthors.count, @"Linked author resource count is not %d", linkedAuthors.count);
+    XCTAssert(linkedAuthorsResources.count == linkedAuthors.count, @"Linked author resource count is not %d", linkedAuthors.count);
     
-    NSAssert([[linkedAuthorResource9 objectForKey:@"name"] isEqualToString:[linkedAuthor9 objectForKey:@"name"]], @"Linked author's 9 name is not equal to %@", [linkedAuthor9 objectForKey:@"name"]);
-    NSAssert([[linkedAuthorResource9 objectForKey:@"name"] isEqualToString:[linkedAuthor9 objectForKey:@"name"]], @"Linked author's 9 name is not equal to %@", [linkedAuthor9 objectForKey:@"name"]);
+    XCTAssertEqualObjects([linkedAuthorResource9 objectForKey:@"name"], [linkedAuthor9 objectForKey:@"name"], @"Linked author's 9 name is not equal to %@", [linkedAuthor9 objectForKey:@"name"]);
+    XCTAssertEqualObjects([linkedAuthorResource9 objectForKey:@"name"], [linkedAuthor9 objectForKey:@"name"], @"Linked author's 9 name is not equal to %@", [linkedAuthor9 objectForKey:@"name"]);
     
-    NSAssert([[linkedAuthorResource11 objectForKey:@"name"] isEqualToString:[linkedAuthor11 objectForKey:@"name"]], @"Linked author's 11 name is not equal to %@", [linkedAuthor9 objectForKey:@"name"]);
-    NSAssert([[linkedAuthorResource11 objectForKey:@"name"] isEqualToString:[linkedAuthor11 objectForKey:@"name"]], @"Linked author's 11 name is not equal to %@", [linkedAuthor9 objectForKey:@"name"]);
+    XCTAssertEqualObjects([linkedAuthorResource11 objectForKey:@"name"], [linkedAuthor11 objectForKey:@"name"], @"Linked author's 11 name is not equal to %@", [linkedAuthor9 objectForKey:@"name"]);
+    XCTAssertEqualObjects([linkedAuthorResource11 objectForKey:@"name"], [linkedAuthor11 objectForKey:@"name"], @"Linked author's 11 name is not equal to %@", [linkedAuthor9 objectForKey:@"name"]);
     
 }
 
@@ -197,9 +199,9 @@ - (void)testResourceLinksRealDifferentTypeName {
     
     JSONAPIResource *linkedPersonResource = [resource linkedResourceForKey:@"person"];
     
-    NSAssert(linkedPersonResource != nil, @"Linked person is nil");
-    NSAssert([[linkedPersonResource objectForKey:@"name"] isEqualToString:[linkedPeople9 objectForKey:@"name"]], @"Linked person's 9 name is not equal to %@", [linkedPeople11 objectForKey:@"name"]);
-    NSAssert([[linkedPersonResource objectForKey:@"name"] isEqualToString:[linkedPeople9 objectForKey:@"name"]], @"Linked person's 9 name is not equal to %@", [linkedPeople11 objectForKey:@"name"]);
+    XCTAssertNotNil(linkedPersonResource, @"Linked person is nil");
+    XCTAssertEqualObjects([linkedPersonResource objectForKey:@"name"], [linkedPeople9 objectForKey:@"name"], @"Linked person's 9 name is not equal to %@", [linkedPeople11 objectForKey:@"name"]);
+    XCTAssertEqualObjects([linkedPersonResource objectForKey:@"name"], [linkedPeople9 objectForKey:@"name"], @"Linked person's 9 name is not equal to %@", [linkedPeople11 objectForKey:@"name"]);
 
     
 }
@@ -217,10 +219,32 @@ - (void)testResourceModels {
     JSONAPI *jsonAPI = [[JSONAPI alloc] initWithDictionary:json];
     PostResource *postResource = [jsonAPI resourceForKey:@"posts"];
     
-    NSAssert([postResource class] == [PostResource class], @"Post resource is not of type PostResource, but %@", [postResource class]);
-    NSAssert([postResource.author class] == [PeopleResource class], @"Post resource's author is not of type PeopleResource, but %@", [postResource.author class]);
-    NSAssert([postResource.name isEqualToString:[post objectForKey:@"name"]], @"Post name is not equal to %@", [post objectForKey:@"name"]);
-    NSAssert([postResource.author.name isEqualToString:[linkedAuthor9 objectForKey:@"name"]], @"Author name is not equal to %@", [post objectForKey:@"name"]);
+    XCTAssertEqual([postResource class], [PostResource class], @"Post resource is not of type PostResource, but %@", [postResource class]);
+    XCTAssertEqual([postResource.author class], [PeopleResource class], @"Post resource's author is not of type PeopleResource, but %@", [postResource.author class]);
+    XCTAssertEqualObjects(postResource.name, [post objectForKey:@"name"], @"Post name is not equal to %@", [post objectForKey:@"name"]);
+    XCTAssertEqualObjects(postResource.author.name, [linkedAuthor9 objectForKey:@"name"], @"Author name is not equal to %@", [post objectForKey:@"name"]);
+}
+
+- (void)testLinksInLinked {
+    NSDictionary *meta = @{};
+    NSDictionary *linkedBook9 = @{ @"id" : @9, @"name" : @"A Book That's A Book", @"links" : @{ @"author" : @11 } };
+    NSArray *linkedBooks = @[ linkedBook9 ];
+    NSDictionary *linkedAuthor11 = @{ @"id" : @11, @"name" : @"Bandit"};
+    NSArray *linkedAuthors = @[ linkedAuthor11 ];
+    NSDictionary *linked = @{ @"authors" : linkedAuthors, @"books" : linkedBooks};
+    NSDictionary *chapter = @{ @"id" : @1, @"name" : @"Chapter 1: And It Begins", @"links" : @{ @"book" : @9 } };
+    NSArray *chapters = @[ chapter ];
+    NSDictionary *json = @{ @"meta" : meta, @"linked" : linked, @"chapters" : chapters };
+    
+    JSONAPI *jsonAPI = [[JSONAPI alloc] initWithDictionary:json];
+    
+    JSONAPIResource *chapterResource = [jsonAPI resourceForKey:@"chapters"];
+    JSONAPIResource *bookResource = [chapterResource linkedResourceForKey:@"book"];
+    JSONAPIResource *authorResource = [bookResource linkedResourceForKey:@"author"];
+    
+    XCTAssertEqualObjects([chapterResource objectForKey:@"name"], [chapter objectForKey:@"name"], @"Chapter name should equal %@", [chapter objectForKey:@"name"]);
+    XCTAssertEqualObjects([bookResource objectForKey:@"name"], [linkedBook9 objectForKey:@"name"], @"Book name should equal %@", [chapter objectForKey:@"name"]);
+    XCTAssertEqualObjects([authorResource objectForKey:@"name"], [linkedAuthor11 objectForKey:@"name"], @"Author name should equal %@", [chapter objectForKey:@"name"]);
 }
 
 @end

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,8 @@ - (void)inflateWithDictionary:(NSDictionary*)dictionary {`
`101`	`101`	`NSDictionary *rawLinked = [dictionary objectForKey:@"linked"];`
`102`	`102`	`if ([rawLinked isKindOfClass:[NSDictionary class]] == YES) {`
`103`	`103`
	`104`	`+ NSMutableArray *linkedToLinkWithLinked = [NSMutableArray array];`
	`105`	`+`
`104`	`106`	`// Loops through linked arrays`
`105`	`107`	`for (NSString *key in rawLinked.allKeys) {`
`106`	`108`	`NSArray *value = [rawLinked objectForKey:key];`
`@@ -111,14 +113,22 @@ - (void)inflateWithDictionary:(NSDictionary*)dictionary {`
`111`	`113`	`Class c = [JSONAPIResourceModeler resourceForLinkedType:[JSONAPIResourceLinker linkedType:key]];`
`112`	`114`	`JSONAPIResource *resource = [JSONAPIResource jsonAPIResource:resourceDictionary withLinked:nil withClass:c];`
`113`	`115`	`[resources setObject:resource forKey:resource.ID];`
	`116`	`+`
	`117`	`+ [linkedToLinkWithLinked addObject:resource];`
`114`	`118`	`}`
`115`	`119`	`[creatingLinked setObject:resources forKey:key];`
`116`	`120`
`117`	`121`	`}`
`118`	`122`
`119`	`123`	`}`
`120`	`124`
	`125`	`+ // Linked the linked`
	`126`	`+ for (JSONAPIResource *resource in linkedToLinkWithLinked) {`
	`127`	`+ [resource linkLinks:creatingLinked];`
	`128`	`+ }`
	`129`	`+`
`121`	`130`	`}`
	`131`	`+`
`122`	`132`	`_linked = creatingLinked;`
`123`	`133`	`}`
`124`	`134`