kylefang/RestKit
1
0
Fork 0
mirror of https://github.com/zhigang1992/RestKit.git synced 2026-04-01 09:31:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

DRY up find or create of destination object within the mapping operation and change nil destination object to an error condition instead of an assertion.

Browse Source
This commit is contained in:
Blake Watters
2012-10-18 14:06:46 -04:00
parent f5ed351a89
commit e8b4cdd19c
3 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Code/ObjectMapping/RKMappingErrors.h
View File

@@ -27,7 +27,8 @@ enum {
RKMappingErrorUnmappableRepresentation = 1003, // No values were found at the key paths of any attribute or relationship mappings in the given representation
RKMappingErrorFromMappingResult = 1004, // The error was returned from the mapping result
RKMappingErrorValidationFailure = 1005, // Generic error code for use when constructing validation errors
RKMappingErrorUnableToDetermineMapping = 1006 // The mapping operation was unable to obtain a concrete object mapping from a given dynamic mapping
RKMappingErrorUnableToDetermineMapping = 1006, // The mapping operation was unable to obtain a concrete object mapping from a given dynamic mapping
RKMappingErrorNilDestinationObject = 1007, // The mapping operation failed due to a nil destination object.
};
extern NSString * const RKMappingErrorKeyPathErrorKey; // The key path the error is associated with

4
Code/ObjectMapping/RKMappingOperation.h
View File

@@ -135,7 +135,9 @@
@property (nonatomic, strong, readonly) id sourceObject;
/**
The target object for this operation. Mappable values in elements will be applied to object using key-value coding.
The target object for this operation. Mappable values in the source object will be applied to the destination object using key-value coding.
If initialized with a `nil` destination object, the mapping operation will attempt to find or create a destination object via the data source and will populate the value of the `destinationObject` property.
*/
@property (nonatomic, strong, readonly) id destinationObject;

55
Code/ObjectMapping/RKMappingOperation.m
View File

@@ -71,7 +71,6 @@ static void RKSetIntermediateDictionaryValuesOnObjectForKeyPath(id object, NSStr
- (id)initWithSourceObject:(id)sourceObject destinationObject:(id)destinationObject mapping:(RKMapping *)objectOrDynamicMapping
{
NSAssert(sourceObject != nil, @"Cannot perform a mapping operation without a sourceObject object");
NSAssert(destinationObject != nil, @"Cannot perform a mapping operation without a destinationObject");
NSAssert(objectOrDynamicMapping != nil, @"Cannot perform a mapping operation without a mapping");
self = [super init];
@@ -84,6 +83,21 @@ static void RKSetIntermediateDictionaryValuesOnObjectForKeyPath(id object, NSStr
return self;
}
- (id)destinationObjectForMappingRepresentation:(id)representation withMapping:(RKMapping *)mapping
{
RKObjectMapping *concreteMapping = nil;
if ([mapping isKindOfClass:[RKDynamicMapping class]]) {
concreteMapping = [(RKDynamicMapping *)mapping objectMappingForRepresentation:representation];
if (! concreteMapping) {
RKLogDebug(@"Unable to determine concrete object mapping from dynamic mapping %@ with which to map object representation: %@", mapping, representation);
return nil;
}
} else if ([mapping isKindOfClass:[RKObjectMapping class]]) {
concreteMapping = (RKObjectMapping *)mapping;
}
return [self.dataSource mappingOperation:self targetObjectForRepresentation:representation withMapping:concreteMapping];
}
- (NSDate *)parseDateFromString:(NSString *)string
{
@@ -502,20 +516,11 @@ static void RKSetIntermediateDictionaryValuesOnObjectForKeyPath(id object, NSStr
RKLogWarning(@"Key path '%@' yielded collection containing another collection rather than a collection of objects: %@", relationshipMapping.sourceKeyPath, value);
}
for (id nestedObject in value) {
RKMapping *mapping = relationshipMapping.mapping;
RKObjectMapping *objectMapping = nil;
if ([mapping isKindOfClass:[RKDynamicMapping class]]) {
objectMapping = [(RKDynamicMapping *)mapping objectMappingForRepresentation:nestedObject];
if (! objectMapping) {
RKLogDebug(@"Mapping %@ declined mapping for data %@: returned nil objectMapping", mapping, nestedObject);
continue;
}
} else if ([mapping isKindOfClass:[RKObjectMapping class]]) {
objectMapping = (RKObjectMapping *)mapping;
} else {
NSAssert(objectMapping, @"Encountered unknown mapping type '%@'", NSStringFromClass([mapping class]));
id mappableObject = [self destinationObjectForMappingRepresentation:nestedObject withMapping:relationshipMapping.mapping];
if (! mappableObject) {
RKLogDebug(@"Mapping %@ declined mapping for representation %@: returned `nil` destination object.", relationshipMapping.mapping, nestedObject);
continue;
}
id mappableObject = [self.dataSource mappingOperation:self targetObjectForRepresentation:nestedObject withMapping:objectMapping];
if ([self mapNestedObject:nestedObject toObject:mappableObject withRelationshipMapping:relationshipMapping]) {
[destinationObject addObject:mappableObject];
}
@@ -560,15 +565,11 @@ static void RKSetIntermediateDictionaryValuesOnObjectForKeyPath(id object, NSStr
// One to one relationship
RKLogDebug(@"Mapping one to one relationship value at keyPath '%@' to '%@'", relationshipMapping.sourceKeyPath, relationshipMapping.destinationKeyPath);
RKMapping *mapping = relationshipMapping.mapping;
RKObjectMapping *objectMapping = nil;
if ([mapping isKindOfClass:[RKDynamicMapping class]]) {
objectMapping = [(RKDynamicMapping *)mapping objectMappingForRepresentation:value];
} else if ([mapping isKindOfClass:[RKObjectMapping class]]) {
objectMapping = (RKObjectMapping *)mapping;
destinationObject = [self destinationObjectForMappingRepresentation:value withMapping:relationshipMapping.mapping];
if (! destinationObject) {
RKLogDebug(@"Mapping %@ declined mapping for representation %@: returned `nil` destination object.", relationshipMapping.mapping, destinationObject);
continue;
}
NSAssert(objectMapping, @"Encountered unknown mapping type '%@'", NSStringFromClass([mapping class]));
destinationObject = [self.dataSource mappingOperation:self targetObjectForRepresentation:value withMapping:objectMapping];
if ([self mapNestedObject:value toObject:destinationObject withRelationshipMapping:relationshipMapping]) {
appliedMappings = YES;
}
@@ -620,6 +621,16 @@ static void RKSetIntermediateDictionaryValuesOnObjectForKeyPath(id object, NSStr
RKLogDebug(@"Starting mapping operation...");
RKLogTrace(@"Performing mapping operation: %@", self);
if (! self.destinationObject) {
self.destinationObject = [self destinationObjectForMappingRepresentation:self.sourceObject withMapping:self.mapping];
if (! self.destinationObject) {
RKLogDebug(@"Mapping operation failed: Given nil destination object and unable to instantiate a destination object for mapping.");
NSDictionary *userInfo = @{ NSLocalizedDescriptionKey: @"Cannot perform a mapping operation with a nil destination object." };
self.error = [NSError errorWithDomain:RKErrorDomain code:RKMappingErrorNilDestinationObject userInfo:userInfo];
return;
}
}
// Determine the concrete mapping if we were initialized with a dynamic mapping
if ([self.mapping isKindOfClass:[RKDynamicMapping class]]) {
self.objectMapping = [(RKDynamicMapping *)self.mapping objectMappingForRepresentation:self.sourceObject];