starred/CoreStore
1
0
Fork 0
mirror of https://github.com/JohnEstropia/CoreStore.git synced 2026-02-24 16:45:07 +01:00
Code Issues 95 Packages Projects Releases 10 Wiki Activity

cleanup

Browse Source
This commit is contained in:
John Rommel Estropia
2015-02-22 23:01:45 +09:00
parent 8f77818015
commit c71198347d
14 changed files with 450 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
HardcoreData/DataStack+Transaction.swift
View File

@@ -2,8 +2,25 @@
// DataStack+Transaction.swift
// HardcoreData
//
// Created by John Rommel Estropia on 2015/02/15.
// Copyright (c) 2015 John Rommel Estropia. All rights reserved.
// Copyright (c) 2015 John Rommel Estropia
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
//
import Foundation
@@ -12,7 +29,7 @@ import CoreData
// MARK: - DataStack
extension DataStack {
public extension DataStack {
// MARK: Public

2
HardcoreData/DataTransaction+Querying.swift
View File

@@ -29,7 +29,7 @@ import CoreData
// MARK: - DataTransaction
extension DataTransaction {
public extension DataTransaction {
// MARK: Public

11
HardcoreData/DataTransaction.swift
View File

@@ -134,15 +134,13 @@ public final class DataTransaction {
internal init(mainContext: NSManagedObjectContext, queue: GCDQueue, closure: (transaction: DataTransaction) -> Void) {
self.mainContext = mainContext
self.transactionQueue = queue
let context = mainContext.temporaryContext()
context.retainsRegisteredObjects = true
self.context = context
self.closure = closure
let context = mainContext.temporaryContextInTransaction(nil)
self.context = context
context.retainsRegisteredObjects = true
context.parentTransaction = self
}
@@ -168,7 +166,6 @@ public final class DataTransaction {
private var isCommitted = false
private var result: SaveResult?
private let mainContext: NSManagedObjectContext
private let transactionQueue: GCDQueue
private let closure: (transaction: DataTransaction) -> Void
}

2
HardcoreData/HardcoreData+Querying.swift
View File

@@ -27,7 +27,7 @@ import Foundation
// MARK: - HardcoreData
extension HardcoreData {
public extension HardcoreData {
// MARK: Public

2
HardcoreData/HardcoreData+Transaction.swift
View File

@@ -28,7 +28,7 @@ import Foundation
// MARK: - HardcoreData
extension HardcoreData {
public extension HardcoreData {
// MARK: Public

6
HardcoreData/NSManagedObject+HardcoreData.swift → HardcoreData/NSManagedObject+Transaction.swift
View File

@@ -1,5 +1,5 @@
//
// NSManagedObject+HardcoreData.swift
// NSManagedObject+Transaction.swift
// HardcoreData
//
// Copyright (c) 2014 John Rommel Estropia
@@ -27,9 +27,9 @@ import Foundation
import CoreData
// MARK: - NSManagedObject+HardcoreData
// MARK: - NSManagedObject
extension NSManagedObject {
internal extension NSManagedObject {
// MARK: - Internal

286
HardcoreData/NSManagedObjectContext+HardcoreData.swift
View File

@@ -30,61 +30,22 @@ import GCDKit
// MARK: - NSManagedObjectContext
public extension NSManagedObjectContext {
// MARK: NSObject
// MARK: Transactions
public func temporaryContext() -> NSManagedObjectContext {
let context = NSManagedObjectContext(concurrencyType: .PrivateQueueConcurrencyType)
context.parentContext = self
context.parentStack = self.parentStack
context.parentTransaction = self.parentTransaction
context.setupForHardcoreDataWithContextName("com.hardcoredata.temporarycontext")
context.shouldCascadeSavesToParent = true
return context
}
internal extension NSManagedObjectContext {
// MARK: - Internal
internal weak var parentStack: DataStack? {
internal var shouldCascadeSavesToParent: Bool {
get {
if let parentContext = self.parentContext {
return parentContext.parentStack
}
return self.getAssociatedObjectForKey(&PropertyKeys.parentStack)
let number: NSNumber? = self.getAssociatedObjectForKey(&PropertyKeys.shouldCascadeSavesToParent)
return number?.boolValue ?? false
}
set {
if let parentContext = self.parentContext {
return
}
self.setAssociatedWeakObject(
newValue,
forKey: &PropertyKeys.parentStack)
}
}
internal weak var parentTransaction: DataTransaction? {
get {
return self.getAssociatedObjectForKey(&PropertyKeys.parentTransaction)
}
set {
self.setAssociatedWeakObject(
newValue,
forKey: &PropertyKeys.parentTransaction)
self.setAssociatedCopiedObject(
NSNumber(bool: newValue),
forKey: &PropertyKeys.shouldCascadeSavesToParent)
}
}
@@ -100,215 +61,7 @@ public extension NSManagedObjectContext {
return nil
}
internal func temporaryContextInTransaction(transaction: DataTransaction?) -> NSManagedObjectContext {
let context = NSManagedObjectContext(concurrencyType: .PrivateQueueConcurrencyType)
context.parentContext = self
context.parentStack = self.parentStack
context.setupForHardcoreDataWithContextName("com.hardcoredata.temporarycontext")
context.shouldCascadeSavesToParent = true
return context
}
internal func saveSynchronously() -> SaveResult {
var result = SaveResult(hasChanges: false)
self.performBlockAndWait {
[unowned self] () -> Void in
if !self.hasChanges {
self.reset()
return
}
var saveError: NSError?
if self.save(&saveError) {
if self.shouldCascadeSavesToParent {
if let parentContext = self.parentContext {
switch parentContext.saveSynchronously() {
case .Success(let hasChanges):
result = SaveResult(hasChanges: true)
case .Failure(let error):
result = SaveResult(error)
}
return
}
}
result = SaveResult(hasChanges: true)
}
else if let error = saveError {
HardcoreData.handleError(
error,
"Failed to save NSManagedObjectContext.")
result = SaveResult(error)
}
else {
result = SaveResult(hasChanges: false)
}
}
return result
}
internal func saveAsynchronouslyWithCompletion(completion: ((result: SaveResult) -> Void)?) {
self.performBlock { () -> Void in
if !self.hasChanges {
if let completion = completion {
GCDQueue.Main.async {
completion(result: SaveResult(hasChanges: false))
}
}
return
}
var saveError: NSError?
if self.save(&saveError) {
if self.shouldCascadeSavesToParent {
if let parentContext = self.parentContext {
let result = parentContext.saveSynchronously()
if let completion = completion {
GCDQueue.Main.async {
completion(result: result)
}
}
return
}
}
if let completion = completion {
GCDQueue.Main.async {
completion(result: SaveResult(hasChanges: true))
}
}
}
else if let error = saveError {
HardcoreData.handleError(
error,
"Failed to save NSManagedObjectContext.")
if let completion = completion {
GCDQueue.Main.async {
completion(result: SaveResult(error))
}
}
}
else if let completion = completion {
GCDQueue.Main.async {
completion(result: SaveResult(hasChanges: false))
}
}
}
}
internal class func rootSavingContextForCoordinator(coordinator: NSPersistentStoreCoordinator) -> NSManagedObjectContext {
let context = NSManagedObjectContext(concurrencyType: .PrivateQueueConcurrencyType)
context.persistentStoreCoordinator = coordinator
context.mergePolicy = NSMergeByPropertyObjectTrumpMergePolicy
context.setupForHardcoreDataWithContextName("com.hardcoredata.rootcontext")
return context
}
internal class func mainContextForRootContext(rootContext: NSManagedObjectContext) -> NSManagedObjectContext {
let context = NSManagedObjectContext(concurrencyType: .MainQueueConcurrencyType)
context.parentContext = rootContext
context.setupForHardcoreDataWithContextName("com.hardcoredata.maincontext")
context.shouldCascadeSavesToParent = true
context.observerForDidSaveNotification = NotificationObserver(
notificationName: NSManagedObjectContextDidSaveNotification,
object: rootContext,
closure: { [weak context] (note) -> Void in
context?.mergeChangesFromContextDidSaveNotification(note)
return
})
return context
}
// MARK: - Private
private struct PropertyKeys {
static var observerForWillSaveNotification: Void?
static var observerForDidSaveNotification: Void?
static var shouldCascadeSavesToParent: Void?
static var parentStack: Void?
static var parentTransaction: Void?
}
private var observerForWillSaveNotification: NotificationObserver? {
get {
return self.getAssociatedObjectForKey(&PropertyKeys.observerForWillSaveNotification)
}
set {
self.setAssociatedRetainedObject(
newValue,
forKey: &PropertyKeys.observerForWillSaveNotification)
}
}
private var observerForDidSaveNotification: NotificationObserver? {
get {
return self.getAssociatedObjectForKey(&PropertyKeys.observerForDidSaveNotification)
}
set {
self.setAssociatedRetainedObject(
newValue,
forKey: &PropertyKeys.observerForDidSaveNotification)
}
}
private var shouldCascadeSavesToParent: Bool {
get {
let number: NSNumber? = self.getAssociatedObjectForKey(&PropertyKeys.observerForDidSaveNotification)
return number?.boolValue ?? false
}
set {
self.setAssociatedCopiedObject(
NSNumber(bool: newValue),
forKey: &PropertyKeys.shouldCascadeSavesToParent)
}
}
private func setupForHardcoreDataWithContextName(contextName: String) {
internal func setupForHardcoreDataWithContextName(contextName: String) {
if self.respondsToSelector("setName:") {
@@ -341,5 +94,28 @@ public extension NSManagedObjectContext {
}
})
}
// MARK: - Private
private struct PropertyKeys {
static var observerForWillSaveNotification: Void?
static var shouldCascadeSavesToParent: Void?
}
private var observerForWillSaveNotification: NotificationObserver? {
get {
return self.getAssociatedObjectForKey(&PropertyKeys.observerForWillSaveNotification)
}
set {
self.setAssociatedRetainedObject(
newValue,
forKey: &PropertyKeys.observerForWillSaveNotification)
}
}
}

2
HardcoreData/NSManagedObjectContext+Querying.swift
View File

@@ -29,7 +29,7 @@ import CoreData
// MARK: - NSManagedObjectContext
extension NSManagedObjectContext {
public extension NSManagedObjectContext {
// MARK: Public

110
HardcoreData/NSManagedObjectContext+Setup.swift Normal file
View File

@@ -0,0 +1,110 @@
//
// NSManagedObjectContext+Setup.swift
// HardcoreData
//
// Copyright (c) 2015 John Rommel Estropia
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
//
import Foundation
import CoreData
// MARK: - NSManagedObjectContext
internal extension NSManagedObjectContext {
// MARK: - Internal
internal weak var parentStack: DataStack? {
get {
if let parentContext = self.parentContext {
return parentContext.parentStack
}
return self.getAssociatedObjectForKey(&PropertyKeys.parentStack)
}
set {
if let parentContext = self.parentContext {
return
}
self.setAssociatedWeakObject(
newValue,
forKey: &PropertyKeys.parentStack)
}
}
internal class func rootSavingContextForCoordinator(coordinator: NSPersistentStoreCoordinator) -> NSManagedObjectContext {
let context = NSManagedObjectContext(concurrencyType: .PrivateQueueConcurrencyType)
context.persistentStoreCoordinator = coordinator
context.mergePolicy = NSMergeByPropertyObjectTrumpMergePolicy
context.setupForHardcoreDataWithContextName("com.hardcoredata.rootcontext")
return context
}
internal class func mainContextForRootContext(rootContext: NSManagedObjectContext) -> NSManagedObjectContext {
let context = NSManagedObjectContext(concurrencyType: .MainQueueConcurrencyType)
context.parentContext = rootContext
context.setupForHardcoreDataWithContextName("com.hardcoredata.maincontext")
context.shouldCascadeSavesToParent = true
context.observerForDidSaveNotification = NotificationObserver(
notificationName: NSManagedObjectContextDidSaveNotification,
object: rootContext,
closure: { [weak context] (note) -> Void in
context?.mergeChangesFromContextDidSaveNotification(note)
return
}
)
return context
}
// MARK: Private
private struct PropertyKeys {
static var parentStack: Void?
static var observerForDidSaveNotification: Void?
}
private var observerForDidSaveNotification: NotificationObserver? {
get {
return self.getAssociatedObjectForKey(&PropertyKeys.observerForDidSaveNotification)
}
set {
self.setAssociatedRetainedObject(
newValue,
forKey: &PropertyKeys.observerForDidSaveNotification)
}
}
}

183
HardcoreData/NSManagedObjectContext+Transaction.swift Normal file
View File

@@ -0,0 +1,183 @@
//
// NSManagedObjectContext+Transaction.swift
// HardcoreData
//
// Copyright (c) 2015 John Rommel Estropia
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
//
import Foundation
import CoreData
import GCDKit
// MARK: - NSManagedObjectContext
internal extension NSManagedObjectContext {
// MARK: - Internal
internal weak var parentTransaction: DataTransaction? {
get {
return self.getAssociatedObjectForKey(&PropertyKeys.parentTransaction)
}
set {
self.setAssociatedWeakObject(
newValue,
forKey: &PropertyKeys.parentTransaction)
}
}
internal func temporaryContextInTransaction(transaction: DataTransaction?) -> NSManagedObjectContext {
let context = NSManagedObjectContext(concurrencyType: .PrivateQueueConcurrencyType)
context.parentContext = self
context.parentStack = self.parentStack
context.setupForHardcoreDataWithContextName("com.hardcoredata.temporarycontext")
context.shouldCascadeSavesToParent = true
return context
}
internal func saveSynchronously() -> SaveResult {
var result = SaveResult(hasChanges: false)
self.performBlockAndWait {
[unowned self] () -> Void in
if !self.hasChanges {
self.reset()
return
}
var saveError: NSError?
if self.save(&saveError) {
if self.shouldCascadeSavesToParent {
if let parentContext = self.parentContext {
switch parentContext.saveSynchronously() {
case .Success(let hasChanges):
result = SaveResult(hasChanges: true)
case .Failure(let error):
result = SaveResult(error)
}
return
}
}
result = SaveResult(hasChanges: true)
}
else if let error = saveError {
HardcoreData.handleError(
error,
"Failed to save NSManagedObjectContext.")
result = SaveResult(error)
}
else {
result = SaveResult(hasChanges: false)
}
}
return result
}
internal func saveAsynchronouslyWithCompletion(completion: ((result: SaveResult) -> Void)?) {
self.performBlock { () -> Void in
if !self.hasChanges {
if let completion = completion {
GCDQueue.Main.async {
completion(result: SaveResult(hasChanges: false))
}
}
return
}
var saveError: NSError?
if self.save(&saveError) {
if self.shouldCascadeSavesToParent {
if let parentContext = self.parentContext {
let result = parentContext.saveSynchronously()
if let completion = completion {
GCDQueue.Main.async {
completion(result: result)
}
}
return
}
}
if let completion = completion {
GCDQueue.Main.async {
completion(result: SaveResult(hasChanges: true))
}
}
}
else if let error = saveError {
HardcoreData.handleError(
error,
"Failed to save NSManagedObjectContext.")
if let completion = completion {
GCDQueue.Main.async {
completion(result: SaveResult(error))
}
}
}
else if let completion = completion {
GCDQueue.Main.async {
completion(result: SaveResult(hasChanges: false))
}
}
}
}
// MARK: Private
private struct PropertyKeys {
static var parentTransaction: Void?
}
}

13
HardcoreData/NSObject+HardcoreData.swift
View File

@@ -26,18 +26,7 @@
import Foundation
private class WeakObject {
private(set) weak var object: AnyObject?
init(_ object: AnyObject) {
self.object = object
}
}
// MARK: - NSObject+HardcoreData
// MARK: - NSObject
internal extension NSObject {

8
HardcoreData/NSPersistentStoreCoordinator+HardcoreData.swift
View File

@@ -27,11 +27,13 @@ import Foundation
import CoreData
// MARK: - NSPersistentStoreCoordinator+HardcoreData
// MARK: - NSPersistentStoreCoordinator
public extension NSPersistentStoreCoordinator {
internal extension NSPersistentStoreCoordinator {
public func performSynchronously(closure: () -> Void) {
// MARK: Internal
internal func performSynchronously(closure: () -> Void) {
if self.respondsToSelector("performBlockAndWait:") {

44
HardcoreData/WeakObject.swift Normal file
View File

@@ -0,0 +1,44 @@
//
// WeakObject.swift
// HardcoreData
//
// Copyright (c) 2015 John Rommel Estropia
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
//
import Foundation
// MARK: - WeakObject
internal final class WeakObject {
// MARK: Internal
internal init(_ object: AnyObject) {
self.object = object
}
// MARK: Private
private(set) weak var object: AnyObject?
}