kylefang/RestKit
1
0
Fork 0
mirror of https://github.com/zhigang1992/RestKit.git synced 2026-01-12 22:51:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't throw an exception if doing a simple attribute mapping with a nil data source. closes #1005

Browse Source
This commit is contained in:
Blake Watters
2012-10-18 15:17:57 -04:00
parent f69c2976e2
commit e748e5bfce
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Code/ObjectMapping/RKMappingOperation.m
View File

@@ -650,7 +650,7 @@ static void RKSetIntermediateDictionaryValuesOnObjectForKeyPath(id object, NSStr
[self applyNestedMappings];
BOOL mappedSimpleAttributes = [self applyAttributeMappings:[self simpleAttributeMappings]];
BOOL mappedRelationships = [self applyRelationshipMappings];
BOOL mappedRelationships = [[self relationshipMappings] count] ? [self applyRelationshipMappings] : NO;
BOOL mappedKeyPathAttributes = [self applyAttributeMappings:[self keyPathAttributeMappings]];
if ((mappedSimpleAttributes || mappedKeyPathAttributes || mappedRelationships) && _validationError == nil) {
RKLogDebug(@"Finished mapping operation successfully...");

20
Tests/Logic/ObjectMapping/RKMappingOperationTest.m
View File

@@ -490,4 +490,24 @@
});
}
- (void)testMappingSimpleAttributesDoesNotTriggerDataSourceAssertion
{
RKObjectMapping *mapping = [RKObjectMapping mappingForClass:[NSMutableDictionary class]];
[mapping addAttributeMappingsFromArray:@[@"boolString"]];
TestMappable *object = [TestMappable new];
object.boolString = @"test";
NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
RKMappingOperation *operation = [[RKMappingOperation alloc] initWithSourceObject:object destinationObject:dictionary mapping:mapping];
NSException *exception = nil;
@try {
[operation start];
}
@catch (NSException *e) {
exception = e;
}
@finally {
expect(exception).to.beNil();
}
}
@end