Add resource formatter and fixed NSCopying

Josh Holtz · Josh Holtz · commit 50b19a9f660b · 2014-07-09T17:15:34.000-05:00
diff --git a/Classes/JSONAPI.h b/Classes/JSONAPI.h
@@ -9,6 +9,7 @@
 #import <Foundation/Foundation.h>
 
 #import "JSONAPIResource.h"
+#import "JSONAPIResourceFormatter.h"
 #import "JSONAPIResourceLinker.h"
 #import "JSONAPIResourceModeler.h"
 
diff --git a/Classes/JSONAPIResource.m b/Classes/JSONAPIResource.m
@@ -8,6 +8,7 @@
 
 #import "JSONAPIResource.h"
 
+#import "JSONAPIResourceFormatter.h"
 #import "JSONAPIResourceLinker.h"
 
 #import <objc/runtime.h>
@@ -24,6 +25,9 @@ @interface JSONAPIResource()
 
 @implementation JSONAPIResource
 
+#pragma mark -
+#pragma mark - Class Methods
+
 + (NSArray*)jsonAPIResources:(NSArray*)array withLinked:(NSDictionary*)linked {
     return [JSONAPIResource jsonAPIResources:array withLinked:linked withClass:[self class]];
 }
@@ -53,6 +57,9 @@ + (id)jsonAPIResource:(NSDictionary*)dictionary withLinked:(NSDictionary*)linked
     return [[resourceObjectClass alloc] initWithDictionary:dictionary withLinked:linked];
 }
 
