Skip to content

Fix PFUser unboxing logic #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix PFUser unboxing logic #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de21c68
Fix PFUser unboxing.
Sep 25, 2014
27de2c5
Update PFUser parseModelClass
Sep 25, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ParseModel/ParseModelUser.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ + (NSString *)parseModelClass
{
// Default Implementation.

return @"User";
return @"_User";
}

+ (instancetype)parseModel
Expand Down
15 changes: 8 additions & 7 deletions ParseModel/ParseModelUtils.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,19 +146,20 @@ - (id)performUnboxingIfNecessary:(id)object targetClass:(Class)targetClass
unboxedObject = unboxedDictionary;
}

// Lastly, if this class is a PFObject or PFUser 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];
}
}
// Lastly, if this class is a PFUser or PFObject (checking in that order) and it is registered, instantiate the appropriate ParseModel...
else if ([object isKindOfClass:[PFUser class]]) {
NSString *unboxedClassString = [self.registeredParseUsers objectForKey:[(PFUser *)object parseClassName]];
if (unboxedClassString.length) {
unboxedObject = [[NSClassFromString(unboxedClassString) alloc] initWithParseUser:object];
}
}
else if ([object isKindOfClass:[PFObject class]]) {
NSString *unboxedClassString = [self.registeredParseModels objectForKey:[(PFObject *)object parseClassName]];
if (unboxedClassString.length) {
unboxedObject = [[NSClassFromString(unboxedClassString) alloc] initWithParseObject:object];
}
}


// Check for NSNull and destroy it. Sorry.
if ([unboxedObject class] == [NSNull class]) {
Expand Down