kylefang/MagicalRecord
1
0
Fork 0
mirror of https://github.com/zhigang1992/MagicalRecord.git synced 2026-01-12 17:32:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/2.0.7'

Browse Source
This commit is contained in:
Stephen Vanterpool
2012-10-15 23:15:00 -07:00
parent 835b4675f6 601869e953
commit 58f463d281
4 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MagicalRecord.podspec
View File

@@ -1,11 +1,11 @@
Pod::Spec.new do |s|
s.name = 'MagicalRecord'
s.version = '2.0.6'
s.version = '2.0.7'
s.license = 'MIT'
s.summary = 'Super Awesome Easy Fetching for Core Data 1!!!11!!!!1!.'
s.homepage = 'http://github.com/magicalpanda/MagicalRecord'
s.author = { 'Saul Mora' => 'saul@magicalpanda.com' }
s.source = { :git => 'https://github.com/magicalpanda/MagicalRecord.git', :tag => '2.0.6' }
s.source = { :git => 'https://github.com/magicalpanda/MagicalRecord.git', :tag => '2.0.7' }
s.description = 'Handy fetching, threading and data import helpers to make Core Data a little easier to use.'
s.source_files = 'MagicalRecord/**/*.{h,m}'
s.framework = 'CoreData'

12
MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalSaves.m
View File

@@ -95,13 +95,13 @@
{
[self performBlockAndWait:^{
[self MR_saveWithErrorCallback:errorCallback];
if (self.parentContext) {
[[self parentContext] performBlockAndWait:^{
[[self parentContext] MR_saveErrorHandler:errorCallback];
}];
}
}];
if (self == [[self class] MR_defaultContext])
{
// Since this is a synchronous call, I made the background context save synchronous as well to reflect the intent.
[[[self class] MR_rootSavingContext] MR_saveErrorHandler:errorCallback];
}
}
- (void) MR_saveInBackgroundCompletion:(void (^)(void))completion;

2
MagicalRecord/Core/MagicalRecord+Actions.m
View File

@@ -66,7 +66,7 @@ void reset_action_queue(void)
if ([localContext hasChanges])
{
[localContext MR_saveNestedContextsErrorHandler:errorHandler];
[localContext MR_saveErrorHandler:errorHandler];
}
if (completion)

17
Project Files/Unit Tests/SaveTests.m
View File

@@ -65,4 +65,21 @@
expect([fetchedObject hasChanges]).to.beFalsy();
}
- (void)testCurrentThreadSavesActuallySave
{
__block NSManagedObjectID *objectId;
__block NSManagedObject *fetchedObject;
[MagicalRecord saveWithBlock:^(NSManagedObjectContext *localContext) {
NSManagedObject *inserted = [SingleEntityWithNoRelationships MR_createInContext:localContext];
expect([inserted hasChanges]).to.beTruthy();
[localContext obtainPermanentIDsForObjects:@[inserted] error:nil];
objectId = inserted.objectID;
}];
fetchedObject = [[NSManagedObjectContext MR_rootSavingContext] objectWithID:objectId];
expect(fetchedObject).toNot.beNil();
expect([fetchedObject hasChanges]).to.beFalsy();
}
@end