Linked resources with links actually link

Author: Josh Holtz

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

Classes/JSONAPIResource.h

@@ -23,4 +23,6 @@
 - (id)objectForKey:(NSString*)key;
 - (id)linkedResourceForKey:(NSString*)key;
 
+- (void)linkLinks:(NSDictionary*)linked;
+
 @end

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];

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"];
@@ -223,4 +225,26 @@ - (void)testResourceModels {
     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