Updates for new JSON API spec

Author: rokkincat

Classes/JSONAPI.h

@@ -26,7 +26,7 @@
 - (id)initWithDictionary:(NSDictionary*)dictionary;
 
 - (id)objectForKey:(NSString*)key;
-- (id)resourceForKey:(NSString*)key;
-- (NSArray*)resourcesForKey:(NSString*)key;
+- (id)resource;
+- (NSArray*)resources;
 
 @end

Classes/JSONAPI.m

@@ -58,21 +58,21 @@ - (id)objectForKey:(NSString*)key {
     return [_dictionary objectForKey:key];
 }
 
-- (id)resourceForKey:(NSString*)key {
+- (id)resource {
+    NSString *key = @"data";
     if ([key isEqualToString:@"meta"] == YES || [key isEqualToString:@"linked"] == YES) {
         return nil;
     }
 
     NSDictionary *rawResource = [_dictionary objectForKey:key];
     JSONAPIResource *resource = nil;
     if ([rawResource isKindOfClass:[NSDictionary class]] == YES) {
-        Class c = [JSONAPIResourceModeler resourceForLinkedType:[JSONAPIResourceLinker linkedType:key]];
-        resource = [JSONAPIResource jsonAPIResource:rawResource withLinked:self.linked withClass:c];
+        resource = [JSONAPIResource jsonAPIResource:rawResource withLinked:self.linked];
     }
 
     // Fall back to first element in array
     if (resource == nil) {
-        id resources = [self resourcesForKey:key];
+        id resources = [self resources];
         if ([resources isKindOfClass:[NSArray class]] == YES) {
             return [resources firstObject];
         }
@@ -82,16 +82,16 @@ - (id)resourceForKey:(NSString*)key {
 
 }
 
-- (NSArray*)resourcesForKey:(NSString*)key {
+- (NSArray*)resources {
+    NSString *key = @"data";
     if ([key isEqualToString:@"meta"] == YES || [key isEqualToString:@"linked"] == YES) {
         return nil;
     }
 
     NSArray *rawResources = [_dictionary objectForKey:key];
     NSArray *resources = nil;
     if ([rawResources isKindOfClass:[NSArray class]] == YES) {
-        Class c = [JSONAPIResourceModeler resourceForLinkedType:[JSONAPIResourceLinker linkedType:key]];
-        resources = [JSONAPIResource jsonAPIResources:rawResources withLinked:self.linked withClass:c];
+        resources = [JSONAPIResource jsonAPIResources:rawResources withLinked:self.linked];
     }
 
     return resources;
@@ -112,26 +112,21 @@ - (void)inflateWithDictionary:(NSDictionary*)dictionary {
     // Sets linked
     NSMutableDictionary *creatingLinked = [NSMutableDictionary dictionary];
     NSDictionary *rawLinked = [dictionary objectForKey:@"linked"];
-    if ([rawLinked isKindOfClass:[NSDictionary class]] == YES) {
+    if ([rawLinked isKindOfClass:[NSArray class]] == YES) {
 
         NSMutableArray *linkedToLinkWithLinked = [NSMutableArray array];
 
         // Loops through linked arrays
-        for (NSString *key in rawLinked.allKeys) {
-            NSArray *value = [rawLinked objectForKey:key];
+        for (NSDictionary *resourceDictionary in rawLinked) {
 
-            if ([value isKindOfClass:[NSArray class]] == YES) {
-                NSMutableDictionary *resources = [NSMutableDictionary dictionary];
-                for (NSDictionary *resourceDictionary in value) {
-                    Class c = [JSONAPIResourceModeler resourceForLinkedType:[JSONAPIResourceLinker linkedType:key]];
-                    JSONAPIResource *resource = [JSONAPIResource jsonAPIResource:resourceDictionary withLinked:nil withClass:c];
-                    if (resource.ID != nil) {
-                        [resources setObject:resource forKey:resource.ID];
-                        [linkedToLinkWithLinked addObject:resource];
-                    }
-                }
-                [creatingLinked setObject:resources forKey:key];
-                
+            NSString *type = resourceDictionary[@"type"];
+            NSMutableDictionary *resources = creatingLinked[type] ?: @{}.mutableCopy;
+            [creatingLinked setObject:resources forKey:type];
+            
+            JSONAPIResource *resource = [JSONAPIResource jsonAPIResource:resourceDictionary withLinked:nil];
+            if (resource.ID != nil) {
+                [resources setObject:resource forKey:resource.ID];
+                [linkedToLinkWithLinked addObject:resource];
             }
 
         }

Classes/JSONAPIResource.h

@@ -15,10 +15,7 @@
 @property (nonatomic, strong) NSDictionary *links;
 
 + (NSArray*)jsonAPIResources:(NSArray*)array withLinked:(NSDictionary*)linked;
-+ (NSArray*)jsonAPIResources:(NSArray*)array withLinked:(NSDictionary*)linked withClass:(Class)resourceObjectClass;
-
 + (id)jsonAPIResource:(NSDictionary*)dictionary withLinked:(NSDictionary*)linked;
-+ (id)jsonAPIResource:(NSDictionary*)dictionary withLinked:(NSDictionary*)linked withClass:(Class)resourceObjectClass;
 
 - (id)initWithDictionary:(NSDictionary*)dict withLinked:(NSDictionary*)linked;
 - (void)setWithDictionary:(NSDictionary*)dict;

Classes/JSONAPIResource.m

@@ -10,6 +10,7 @@
 
 #import "JSONAPIResourceFormatter.h"
 #import "JSONAPIResourceLinker.h"
+#import "JSONAPIResourceModeler.h"
 
 #import <objc/runtime.h>
 #import <objc/message.h>
@@ -29,30 +30,20 @@ @implementation JSONAPIResource
 #pragma mark - Class Methods
 
 + (NSArray*)jsonAPIResources:(NSArray*)array withLinked:(NSDictionary*)linked {
-    return [JSONAPIResource jsonAPIResources:array withLinked:linked withClass:[self class]];
-}
-
-+ (NSArray*)jsonAPIResources:(NSArray*)array withLinked:(NSDictionary*)linked withClass:(Class)resourceObjectClass {
-    if (resourceObjectClass == nil) {
-        resourceObjectClass = [self class];
-    }
 
     NSMutableArray *mutableArray = [[NSMutableArray alloc] init];
     for (NSDictionary *dict in array) {
+        NSString *type = dict[@"type"] ?: @"";
+        Class resourceObjectClass = [JSONAPIResourceModeler resourceForLinkedType:[JSONAPIResourceLinker linkedType:type]];
         [mutableArray addObject:[[resourceObjectClass alloc] initWithDictionary:dict withLinked:linked]];
     }
 
     return mutableArray;
 }
 
 + (id)jsonAPIResource:(NSDictionary*)dictionary withLinked:(NSDictionary*)linked {
-    return [JSONAPIResource jsonAPIResource:dictionary withLinked:linked withClass:[self class]];
-}
-
-+ (id)jsonAPIResource:(NSDictionary*)dictionary withLinked:(NSDictionary*)linked withClass:(Class)resourceObjectClass {
-    if (resourceObjectClass == nil) {
-        resourceObjectClass = [self class];
-    }
+    NSString *type = dictionary[@"type"] ?: @"";
+    Class resourceObjectClass = [JSONAPIResourceModeler resourceForLinkedType:[JSONAPIResourceLinker linkedType:type]];
 
     return [[resourceObjectClass alloc] initWithDictionary:dictionary withLinked:linked];
 }
@@ -146,32 +137,39 @@ - (void)setWithDictionary:(NSDictionary*)dict {
 }
 
 - (void)linkLinks:(NSDictionary*)linked {
+    
     // Loops through links of resources
-    for (NSString *linkTypeUnmapped in self.links.allKeys) {
-        
-        NSString *linkType = [JSONAPIResourceLinker linkedType:linkTypeUnmapped];
-        if (linkType == nil) {
-            linkType = linkTypeUnmapped;
-        }
+    for (NSString *linkKey in self.links.allKeys) {
 
         // Gets linked objects for the resource
-        id linksTo = [self.links objectForKey:linkTypeUnmapped];
-        if ([linksTo isKindOfClass:[NSNumber class]] == YES || [linksTo isKindOfClass:[NSString class]] == YES) {
-            JSONAPIResource *linkedResource = [[linked objectForKey:linkType] objectForKey:linksTo];
-            if (linkedResource != nil) {
-                [self.__resourceLinks setObject:linkedResource forKey:linkTypeUnmapped];
-            }
+        id linksTo = [self.links objectForKey:linkKey];
+        if ([linksTo isKindOfClass:[NSDictionary class]] == YES) {
+            
+            NSString *linkType = linksTo[@"type"];
+            linkType = [JSONAPIResourceLinker linkedType:linkType] ?: linkType;
 
-        } else if ([linksTo isKindOfClass:[NSArray class]] == YES) {
-            NSMutableArray *linkedResources = [NSMutableArray array];
-            [self.__resourceLinks setObject:linkedResources forKey:linkTypeUnmapped];
-            for (id linkedId in linksTo) {
-                JSONAPIResource *linkedResource = [[linked objectForKey:linkType] objectForKey:linkedId];
+            if (linksTo[@"id"] != nil) {
+                id linksToId = linksTo[@"id"];
+                
+                JSONAPIResource *linkedResource = [[linked objectForKey:linkType] objectForKey:linksToId];
                 if (linkedResource != nil) {
-                    [linkedResources addObject:linkedResource];
+                    [self.__resourceLinks setObject:linkedResource forKey:linkKey];
+                }
+            } else if (linksTo[@"ids"] != nil) {
+                id linksToIds = linksTo[@"ids"];
+                
+                NSMutableArray *linkedResources = [NSMutableArray array];
+                [self.__resourceLinks setObject:linkedResources forKey:linkKey];
+                
+                for (id linkedId in linksToIds) {
+                    JSONAPIResource *linkedResource = [[linked objectForKey:linkType] objectForKey:linkedId];
+                    if (linkedResource != nil) {
+                        [linkedResources addObject:linkedResource];
+                    }
                 }
             }
 
+            
         }
     }