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

Merge branch '0.9' of github.com:twotoasters/RestKit into 0.9

Browse Source
This commit is contained in:
Blake Watters
2011-04-05 10:06:43 -04:00
parent 322599e14a 8b89d017c4
commit 7589060e6d
7 changed files with 72 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Code/Network/RKRequestQueue.m
View File

@@ -14,7 +14,6 @@
static RKRequestQueue* gSharedQueue = nil;
static const NSTimeInterval kFlushDelay = 0.3;
static const NSTimeInterval kTimeout = 300.0;
static const NSInteger kMaxConcurrentLoads = 5;
@implementation RKRequestQueue

15
Code/ObjectMapping/RKObjectMapper.m
View File

@@ -409,6 +409,16 @@ static const NSString* kRKModelMapperRailsDateFormatString = @"MM/dd/yyyy";
NSLog(@"Caught exception:%@ when trying valueForKeyPath with path:%@ for elements:%@", e, elementKeyPath, elements);
}
// Handle missing elements for the relationship
if (relationshipElements == nil) {
if (self.missingElementMappingPolicy == RKSetNilForMissingElementMappingPolicy) {
[object setValue:nil forKey:propertyName];
continue;
} else if(self.missingElementMappingPolicy == RKIgnoreMissingElementMappingPolicy) {
continue;
}
}
// NOTE: The last part of the keyPath contains the elementName for the mapped destination class of our children
NSArray* componentsOfKeyPath = [elementKeyPath componentsSeparatedByString:@"."];
NSString *className = [componentsOfKeyPath objectAtIndex:[componentsOfKeyPath count] - 1];
@@ -422,8 +432,7 @@ static const NSString* kRKModelMapperRailsDateFormatString = @"MM/dd/yyyy";
}
Class collectionClass = [self typeClassForProperty:propertyName ofClass:[object class]];
if ([collectionClass isSubclassOfClass:[NSSet class]] || [collectionClass isSubclassOfClass:[NSArray class]])
{
if ([collectionClass isSubclassOfClass:[NSSet class]] || [collectionClass isSubclassOfClass:[NSArray class]]) {
id children = nil;
if ([collectionClass isSubclassOfClass:[NSSet class]]) {
children = [NSMutableSet setWithCapacity:[relationshipElements count]];
@@ -443,9 +452,9 @@ static const NSString* kRKModelMapperRailsDateFormatString = @"MM/dd/yyyy";
id child = [self createOrUpdateInstanceOfModelClass:modelClass fromElements:relationshipElements];
[object setValue:child forKey:propertyName];
}
}
// Connect relationships by primary key
Class managedObjectClass = NSClassFromString(@"RKManagedObject");
if (managedObjectClass && [object isKindOfClass:managedObjectClass]) {
RKManagedObject* managedObject = (RKManagedObject*)object;