Work in progress

Conflicts:
	Code/CoreData/RKManagedObjectLoader.h
	Code/CoreData/RKManagedObjectLoader.m
	Code/CoreData/RKManagedObjectMapping.m
	Code/CoreData/RKManagedObjectMappingOperation.m
	Code/CoreData/RKManagedObjectStore.m
	Code/CoreData/RKManagedObjectThreadSafeInvocation.h
	Code/CoreData/RKManagedObjectThreadSafeInvocation.m
	Code/CoreData/RKSearchableManagedObject.m
	Code/ObjectMapping/RKObjectLoader.m
	Code/ObjectMapping/RKObjectMapper.h
	Code/ObjectMapping/RKObjectMappingOperation.m
	RestKit.xcodeproj/project.pbxproj
	Tests/Logic/CoreData/RKManagedObjectThreadSafeInvocationTest.m
This commit is contained in:
Blake Watters
2012-07-13 13:07:42 -04:00
parent 87797780a4
commit f0706dbdbf
47 changed files with 1610 additions and 642 deletions

View File

@@ -27,11 +27,7 @@
transient object loader only by handling the special threading
concerns imposed by Core Data.
*/
@interface RKManagedObjectLoader : RKObjectLoader {
NSManagedObjectID *_targetObjectID;
NSMutableSet *_managedObjectKeyPaths;
BOOL _deleteObjectOnFailure;
}
@interface RKManagedObjectLoader : RKObjectLoader
/**
A reference to a RestKit managed object store for interacting with Core Data
@@ -39,6 +35,7 @@
@see RKManagedObjectStore
*/
@property (nonatomic, retain) RKManagedObjectStore *objectStore;
@property (nonatomic, retain, readonly) NSManagedObjectContext *managedObjectContext;
+ (id)loaderWithURL:(RKURL *)URL mappingProvider:(RKObjectMappingProvider *)mappingProvider objectStore:(RKManagedObjectStore *)objectStore;
- (id)initWithURL:(RKURL *)URL mappingProvider:(RKObjectMappingProvider *)mappingProvider objectStore:(RKManagedObjectStore *)objectStore;