Fixed some issues with boxing/unboxing ParseModel objects inside arrays and dictionaries.

Author: cconstable

ParseModel/ParseModel.m

@@ -34,8 +34,7 @@ + (instancetype)parseModel
 
 + (void)registerParseModel
 {
-    [[[ParseModelUtils sharedUtilities] registeredParseModels] setObject:[self parseModelClass]
-                                                                  forKey:NSStringFromClass([self class])];
+    [[ParseModelUtils sharedUtilities] registerParseModel:self];
 }
 
 - (id)init

ParseModel/ParseModelBase.m

@@ -165,6 +165,7 @@ static BOOL getPropertyInfo(Class cls,
     // Find the property declaration:
     const char *name = [propertyName UTF8String];
     objc_property_t property = class_getProperty(cls, name);
+    
     if (!property) {
         if (![propertyName hasPrefix: @"primitive"]) {   // Ignore "primitiveXXX" KVC accessors
             NSLog(@"%@ has no dynamic property named '%@' -- failure likely", cls, propertyName);
@@ -178,7 +179,7 @@ static BOOL getPropertyInfo(Class cls,
         *declaredInClass = cls;
         cls = class_getSuperclass(cls);
     } while (class_getProperty(cls, name) == property);
-    
+        
     // Get the property's type:
     BOOL isSettable;
     *propertyType = getPropertyType(property, &isSettable);

ParseModel/ParseModelUtils.h

@@ -10,19 +10,29 @@
 
 @interface ParseModelUtils : NSObject
 
++ (instancetype)sharedUtilities;
+
 /**
+ This is called by the Parse Models to register themselves.
+ 
  Registered Parse Models help Parse Model know what kind of class to instantiate
- when doing things like unboxing array/dictionary values from the backend. 
+ when doing things like unboxing array/dictionary values from the backend.
  Registering your Parse Models on start-up is highly recommended. If you don't,
  bad things may happen.
  */
-@property (nonatomic, strong) NSMutableDictionary *registeredParseModels;
-
-+ (instancetype)sharedUtilities;
+- (BOOL)registerParseModel:(Class)parseModelClass;
 
 // Generic boxing/unboxing methods.
 - (id)performBoxingIfNecessary:(id)object;
 - (id)performUnboxingIfNecessary:(id)object
                      targetClass:(Class)targetClass;
 
+/** 
+ Attempts to resolve the type Class this object represents in the context
+ of this app. Usually, 'object' parameter will be of type PFObject and
+ ParseModelUtils will use the registered Parse Models to find the right
+ Class.
+*/
+- (Class)resolveModelClassForObject:(id)object;
+
 @end

ParseModel/ParseModelUtils.m

@@ -12,6 +12,10 @@
 #import "ParseModel.h"
 #import "ParseModelUser.h"
 
+@interface ParseModelUtils ()
+@property (nonatomic, strong) NSMutableDictionary *registeredParseModels;
+@end
+
 @implementation ParseModelUtils
 
 + (instancetype)sharedUtilities
@@ -28,6 +32,24 @@ + (instancetype)sharedUtilities
     return parseModelUtils;
 }
 
+- (BOOL)registerParseModel:(Class)parseModelClass
+{
+    // Get out of there cat! You are not a ParseModel.
+    // http://getoutoftherecat.tumblr.com/
+    if ([parseModelClass isSubclassOfClass:[ParseModel class]] == NO) {
+        return NO;
+    }
+    
+    if (!self.registeredParseModels) {
+        self.registeredParseModels = [[NSMutableDictionary alloc] init];
+    }
+    
+    [self.registeredParseModels setObject:NSStringFromClass(parseModelClass)
+                                   forKey:[parseModelClass parseModelClass]];
+    
+    return YES;
+}
+
 - (id)performBoxingIfNecessary:(id)object
 {
     id boxedObject = object;
@@ -87,26 +109,47 @@ - (id)performUnboxingIfNecessary:(id)object targetClass:(Class)targetClass
 
     // Let's get recursive
     // Handle arrays and dictionaries...
-    else if ([targetClass isKindOfClass:[NSArray class]]) {
+    else if ([object isKindOfClass:[NSArray class]]) {
         NSMutableArray *unboxedArray = [NSMutableArray array];
         for (id interalObject in object) {
-            [unboxedArray addObject:[[ParseModelUtils sharedUtilities] performUnboxingIfNecessary:object targetClass:targetClass]];
+            [unboxedArray addObject:[[ParseModelUtils sharedUtilities] performUnboxingIfNecessary:interalObject
+                                                                                      targetClass:[self resolveModelClassForObject:interalObject]]];
         }
         unboxedObject = unboxedArray;
     }
-    else if ([targetClass isKindOfClass:[NSDictionary class]]) {
+    else if ([object isKindOfClass:[NSDictionary class]]) {
         NSMutableDictionary *unboxedDictionary = [NSMutableDictionary dictionary];
         NSArray *keys = [object allKeys];
         for (id key in keys) {
-            id unboxedKey = [[ParseModelUtils sharedUtilities] performUnboxingIfNecessary:key targetClass:[key class]];
-            id unboxedValue = [[ParseModelUtils sharedUtilities] performUnboxingIfNecessary:[object objectForKey:key]
-                                                            targetClass:[[object objectForKey:key] class]];
+            id unboxedKey = [[ParseModelUtils sharedUtilities] performUnboxingIfNecessary:key targetClass:[self resolveModelClassForObject:key]];
+            id rawValue = [object objectForKey:key];
+            id unboxedValue = [[ParseModelUtils sharedUtilities] performUnboxingIfNecessary:rawValue
+                                                                                targetClass:[self resolveModelClassForObject:rawValue]];
             [unboxedDictionary setObject:unboxedValue forKey:unboxedKey];
         }
         unboxedObject = unboxedDictionary;
     }
 
+    // Lastly, if this class is a PFObject and it is registered, instantiate the appropriate ParseModel...
+    else if ([object isKindOfClass:[PFObject class]]) {
+        NSString *unboxedClassString = [self.registeredParseModels objectForKey:[(PFObject *)object parseClassName]];
+        if (unboxedClassString.length) {
+            unboxedObject = [[NSClassFromString(unboxedClassString) alloc] initWithParseObject:object];
+        }
+    }
+    
     return unboxedObject;
 }
 
+- (Class)resolveModelClassForObject:(id)object
+{
+    if ([object isKindOfClass:[PFObject class]]) {
+        NSString *classString = [self.registeredParseModels objectForKey:[(PFObject *)object parseClassName]];
+        return NSClassFromString(classString);
+    }
+    else {
+        return [object class];
+    }
+}
+
 @end