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

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

Browse Source 
Conflicts:
	Code/ObjectMapping/RKObjectLoader.m
This commit is contained in:
Blake Watters
2010-10-19 14:28:18 -04:00
parent 2fbdfb9c37 92b39313f0
commit 3dff8b0f0d
4 changed files with 64 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Code/ObjectMapping/RKObjectLoader.m
View File

@@ -146,7 +146,7 @@
- (void)processLoadModelsInBackground:(RKResponse *)response {
NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
RKManagedObjectStore* objectStore = [[RKObjectManager globalManager] objectStore]; // TODO: Should probably relax singleton...
RKManagedObjectStore* objectStore = self.managedObjectStore;
// If the request was sent through a model, we map the results back into that object
// TODO: Note that this assumption may not work in all cases, other approaches?
@@ -174,10 +174,10 @@
results = [NSArray arrayWithObjects:result, nil];
}
if (self.managedObjectStore && [self.managedObjectStore managedObjectCache]) {
if (objectStore && [objectStore managedObjectCache]) {
if ([self.URL isKindOfClass:[RKURL class]]) {
RKURL* rkURL = (RKURL*)self.URL;
NSArray* fetchRequests = [[self.managedObjectStore managedObjectCache] fetchRequestsForResourcePath:rkURL.resourcePath];
NSArray* fetchRequests = [[objectStore managedObjectCache] fetchRequestsForResourcePath:rkURL.resourcePath];
NSArray* cachedObjects = [RKManagedObject objectsWithFetchRequests:fetchRequests];
for (id object in cachedObjects) {
if ([object isKindOfClass:[RKManagedObject class]]) {
@@ -192,7 +192,7 @@
// Before looking up NSManagedObjectIDs, need to save to ensure we do not have
// temporary IDs for new objects prior to handing the objectIDs across threads
NSError* error = [self.managedObjectStore save];
NSError* error = [objectStore save];
if (nil != error) {
NSDictionary* infoDictionary = [[NSDictionary dictionaryWithObjectsAndKeys:response, @"response", error, @"error", nil] retain];
[self performSelectorOnMainThread:@selector(informDelegateOfObjectLoadErrorWithInfoDictionary:) withObject:infoDictionary waitUntilDone:NO];

7
Code/ObjectMapping/RKObjectManager.m
View File

@@ -107,8 +107,11 @@ static RKObjectManager* globalManager = nil;
}
// Grab request through client to get HTTP AUTH & Headers
RKRequest* request = [self.client requestWithResourcePath:resourcePath delegate:nil callback:nil];
return [RKObjectLoader loaderWithMapper:self.mapper request:request delegate:delegate];
RKRequest* request = [self.client requestWithResourcePath:resourcePath delegate:nil callback:nil];
RKObjectLoader* loader = [RKObjectLoader loaderWithMapper:self.mapper request:request delegate:delegate];
loader.managedObjectStore = self.objectStore;
return loader;
}
/////////////////////////////////////////////////////////////