+#pragma mark -
+#pragma mark - Instance Methods
+
 - (id)init {
     self = [super init];
     if (self) {
@@ -110,7 +117,10 @@ - (void)setWithDictionary:(NSDictionary*)dict {
                 if (inflateRange.location != NSNotFound) {
 
                 } else if (formatRange.location != NSNotFound) {
-  
+                    NSString *formatFunction = [property substringToIndex:formatRange.location];
+                    property = [property substringFromIndex:(formatRange.location+1)];
+                    
+                    [self setValue:[JSONAPIResourceFormatter performFormatBlock:[dict objectForKey:key] withName:formatFunction] forKey:property ];
                 } else {
                     [self setValue:[dict objectForKey:key] forKey:property ];
                 }
@@ -167,6 +177,7 @@ - (void)linkLinks:(NSDictionary*)linked {
             
             id resource = [self linkedResourceForKey:linkedResource];
             if (resource != nil) {
+                
                 @try {
                     [self setValue:resource forKey:propertyName];
                 }
@@ -186,7 +197,19 @@ - (id)copyWithZone:(NSZone *)zone {
     
     if (copy) {
         // Copy NSObject subclasses
+        NSLog(@"__resourceLinks - %@", self.__resourceLinks);
         [copy set__resourceLinks:[self.__resourceLinks copyWithZone:zone]];
+        
+        // Link links for mapped key to properties
+        for (NSString *key in [copy __resourceLinks]) {
+            @try {
+                [copy setValue:[[copy __resourceLinks] objectForKey:key] forKey:key];
+            }
+            @catch (NSException *exception) {
+                NSLog(@"JSONAPIResource Warning - %@", [exception description]);
+            }
+        }
+
     }
     
     return copy;
diff --git a/Classes/JSONAPIResourceFormatter.h b/Classes/JSONAPIResourceFormatter.h
@@ -0,0 +1,16 @@
+//
+//  JSONAPIResourceFormatter.h
+//  JSONAPI
+//
+//  Created by Josh Holtz on 7/9/14.
+//  Copyright (c) 2014 Josh Holtz. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface JSONAPIResourceFormatter : NSObject
+
++ (void)registerFormat:(NSString*)name withBlock:(id(^)(id jsonValue))block;
++ (id)performFormatBlock:(NSString*)value withName:(NSString*)name;
+
+@end
diff --git a/Classes/JSONAPIResourceFormatter.m b/Classes/JSONAPIResourceFormatter.m
@@ -0,0 +1,51 @@
+//
+//  JSONAPIResourceFormatter.m
+//  JSONAPI
+//
+//  Created by Josh Holtz on 7/9/14.
+//  Copyright (c) 2014 Josh Holtz. All rights reserved.
+//
+
+#import "JSONAPIResourceFormatter.h"
+
+@interface JSONAPIResourceFormatter()
+
+@property (nonatomic, strong) NSMutableDictionary *formatBlocks;
+
+@end
+
+@implementation JSONAPIResourceFormatter
+
++ (instancetype)sharedFormatter {
+    static JSONAPIResourceFormatter *_sharedFormatter = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        _sharedFormatter = [[JSONAPIResourceFormatter alloc] init];
+    });
+    
+    return _sharedFormatter;
+}
+
+- (id)init {
+    self = [super init];
+    if (self) {
+        self.formatBlocks = @{}.mutableCopy;
+    }
+    return self;
+}
+
++ (void)registerFormat:(NSString*)name withBlock:(id(^)(id jsonValue))block {
+    [[JSONAPIResourceFormatter sharedFormatter].formatBlocks setObject:[block copy] forKey:name];
+}
+
++ (id)performFormatBlock:(NSString*)value withName:(NSString*)name {
+    id(^block)(NSString *);
+    block = [[JSONAPIResourceFormatter sharedFormatter].formatBlocks objectForKey:name];
+    if (block != nil) {
+        return block(value);
+    } else {
+        return nil;
+    }
+}
+
+@end
diff --git a/Project/JSONAPI.xcodeproj/project.pbxproj b/Project/JSONAPI.xcodeproj/project.pbxproj
@@ -30,6 +30,7 @@
 		03A055E61868E038004807F0 /* JSONAPITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 03A055E51868E038004807F0 /* JSONAPITests.m */; };
 		03A055F71868E08A004807F0 /* JSONAPI.m in Sources */ = {isa = PBXBuildFile; fileRef = 03A055F41868E08A004807F0 /* JSONAPI.m */; };
 		03A055F81868E08A004807F0 /* JSONAPI.podspec in Resources */ = {isa = PBXBuildFile; fileRef = 03A055F51868E08A004807F0 /* JSONAPI.podspec */; };
+		03A9ED58196DEF9B00E61E2E /* JSONAPIResourceFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 03A9ED57196DEF9B00E61E2E /* JSONAPIResourceFormatter.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -78,6 +79,8 @@
 		03A055F31868E08A004807F0 /* JSONAPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONAPI.h; sourceTree = "<group>"; };
 		03A055F41868E08A004807F0 /* JSONAPI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSONAPI.m; sourceTree = "<group>"; };
 		03A055F51868E08A004807F0 /* JSONAPI.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = JSONAPI.podspec; path = ../JSONAPI.podspec; sourceTree = "<group>"; };
+		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>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -201,6 +204,8 @@
 				03A055F41868E08A004807F0 /* JSONAPI.m */,
 				033A6C5D18695CD2001CF9FA /* JSONAPIResource.h */,
 				033A6C5E18695CD2001CF9FA /* JSONAPIResource.m */,
+				03A9ED56196DEF9B00E61E2E /* JSONAPIResourceFormatter.h */,
+				03A9ED57196DEF9B00E61E2E /* JSONAPIResourceFormatter.m */,
 				0386643B186A0DAD00985CEC /* JSONAPIResourceLinker.h */,
 				0386643C186A0DAD00985CEC /* JSONAPIResourceLinker.m */,
 				0386644C186A8DA000985CEC /* JSONAPIResourceModeler.h */,
@@ -316,6 +321,7 @@
 				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 */,
diff --git a/Project/JSONAPI/CommentResource.h b/Project/JSONAPI/CommentResource.h
@@ -10,8 +10,6 @@
 
 @interface CommentResource : JSONAPIResource
 
-@property (nonatomic, strong) NSString *mapText;
-
-- (NSString*)text;
+@property (nonatomic, strong) NSString *text;
 
 @end
diff --git a/Project/JSONAPI/CommentResource.m b/Project/JSONAPI/CommentResource.m
@@ -10,13 +10,9 @@
 
 @implementation CommentResource
 
-- (NSString *)text {
-    return [self objectForKey:@"text"];
-}
-
 - (NSDictionary *)mapKeysToProperties {
     return @{
-             @"text" : @"mapText"
+             @"text" : @"text"
              };
 }
 
diff --git a/Project/JSONAPI/PeopleResource.h b/Project/JSONAPI/PeopleResource.h
@@ -10,8 +10,6 @@
 
 @interface PeopleResource : JSONAPIResource
 
-@property (nonatomic, strong) NSString *mapName;
-
-- (NSString*)name;
+@property (nonatomic, strong) NSString *name;
 
 @end
diff --git a/Project/JSONAPI/PeopleResource.m b/Project/JSONAPI/PeopleResource.m
@@ -10,13 +10,9 @@
 
 @implementation PeopleResource
 
-- (NSString *)name {
-    return [self objectForKey:@"name"];
-}
-
 - (NSDictionary *)mapKeysToProperties {
     return @{
-             @"name" : @"mapName"
+             @"name" : @"name"
              };
 }
 
diff --git a/Project/JSONAPI/PostResource.h b/Project/JSONAPI/PostResource.h
@@ -13,12 +13,9 @@
 
 @interface PostResource : JSONAPIResource
 
-@property (nonatomic, strong) NSString *mapName;
-@property (nonatomic, strong) PeopleResource *mapAuthor;
-@property (nonatomic, strong) NSArray *mapComments;
-
-- (PeopleResource*)author;
-- (NSArray*)comments;
-- (NSString*)name;
+@property (nonatomic, strong) NSString *name;
+@property (nonatomic, strong) PeopleResource *author;
+@property (nonatomic, strong) NSDate *date;
+@property (nonatomic, strong) NSArray *comments;
 
 @end
diff --git a/Project/JSONAPI/PostResource.m b/Project/JSONAPI/PostResource.m
@@ -10,23 +10,12 @@
 
 @implementation PostResource
 
-- (PeopleResource *)author {
-    return [self linkedResourceForKey:@"author"];
-}
-
-- (NSArray *)comments {
-    return [self linkedResourceForKey:@"comments"];
-}
-
-- (NSString *)name {
-    return [self objectForKey:@"name"];
-}
-
 - (NSDictionary *)mapKeysToProperties {
     return @{
-             @"name" : @"mapName",
-             @"links.author" : @"mapAuthor",
-             @"links.comments" : @"mapComments"
+             @"name" : @"name",
+             @"date" : @"Date:date",
+             @"links.author" : @"author",
+             @"links.comments" : @"comments"
              };
 }
 
diff --git a/Project/JSONAPI/ViewController.m b/Project/JSONAPI/ViewController.m
@@ -29,49 +29,40 @@ - (void)viewDidLoad
     [JSONAPIResourceModeler useResource:[CommentResource class] toLinkedType:@"comments"];
     [JSONAPIResourceModeler useResource:[PeopleResource class] toLinkedType:@"people"];
     [JSONAPIResourceModeler useResource:[PostResource class] toLinkedType:@"posts"];
+    
+    // Register formatting
+    [JSONAPIResourceFormatter registerFormat:@"Date" withBlock:^id(id jsonValue) {
+        NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+        [dateFormatter setLocale:[[NSLocale alloc] initWithLocaleIdentifier:@"en_US_POSIX"]];
+        [dateFormatter setDateFormat:@"yyyy-MM-dd'T'HH:mm:ssZ"];
+        
+        NSDate *date = nil;
+        NSError *error = nil;
+        if (![dateFormatter getObjectValue:&date forString:jsonValue range:nil error:&error]) {
+            NSLog(@"Date '%@' could not be parsed: %@", jsonValue, error);
+        }
+        
+        return date;
+    }];
 	
     // Parsing using JSONAPI and JSONAPIResource
     JSONAPI *jsonApi = [JSONAPI JSONAPIWithDictionary:[self authorResponse]];
     
-    NSLog(@"------------ Parsing using JSONAPI and JSONAPIResource");
+    NSLog(@"------------ Parsing using JSONAPI, modeled resources, and mapped properties (PostResource, PeopleResource, CommentResource");
     NSArray *posts = [jsonApi resourcesForKey:@"posts"];
-    for (JSONAPIResource *post in posts) {
-        
-        JSONAPIResource *author = [post linkedResourceForKey:@"author"];
-        NSLog(@"\"%@\" by %@", [post objectForKey:@"name"], [author objectForKey:@"name"]);
-        
-        NSArray *comments = [post linkedResourceForKey:@"comments"];
-        for (JSONAPIResource *comment in comments) {
-            NSLog(@"\t%@", [comment objectForKey:@"text"]);
-        }
-    }
     
-    // Parsing using JSONAPI and modeled resources (PostResource, PeopleResource, CommentResource
-    NSLog(@"\n\n------------ Parsing using JSONAPI and modeled resources (PostResource, PeopleResource, CommentResource");
+    // Parsing using JSONAPI, modeled resources, and mapped properties (PostResource, PeopleResource, CommentResource
     for (PostResource *post in posts) {
         
         PeopleResource *author = post.author;
-        NSLog(@"\"%@\" by %@", post.name, author.name);
+        NSLog(@"\"%@\" by %@ on %@", post.name, author.name, post.date);
         
         NSArray *comments = post.comments;
         for (CommentResource *comment in comments) {
             NSLog(@"\t%@", comment.text);
         }
     }
     
-    // Parsing using JSONAPI, modeled resources, and mapped properties (PostResource, PeopleResource, CommentResource
-    NSLog(@"\n\n------------ Parsing using JSONAPI, modeled resources, and mapped properties (PostResource, PeopleResource, CommentResource");
-    for (PostResource *post in posts) {
-        
-        PeopleResource *author = post.author;
-        NSLog(@"\"%@\" by %@", post.mapName, author.mapName);
-        
-        NSArray *comments = post.mapComments;
-        for (CommentResource *comment in comments) {
-            NSLog(@"\t%@", comment.mapText);
-        }
-    }
-    
 }
 
 - (void)didReceiveMemoryWarning
@@ -94,8 +85,8 @@ - (NSDictionary*)authorResponse {
                                       @{ @"id" : @4, @"text" : @"Meeeehhhhh" }
                                       ]};
     
-    NSDictionary *post1 = @{ @"id" : @1, @"name" : @"Josh is awesome", @"links" : @{ @"author" : @9, @"comments" : @[ @2, @3 ] } };
-    NSDictionary *post2 = @{ @"id" : @2, @"name" : @"Bandit is awesome", @"links" : @{ @"author" : @10, @"comments" : @[ @4 ] } };
+    NSDictionary *post1 = @{ @"id" : @1, @"name" : @"Josh is awesome", @"date" : @"2013-10-14T05:34:32+600", @"links" : @{ @"author" : @9, @"comments" : @[ @2, @3 ] } };
+    NSDictionary *post2 = @{ @"id" : @2, @"name" : @"Bandit is awesome", @"date" : @"2013-10-14T05:34:32+600", @"links" : @{ @"author" : @10, @"comments" : @[ @4 ] } };
     
     NSArray *posts = @[ post1, post2 ];
     NSDictionary *json = @{ @"meta" : meta, @"linked" : linked, @"posts" : posts };
diff --git a/Project/JSONAPITests/JSONAPITests.m b/Project/JSONAPITests/JSONAPITests.m
