starred/CoreStore-JohnEstropia
1
0
Fork 0
mirror of https://github.com/JohnEstropia/CoreStore.git synced 2026-03-29 05:31:53 +02:00
Code Issues 95 Packages Projects Releases 10 Wiki Activity

update

Browse Source
This commit is contained in:
John Rommel Estropia
2015-02-21 21:14:19 +09:00
parent 23f09fe5a6
commit 061a863235
21 changed files with 248 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
HardcoreData/DataStack+Transaction.swift Normal file
View File

@@ -0,0 +1,45 @@
//
// DataStack+Transaction.swift
// HardcoreData
//
// Created by John Rommel Estropia on 2015/02/15.
// Copyright (c) 2015 John Rommel Estropia. All rights reserved.
//
import Foundation
import CoreData
// MARK: - DataStack+Transaction
extension DataStack {
// MARK: Public
/**
Begins a transaction asynchronously where NSManagedObject creates, updates, and deletes can be made.
:param: closure the block where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent NSManagedObjectContext.
*/
public func performTransaction(closure: (transaction: DataTransaction) -> Void) {
DataTransaction(
mainContext: self.mainContext,
queue: self.transactionQueue,
closure: closure).perform()
}
/**
Begins a transaction synchronously where NSManagedObject creates, updates, and deletes can be made.
:param: closure the block where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent NSManagedObjectContext.
:returns: a SaveResult value indicating success or failure, or nil if the transaction was not comitted synchronously
*/
public func performTransactionAndWait(closure: (transaction: DataTransaction) -> Void) -> SaveResult? {
return DataTransaction(
mainContext: self.mainContext,
queue: self.transactionQueue,
closure: closure).performAndWait()
}
}

90
HardcoreData/DataStack.swift
View File

@@ -33,14 +33,14 @@ private let applicationSupportDirectory = NSFileManager.defaultManager().URLsFor
private let applicationName = ((NSBundle.mainBundle().objectForInfoDictionaryKey("CFBundleName") as? String) ?? "CoreData")
// MARK: DataStack
// MARK: - DataStack
/**
The DataStack encapsulates the data model for the Core Data stack. Each DataStack can have multiple data stores, usually specified as a "Configuration" in the model editor. Behind the scenes, the DataStack manages its own NSPersistentStoreCoordinator, a root NSManagedObjectContext for disk saves, and a shared NSManagedObjectContext acting as a model interface for NSManagedObjects.
*/
public class DataStack: NSObject {
// MARK: - Public
// MARK: Public
/**
Initializes a DataStack from merged model in the app bundle.
@@ -251,93 +251,15 @@ public class DataStack: NSObject {
return PersistentStoreResult(.UnknownError)
}
/**
Begins a transaction asynchronously where NSManagedObject creates, updates, and deletes can be made.
:param: closure the block where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent NSManagedObjectContext.
*/
public func performTransaction(closure: (transaction: DataTransaction) -> ()) {
DataTransaction(
mainContext: self.mainContext,
queue: self.transactionQueue,
closure: closure).perform()
}
// MARK: Internal
/**
Begins a transaction synchronously where NSManagedObject creates, updates, and deletes can be made.
public let mainContext: NSManagedObjectContext
internal let transactionQueue: GCDQueue;
:param: closure the block where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent NSManagedObjectContext.
:returns: a SaveResult value indicating success or failure, or nil if the transaction was not comitted synchronously
*/
public func performTransactionAndWait(closure: (transaction: DataTransaction) -> ()) -> SaveResult? {
return DataTransaction(
mainContext: self.mainContext,
queue: self.transactionQueue,
closure: closure).performAndWait()
}
// MARK: - Internal
// MARK: Private
private let coordinator: NSPersistentStoreCoordinator
private let rootSavingContext: NSManagedObjectContext
private let mainContext: NSManagedObjectContext
private let transactionQueue: GCDQueue;
}
// MARK: - DataStack+DataContextProvider
//extension DataStack: ObjectQueryable {
//
// public func firstObject<T: NSManagedObject>(entity: T.Type) -> T? {
//
// return self.mainContext.firstObject(entity)
// }
//
// public func firstObject<T: NSManagedObject>(entity: T.Type, customizeFetch: FetchRequestCustomization?) -> T? {
//
// return self.mainContext.firstObject(entity, customizeFetch: customizeFetch)
// }
//
// public func firstObject<T: NSManagedObject>(query: ObjectQuery<T>) -> T? {
//
// return self.mainContext.firstObject(query)
// }
//
// public func firstObject<T: NSManagedObject>(query: ObjectQuery<T>, customizeFetch: FetchRequestCustomization?) -> T? {
//
// return self.mainContext.firstObject(query, customizeFetch: customizeFetch)
// }
//
// public func allObjects<T: NSManagedObject>(entity: T.Type) -> [T]? {
//
// return self.mainContext.allObjects(entity)
// }
//
// public func allObjects<T: NSManagedObject>(entity: T.Type, customizeFetch: FetchRequestCustomization?) -> [T]? {
//
// return self.mainContext.allObjects(entity, customizeFetch: customizeFetch)
// }
//
// public func allObjects<T: NSManagedObject>(query: ObjectQuery<T>) -> [T]? {
//
// return self.mainContext.allObjects(query)
// }
//
// public func allObjects<T: NSManagedObject>(query: ObjectQuery<T>, customizeFetch: FetchRequestCustomization?) -> [T]? {
//
// return self.mainContext.allObjects(query, customizeFetch: customizeFetch)
// }
//
// public func countObjects<T: NSManagedObject>(entity: T.Type) -> Int {
//
// return self.mainContext.countObjects(entity)
// }
//
// public func countObjects<T: NSManagedObject>(query: ObjectQuery<T>) -> Int {
//
// return self.mainContext.countObjects(query)
// }
//}

