Added errors, removed other stuff

Author: Josh Holtz

Classes/JSONAPI.h

@@ -10,8 +10,8 @@
 
 #import "JSONAPIResource.h"
 #import "JSONAPIResourceFormatter.h"
-#import "JSONAPIResourceLinker.h"
 #import "JSONAPIResourceModeler.h"
+#import "JSONAPIErrorResource.h"
 
 @interface JSONAPI : NSObject
 
@@ -32,5 +32,6 @@
 - (instancetype)initWithString:(NSString*)string;
 
 - (id)includedResource:(id)ID withType:(NSString*)type;
+- (BOOL)hasErrors;
 
 @end

Classes/JSONAPI.m

@@ -8,6 +8,8 @@
 
 #import "JSONAPI.h"
 
+#import "JSONAPIErrorResource.h"
+
 @interface JSONAPI()
 
 @property (nonatomic, strong) NSDictionary *dictionary;
@@ -66,6 +68,10 @@ - (id)includedResource:(id)ID withType:(NSString *)type {
     return _includedResources[type][ID];
 }
 
+- (BOOL)hasErrors {
+    return _errors.count > 0;
+}
+
 #pragma mark - Private
 
 - (void)inflateWithDictionary:(NSDictionary*)dictionary {
@@ -126,6 +132,16 @@ - (void)inflateWithDictionary:(NSDictionary*)dictionary {
         [resource linkWithIncluded:self];
     }
 
+    // Parse errors
+    NSMutableArray *errors = @[].mutableCopy;
+    NSLog(@"ERROS - %@", _dictionary[@"errors"]);
+    for (NSDictionary *data in _dictionary[@"errors"]) {
+        
+        JSONAPIErrorResource *resource = [[JSONAPIErrorResource alloc] initWithDictionary:data];
+        NSLog(@"Error resource - %@", resource);
+        if (resource) [errors addObject:resource];
+    }
+    _errors = errors;
 }
 
 - (id)inflateResourceData:(NSDictionary*)data {

Classes/JSONAPIErrorResource.h

@@ -0,0 +1,20 @@
+//
+//  JSONAPIErrorResource.h
+//  JSONAPI
+//
+//  Created by Josh Holtz on 3/17/15.
+//  Copyright (c) 2015 Josh Holtz. All rights reserved.
+//
+
+#import "JSONAPIResource.h"
+
+@interface JSONAPIErrorResource : JSONAPIResource
+
+@property (nonatomic, strong) NSString *status;
+@property (nonatomic, strong) NSString *code;
+@property (nonatomic, strong) NSString *title;
+@property (nonatomic, strong) NSString *detail;
+@property (nonatomic, strong) NSArray *links;
+@property (nonatomic, strong) NSArray *paths;
+
+@end

Classes/JSONAPIErrorResource.m

@@ -0,0 +1,23 @@
+//
+//  JSONAPIErrorResource.m
+//  JSONAPI
+//
+//  Created by Josh Holtz on 3/17/15.
+//  Copyright (c) 2015 Josh Holtz. All rights reserved.
+//
+
+#import "JSONAPIErrorResource.h"
+
+@implementation JSONAPIErrorResource
+
+- (NSDictionary *)mapKeysToProperties {
+    return @{
+             @"status" : @"status",
+             @"code" : @"code",
+             @"title" : @"title",
+             @"detail" : @"detail",
+             @"paths" : @"paths",
+             };
+}
+
+@end

Classes/JSONAPIResource.h

@@ -14,11 +14,13 @@
 
 @property (nonatomic, strong) id ID;
 @property (nonatomic, strong) NSString *type;
-@property (nonatomic, strong) NSDictionary *links;
+@property (nonatomic, strong) id links;
 
 + (id)jsonAPIResource:(NSDictionary*)dictionary;
 + (NSArray*)jsonAPIResources:(NSArray*)array;
 
+- (id)initWithDictionary:(NSDictionary*)dict;
+
 - (NSDictionary *)mapKeysToProperties;
 - (void)linkWithIncluded:(JSONAPI*)jsonAPI;
 

Classes/JSONAPIResource.m

@@ -10,7 +10,6 @@
 
 #import "JSONAPI.h"
 #import "JSONAPIResourceFormatter.h"
-#import "JSONAPIResourceLinker.h"
 #import "JSONAPIResourceModeler.h"
 
 #import <objc/runtime.h>
@@ -35,7 +34,7 @@ + (NSArray*)jsonAPIResources:(NSArray*)array {
     NSMutableArray *mutableArray = @[].mutableCopy;
     for (NSDictionary *dict in array) {
         NSString *type = dict[@"type"] ?: @"";
-        Class resourceObjectClass = [JSONAPIResourceModeler resourceForLinkedType:[JSONAPIResourceLinker linkedType:type]];
+        Class resourceObjectClass = [JSONAPIResourceModeler resourceForLinkedType:type];
         [mutableArray addObject:[[resourceObjectClass alloc] initWithDictionary:dict]];
     }
 
@@ -44,7 +43,7 @@ + (NSArray*)jsonAPIResources:(NSArray*)array {
 
 + (id)jsonAPIResource:(NSDictionary*)dictionary {
     NSString *type = dictionary[@"type"] ?: @"";
-    Class resourceObjectClass = [JSONAPIResourceModeler resourceForLinkedType:[JSONAPIResourceLinker linkedType:type]];
+    Class resourceObjectClass = [JSONAPIResourceModeler resourceForLinkedType:type];
 
     return [[resourceObjectClass alloc] initWithDictionary:dictionary];
 }
@@ -141,7 +140,8 @@ - (void)linkWithIncluded:(JSONAPI*)jsonAPI {
     NSDictionary *included = jsonAPI.includedResources;
 
     // Loops through links of resources
-    for (NSString *linkKey in self.links.allKeys) {
+    NSDictionary *links = self.links;
+    for (NSString *linkKey in links.allKeys) {
 
         // Gets linked objects for the resource
         id linksTo = self.links[linkKey];
@@ -151,7 +151,6 @@ - (void)linkWithIncluded:(JSONAPI*)jsonAPI {
             if ([linkage isKindOfClass:[NSDictionary class]] == YES) {
 
                 NSString *linkType = linkage[@"type"];
-                linkType = [JSONAPIResourceLinker linkedType:linkType] ?: linkType;
 
                 if (linkage[@"id"] != nil) {
                     id linksToId = linkage[@"id"];
@@ -167,7 +166,6 @@ - (void)linkWithIncluded:(JSONAPI*)jsonAPI {
                 NSMutableArray *linkedResources = @[].mutableCopy;
                 for (NSDictionary *linkageData in linkage) {
                     NSString *linkType = linkageData[@"type"];
-                    linkType = [JSONAPIResourceLinker linkedType:linkType] ?: linkType;
 
                     if (linkageData[@"id"] != nil) {
                         id linksToId = linkageData[@"id"];

Classes/JSONAPIResourceLinker.h

@@ -8,7 +8,6 @@
 
 /* Begin PBXBuildFile section */
 		033A6C5F18695CD2001CF9FA /* JSONAPIResource.m in Sources */ = {isa = PBXBuildFile; fileRef = 033A6C5E18695CD2001CF9FA /* JSONAPIResource.m */; };
-		0386643D186A0DAD00985CEC /* JSONAPIResourceLinker.m in Sources */ = {isa = PBXBuildFile; fileRef = 0386643C186A0DAD00985CEC /* JSONAPIResourceLinker.m */; };
 		0386644E186A8DA000985CEC /* JSONAPIResourceModeler.m in Sources */ = {isa = PBXBuildFile; fileRef = 0386644D186A8DA000985CEC /* JSONAPIResourceModeler.m */; };
 		03866451186A909200985CEC /* PeopleResource.m in Sources */ = {isa = PBXBuildFile; fileRef = 03866450186A909200985CEC /* PeopleResource.m */; };
 		03866454186A94B700985CEC /* CommentResource.m in Sources */ = {isa = PBXBuildFile; fileRef = 03866453186A94B700985CEC /* CommentResource.m */; };
@@ -33,6 +32,9 @@
 		03A9ED58196DEF9B00E61E2E /* JSONAPIResourceFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 03A9ED57196DEF9B00E61E2E /* JSONAPIResourceFormatter.m */; };
 		03FBD8DA1AB879FD00789DF3 /* main_example.json in Resources */ = {isa = PBXBuildFile; fileRef = 03FBD8D91AB879FD00789DF3 /* main_example.json */; };
 		03FBD8DC1AB87EE000789DF3 /* main_example.json in Resources */ = {isa = PBXBuildFile; fileRef = 03FBD8D91AB879FD00789DF3 /* main_example.json */; };
+		03FBD8DF1AB8DF8E00789DF3 /* JSONAPIErrorResource.m in Sources */ = {isa = PBXBuildFile; fileRef = 03FBD8DE1AB8DF8E00789DF3 /* JSONAPIErrorResource.m */; };
+		03FBD8E21AB8E46E00789DF3 /* error_example.json in Resources */ = {isa = PBXBuildFile; fileRef = 03FBD8E11AB8E46E00789DF3 /* error_example.json */; };
+		03FBD8E31AB8E46E00789DF3 /* error_example.json in Resources */ = {isa = PBXBuildFile; fileRef = 03FBD8E11AB8E46E00789DF3 /* error_example.json */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -48,8 +50,6 @@
 /* Begin PBXFileReference section */
 		033A6C5D18695CD2001CF9FA /* JSONAPIResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONAPIResource.h; sourceTree = "<group>"; };
 		033A6C5E18695CD2001CF9FA /* JSONAPIResource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSONAPIResource.m; sourceTree = "<group>"; };
-		0386643B186A0DAD00985CEC /* JSONAPIResourceLinker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONAPIResourceLinker.h; sourceTree = "<group>"; };
-		0386643C186A0DAD00985CEC /* JSONAPIResourceLinker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSONAPIResourceLinker.m; sourceTree = "<group>"; };
 		0386644C186A8DA000985CEC /* JSONAPIResourceModeler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONAPIResourceModeler.h; sourceTree = "<group>"; };
 		0386644D186A8DA000985CEC /* JSONAPIResourceModeler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSONAPIResourceModeler.m; sourceTree = "<group>"; };
 		0386644F186A909200985CEC /* PeopleResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PeopleResource.h; sourceTree = "<group>"; };
@@ -84,6 +84,9 @@
 		03A9ED56196DEF9B00E61E2E /* JSONAPIResourceFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONAPIResourceFormatter.h; sourceTree = "<group>"; };
 		03A9ED57196DEF9B00E61E2E /* JSONAPIResourceFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSONAPIResourceFormatter.m; sourceTree = "<group>"; };
 		03FBD8D91AB879FD00789DF3 /* main_example.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = main_example.json; sourceTree = "<group>"; };
+		03FBD8DD1AB8DF8E00789DF3 /* JSONAPIErrorResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONAPIErrorResource.h; sourceTree = "<group>"; };
+		03FBD8DE1AB8DF8E00789DF3 /* JSONAPIErrorResource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSONAPIErrorResource.m; sourceTree = "<group>"; };
+		03FBD8E11AB8E46E00789DF3 /* error_example.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = error_example.json; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -210,10 +213,10 @@
 				033A6C5E18695CD2001CF9FA /* JSONAPIResource.m */,
 				03A9ED56196DEF9B00E61E2E /* JSONAPIResourceFormatter.h */,
 				03A9ED57196DEF9B00E61E2E /* JSONAPIResourceFormatter.m */,
-				0386643B186A0DAD00985CEC /* JSONAPIResourceLinker.h */,
-				0386643C186A0DAD00985CEC /* JSONAPIResourceLinker.m */,
 				0386644C186A8DA000985CEC /* JSONAPIResourceModeler.h */,
 				0386644D186A8DA000985CEC /* JSONAPIResourceModeler.m */,
+				03FBD8DD1AB8DF8E00789DF3 /* JSONAPIErrorResource.h */,
+				03FBD8DE1AB8DF8E00789DF3 /* JSONAPIErrorResource.m */,
 			);
 			name = Classes;
 			path = ../Classes;
@@ -223,6 +226,7 @@
 			isa = PBXGroup;
 			children = (
 				03FBD8D91AB879FD00789DF3 /* main_example.json */,
+				03FBD8E11AB8E46E00789DF3 /* error_example.json */,
 			);
 			name = Assets;
 			sourceTree = "<group>";
@@ -307,6 +311,7 @@
 				03866459186CCE6600985CEC /* CHANGELOG.md in Resources */,
 				03A055C51868E038004807F0 /* InfoPlist.strings in Resources */,
 				03FBD8DC1AB87EE000789DF3 /* main_example.json in Resources */,
+				03FBD8E21AB8E46E00789DF3 /* error_example.json in Resources */,
 				03A055CE1868E038004807F0 /* Main.storyboard in Resources */,
 				03A055F81868E08A004807F0 /* JSONAPI.podspec in Resources */,
 			);
@@ -316,6 +321,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				03FBD8E31AB8E46E00789DF3 /* error_example.json in Resources */,
 				03A055E41868E038004807F0 /* InfoPlist.strings in Resources */,
 				03FBD8DA1AB879FD00789DF3 /* main_example.json in Resources */,
 			);
@@ -331,14 +337,14 @@
 				03866451186A909200985CEC /* PeopleResource.m in Sources */,
 				03866457186A94C200985CEC /* PostResource.m in Sources */,
 				03A055D11868E038004807F0 /* ViewController.m in Sources */,
-				0386643D186A0DAD00985CEC /* JSONAPIResourceLinker.m in Sources */,
 				03A055F71868E08A004807F0 /* JSONAPI.m in Sources */,
 				033A6C5F18695CD2001CF9FA /* JSONAPIResource.m in Sources */,
 				03866454186A94B700985CEC /* CommentResource.m in Sources */,
 				03A9ED58196DEF9B00E61E2E /* JSONAPIResourceFormatter.m in Sources */,
 				03A055CB1868E038004807F0 /* AppDelegate.m in Sources */,
 				0386644E186A8DA000985CEC /* JSONAPIResourceModeler.m in Sources */,
 				03A055C71868E038004807F0 /* main.m in Sources */,
+				03FBD8DF1AB8DF8E00789DF3 /* JSONAPIErrorResource.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Classes/JSONAPIResourceLinker.m

@@ -9,6 +9,7 @@
 #import <XCTest/XCTest.h>
 
 #import "JSONAPI.h"
+#import "JSONAPIErrorResource.h"
 
 #import "CommentResource.h"
 #import "PeopleResource.h"
@@ -73,7 +74,7 @@ - (void)testDataPostAuthorAndComments {
     XCTAssertEqual(post.comments.count, 2, @"Post should contain 2 comments");
 }
 
-- (void)testIncludedIsLinked {
+- (void)testIncludedCommentIsLinked {
     NSDictionary *json = [self mainExampleJSON];
     JSONAPI *jsonAPI = [JSONAPI jsonAPIWithDictionary:json];
 
@@ -82,12 +83,33 @@ - (void)testIncludedIsLinked {
     XCTAssertEqualObjects(comment.author.ID, @"9", @"Comment's author's ID should be 9");
 }
 
+- (void)testNoError {
+    NSDictionary *json = [self mainExampleJSON];
+    JSONAPI *jsonAPI = [JSONAPI jsonAPIWithDictionary:json];
+ 
+    XCTAssertFalse([jsonAPI hasErrors], @"JSON API should not have errors");
+}
+
+- (void)testError {
+    NSDictionary *json = [self errorExampleJSON];
+    JSONAPI *jsonAPI = [JSONAPI jsonAPIWithDictionary:json];
+    
+    XCTAssertTrue([jsonAPI hasErrors], @"JSON API should have errors");
+    
+    JSONAPIErrorResource *error = jsonAPI.errors.firstObject;
+    XCTAssertEqualObjects(error.ID, @"123456", @"Error id should be 123456");
+}
+
 #pragma mark - Private
 
 - (NSDictionary*)mainExampleJSON {
     return [self jsonFor:@"main_example" ofType:@"json"];
 }
 
+- (NSDictionary*)errorExampleJSON {
+    return [self jsonFor:@"error_example" ofType:@"json"];
+}
+
 - (NSDictionary*)jsonFor:(NSString*)resource ofType:(NSString*)type {
     NSString *path = [[NSBundle mainBundle] pathForResource:resource ofType:type];
     NSString *jsonStr = [NSString stringWithContentsOfFile:path encoding:NSUTF8StringEncoding error:nil];