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

Fixed crash during dealloc of RKClient due to initialization of baseURL observer using a blank host. Updated the object mapper to support class/keypath when loading a single object. Some updates to the UISpec harness to get things working again.

Browse Source
This commit is contained in:
Blake Watters
2011-02-25 14:42:50 -05:00
parent 976942d054
commit e03c6d3d10
7 changed files with 112 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Code/ObjectMapping/RKObjectMapper.m
View File

@@ -125,13 +125,19 @@ static const NSString* kRKModelMapperMappingFormatParserKey = @"RKMappingFormatP
return error;
}
// Primary entry point for RKObjectLoader
- (id)mapFromString:(NSString*)string toClass:(Class)class keyPath:(NSString*)keyPath {
id object = [self parseString:string];
if (keyPath) {
object = [object valueForKeyPath:keyPath];
}
if ([object isKindOfClass:[NSDictionary class]]) {
return [self mapObjectFromDictionary:(NSDictionary*)object];
if (class) {
return [self mapObjectFromDictionary:(NSDictionary*)object toClass:class];
} else {
return [self mapObjectFromDictionary:(NSDictionary*)object];
}
} else if ([object isKindOfClass:[NSArray class]]) {
if (class) {
return [self mapObjectsFromArrayOfDictionaries:(NSArray*)object toClass:class];
@@ -193,8 +199,12 @@ static const NSString* kRKModelMapperMappingFormatParserKey = @"RKMappingFormatP
}
}
// TODO: Can I make this support keyPath??
- (id)mapObjectFromDictionary:(NSDictionary*)dictionary toClass:(Class)class {
return [self createOrUpdateInstanceOfModelClass:class fromElements:dictionary];
}
- (id)mapObjectFromDictionary:(NSDictionary*)dictionary {
// TODO: Makes assumptions about the structure of the JSON...
NSString* elementName = [[dictionary allKeys] objectAtIndex:0];
Class class = [_elementToClassMappings objectForKey:elementName];
NSDictionary* elements = [dictionary objectForKey:elementName];
@@ -365,15 +375,24 @@ static const NSString* kRKModelMapperMappingFormatParserKey = @"RKMappingFormatP
NSLog(@"Caught exception:%@ when trying valueForKeyPath with path:%@ for elements:%@", e, elementKeyPath, elements);
}
if ([relationshipElements isKindOfClass:[NSArray class]] || [relationshipElements isKindOfClass:[NSSet class]]) {
// TODO: Need to send NSSet or NSArray depending on what the property type is...
Class collectionClass = [self typeClassForProperty:propertyName ofClass:[object class]];
// if ([relationshipElements isKindOfClass:[NSArray class]] || [relationshipElements isKindOfClass:[NSSet class]]) {
if ([collectionClass isSubclassOfClass:[NSSet class]] || [collectionClass isSubclassOfClass:[NSArray class]]) {
// NOTE: The last part of the keyPath contains the elementName for the mapped destination class of our children
NSArray* componentsOfKeyPath = [elementKeyPath componentsSeparatedByString:@"."];
Class class = [_elementToClassMappings objectForKey:[componentsOfKeyPath objectAtIndex:[componentsOfKeyPath count] - 1]];
NSMutableSet* children = [NSMutableSet setWithCapacity:[relationshipElements count]];
id children = nil;
if ([collectionClass isSubclassOfClass:[NSSet class]]) {
children = [NSMutableSet setWithCapacity:[relationshipElements count]];
} else if ([collectionClass isSubclassOfClass:[NSArray class]]) {
children = [NSMutableArray arrayWithCapacity:[relationshipElements count]];
}
for (NSDictionary* childElements in relationshipElements) {
id child = [self createOrUpdateInstanceOfModelClass:class fromElements:childElements];
if (child) {
[children addObject:child];
[(NSMutableArray*)children addObject:child];
}
}