2
HardcoreData/DataTransaction+Querying.swift
View File

@@ -27,6 +27,8 @@ import Foundation
import CoreData
// MARK: - DataTransaction+Querying
extension DataTransaction {
public func fetchOne<T: NSManagedObject>(entity: T.Type, _ queryClauses: FetchClause...) -> T? {

24
HardcoreData/DataTransaction.swift
View File

@@ -99,15 +99,17 @@ public final class DataTransaction {
:param: completion the block executed after the save completes. Success or failure is reported by the SaveResult argument of the block.
*/
public func commit(completion: (result: SaveResult) -> ()) {
public func commit(completion: (result: SaveResult) -> Void) {
HardcoreData.assert(self.transactionQueue.isCurrentExecutionContext() == true, "Attempted to commit a DataTransaction outside a transaction queue.")
HardcoreData.assert(!self.isCommitted, "Attempted to commit a DataTransaction more than once.")
self.isCommitted = true
self.context.saveAsynchronouslyWithCompletion { (result) -> () in
let result = self.context.saveSynchronously()
self.result = result
GCDQueue.Main.async {
self.result = result
completion(result: result)
}
}
@@ -129,19 +131,23 @@ public final class DataTransaction {
// MARK: - Internal
internal init(mainContext: NSManagedObjectContext, queue: GCDQueue, closure: (transaction: DataTransaction) -> ()) {
internal init(mainContext: NSManagedObjectContext, queue: GCDQueue, closure: (transaction: DataTransaction) -> Void) {
self.mainContext = mainContext
self.transactionQueue = queue
self.context = mainContext.temporaryContext()
let context = mainContext.temporaryContext()
context.retainsRegisteredObjects = true
self.context = context
self.closure = closure
self.context.parentTransaction = self
context.parentTransaction = self
}
internal func perform() {
self.transactionQueue.barrierAsync {
self.transactionQueue.async {
self.closure(transaction: self)
}
@@ -149,7 +155,7 @@ public final class DataTransaction {
internal func performAndWait() -> SaveResult? {
self.transactionQueue.barrierSync {
self.transactionQueue.sync {
self.closure(transaction: self)
}
@@ -163,5 +169,5 @@ public final class DataTransaction {
private var result: SaveResult?
private let mainContext: NSManagedObjectContext
private let transactionQueue: GCDQueue
private let closure: (transaction: DataTransaction) -> ()
private let closure: (transaction: DataTransaction) -> Void
}

2
HardcoreData/DefaultLogger.swift
View File

@@ -26,6 +26,8 @@
import Foundation
// MARK: - DefaultLogger
public final class DefaultLogger: HardcoreDataLogger {
public func log(#level: LogLevel, message: String, fileName: StaticString, lineNumber: UWord, functionName: StaticString) {

64
HardcoreData/HardcoreData.swift
View File

@@ -27,6 +27,9 @@ import CoreData
import GCDKit
/**
Okay, okay. This one's shorter.
*/
typealias HCD = HardcoreData
@@ -71,6 +74,8 @@ public struct HardcoreData {
public static var logger: HardcoreDataLogger = DefaultLogger()
// MARK: Internal
internal static func log(level: LogLevel, message: String, fileName: StaticString = __FILE__, lineNumber: UWord = __LINE__, functionName: StaticString = __FUNCTION__) {
self.logger.log(
@@ -118,7 +123,7 @@ extension HardcoreData {
:param: closure the block where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent NSManagedObjectContext.
*/
public static func performTransaction(closure: (transaction: DataTransaction) -> ()) {
public static func performTransaction(closure: (transaction: DataTransaction) -> Void) {
self.defaultStack.performTransaction(closure)
}
@@ -129,63 +134,8 @@ extension HardcoreData {
:param: closure the block where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent NSManagedObjectContext.
:returns: a SaveResult value indicating success or failure, or nil if the transaction was not comitted synchronously
*/
public static func performTransactionAndWait(closure: (transaction: DataTransaction) -> ()) -> SaveResult? {
public static func performTransactionAndWait(closure: (transaction: DataTransaction) -> Void) -> SaveResult? {
return self.defaultStack.performTransactionAndWait(closure)
}
}
//extension HardcoreData {
//
// public static func firstObject<T: NSManagedObject>(entity: T.Type) -> T? {
//
// return self.defaultStack.firstObject(entity)
// }
//
// public static func firstObject<T: NSManagedObject>(entity: T.Type, customizeFetch: FetchRequestCustomization?) -> T? {
//
// return self.defaultStack.firstObject(entity, customizeFetch: customizeFetch)
// }
//
// public static func firstObject<T: NSManagedObject>(query: ObjectQuery<T>) -> T? {
//
// return self.defaultStack.firstObject(query)
// }
//
// public static func firstObject<T: NSManagedObject>(query: ObjectQuery<T>, customizeFetch: FetchRequestCustomization?) -> T? {
//
// return self.defaultStack.firstObject(query, customizeFetch: customizeFetch)
// }
//
// public static func allObjects<T: NSManagedObject>(entity: T.Type) -> [T]? {
//
// return self.defaultStack.allObjects(entity)
// }
//
// public static func allObjects<T: NSManagedObject>(entity: T.Type, customizeFetch: FetchRequestCustomization?) -> [T]? {
//
// return self.defaultStack.allObjects(entity, customizeFetch: customizeFetch)
// }
//
// public static func allObjects<T: NSManagedObject>(query: ObjectQuery<T>) -> [T]? {
//
// return self.defaultStack.allObjects(query)
// }
//
// public static func allObjects<T: NSManagedObject>(query: ObjectQuery<T>, customizeFetch: FetchRequestCustomization?) -> [T]? {
//
// return self.defaultStack.allObjects(query, customizeFetch: customizeFetch)
// }
//
// public static func countObjects<T: NSManagedObject>(entity: T.Type) -> Int {
//
// return self.defaultStack.countObjects(entity)
// }
//
// public static func countObjects<T: NSManagedObject>(query: ObjectQuery<T>) -> Int {
//
// return self.defaultStack.countObjects(query)
// }
//}

4
HardcoreData/HardcoreDataLogger.swift
View File

@@ -26,6 +26,8 @@
import Foundation
// MARK: - LogLevel
public enum LogLevel {
case Trace
@@ -35,6 +37,8 @@ public enum LogLevel {
}
// MARK: - HardcoreDataLogger
public protocol HardcoreDataLogger {
func log(#level: LogLevel, message: String, fileName: StaticString, lineNumber: UWord, functionName: StaticString)

3
HardcoreData/NSManagedObject+HardcoreData.swift
View File

@@ -58,6 +58,9 @@ extension NSManagedObject {
self.managedObjectContext?.deleteObject(self)
}
// MARK: Private
private func typedObjectInContext<T: NSManagedObject>(context: NSManagedObjectContext) -> T? {
let objectID = self.objectID

47
HardcoreData/NSManagedObjectContext+HardcoreData.swift
View File

@@ -51,7 +51,7 @@ public extension NSManagedObjectContext {
// MARK: - Internal
internal var parentStack: DataStack? {
internal weak var parentStack: DataStack? {
get {
@@ -59,13 +59,13 @@ public extension NSManagedObjectContext {
}
set {
self.setAssociatedAssignedObject(
self.setAssociatedWeakObject(
newValue,
forKey: &PropertyKeys.parentStack)
}
}
internal var parentTransaction: DataTransaction? {
internal weak var parentTransaction: DataTransaction? {
get {
@@ -73,7 +73,7 @@ public extension NSManagedObjectContext {
}
set {
self.setAssociatedAssignedObject(
self.setAssociatedWeakObject(
newValue,
forKey: &PropertyKeys.parentTransaction)
}
@@ -91,15 +91,15 @@ public extension NSManagedObjectContext {
internal func saveSynchronously() -> SaveResult {
var result: SaveResult = SaveResult(hasChanges: false)
if !self.hasChanges {
self.reset()
return result
}
var result = SaveResult(hasChanges: false)
self.performBlockAndWait {
[unowned self] () -> () in
[unowned self] () -> Void in
if !self.hasChanges {
self.reset()
return
}
var saveError: NSError?
if self.save(&saveError) {
@@ -137,22 +137,21 @@ public extension NSManagedObjectContext {
return result
}
internal func saveAsynchronouslyWithCompletion(completion: ((result: SaveResult) -> ())?) {
internal func saveAsynchronouslyWithCompletion(completion: ((result: SaveResult) -> Void)?) {
if !self.hasChanges {
self.performBlock { () -> Void in
self.reset()
if let completion = completion {
if !self.hasChanges {
GCDQueue.Main.async {
if let completion = completion {
completion(result: SaveResult(hasChanges: false))
GCDQueue.Main.async {
completion(result: SaveResult(hasChanges: false))
}
}
return
}
return
}
self.performBlock { () -> () in
var saveError: NSError?
if self.save(&saveError) {
@@ -216,7 +215,7 @@ public extension NSManagedObjectContext {
context.observerForDidSaveNotification = NotificationObserver(
notificationName: NSManagedObjectContextDidSaveNotification,
object: rootContext,
closure: { [weak context] (note) -> () in
closure: { [weak context] (note) -> Void in
context?.mergeChangesFromContextDidSaveNotification(note)
return
@@ -290,7 +289,7 @@ public extension NSManagedObjectContext {
self.observerForWillSaveNotification = NotificationObserver(
notificationName: NSManagedObjectContextWillSaveNotification,
object: self,
closure: { (note) -> () in
closure: { (note) -> Void in
let context = note.object as! NSManagedObjectContext
let insertedObjects = context.insertedObjects

2
HardcoreData/NSManagedObjectContext+Querying.swift
View File

@@ -27,6 +27,8 @@ import Foundation
import CoreData
// MARK: - NSManagedObjectContext+Querying
extension NSManagedObjectContext {
public func fetchOne<T: NSManagedObject>(entity: T.Type, _ queryClauses: FetchClause...) -> T? {

37
HardcoreData/NSObject+HardcoreData.swift
View File

@@ -26,13 +26,36 @@
import Foundation
private class WeakObject {
private(set) weak var object: AnyObject?
init(_ object: AnyObject) {
self.object = object
}
}
// MARK: - NSObject+HardcoreData
internal extension NSObject {
// MARK: Internal
internal func getAssociatedObjectForKey<T: AnyObject>(key: UnsafePointer<Void>) -> T? {
return objc_getAssociatedObject(self, key) as? T
switch objc_getAssociatedObject(self, key) {
case let object as T:
return object
case let object as WeakObject:
return object.object as? T
default:
return nil
}
}
internal func setAssociatedRetainedObject<T: AnyObject>(object: T?, forKey key: UnsafePointer<Void>) {
@@ -49,4 +72,16 @@ internal extension NSObject {
objc_setAssociatedObject(self, key, object, UInt(OBJC_ASSOCIATION_ASSIGN))
}
internal func setAssociatedWeakObject<T: AnyObject>(object: T?, forKey key: UnsafePointer<Void>) {
if let object = object {
objc_setAssociatedObject(self, key, WeakObject(object), UInt(OBJC_ASSOCIATION_RETAIN_NONATOMIC))
}
else {
objc_setAssociatedObject(self, key, nil, UInt(OBJC_ASSOCIATION_RETAIN_NONATOMIC))
}
}
}

2
HardcoreData/NSPersistentStoreCoordinator+HardcoreData.swift
View File

@@ -31,7 +31,7 @@ import CoreData
public extension NSPersistentStoreCoordinator {
public func performSynchronously(closure: () -> ()) {
public func performSynchronously(closure: () -> Void) {
if self.respondsToSelector("performBlockAndWait:") {

4
HardcoreData/NotificationObserver.swift
View File

@@ -30,11 +30,13 @@ import Foundation
internal final class NotificationObserver {
// MARK: Public
let notificationName: String
let object: AnyObject?
let observer: NSObjectProtocol
init(notificationName: String, object: AnyObject?, closure: (note: NSNotification!) -> ()) {
init(notificationName: String, object: AnyObject?, closure: (note: NSNotification!) -> Void) {
self.notificationName = notificationName
self.object = object

10
HardcoreData/PersistentStoreResult.swift
View File

@@ -31,9 +31,14 @@ import CoreData
public enum PersistentStoreResult {
// MARK: Public
case Success(NSPersistentStore)
case Failure(NSError)
// MARK: Internal
internal init(_ store: NSPersistentStore) {
self = .Success(store)
@@ -58,13 +63,16 @@ public enum PersistentStoreResult {
}
// MARK: - PersistentStoreResult+BooleanType
// MARK: - PersistentStoreResult: BooleanType
extension PersistentStoreResult: BooleanType {
// MARK: Public
public var boolValue: Bool {
switch self {
case .Success: return true
case .Failure: return false
}

35
HardcoreData/QueryClause.swift
View File

@@ -1,35 +0,0 @@
//
// FetchClause.swift
// HardcoreData
//
// Copyright (c) 2014 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: - QueryClause
public protocol QueryClause {
func applyToFetchRequest(fetchRequest: NSFetchRequest)
}

2
HardcoreData/SaveResult.swift
View File

@@ -57,7 +57,7 @@ public enum SaveResult {
}
// MARK: - SaveResult+BooleanType
// MARK: - SaveResult: BooleanType
extension SaveResult: BooleanType {

4
HardcoreData/SortedBy.swift
View File

@@ -31,10 +31,14 @@ public func +(left: SortedBy, right: SortedBy) -> SortedBy {
return SortedBy(left.sortDescriptors + right.sortDescriptors)
}
// MARK: - AttributeName
public typealias AttributeName = Selector
// MARK: - SortOrder
public enum SortOrder {
case Ascending(AttributeName)