kylefang/RestKit
1
0
Fork 0
mirror of https://github.com/zhigang1992/RestKit.git synced 2026-04-20 07:54:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Port commented out unit tests from 0.10.x to latest development sources to nail down issues with targetObject behaviors

Browse Source
This commit is contained in:
Blake Watters
2012-11-05 17:16:33 -05:00
parent e7505df56c
commit 28c8262b0d
3 changed files with 500 additions and 766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Code/Network/RKObjectRequestOperation.m
View File

@@ -272,7 +272,7 @@ static NSString *RKStringDescribingURLResponseWithData(NSURLResponse *response,
if (self.isCancelled) return;
// Map the response
NSError *error;
NSError *error = nil;
RKMappingResult *mappingResult = [self performMappingOnResponse:&error];
if (self.isCancelled) {
return;

5
Code/Network/RKResponseMapperOperation.m
View File

@@ -183,7 +183,9 @@ static dispatch_queue_t RKResponseMapperSerializationQueue() {
if (self.targetObject) {
self.mappingResult = [[RKMappingResult alloc] initWithDictionary:[NSDictionary dictionaryWithObject:self.targetObject forKey:[NSNull null]]];
} else {
self.mappingResult = [[RKMappingResult alloc] initWithDictionary:[NSDictionary dictionary]];
// NOTE: For alignment with the behavior of loading an empty array or empty dictionary, if there is a nil targetObject we return a nil mappingResult.
// This informs the caller that operation succeeded, but performed no mapping.
self.mappingResult = nil;
}
return;
@@ -230,6 +232,7 @@ static dispatch_queue_t RKResponseMapperSerializationQueue() {
RKObjectMappingOperationDataSource *dataSource = [RKObjectMappingOperationDataSource new];
self.mapperOperation = [[RKMapperOperation alloc] initWithObject:sourceObject mappingsDictionary:self.responseMappingsDictionary];
self.mapperOperation.mappingOperationDataSource = dataSource;
self.mapperOperation.targetObject = self.targetObject;
[self.mapperOperation start];
if (error) *error = self.mapperOperation.error;
return self.mapperOperation.mappingResult;