Skip to content
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

Jump to bottom

Changed server response handling from NSException to NSError #54

Merged
merged 4 commits into from
Apr 2, 2014
Merged

Changed server response handling from NSException to NSError #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0862131
Changed the malformed server response handling from an application ex…
jhilts Apr 1, 2014
00f8b9b
Updating AFMMRecordResponseSerializer modifications to match MMRecord…
jhilts Apr 1, 2014
ec66576
Added line break for readability
jhilts Apr 1, 2014
572000c
Updated responseObject checking logic, tweaked descriptions
jhilts Apr 1, 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
11 changes: 8 additions & 3 deletions Source/AFMMRecordResponseSerializer/AFMMRecordResponseSerializer.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,15 @@ - (id)responseObjectForResponse:(NSURLResponse *)response
(*error) = newError;
}

NSAssert(([responseObject isKindOfClass:[NSDictionary class]] ||
[responseObject isKindOfClass:[NSArray class]]),
@"Response object should be of type array or dictionary.");
// Verify that the server responded in an expected manner.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The assertion will only get triggered in DEBUG builds, so I don't think this is a terrible thing to do. However, I could be sold on having an error condition as a better way to handle this. An error is also more consistent with the way the rest of the library works.

if (!([responseObject isKindOfClass:[NSDictionary class]]) &&
!([responseObject isKindOfClass:[NSArray class]])) {

(*error) = [MMRecord errorWithMMRecordCode:MMRecordErrorCodeInvalidResponseFormat
description:[NSString stringWithFormat:@"The response object should be an array or dictionary. The returned response object type was: %@", NSStringFromClass([responseObject class])]];

return nil;
}

NSEntityDescription *initialEntity = [self.entityMapper recordResponseSerializer:self
entityForResponse:response
Expand Down
4 changes: 4 additions & 0 deletions Source/MMRecord/MMRecord.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1037,6 +1037,10 @@ + (NSString *)descriptionForMCErrorCode:(MMRecordErrorCode)errorCode {
result = NSLocalizedString(@"Invalid Entity Description. This could be because this record class is not used in your managed object model, or because your persistent store coordinator or managed object model are not defined properly. An entity description is required for creating records.",
@"This could be because this record class is not used in your managed object model, or because your persistent store coordinator or managed object model are not defined properly. An entity description is required for creating records.");
break;
case MMRecordErrorCodeInvalidResponseFormat:
result = NSLocalizedString(@"Invalid Response Format.",
@"The server response was in an unexpected format that could not be handled by MMRecord.");
break;
default:
case MMRecordErrorCodeUnknown:
result = NSLocalizedString(@"Unknown Error",
Expand Down