This repository has been archived by the owner on Jun 2, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 76
Elevate performAndWaitOrThrow to public API
#59
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
bec2c95
Move NSManagedObjectContext throwing performBlockAndWait to API
zwaldowski 4e455a9
Move NSPersistentStoreCoordinator throwing performBlock to public method
zwaldowski e837f35
Doc comments for performAndWaitOrThrow
zwaldowski b852047
Merge branch 'master' into zwaldowski/perform-block
zwaldowski File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| // | ||
| // NSManagedObjectContext+AsyncHelpers.swift | ||
| // CoreDataStack | ||
| // | ||
| // Created by Zachary Waldowski on 12/2/15. | ||
| // Copyright © 2015 Big Nerd Ranch. All rights reserved. | ||
| // | ||
|
|
||
| import CoreData | ||
| import Swift | ||
|
|
||
| extension NSManagedObjectContext { | ||
| /** | ||
| Synchronously exexcutes a given function on the receiver’s queue. | ||
|
|
||
| You use this method to safely address managed objects on a concurrent | ||
| queue. | ||
|
|
||
| - attention: This method may safely be called reentrantly. | ||
| - parameter body: The method body to perform on the reciever. | ||
| - returns: The value returned from the inner function. | ||
| - throws: Any error thrown by the inner function. This method should be | ||
| technically `rethrows`, but cannot be due to Swift limitations. | ||
| **/ | ||
| public func performAndWaitOrThrow<Return>(body: () throws -> Return) throws -> Return { | ||
| var result: Return! | ||
| var thrown: ErrorType? | ||
|
|
||
| performBlockAndWait { | ||
| do { | ||
| result = try body() | ||
| } catch { | ||
| thrown = error | ||
| } | ||
| } | ||
|
|
||
| if let thrown = thrown { | ||
| throw thrown | ||
| } else { | ||
| return result | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 40 additions & 0 deletions
40
CoreDataStack/NSPersistentStoreCoordinator+AsyncHelpers.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| // | ||
| // NSPersistentStoreCoordinator+AsyncHelpers.swift | ||
| // CoreDataStack | ||
| // | ||
| // Created by Zachary Waldowski on 12/2/15. | ||
| // Copyright © 2015 Big Nerd Ranch. All rights reserved. | ||
| // | ||
|
|
||
| import CoreData | ||
|
|
||
| extension NSPersistentStoreCoordinator { | ||
| /** | ||
| Synchronously exexcutes a given function on the coordinator's internal | ||
| queue. | ||
|
|
||
| - attention: This method may safely be called reentrantly. | ||
| - parameter body: The method body to perform on the reciever. | ||
| - returns: The value returned from the inner function. | ||
| - throws: Any error thrown by the inner function. This method should be | ||
| technically `rethrows`, but cannot be due to Swift limitations. | ||
| **/ | ||
| public func performAndWaitOrThrow<Return>(body: () throws -> Return) throws -> Return { | ||
| var result: Return! | ||
| var thrown: ErrorType? | ||
|
|
||
| performBlockAndWait { | ||
| do { | ||
| result = try body() | ||
| } catch { | ||
| thrown = error | ||
| } | ||
| } | ||
|
|
||
| if let thrown = thrown { | ||
| throw thrown | ||
| } else { | ||
| return result | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same thing here for method docs