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

Updates to entity cache and other components to operate in parent/child context world.

Browse Source
This commit is contained in:
Blake Watters
2012-07-20 14:44:48 -04:00
parent e952f451fb
commit 6b315fbd54
13 changed files with 290 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Code/ObjectMapping/RKObjectManager.m
View File

@@ -238,6 +238,7 @@ static NSOperationQueue *defaultMappingQueue = nil;
RKManagedObjectLoader *managedObjectLoader = (RKManagedObjectLoader *)loader;
managedObjectLoader.managedObjectContext = self.managedObjectStore.primaryManagedObjectContext;
managedObjectLoader.mainQueueManagedObjectContext = self.managedObjectStore.mainQueueManagedObjectContext;
managedObjectLoader.managedObjectCache = self.managedObjectStore.cacheStrategy;
}
[self configureObjectLoader:loader];

10
Code/ObjectMapping/RKObjectMapper.m
View File

@@ -30,7 +30,6 @@
@interface RKObjectMapper ()
@property (nonatomic, retain) NSOperationQueue *operationQueue;
@property (nonatomic, retain) NSMutableArray *mappingErrors;
@end
@@ -43,7 +42,6 @@
@synthesize mappingProvider = _mappingProvider;
@synthesize mappingOperationDataSource = _mappingOperationDataSource;
@synthesize mappingErrors = _mappingErrors;
@synthesize operationQueue = _operationQueue;
@synthesize context = _context;
+ (id)mapperWithObject:(id)object mappingProvider:(RKObjectMappingProvider *)mappingProvider
@@ -58,7 +56,6 @@
_sourceObject = [object retain];
_mappingProvider = mappingProvider;
_mappingErrors = [NSMutableArray new];
_operationQueue = [NSOperationQueue new];
_context = RKObjectMappingProviderContextObjectsByKeyPath;
_mappingOperationDataSource = [RKObjectMappingOperationDataSource new];
}
@@ -70,7 +67,6 @@
{
[_sourceObject release];
[_mappingErrors release];
[_operationQueue release];
[_mappingOperationDataSource release];
[super dealloc];
}
@@ -369,14 +365,10 @@
if (mappableData) {
id mappingResult = [self performMappingForObject:mappableData atKeyPath:@"" usingMapping:mappingsForContext];
foundMappable = YES;
results = [NSDictionary dictionaryWithObject:mappingResult forKey:@""];
results = mappingResult ? [NSDictionary dictionaryWithObject:mappingResult forKey:@""] : nil;
}
}
// Allow any queued operations to complete
RKLogDebug(@"The following operations are in the queue: %@", self.operationQueue.operations);
[self.operationQueue waitUntilAllOperationsAreFinished];
if ([self.delegate respondsToSelector:@selector(mapperDidFinishMapping:)]) {
[self.delegate mapperDidFinishMapping:self];
}