From 7d42e17ae51bd46d9a97cb2bcae862b28508d50a Mon Sep 17 00:00:00 2001 From: Saul Mora Date: Thu, 8 Mar 2012 23:35:05 +0100 Subject: [PATCH] Refactor save* method names --- .../NSManagedObject+MagicalDataImport.m | 4 +- MagicalRecord/MagicalRecord+Actions.h | 22 ++-------- MagicalRecord/MagicalRecord+Actions.m | 43 ++++--------------- MagicalRecord/MagicalRecord+Options.h | 1 + ...portSingleEntityWithNoRelationshipsTests.m | 2 +- 5 files changed, 16 insertions(+), 56 deletions(-) diff --git a/MagicalRecord/Categories/NSManagedObject+MagicalDataImport.m b/MagicalRecord/Categories/NSManagedObject+MagicalDataImport.m index e9f0918..6c5c3be 100644 --- a/MagicalRecord/Categories/NSManagedObject+MagicalDataImport.m +++ b/MagicalRecord/Categories/NSManagedObject+MagicalDataImport.m @@ -323,7 +323,7 @@ NSString * const kMagicalRecordImportRelationshipTypeKey = @"type"; { NSMutableArray *objectIDs = [NSMutableArray array]; - [MagicalRecord saveDataWithBlock:^(NSManagedObjectContext *localContext) + [MagicalRecord saveWithBlock:^(NSManagedObjectContext *localContext) { [listOfObjectData enumerateObjectsWithOptions:0 usingBlock:^(id obj, NSUInteger idx, BOOL *stop) { @@ -350,7 +350,7 @@ NSString * const kMagicalRecordImportRelationshipTypeKey = @"type"; { NSMutableArray *objectIDs = [NSMutableArray array]; - [MagicalRecord saveDataWithBlock:^(NSManagedObjectContext *localContext) + [MagicalRecord saveWithBlock:^(NSManagedObjectContext *localContext) { [listOfObjectData enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) { diff --git a/MagicalRecord/MagicalRecord+Actions.h b/MagicalRecord/MagicalRecord+Actions.h index b2a47d3..896fd03 100644 --- a/MagicalRecord/MagicalRecord+Actions.h +++ b/MagicalRecord/MagicalRecord+Actions.h @@ -9,30 +9,14 @@ #import #import "NSManagedObjectContext+MagicalRecord.h" -typedef enum -{ - MRCoreDataSaveOptionInBackground = 1 << 0, - MRCoreDataSaveOptionWithNewContext = 1 << 1 -} MRCoreDataSaveOption; - -typedef enum -{ - MRCoreDataLookupOptionWithNewContext = 1 << 0 -} MRCoreDataLookupOption; - @interface MagicalRecord (Actions) #ifdef NS_BLOCKS_AVAILABLE -+ (void) saveDataWithBlock:(void(^)(NSManagedObjectContext *localContext))block; ++ (void) saveWithBlock:(void(^)(NSManagedObjectContext *localContext))block; -+ (void) saveDataInBackgroundWithBlock:(void(^)(NSManagedObjectContext *localContext))block; -+ (void) saveDataInBackgroundWithBlock:(void(^)(NSManagedObjectContext *localContext))block completion:(void(^)(void))callback; - -+ (void) saveDataWithOptions:(MRCoreDataSaveOption)options withBlock:(void(^)(NSManagedObjectContext *localContext))block; -+ (void) saveDataWithOptions:(MRCoreDataSaveOption)options withBlock:(void(^)(NSManagedObjectContext *localContext))block completion:(void(^)(void))callback; - -+ (void) lookupWithBlock:(void(^)(NSManagedObjectContext *localContext))block; ++ (void) saveInBackgroundWithBlock:(void(^)(NSManagedObjectContext *localContext))block; ++ (void) saveInBackgroundWithBlock:(void(^)(NSManagedObjectContext *localContext))block completion:(void(^)(void))callback; #endif diff --git a/MagicalRecord/MagicalRecord+Actions.m b/MagicalRecord/MagicalRecord+Actions.m index 10714c6..00739a4 100644 --- a/MagicalRecord/MagicalRecord+Actions.m +++ b/MagicalRecord/MagicalRecord+Actions.m @@ -37,7 +37,7 @@ void cleanup_save_queue() #ifdef NS_BLOCKS_AVAILABLE -+ (void) saveDataWithBlock:(void (^)(NSManagedObjectContext *localContext))block errorHandler:(void (^)(NSError *))errorHandler ++ (void) saveWithBlock:(void (^)(NSManagedObjectContext *localContext))block errorHandler:(void (^)(NSError *))errorHandler { NSManagedObjectContext *mainContext = [NSManagedObjectContext MR_defaultContext]; NSManagedObjectContext *localContext = mainContext; @@ -67,22 +67,22 @@ void cleanup_save_queue() [mainContext setMergePolicy:NSMergeByPropertyObjectTrumpMergePolicy]; } -+ (void) saveDataWithBlock:(void(^)(NSManagedObjectContext *localContext))block ++ (void) saveWithBlock:(void(^)(NSManagedObjectContext *localContext))block { - [self saveDataWithBlock:block errorHandler:NULL]; + [self saveWithBlock:block errorHandler:NULL]; } -+ (void) saveDataInBackgroundWithBlock:(void(^)(NSManagedObjectContext *localContext))block ++ (void) saveInBackgroundWithBlock:(void(^)(NSManagedObjectContext *localContext))block { dispatch_async(background_save_queue(), ^{ - [self saveDataWithBlock:block]; + [self saveWithBlock:block]; }); } -+ (void) saveDataInBackgroundWithBlock:(void(^)(NSManagedObjectContext *localContext))block completion:(void(^)(void))callback ++ (void) saveInBackgroundWithBlock:(void(^)(NSManagedObjectContext *localContext))block completion:(void(^)(void))callback { dispatch_async(background_save_queue(), ^{ - [self saveDataWithBlock:block]; + [self saveWithBlock:block]; if (callback) { @@ -91,10 +91,10 @@ void cleanup_save_queue() }); } -+ (void) saveDataInBackgroundWithBlock:(void (^)(NSManagedObjectContext *localContext))block completion:(void (^)(void))callback errorHandler:(void (^)(NSError *))errorHandler ++ (void) saveInBackgroundWithBlock:(void (^)(NSManagedObjectContext *localContext))block completion:(void (^)(void))callback errorHandler:(void (^)(NSError *))errorHandler { dispatch_async(background_save_queue(), ^{ - [self saveDataWithBlock:block errorHandler:errorHandler]; + [self saveWithBlock:block errorHandler:errorHandler]; if (callback) { @@ -103,31 +103,6 @@ void cleanup_save_queue() }); } -+ (void) lookupWithBlock:(void(^)(NSManagedObjectContext *localContext))block -{ - NSManagedObjectContext *context = [NSManagedObjectContext MR_contextForCurrentThread]; - - if (block) - { - block(context); - } -} - -+ (void) saveDataWithOptions:(MRCoreDataSaveOption)options withBlock:(void(^)(NSManagedObjectContext *localContext))block; -{ - [self saveDataWithOptions:options withBlock:block completion:NULL]; -} - -+ (void) saveDataWithOptions:(MRCoreDataSaveOption)options withBlock:(void(^)(NSManagedObjectContext *localContext))block completion:(void(^)(void))callback; -{ - //TODO: add implementation -} - -+ (void) saveDataWithOptions:(MRCoreDataSaveOption)options withBlock:(void (^)(NSManagedObjectContext *))block completion:(void (^)(void))callback errorHandler:(void(^)(NSError *))errorCallback -{ - -} - #endif @end \ No newline at end of file diff --git a/MagicalRecord/MagicalRecord+Options.h b/MagicalRecord/MagicalRecord+Options.h index e535795..e0d224e 100644 --- a/MagicalRecord/MagicalRecord+Options.h +++ b/MagicalRecord/MagicalRecord+Options.h @@ -15,6 +15,7 @@ // add logging provider // autocreate new PSC per Store // autoassign new instances to default store + + (BOOL) shouldAutoCreateManagedObjectModel; + (void) setShouldAutoCreateManagedObjectModel:(BOOL)shouldAutoCreate; + (BOOL) shouldAutoCreateDefaultPersistentStoreCoordinator; diff --git a/Project Files/Unit Tests/ImportSingleEntityWithNoRelationshipsTests.m b/Project Files/Unit Tests/ImportSingleEntityWithNoRelationshipsTests.m index 1978566..980262f 100644 --- a/Project Files/Unit Tests/ImportSingleEntityWithNoRelationshipsTests.m +++ b/Project Files/Unit Tests/ImportSingleEntityWithNoRelationshipsTests.m @@ -130,7 +130,7 @@ - (void) testImportNSColorAttributeToEntity { - id actualColor = [testEntity colorTestAttribute]; + NSColor *actualColor = [testEntity colorTestAttribute]; assertThatFloat([actualColor alphaComponent], is(equalToFloat(255./255.))); assertThatFloat([actualColor redComponent], is(equalToFloat(64./255.)));