WIP: Objective-C bridge

Sources/Convenience Helpers/NSFetchedResultsController+Convenience.swift

@@ -34,6 +34,7 @@ public extension NSFetchedResultsController {
     /**
      Utility for creating an `NSFetchedResultsController` from a `DataStack`. This is useful to partially support Objective-C classes by passing an `NSFetchedResultsController` instance instead of a `ListMonitor`.
      */
+    @nonobjc
     public static func createForStack<T: NSManagedObject>(dataStack: DataStack, fetchRequest: NSFetchRequest, from: From<T>? = nil, sectionBy: SectionBy? = nil, fetchClauses: [FetchClause]) -> NSFetchedResultsController {
         
         return CoreStoreFetchedResultsController<T>(

Sources/Convenience Helpers/NSManagedObject+Convenience.swift

@@ -38,6 +38,7 @@ public extension NSManagedObject {
      - returns: the primitive value for the KVC key
      */
     @warn_unused_result
+    @nonobjc
     public func accessValueForKVCKey(KVCKey: KeyPath) -> AnyObject? {
         
         self.willAccessValueForKey(KVCKey)
@@ -53,6 +54,7 @@ public extension NSManagedObject {
      - parameter value: the value to set the KVC key with
      - parameter KVCKey: the KVC key
      */
+    @nonobjc
     public func setValue(value: AnyObject?, forKVCKey KVCKey: KeyPath) {
         
         self.willChangeValueForKey(KVCKey)
@@ -63,6 +65,7 @@ public extension NSManagedObject {
     /**
      Re-faults the object to use the latest values from the persistent store
      */
+    @nonobjc
     public func refreshAsFault() {
         
         self.managedObjectContext?.refreshObject(self, mergeChanges: false)
@@ -71,6 +74,7 @@ public extension NSManagedObject {
     /**
      Re-faults the object to use the latest values from the persistent store and merges previously pending changes back
      */
+    @nonobjc
     public func refreshAndMerge() {
         
         self.managedObjectContext?.refreshObject(self, mergeChanges: true)

Sources/Convenience Helpers/NSProgress+Convenience.swift

@@ -37,6 +37,7 @@ public extension NSProgress {
      Sets a closure that the `NSProgress` calls whenever its `fractionCompleted` changes. You can use this instead of setting up KVO.
      - parameter closure: the closure to execute on progress change
      */
+    @nonobjc
     public func setProgressHandler(closure: ((progress: NSProgress) -> Void)?) {
         
         self.progressObserver.progressHandler = closure

Sources/Migrating/MigrationChain.swift

@@ -62,9 +62,7 @@ import CoreData
  */
 public struct MigrationChain: NilLiteralConvertible, StringLiteralConvertible, DictionaryLiteralConvertible, ArrayLiteralConvertible {
     
-    // MARK: NilLiteralConvertible
-    
-    public init(nilLiteral: ()) {
+    public init() {
         
         self.versionTree = [:]
         self.rootVersions = []
@@ -72,10 +70,7 @@ public struct MigrationChain: NilLiteralConvertible, StringLiteralConvertible, D
         self.valid = true
     }
     
-    
-    // MARK: StringLiteralConvertible
-    
-    public init(stringLiteral value: String) {
+    public init(_ value: String) {
         
         self.versionTree = [:]
         self.rootVersions = [value]
@@ -83,32 +78,30 @@ public struct MigrationChain: NilLiteralConvertible, StringLiteralConvertible, D
         self.valid = true
     }
     
-    
-    // MARK: ExtendedGraphemeClusterLiteralConvertible
-    
-    public init(extendedGraphemeClusterLiteral value: String) {
+    public init<T: CollectionType where T.Generator.Element == String, T.Index: BidirectionalIndexType>(_ elements: T) {
         
-        self.versionTree = [:]
-        self.rootVersions = [value]
-        self.leafVersions = [value]
-        self.valid = true
+        CoreStore.assert(Set(elements).count == Array(elements).count, "\(typeName(MigrationChain))'s migration chain could not be created due to duplicate version strings.")
+        
+        var lastVersion: String?
+        var versionTree = [String: String]()
+        var valid = true
+        for version in elements {
+            
+            if let lastVersion = lastVersion,
+                let _ = versionTree.updateValue(version, forKey: lastVersion) {
+                
+                valid = false
+            }
+            lastVersion = version
+        }
+        
+        self.versionTree = versionTree
+        self.rootVersions = Set([elements.first].flatMap { $0 == nil ? [] : [$0!] })
+        self.leafVersions = Set([elements.last].flatMap { $0 == nil ? [] : [$0!] })
+        self.valid = valid
     }
     
-    
-    // MARK: UnicodeScalarLiteralConvertible
-    
-    public init(unicodeScalarLiteral value: String) {
-        
-        self.versionTree = [:]
-        self.rootVersions = [value]
-        self.leafVersions = [value]
-        self.valid = true
-    }
-    
-    
-    // MARK: DictionaryLiteralConvertible
-    
-    public init(dictionaryLiteral elements: (String, String)...) {
+    public init(_ elements: [(String, String)]) {
         
         var valid = true
         var versionTree = [String: String]()
@@ -124,11 +117,9 @@ public struct MigrationChain: NilLiteralConvertible, StringLiteralConvertible, D
             valid = false
         }
         let leafVersions = Set(
-            elements.filter { (tuple: (String, String)) -> Bool in
-                
-                return versionTree[tuple.1] == nil
-                
-            }.map { $1 }
+            elements
+                .filter { versionTree[$1] == nil }
+                .map { $1 }
         )
         
         let isVersionAmbiguous = { (start: String) -> Bool in
@@ -156,30 +147,57 @@ public struct MigrationChain: NilLiteralConvertible, StringLiteralConvertible, D
         self.valid = valid && Set(versionTree.keys).union(versionTree.values).filter { isVersionAmbiguous($0) }.count <= 0
     }
     
+    public init(_ dictionary: [String: String]) {
+        
+        self.init(dictionary.map { $0 })
+    }
+    
+    
+    // MARK: NilLiteralConvertible
+    
+    public init(nilLiteral: ()) {
+        
+        self.init()
+    }
+    
+    
+    // MARK: StringLiteralConvertible
+    
+    public init(stringLiteral value: String) {
+        
+        self.init(value)
+    }
+    
+    
+    // MARK: ExtendedGraphemeClusterLiteralConvertible
+    
+    public init(extendedGraphemeClusterLiteral value: String) {
+        
+        self.init(value)
+    }
+    
+    
+    // MARK: UnicodeScalarLiteralConvertible
+    
+    public init(unicodeScalarLiteral value: String) {
+        
+        self.init(value)
+    }
+    
+    
+    // MARK: DictionaryLiteralConvertible
+    
+    public init(dictionaryLiteral elements: (String, String)...) {
+        
+        self.init(elements)
+    }
+    
     
     // MARK: ArrayLiteralConvertible
     
     public init(arrayLiteral elements: String...) {
         
-        CoreStore.assert(Set(elements).count == elements.count, "\(typeName(MigrationChain))'s migration chain could not be created due to duplicate version strings.")
-        
-        var lastVersion: String?
-        var versionTree = [String: String]()
-        var valid = true
-        for version in elements {
-            
-            if let lastVersion = lastVersion,
-                let _ = versionTree.updateValue(version, forKey: lastVersion) {
-                    
-                    valid = false
-            }
-            lastVersion = version
-        }
-        
-        self.versionTree = versionTree
-        self.rootVersions = Set([elements.first].flatMap { $0 == nil ? [] : [$0!] })
-        self.leafVersions = Set([elements.last].flatMap { $0 == nil ? [] : [$0!] })
-        self.valid = valid
+        self.init(elements)
     }
     
     

Sources/ObjectiveC/CSCoreStore.swift

@@ -0,0 +1,63 @@
+//
+//  CSCoreStore.swift
+//  CoreStore
+//
+//  Copyright © 2016 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: - CSCoreStore
+
+/**
+ The `CSCoreStore` serves as the Objective-C bridging type for `CoreStore`.
+ */
+@objc
+public final class CSCoreStore: NSObject {
+    
+    /**
+     The default `CSDataStack` instance to be used. If `defaultStack` is not set before the first time accessed, a default-configured `DataStack` will be created.
+     
+     Changing the `defaultStack` is thread safe, but it is recommended to setup `DataStacks` on a common queue (e.g. the main queue).
+     */
+    @objc
+    public class var defaultStack: CSDataStack {
+        
+        get {
+            
+            return CoreStore.defaultStack.objc
+        }
+        set {
+            
+            CoreStore.defaultStack = newValue.swift
+        }
+    }
+    
+    
+    // MARK: Private
+    
+    private override init() {
+        
+        fatalError()
+    }
+}

Sources/ObjectiveC/CSDataStack.swift

@@ -0,0 +1,155 @@
+//
+//  CSDataStack.swift
+//  CoreStore
+//
+//  Copyright © 2016 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: - DataStack
+
+extension DataStack: CoreStoreBridgeable {
+    
+    // MARK: CoreStoreBridgeable
+    
+    public typealias NativeType = CSDataStack
+}
+
+
+// MARK: - CSDataStack
+
+/**
+ The `CSDataStack` serves as the Objective-C bridging type for `DataStack`.
+ */
+@objc
+public final class CSDataStack: NSObject, CoreStoreBridge {
+    
+    /**
+     Initializes a `CSDataStack` with default settings. CoreStore searches for <CFBundleName>.xcdatamodeld from the main `NSBundle` and loads an `NSManagedObjectModel` from it. An assertion is raised if the model could not be found.
+     */
+    @objc
+    public convenience override init() {
+        
+        self.init(DataStack())
+    }
+    
+    /**
+     Initializes a `CSDataStack` from the model with the specified `modelName` in the specified `bundle`.
+     
+     - parameter modelName: the name of the (.xcdatamodeld) model file. If not specified, the application name (CFBundleName) will be used if it exists, or "CoreData" if it the bundle name was not set.
+     - parameter bundle: an optional bundle to load models from. If not specified, the main bundle will be used.
+     - parameter versionChain: the version strings that indicate the sequence of model versions to be used as the order for progressive migrations. If not specified, will default to a non-migrating data stack.
+     */
+    @objc
+    public convenience init(modelName: String = DataStack.applicationName, bundle: NSBundle = NSBundle.mainBundle(), versionChain: [String]? = nil) {
+        
+        self.init(
+            DataStack(
+                modelName: modelName,
+                bundle: bundle,
+                migrationChain: versionChain.flatMap { MigrationChain($0) } ?? nil
+            )
+        )
+    }
+    
+    /**
+     Initializes a `CSDataStack` from the model with the specified `modelName` in the specified `bundle`.
+     
+     - parameter modelName: the name of the (.xcdatamodeld) model file. If not specified, the application name (CFBundleName) will be used if it exists, or "CoreData" if it the bundle name was not set.
+     - parameter bundle: an optional bundle to load models from. If not specified, the main bundle will be used.
+     - parameter versionTree: the version strings that indicate the sequence of model versions to be used as the order for progressive migrations. If not specified, will default to a non-migrating data stack.
+     */
+    @objc
+    public convenience init(modelName: String = DataStack.applicationName, bundle: NSBundle = NSBundle.mainBundle(), versionTree: [String: String]? = nil) {
+        
+        self.init(
+            DataStack(
+                modelName: modelName,
+                bundle: bundle,
+                migrationChain: versionTree.flatMap { MigrationChain($0) } ?? nil
+            )
+        )
+    }
+    
+    /**
+     Initializes a `DataStack` from an `NSManagedObjectModel`.
+     
+     - parameter model: the `NSManagedObjectModel` for the stack
+     - parameter versionChain: the `MigrationChain` that indicates the sequence of model versions to be used as the order for progressive migrations. If not specified, will default to a non-migrating data stack.
+     */
+    @objc
+    public convenience init(model: NSManagedObjectModel, versionChain: [String]? = nil) {
+        
+        self.init(
+            DataStack(
+                model: model,
+                migrationChain: versionChain.flatMap { MigrationChain($0) } ?? nil
+            )
+        )
+    }
+    
+    /**
+     Initializes a `DataStack` from an `NSManagedObjectModel`.
+     
+     - parameter model: the `NSManagedObjectModel` for the stack
+     - parameter versionTree: the `MigrationChain` that indicates the sequence of model versions to be used as the order for progressive migrations. If not specified, will default to a non-migrating data stack.
+     */
+    @objc
+    public convenience init(model: NSManagedObjectModel, versionTree: [String]? = nil) {
+        
+        self.init(
+            DataStack(
+                model: model,
+                migrationChain: versionTree.flatMap { MigrationChain($0) } ?? nil
+            )
+        )
+    }
+    
+    
+    // MARK: NSObject
+    
+    public override var hash: Int {
+        
+        return ObjectIdentifier(self.swift).hashValue
+    }
+    
+    public override func isEqual(object: AnyObject?) -> Bool {
+        
+        guard let object = object as? CSDataStack else {
+            
+            return false
+        }
+        return self.swift === object.swift
+    }
+    
+    
+    // MARK: CoreStoreBridge
+    
+    public let swift: DataStack
+    
+    public required init(_ swiftObject: DataStack) {
+        
+        self.swift = swiftObject
+    }
+}

Sources/ObjectiveC/CoreStoreBridge.swift

@@ -0,0 +1,74 @@
+//
+//  CoreStoreBridge.swift
+//  CoreStore
+//
+//  Copyright © 2016 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
+
+public protocol CoreStoreBridge: class, AnyObject {
+    
+    associatedtype SwiftType
+    
+    var swift: SwiftType { get }
+    
+    init(_ swiftObject: SwiftType)
+}
+
+public protocol CoreStoreBridgeable: _ObjectiveCBridgeable {
+    
+    associatedtype NativeType: CoreStoreBridge
+}
+
+public extension CoreStoreBridgeable where NativeType.SwiftType == Self {
+    
+    static func _isBridgedToObjectiveC() -> Bool {
+        
+        return true
+    }
+    
+    static func _getObjectiveCType() -> Any.Type {
+        
+        return NativeType.self
+    }
+    
+    func _bridgeToObjectiveC() -> NativeType {
+        
+        return NativeType(self)
+    }
+    
+    static func _forceBridgeFromObjectiveC(source: NativeType, inout result: Self?) {
+        
+        result = source.swift
+    }
+    
+    static func _conditionallyBridgeFromObjectiveC(source: NativeType, inout result: Self?) -> Bool {
+        
+        self._forceBridgeFromObjectiveC(source, result: &result)
+        return true
+    }
+    
+    var objc: NativeType {
+        
+        return self._bridgeToObjectiveC()
+    }
+}

Sources/Saving and Processing/NSManagedObject+Transaction.swift

@@ -38,6 +38,7 @@ public extension NSManagedObject {
      
      Note that the internal reference to the transaction is `weak`, and it is still the developer's responsibility to retain a strong reference to the `UnsafeDataTransaction`.
      */
+    @nonobjc
     public var unsafeDataTransaction: UnsafeDataTransaction? {
         
         return self.managedObjectContext?.parentTransaction as? UnsafeDataTransaction