kylefang/RestKit
1
0
Fork 0
mirror of https://github.com/zhigang1992/RestKit.git synced 2026-04-28 12:45:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Migrate to NSData based parsing/serialization. Slim down RKObjectSerializer and rename to RKObjectParameters. refs #762

Browse Source
This commit is contained in:
Blake Watters
2012-09-03 16:23:22 -04:00
parent cb624080b2
commit e67848439c
17 changed files with 259 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Code/CoreData/RKManagedObjectImporter.m
View File

@@ -184,7 +184,7 @@
[self resetPersistentStoreIfNecessary];
NSError *localError = nil;
NSString *payload = [NSString stringWithContentsOfFile:path encoding:NSUTF8StringEncoding error:&localError];
NSData *payload = [NSData dataWithContentsOfFile:path options:0 error:&localError];
if (! payload) {
RKLogError(@"Failed to read file at path '%@': %@", path, [localError localizedDescription]);
if (error) *error = localError;
@@ -192,10 +192,11 @@
}
NSString *MIMEType = [path MIMETypeForPathExtension];
id<RKParser> parser = [[RKParserRegistry sharedRegistry] parserForMIMEType:MIMEType];
// TODO: Return error RKParserNotRegisteredForMIMETypeError
NSAssert1(parser, @"Could not find a parser for the MIME Type '%@'", MIMEType);
id parsedData = [parser objectFromString:payload error:&localError];
id parsedData = [[RKParserRegistry sharedRegistry] parseData:payload withMIMEType:MIMEType error:&localError];
if (!parsedData) {
RKLogError(@"Failed to parse file at path '%@': %@", path, [localError localizedDescription]);
}
if (! parsedData) {
if (error) *error = localError;
return NSNotFound;