Minor fixes

Author: rokkincat

Classes/JSONAPI.m

@@ -59,14 +59,27 @@ - (id)objectForKey:(NSString*)key {
 }
 
 - (id)resourceForKey:(NSString*)key {
-    JSONAPIResource *resource;
+    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];
+    }
 
-    NSArray *resources = [self resourcesForKey:key];
-    if (resources.count > 0) {
-        return [resources objectAtIndex:0];
+    // Fall back to first element in array
+    if (resource == nil) {
+        id resources = [self resourcesForKey:key];
+        if ([resources isKindOfClass:[NSArray class]] == YES) {
+            return [resources firstObject];
+        }
     }
 
     return resource;
+
 }
 
 - (NSArray*)resourcesForKey:(NSString*)key {

Classes/JSONAPIResource.h

@@ -21,6 +21,7 @@
 + (id)jsonAPIResource:(NSDictionary*)dictionary withLinked:(NSDictionary*)linked withClass:(Class)resourceObjectClass;
 
 - (id)initWithDictionary:(NSDictionary*)dict withLinked:(NSDictionary*)linked;
+- (void)setWithDictionary:(NSDictionary*)dict;
 
 - (id)objectForKey:(NSString*)key;
 - (id)linkedResourceForKey:(NSString*)key;

Classes/JSONAPIResource.m

@@ -90,6 +90,15 @@ - (NSDictionary *)mapKeysToProperties {
     return [[NSDictionary alloc] init];
 }
 
+- (BOOL)setWithResource:(id)otherResource {
+    if ([otherResource isKindOfClass:[self class]] == YES) {
+        
+        return YES;
+    }
+    
+    return NO;
+}
+
 - (void)setWithDictionary:(NSDictionary*)dict {
     self.__dictionary = dict;
 
@@ -148,9 +157,7 @@ - (void)linkLinks:(NSDictionary*)linked {
         // 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];
             }