Merge pull request #5 from joshdholtz/fun-changes

Fun changes

Author: Josh Holtz

Classes/JSONAPI.h

@@ -9,6 +9,7 @@
 #import <Foundation/Foundation.h>
 
 #import "JSONAPIResource.h"
+#import "JSONAPIResourceFormatter.h"
 #import "JSONAPIResourceLinker.h"
 #import "JSONAPIResourceModeler.h"
 

Classes/JSONAPIResource.h

@@ -8,7 +8,7 @@
 
 #import <Foundation/Foundation.h>
 
-@interface JSONAPIResource : NSObject
+@interface JSONAPIResource : NSObject<NSCopying, NSCoding>
 
 @property (nonatomic, strong) id ID;
 @property (nonatomic, strong) NSString *href;

Classes/JSONAPIResource.m

@@ -8,8 +8,12 @@
 
 #import "JSONAPIResource.h"
 
+#import "JSONAPIResourceFormatter.h"
 #import "JSONAPIResourceLinker.h"
 
+#import <objc/runtime.h>
+#import <objc/message.h>
+
 #pragma mark - JSONAPIResource
 
 @interface JSONAPIResource()
@@ -21,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]];
 }
@@ -50,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) {
@@ -107,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 ];
                 }
@@ -164,6 +177,7 @@ - (void)linkLinks:(NSDictionary*)linked {
 
             id resource = [self linkedResourceForKey:linkedResource];
             if (resource != nil) {
+                
                 @try {
                     [self setValue:resource forKey:propertyName];
                 }
@@ -176,4 +190,102 @@ - (void)linkLinks:(NSDictionary*)linked {
     }
 }
 
+#pragma mark - NSCopying
+
+- (id)copyWithZone:(NSZone *)zone {
+    id copy = [[[self class] alloc] initWithDictionary:[self.__dictionary copyWithZone:zone] withLinked:nil];
+    
+    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;
+}
+
+#pragma mark - NSCoding
+
+- (NSArray *)propertyKeys
+{
+    NSMutableArray *array = [NSMutableArray array];
+    Class class = [self class];
+    while (class != [NSObject class])
+    {
+        unsigned int propertyCount;
+        objc_property_t *properties = class_copyPropertyList(class, &propertyCount);
+        for (int i = 0; i < propertyCount; i++)
+        {
+            //get property
+            objc_property_t property = properties[i];
+            const char *propertyName = property_getName(property);
+            NSString *key = [NSString stringWithCString:propertyName encoding:NSUTF8StringEncoding];
+            
+            //check if read-only
+            BOOL readonly = NO;
+            const char *attributes = property_getAttributes(property);
+            NSString *encoding = [NSString stringWithCString:attributes encoding:NSUTF8StringEncoding];
+            if ([[encoding componentsSeparatedByString:@","] containsObject:@"R"])
+            {
+                readonly = YES;
+                
+                //see if there is a backing ivar with a KVC-compliant name
+                NSRange iVarRange = [encoding rangeOfString:@",V"];
+                if (iVarRange.location != NSNotFound)
+                {
+                    NSString *iVarName = [encoding substringFromIndex:iVarRange.location + 2];
+                    if ([iVarName isEqualToString:key] ||
+                        [iVarName isEqualToString:[@"_" stringByAppendingString:key]])
+                    {
+                        //setValue:forKey: will still work
+                        readonly = NO;
+                    }
+                }
+            }
+            
+            if (!readonly)
+            {
+                //exclude read-only properties
+                [array addObject:key];
+            }
+        }
+        free(properties);
+        class = [class superclass];
+    }
+    return array;
+}
+
+- (id)initWithCoder:(NSCoder *)aDecoder
+{
+    if ((self = [self init]))
+    {
+        for (NSString *key in [self propertyKeys])
+        {
+            id value = [aDecoder decodeObjectForKey:key];
+            [self setValue:value forKey:key];
+        }
+    }
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)aCoder
+{
+    for (NSString *key in [self propertyKeys])
+    {
+        id value = [self valueForKey:key];
+        [aCoder encodeObject:value forKey:key];
+    }
+}
+
 @end

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

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

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 */,

Project/JSONAPI.xcworkspace/xcshareddata/JSONAPI.xccheckout

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDESourceControlProjectFavoriteDictionaryKey</key>
+	<false/>
+	<key>IDESourceControlProjectIdentifier</key>
+	<string>DA49755E-FD70-48BA-8E28-2C90B0ABED83</string>
+	<key>IDESourceControlProjectName</key>
+	<string>JSONAPI</string>
+	<key>IDESourceControlProjectOriginsDictionary</key>
+	<dict>
+		<key>7EE6692C-FAB2-484E-B1C6-2C33369BAE38</key>
+		<string>ssh://github.com/joshdholtz/jsonapi-ios.git</string>
+	</dict>
+	<key>IDESourceControlProjectPath</key>
+	<string>Project/JSONAPI.xcworkspace</string>
+	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
+	<dict>
+		<key>7EE6692C-FAB2-484E-B1C6-2C33369BAE38</key>
+		<string>../..</string>
+	</dict>
+	<key>IDESourceControlProjectURL</key>
+	<string>ssh://github.com/joshdholtz/jsonapi-ios.git</string>
+	<key>IDESourceControlProjectVersion</key>
+	<integer>110</integer>
+	<key>IDESourceControlProjectWCCIdentifier</key>
+	<string>7EE6692C-FAB2-484E-B1C6-2C33369BAE38</string>
+	<key>IDESourceControlProjectWCConfigurations</key>
+	<array>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>7EE6692C-FAB2-484E-B1C6-2C33369BAE38</string>
+			<key>IDESourceControlWCCName</key>
+			<string>JSONAPI</string>
+		</dict>
+	</array>
+</dict>
+</plist>

Project/JSONAPI/CommentResource.h

@@ -10,8 +10,6 @@
 
 @interface CommentResource : JSONAPIResource
 
-@property (nonatomic, strong) NSString *mapText;
-
-- (NSString*)text;
+@property (nonatomic, strong) NSString *text;
 
 @end

Project/JSONAPI/CommentResource.m

@@ -10,13 +10,9 @@
 
 @implementation CommentResource
 
-- (NSString *)text {
-    return [self objectForKey:@"text"];
-}
-
 - (NSDictionary *)mapKeysToProperties {
     return @{
-             @"text" : @"mapText"
+             @"text" : @"text"
              };
 }
 

Project/JSONAPI/PeopleResource.h

@@ -10,8 +10,6 @@
 
 @interface PeopleResource : JSONAPIResource
 
-@property (nonatomic, strong) NSString *mapName;
-
-- (NSString*)name;
+@property (nonatomic, strong) NSString *name;
 
 @end