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

Added Key-Value validation checking during object mapping operation. If you return NO it will continue mapping but skip that key path. If you set the error it will error out of object mapping operation. Issue #166

Browse Source
This commit is contained in:
Scott Penrose
2011-06-27 16:27:14 -04:00
committed by Blake Watters
parent 4b4d3d1af6
commit 41071ad61a
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Code/ObjectMapping/RKObjectMappingOperation.m
View File

@@ -158,6 +158,17 @@ extern NSString* const RKObjectMappingNestingAttributeKeyName;
return ComparisonSender(sourceValue, comparisonSelector, destinationValue);
}
- (BOOL)validateValue:(id)value atKeyPath:(NSString*)keyPath {
NSError* validationError = nil;
BOOL success = [self.destinationObject validateValue:&value forKey:keyPath error:&validationError];
if (!success && validationError) {
// Do something with error?
RKLogError(@"Validation failed while mapping attribute at key path %@ to value %@. Error: %@", keyPath, value, [validationError localizedDescription]);
}
return success;
}
- (BOOL)shouldSetValue:(id)value atKeyPath:(NSString*)keyPath {
id currentValue = [self.destinationObject valueForKeyPath:keyPath];
if (currentValue == [NSNull null] || [currentValue isEqual:[NSNull null]]) {
@@ -169,11 +180,14 @@ extern NSString* const RKObjectMappingNestingAttributeKeyName;
return NO;
} else if (nil == value || nil == currentValue) {
// One is nil and the other is not
return YES;
return [self validateValue:value atKeyPath:keyPath];
}
BOOL isEqual = [self isValue:value equalToValue:currentValue];
return !isEqual;
if (! [self isValue:value equalToValue:currentValue]) {
// Validate value for key
return [self validateValue:value atKeyPath:keyPath];
}
return NO;
}
- (NSArray*)applyNestingToMappings:(NSArray*)mappings {
@@ -218,6 +232,7 @@ extern NSString* const RKObjectMappingNestingAttributeKeyName;
// Ensure that the value is different
if ([self shouldSetValue:value atKeyPath:attributeMapping.destinationKeyPath]) {
RKLogTrace(@"Mapped attribute value from keyPath '%@' to '%@'. Value: %@", attributeMapping.sourceKeyPath, attributeMapping.destinationKeyPath, value);
[self.destinationObject setValue:value forKey:attributeMapping.destinationKeyPath];
if ([self.delegate respondsToSelector:@selector(objectMappingOperation:didSetValue:forKeyPath:usingMapping:)]) {
[self.delegate objectMappingOperation:self didSetValue:value forKeyPath:attributeMapping.destinationKeyPath usingMapping:attributeMapping];