added GCDKit to Carthage installation guide

Fix FRCdelegate issue where invalid type is passed

.gitignore

@@ -2,3 +2,5 @@ CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcuserdata
 CoreStore.xcodeproj/project.xcworkspace/xcuserdata
 CoreStore.xcodeproj/xcuserdata
 CoreStoreDemo/CoreStoreDemo.xcodeproj/xcuserdata
+Carthage/Build
+CoreStore.xcworkspace/xcuserdata

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "Libraries/GCDKit"]
-	path = Libraries/GCDKit
-	url = git@github.com:JohnEstropia/GCDKit.git
+[submodule "Carthage/Checkouts/GCDKit"]
+	path = Carthage/Checkouts/GCDKit
+	url = https://github.com/JohnEstropia/GCDKit.git

.travis.yml

@@ -0,0 +1,40 @@
+language: objective-c
+osx_image: xcode7.1
+sudo: false
+git:
+  submodules: false
+notifications:
+  email: false
+env:
+  global:
+  - LC_CTYPE=en_US.UTF-8
+  - LANG=en_US.UTF-8
+  matrix:
+    - DESTINATION="OS=9.1,name=iPhone 6s" SCHEME="CoreStore iOS" SDK=iphonesimulator9.1 RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=9.0,name=iPhone 6 Plus" SCHEME="CoreStore iOS" SDK=iphonesimulator9.1 RUN_TESTS="YES" POD_LINT="NO"	
+    - DESTINATION="OS=8.4,name=iPhone 6" SCHEME="CoreStore iOS" SDK=iphonesimulator9.1 RUN_TESTS="YES" POD_LINT="NO"	
+    - DESTINATION="OS=8.3,name=iPhone 5S" SCHEME="CoreStore iOS" SDK=iphonesimulator9.1 RUN_TESTS="YES" POD_LINT="NO"	
+    - DESTINATION="OS=8.2,name=iPhone 5" SCHEME="CoreStore iOS" SDK=iphonesimulator9.1 RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=8.1,name=iPhone 4S" SCHEME="CoreStore iOS" SDK=iphonesimulator9.1 RUN_TESTS="YES" POD_LINT="YES"
+    - DESTINATION="arch=x86_64" SCHEME="CoreStore OSX" SDK=macosx10.11 RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=2.0,name=Apple Watch - 42mm" SCHEME="CoreStore watchOS" SDK=watchsimulator2.0 RUN_TESTS="NO" POD_LINT="NO"
+before_install:
+  - gem install cocoapods --no-rdoc --no-ri --no-document --quiet
+  - gem install xcpretty --no-rdoc --no-ri --no-document --quiet
+  - brew update
+  - brew install carthage
+before_script:
+  - carthage update --use-submodules
+script:
+  - set -o pipefail
+  - xcodebuild -version
+  - xcodebuild -showsdks
+  - if [ $RUN_TESTS == "YES" ]; then 
+      xcodebuild -workspace CoreStore.xcworkspace -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO test | xcpretty -c;
+      xcodebuild -workspace CoreStore.xcworkspace -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO test | xcpretty -c;
+    fi
+  - xcodebuild -workspace "CoreStore.xcworkspace" -scheme "CoreStore iOS" -sdk "iphonesimulator9.1" -destination "OS=9.1,name=iPhone 6s" -configuration Debug ONLY_ACTIVE_ARCH=NO test | xcpretty -c;
+  - xcodebuild -workspace "CoreStore.xcworkspace" -scheme "CoreStore iOS" -sdk "iphonesimulator9.1" -destination "OS=9.1,name=iPhone 6s" -configuration Release ONLY_ACTIVE_ARCH=NO test | xcpretty -c;
+  - if [ $POD_LINT == "YES" ]; then
+      pod lib lint --quick;
+    fi

CartFile

@@ -0,0 +1 @@
+github "JohnEstropia/GCDKit" == 1.1.5

Cartfile.resolved

@@ -0,0 +1 @@
+github "JohnEstropia/GCDKit" "1.1.5"

CoreStore.podspec

@@ -1,16 +1,21 @@
 Pod::Spec.new do |s|
     s.name = "CoreStore"
-    s.version = "1.3.0"
+    s.version = "1.4.0"
     s.license = "MIT"
-    s.summary = "Simple, elegant, and smart Core Data programming with Swift"
+    s.summary = "Unleashing the real power of Core Data with the elegance and safety of Swift"
     s.homepage = "https://github.com/JohnEstropia/CoreStore"
     s.author = { "John Rommel Estropia" => "rommel.estropia@gmail.com" }
     s.source = { :git => "https://github.com/JohnEstropia/CoreStore.git", :tag => s.version.to_s }
 
     s.ios.deployment_target = "8.0"
+    s.osx.deployment_target = "10.10"
+    s.watchos.deployment_target = "2.0"
 
     s.source_files = "CoreStore", "CoreStore/**/*.{swift}"
-    s.frameworks = "Foundation", "UIKit", "CoreData"
+    s.osx.exclude_files = "CoreStore/Observing/*.{swift}", "CoreStore/Internal/FetchedResultsControllerDelegate.swift", "CoreStore/Convenience Helpers/NSFetchedResultsController+Convenience.swift"
+    s.frameworks = "Foundation", "CoreData"
     s.requires_arc = true
-    s.dependency "GCDKit", "1.1.1"
+    s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS' => '-D USE_FRAMEWORKS' }
+    
+    s.dependency "GCDKit", "1.1.5"
 end

CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore OSX.xcscheme

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0710"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "B52DD1731BE1F8CC00949AFE"
+               BuildableName = "CoreStore.framework"
+               BlueprintName = "CoreStore OSX"
+               ReferencedContainer = "container:CoreStore.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "B52DD17C1BE1F8CC00949AFE"
+               BuildableName = "CoreStoreTests.xctest"
+               BlueprintName = "CoreStoreTests OSX"
+               ReferencedContainer = "container:CoreStore.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B52DD1731BE1F8CC00949AFE"
+            BuildableName = "CoreStore.framework"
+            BlueprintName = "CoreStore OSX"
+            ReferencedContainer = "container:CoreStore.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B52DD1731BE1F8CC00949AFE"
+            BuildableName = "CoreStore.framework"
+            BlueprintName = "CoreStore OSX"
+            ReferencedContainer = "container:CoreStore.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B52DD1731BE1F8CC00949AFE"
+            BuildableName = "CoreStore.framework"
+            BlueprintName = "CoreStore OSX"
+            ReferencedContainer = "container:CoreStore.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore iOS.xcscheme

@@ -16,7 +16,7 @@
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "2F03A52F19C5C6DA005002A5"
                BuildableName = "CoreStore.framework"
-               BlueprintName = "CoreStore"
+               BlueprintName = "CoreStore iOS"
                ReferencedContainer = "container:CoreStore.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -30,7 +30,7 @@
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "2F03A53A19C5C6DA005002A5"
                BuildableName = "CoreStoreTests.xctest"
-               BlueprintName = "CoreStoreTests"
+               BlueprintName = "CoreStoreTests iOS"
                ReferencedContainer = "container:CoreStore.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -48,7 +48,7 @@
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "2F03A53A19C5C6DA005002A5"
                BuildableName = "CoreStoreTests.xctest"
-               BlueprintName = "CoreStoreTests"
+               BlueprintName = "CoreStoreTests iOS"
                ReferencedContainer = "container:CoreStore.xcodeproj">
             </BuildableReference>
          </TestableReference>
@@ -58,7 +58,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "2F03A52F19C5C6DA005002A5"
             BuildableName = "CoreStore.framework"
-            BlueprintName = "CoreStore"
+            BlueprintName = "CoreStore iOS"
             ReferencedContainer = "container:CoreStore.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -80,7 +80,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "2F03A52F19C5C6DA005002A5"
             BuildableName = "CoreStore.framework"
-            BlueprintName = "CoreStore"
+            BlueprintName = "CoreStore iOS"
             ReferencedContainer = "container:CoreStore.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -98,7 +98,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "2F03A52F19C5C6DA005002A5"
             BuildableName = "CoreStore.framework"
-            BlueprintName = "CoreStore"
+            BlueprintName = "CoreStore iOS"
             ReferencedContainer = "container:CoreStore.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore watchOS.xcscheme

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0700"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "B563216E1BD65082006C9394"
+               BuildableName = "CoreStore.framework"
+               BlueprintName = "CoreStore watchOS"
+               ReferencedContainer = "container:CoreStore.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B563216E1BD65082006C9394"
+            BuildableName = "CoreStore.framework"
+            BlueprintName = "CoreStore watchOS"
+            ReferencedContainer = "container:CoreStore.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B563216E1BD65082006C9394"
+            BuildableName = "CoreStore.framework"
+            BlueprintName = "CoreStore watchOS"
+            ReferencedContainer = "container:CoreStore.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

CoreStore.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:CoreStore.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:CoreStoreDemo/CoreStoreDemo.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Carthage/Checkouts/GCDKit/GCDKit.xcodeproj">
+   </FileRef>
+</Workspace>

CoreStore.xcworkspace/xcshareddata/CoreStore.xcscmblueprint

@@ -0,0 +1,30 @@
+{
+  "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "4B60F1BCB491FF717C56441AE7783C74F417BE48",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
+
+  },
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
+    "8B2E522D57154DFA93A06982C36315ECBEA4FA97" : 0,
+    "4B60F1BCB491FF717C56441AE7783C74F417BE48" : 0
+  },
+  "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "EBFDEFFE-8BA0-441A-862A-1DE28AA5CD21",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
+    "8B2E522D57154DFA93A06982C36315ECBEA4FA97" : "CoreStore\/Carthage\/Checkouts\/GCDKit\/",
+    "4B60F1BCB491FF717C56441AE7783C74F417BE48" : "CoreStore\/"
+  },
+  "DVTSourceControlWorkspaceBlueprintNameKey" : "CoreStore",
+  "DVTSourceControlWorkspaceBlueprintVersion" : 204,
+  "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "CoreStore.xcworkspace",
+  "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/JohnEstropia\/CoreStore",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "4B60F1BCB491FF717C56441AE7783C74F417BE48"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/JohnEstropia\/GCDKit.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "8B2E522D57154DFA93A06982C36315ECBEA4FA97"
+    }
+  ]
+}

CoreStore/CartFile

@@ -0,0 +1 @@
+github "JohnEstropia/GCDKit" == 1.1.5

CoreStore/Convenience Helpers/NSFetchedResultsController+Convenience.swift

@@ -0,0 +1,50 @@
+//
+//  NSManagedObject+Convenience.swift
+//  CoreStore
+//
+//  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: - NSFetchedResultsController
+
+public extension NSFetchedResultsController {
+    
+    public convenience init<T: NSManagedObject>(dataStack: DataStack, fetchRequest: NSFetchRequest, from: From<T>? = nil, sectionBy: SectionBy? = nil, fetchClauses: [FetchClause]) {
+        
+        let context = dataStack.mainContext
+        from?.applyToFetchRequest(fetchRequest, context: context)
+        for clause in fetchClauses {
+            
+            clause.applyToFetchRequest(fetchRequest)
+        }
+        
+        self.init(
+            fetchRequest: fetchRequest,
+            managedObjectContext: context,
+            sectionNameKeyPath: sectionBy?.sectionKeyPath,
+            cacheName: nil
+        )
+    }
+}

CoreStore/Convenience Helpers/NSProgress+Convenience.swift

@@ -24,7 +24,9 @@
 //
 
 import Foundation
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif
 
 
 // MARK: - NSProgress

CoreStore/CoreStore.h

@@ -23,6 +23,7 @@
 //  SOFTWARE.
 //
 
+#import <Foundation/Foundation.h>
 #import <CoreData/CoreData.h>
 
 FOUNDATION_EXPORT double CoreStoreVersionNumber;

CoreStore/CoreStore.swift

@@ -24,7 +24,9 @@
 //
 
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif
 
 
 // MARK: - CoreStore

CoreStore/Fetching and Querying/BaseDataTransaction+Querying.swift

@@ -78,17 +78,9 @@ public extension BaseDataTransaction {
     - returns: the `NSManagedObject` array for objects that exists in the transaction
     */
     @warn_unused_result
-    public func fetchExisting<T: NSManagedObject>(objects: [T]) -> [T] {
+    public func fetchExisting<T: NSManagedObject, S: SequenceType where S.Generator.Element == T>(objects: S) -> [T] {
         
-        var existingObjects = [T]()
-        for object in objects {
-            
-            if let existingObject = (try? self.context.existingObjectWithID(object.objectID)) as? T {
-                
-                existingObjects.append(existingObject)
-            }
-        }
-        return existingObjects
+        return objects.flatMap { (try? self.context.existingObjectWithID($0.objectID)) as? T }
     }
     
     /**
@@ -98,17 +90,9 @@ public extension BaseDataTransaction {
     - returns: the `NSManagedObject` array for objects that exists in the transaction
     */
     @warn_unused_result
-    public func fetchExisting<T: NSManagedObject>(objectIDs: [NSManagedObjectID]) -> [T] {
+    public func fetchExisting<T: NSManagedObject, S: SequenceType where S.Generator.Element == NSManagedObjectID>(objectIDs: S) -> [T] {
         
-        var existingObjects = [T]()
-        for objectID in objectIDs {
-            
-            if let existingObject = (try? self.context.existingObjectWithID(objectID)) as? T {
-                
-                existingObjects.append(existingObject)
-            }
-        }
-        return existingObjects
+        return objectIDs.flatMap { (try? self.context.existingObjectWithID($0)) as? T }
     }
     
     /**

CoreStore/Fetching and Querying/Concrete Clauses/OrderBy.swift

@@ -24,6 +24,7 @@
 //
 
 import Foundation
+import CoreData
 
 
 public func +(left: OrderBy, right: OrderBy) -> OrderBy {

CoreStore/Fetching and Querying/Concrete Clauses/Where.swift

@@ -24,6 +24,7 @@
 //
 
 import Foundation
+import CoreData
 
 
 public func &&(left: Where, right: Where) -> Where {

CoreStore/Fetching and Querying/CoreStore+Querying.swift

@@ -24,6 +24,8 @@
 //
 
 import Foundation
+import CoreData
+
 
 // MARK: - CoreStore
 
@@ -62,7 +64,7 @@ public extension CoreStore {
     - returns: the `NSManagedObject` array for objects that exists in the `DataStack`
     */
     @warn_unused_result
-    public static func fetchExisting<T: NSManagedObject>(objects: [T]) -> [T] {
+    public static func fetchExisting<T: NSManagedObject, S: SequenceType where S.Generator.Element == T>(objects: S) -> [T] {
         
         return self.defaultStack.fetchExisting(objects)
     }
@@ -74,7 +76,7 @@ public extension CoreStore {
     - returns: the `NSManagedObject` array for objects that exists in the `DataStack`
     */
     @warn_unused_result
-    public static func fetchExisting<T: NSManagedObject>(objectIDs: [NSManagedObjectID]) -> [T] {
+    public static func fetchExisting<T: NSManagedObject, S: SequenceType where S.Generator.Element == NSManagedObjectID>(objectIDs: S) -> [T] {
         
         return self.defaultStack.fetchExisting(objectIDs)
     }

CoreStore/Fetching and Querying/DataStack+Querying.swift

@@ -25,7 +25,9 @@
 
 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif
 
 
 // MARK: - DataStack
@@ -79,17 +81,9 @@ public extension DataStack {
     - returns: the `NSManagedObject` array for objects that exists in the `DataStack`
     */
     @warn_unused_result
-    public func fetchExisting<T: NSManagedObject>(objects: [T]) -> [T] {
+    public func fetchExisting<T: NSManagedObject, S: SequenceType where S.Generator.Element == T>(objects: S) -> [T] {
         
-        var existingObjects = [T]()
-        for object in objects {
-            
-            if let existingObject = (try? self.mainContext.existingObjectWithID(object.objectID)) as? T {
-                
-                existingObjects.append(existingObject)
-            }
-        }
-        return existingObjects
+        return objects.flatMap { (try? self.mainContext.existingObjectWithID($0.objectID)) as? T }
     }
     
     /**
@@ -99,17 +93,9 @@ public extension DataStack {
     - returns: the `NSManagedObject` array for objects that exists in the `DataStack`
     */
     @warn_unused_result
-    public func fetchExisting<T: NSManagedObject>(objectIDs: [NSManagedObjectID]) -> [T] {
+    public func fetchExisting<T: NSManagedObject, S: SequenceType where S.Generator.Element == NSManagedObjectID>(objectIDs: S) -> [T] {
         
-        var existingObjects = [T]()
-        for objectID in objectIDs {
-            
-            if let existingObject = (try? self.mainContext.existingObjectWithID(objectID)) as? T {
-                
-                existingObjects.append(existingObject)
-            }
-        }
-        return existingObjects
+        return objectIDs.flatMap { (try? self.mainContext.existingObjectWithID($0)) as? T }
     }
     
     /**

CoreStore/Importing Data/BaseDataTransaction+Importing.swift

@@ -67,73 +67,36 @@ public extension BaseDataTransaction {
     
     - parameter into: an `Into` clause specifying the entity type
     - parameter sourceArray: the array of objects to import values from
+    - returns: the array of created `ImportableObject` instances
     */
-    public func importObjects<T where T: NSManagedObject, T: ImportableObject>(
+    public func importObjects<T, S: SequenceType where T: NSManagedObject, T: ImportableObject, S.Generator.Element == T.ImportSource>(
         into: Into<T>,
-        sourceArray: [T.ImportSource]) throws {
+        sourceArray: S) throws -> [T] {
             
             CoreStore.assert(
                 self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
                 "Attempted to import an object of type \(typeName(into.entityClass)) outside the transaction's designated queue."
             )
             
-            try autoreleasepool {
+            return try autoreleasepool {
                 
-                for source in sourceArray {
+                return try sourceArray.flatMap { (source) -> T? in
                     
                     guard T.shouldInsertFromImportSource(source, inTransaction: self) else {
                         
-                        continue
+                        return nil
                     }
                     
-                    try autoreleasepool {
+                    return try autoreleasepool {
                         
                         let object = self.create(into)
                         try object.didInsertFromImportSource(source, inTransaction: self)
+                        return object
                     }
                 }
             }
     }
     
-    /**
-    Creates multiple `ImportableObject`s by importing from the specified array of import sources.
-    
-    - parameter into: an `Into` clause specifying the entity type
-    - parameter sourceArray: the array of objects to import values from
-    - parameter postProcess: a closure that exposes the array of created objects
-    */
-    public func importObjects<T where T: NSManagedObject, T: ImportableObject>(
-        into: Into<T>,
-        sourceArray: [T.ImportSource],
-        @noescape postProcess: (sorted: [T]) -> Void) throws {
-            
-            CoreStore.assert(
-                self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
-                "Attempted to import an object of type \(typeName(into.entityClass)) outside the transaction's designated queue."
-            )
-            
-            try autoreleasepool {
-                
-                var objects = [T]()
-                for source in sourceArray {
-                    
-                    guard T.shouldInsertFromImportSource(source, inTransaction: self) else {
-                        
-                        continue
-                    }
-                    
-                    try autoreleasepool {
-                        
-                        let object = self.create(into)
-                        try object.didInsertFromImportSource(source, inTransaction: self)
-                        
-                        objects.append(object)
-                    }
-                }
-                postProcess(sorted: objects)
-            }
-    }
-    
     /**
     Updates an existing `ImportableUniqueObject` or creates a new instance by importing from the specified import source.
     
@@ -184,118 +147,36 @@ public extension BaseDataTransaction {
     - parameter into: an `Into` clause specifying the entity type
     - parameter sourceArray: the array of objects to import values from
     - parameter preProcess: a closure that lets the caller tweak the internal `UniqueIDType`-to-`ImportSource` mapping to be used for importing. Callers can remove from/add to/update `mapping` and return the updated array from the closure.
+    - returns: the array of created/updated `ImportableUniqueObject` instances
     */
-    public func importUniqueObjects<T where T: NSManagedObject, T: ImportableUniqueObject>(
+    public func importUniqueObjects<T, S: SequenceType where T: NSManagedObject, T: ImportableUniqueObject, S.Generator.Element == T.ImportSource>(
         into: Into<T>,
-        sourceArray: [T.ImportSource],
-        preProcess: ((mapping: [T.UniqueIDType: T.ImportSource]) throws -> [T.UniqueIDType: T.ImportSource])? = nil) throws {
+        sourceArray: S,
+        @noescape preProcess: (mapping: [T.UniqueIDType: T.ImportSource]) throws -> [T.UniqueIDType: T.ImportSource] = { $0 }) throws -> [T] {
             
             CoreStore.assert(
                 self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
                 "Attempted to import an object of type \(typeName(into.entityClass)) outside the transaction's designated queue."
             )
             
-            try autoreleasepool {
+            return try autoreleasepool {
                 
                 var mapping = Dictionary<T.UniqueIDType, T.ImportSource>()
-                for source in sourceArray {
+                let sortedIDs = try autoreleasepool {
                     
-                    try autoreleasepool {
+                    return try sourceArray.flatMap { (source) -> T.UniqueIDType? in
                         
                         guard let uniqueIDValue = try T.uniqueIDFromImportSource(source, inTransaction: self) else {
                             
-                            return
+                            return nil
                         }
                         
                         mapping[uniqueIDValue] = source
+                        return uniqueIDValue
                     }
                 }
                 
-                if let preProcess = preProcess {
-                    
-                    try autoreleasepool {
-                        
-                        mapping = try preProcess(mapping: mapping)
-                    }
-                }
-                
-                for object in self.fetchAll(From(T), Where(T.uniqueIDKeyPath, isMemberOf: mapping.keys)) ?? [] {
-                    
-                    try autoreleasepool {
-                        
-                        let uniqueIDValue = object.uniqueIDValue
-                        
-                        guard let source = mapping.removeValueForKey(uniqueIDValue)
-                            where T.shouldUpdateFromImportSource(source, inTransaction: self) else {
-                                
-                                return
-                        }
-                        
-                        try object.updateFromImportSource(source, inTransaction: self)
-                    }
-                }
-                
-                for (uniqueIDValue, source) in mapping {
-                    
-                    try autoreleasepool {
-                        
-                        guard T.shouldInsertFromImportSource(source, inTransaction: self) else {
-                            
-                            return
-                        }
-                        
-                        let object = self.create(into)
-                        object.uniqueIDValue = uniqueIDValue
-                        try object.didInsertFromImportSource(source, inTransaction: self)
-                    }
-                }
-            }
-    }
-    
-    /**
-    Updates existing `ImportableUniqueObject`s or creates them by importing from the specified array of import sources.
-    
-    - parameter into: an `Into` clause specifying the entity type
-    - parameter sourceArray: the array of objects to import values from
-    - parameter preProcess: a closure that lets the caller tweak the internal `UniqueIDType`-to-`ImportSource` mapping to be used for importing. Callers can remove from/add to/update `mapping` and return the updated array from the closure.
-    - parameter postProcess: a closure that exposes the array of created/updated objects
-    */
-    public func importUniqueObjects<T where T: NSManagedObject, T: ImportableUniqueObject>(
-        into: Into<T>,
-        sourceArray: [T.ImportSource],
-        preProcess: ((mapping: [T.UniqueIDType: T.ImportSource]) throws -> [T.UniqueIDType: T.ImportSource])? = nil,
-        @noescape postProcess: (sorted: [T]) -> Void) throws {
-            
-            CoreStore.assert(
-                self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
-                "Attempted to import an object of type \(typeName(into.entityClass)) outside the transaction's designated queue."
-            )
-            
-            try autoreleasepool {
-                
-                var sortedIDs = Array<T.UniqueIDType>()
-                var mapping = Dictionary<T.UniqueIDType, T.ImportSource>()
-                for source in sourceArray {
-                    
-                    try autoreleasepool {
-                        
-                        guard let uniqueIDValue = try T.uniqueIDFromImportSource(source, inTransaction: self) else {
-                            
-                            return
-                        }
-                        
-                        mapping[uniqueIDValue] = source
-                        sortedIDs.append(uniqueIDValue)
-                    }
-                }
-                
-                if let preProcess = preProcess {
-                    
-                    try autoreleasepool {
-                        
-                        mapping = try preProcess(mapping: mapping)
-                    }
-                }
+                mapping = try autoreleasepool { try preProcess(mapping: mapping) }
                 
                 var objects = Dictionary<T.UniqueIDType, T>()
                 for object in self.fetchAll(From(T), Where(T.uniqueIDKeyPath, isMemberOf: mapping.keys)) ?? [] {
@@ -332,7 +213,7 @@ public extension BaseDataTransaction {
                     }
                 }
                 
-                postProcess(sorted: sortedIDs.flatMap { objects[$0] })
+                return sortedIDs.flatMap { objects[$0] }
             }
     }
 }

CoreStore/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.0</string>
+	<string>1.4.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

CoreStore/Internal/FetchedResultsControllerDelegate.swift

@@ -29,6 +29,7 @@ import CoreData
 
 // MARK: - FetchedResultsControllerHandler
 
+@available(OSX, unavailable)
 internal protocol FetchedResultsControllerHandler: class {
     
     func controller(controller: NSFetchedResultsController, didChangeObject anObject: AnyObject, atIndexPath indexPath: NSIndexPath?, forChangeType type: NSFetchedResultsChangeType, newIndexPath: NSIndexPath?)
@@ -45,10 +46,13 @@ internal protocol FetchedResultsControllerHandler: class {
 
 // MARK: - FetchedResultsControllerDelegate
 
+@available(OSX, unavailable)
 internal final class FetchedResultsControllerDelegate: NSObject, NSFetchedResultsControllerDelegate {
     
     // MARK: Internal
     
+    internal var enabled = true
+    
     internal weak var handler: FetchedResultsControllerHandler?
     internal weak var fetchedResultsController: NSFetchedResultsController? {
         
@@ -69,6 +73,11 @@ internal final class FetchedResultsControllerDelegate: NSObject, NSFetchedResult
     
     @objc dynamic func controllerWillChangeContent(controller: NSFetchedResultsController) {
         
+        guard self.enabled else {
+            
+            return
+        }
+        
         self.deletedSections = []
         self.insertedSections = []
         
@@ -77,49 +86,38 @@ internal final class FetchedResultsControllerDelegate: NSObject, NSFetchedResult
     
     @objc dynamic func controllerDidChangeContent(controller: NSFetchedResultsController) {
         
+        guard self.enabled else {
+            
+            return
+        }
+        
         self.handler?.controllerDidChangeContent(controller)
     }
     
     @objc dynamic func controller(controller: NSFetchedResultsController, didChangeObject anObject: AnyObject, atIndexPath indexPath: NSIndexPath?, forChangeType type: NSFetchedResultsChangeType, newIndexPath: NSIndexPath?) {
         
-        if #available(iOS 9, *) {
+        guard self.enabled else {
             
-            self.handler?.controller(
-                controller,
-                didChangeObject: anObject,
-                atIndexPath: indexPath,
-                forChangeType: type,
-                newIndexPath: newIndexPath
-            )
             return
         }
         
-        // Workaround a nasty bug introduced in XCode 7 targeted at iOS 8 devices
+        guard let actualType = NSFetchedResultsChangeType(rawValue: type.rawValue) else {
+            
+            // This fix is for a bug where iOS passes 0 for NSFetchedResultsChangeType, but this is not a valid enum case.
+            // Swift will then always execute the first case of the switch causing strange behaviour.
+            // https://forums.developer.apple.com/thread/12184#31850
+            return
+        }
+        
+        // This whole dance is a workaround for a nasty bug introduced in XCode 7 targeted at iOS 8 devices
         // http://stackoverflow.com/questions/31383760/ios-9-attempt-to-delete-and-reload-the-same-index-path/31384014#31384014
         // https://forums.developer.apple.com/message/9998#9998
         // https://forums.developer.apple.com/message/31849#31849
-        switch type {
-            
-        case .Move:
-            guard let indexPath = indexPath, let newIndexPath = newIndexPath else {
-                
-                return
-            }
-            if indexPath == newIndexPath
-                && self.deletedSections.contains(indexPath.section) {
-                    
-                    self.handler?.controller(
-                        controller,
-                        didChangeObject: anObject,
-                        atIndexPath: nil,
-                        forChangeType: .Insert,
-                        newIndexPath: indexPath
-                    )
-                    return
-            }
+        
+        switch actualType {
             
         case .Update:
-            guard let section = indexPath?.section else {
+            guard let section = indexPath?.indexAtPosition(0) else {
                 
                 return
             }
@@ -129,6 +127,47 @@ internal final class FetchedResultsControllerDelegate: NSObject, NSFetchedResult
                     return
             }
             
+        case .Move:
+            guard let indexPath = indexPath, let newIndexPath = newIndexPath else {
+                
+                return
+            }
+            guard indexPath == newIndexPath else {
+                
+                break
+            }
+            if self.insertedSections.contains(indexPath.indexAtPosition(0)) {
+                
+                // Observers that handle the .Move change are advised to delete then reinsert the object instead of just moving. This is especially true when indexPath and newIndexPath are equal. For example, calling tableView.moveRowAtIndexPath(_:toIndexPath) when both indexPaths are the same will crash the tableView.
+                self.handler?.controller(
+                    controller,
+                    didChangeObject: anObject,
+                    atIndexPath: indexPath,
+                    forChangeType: .Move,
+                    newIndexPath: newIndexPath
+                )
+                return
+            }
+            if self.deletedSections.contains(indexPath.indexAtPosition(0)) {
+                
+                self.handler?.controller(
+                    controller,
+                    didChangeObject: anObject,
+                    atIndexPath: nil,
+                    forChangeType: .Insert,
+                    newIndexPath: indexPath
+                )
+                return
+            }
+            self.handler?.controller(
+                controller,
+                didChangeObject: anObject,
+                atIndexPath: indexPath,
+                forChangeType: .Update,
+                newIndexPath: nil
+            )
+            return
+            
         default:
             break
         }
@@ -137,13 +176,18 @@ internal final class FetchedResultsControllerDelegate: NSObject, NSFetchedResult
             controller,
             didChangeObject: anObject,
             atIndexPath: indexPath,
-            forChangeType: type,
+            forChangeType: actualType,
             newIndexPath: newIndexPath
         )
     }
     
     @objc dynamic func controller(controller: NSFetchedResultsController, didChangeSection sectionInfo: NSFetchedResultsSectionInfo, atIndex sectionIndex: Int, forChangeType type: NSFetchedResultsChangeType) {
         
+        guard self.enabled else {
+            
+            return
+        }
+        
         switch type {
             
         case .Delete:   self.deletedSections.insert(sectionIndex)

CoreStore/Internal/Functions.swift

@@ -25,9 +25,9 @@
 
 import Foundation
 
-internal func autoreleasepool<T>(@noescape closure: () -> T?) -> T? {
+internal func autoreleasepool<T>(@noescape closure: () -> T) -> T {
     
-    var closureValue: T?
+    var closureValue: T!
     ObjectiveC.autoreleasepool {
         
         closureValue = closure()
@@ -36,9 +36,9 @@ internal func autoreleasepool<T>(@noescape closure: () -> T?) -> T? {
     return closureValue
 }
 
-internal func autoreleasepool<T>(@noescape closure: () throws -> T?) throws -> T? {
+internal func autoreleasepool<T>(@noescape closure: () throws -> T) throws -> T {
     
-    var closureValue: T?
+    var closureValue: T!
     var closureError: ErrorType?
     ObjectiveC.autoreleasepool {
         

CoreStore/Internal/NSManagedObjectContext+CoreStore.swift

@@ -25,7 +25,9 @@
 
 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif
 
 
 // MARK: - NSManagedObjectContext

CoreStore/Internal/NSManagedObjectContext+Transaction.swift

@@ -25,7 +25,9 @@
 
 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif
 
 
 // MARK: - NSManagedObjectContext

CoreStore/Internal/NSManagedObjectModel+Setup.swift

@@ -65,10 +65,13 @@ internal extension NSManagedObjectModel {
         }
         else if let resolvedVersion = modelVersions.first ?? modelVersionHints.first {
             
-            CoreStore.log(
-                .Warning,
-                message: "The MigrationChain leaf versions do not include any of the model file's embedded versions. Resolving to version \"\(resolvedVersion)\"."
-            )
+            if !modelVersionHints.isEmpty {
+                
+                CoreStore.log(
+                    .Warning,
+                    message: "The MigrationChain leaf versions do not include any of the model file's embedded versions. Resolving to version \"\(resolvedVersion)\"."
+                )
+            }
             currentModelVersion = resolvedVersion
         }
         else {
@@ -154,7 +157,7 @@ internal extension NSManagedObjectModel {
     
         return self.entityNameMapping.reduce([:]) { (var mapping, pair) in
             
-            mapping[pair.0] = (NSClassFromString(pair.1)! as! NSManagedObject.Type)
+            mapping[pair.1] = (NSClassFromString(pair.0)! as! NSManagedObject.Type)
             return mapping
         }
     }

CoreStore/Migrating/CoreStore+Migration.swift

@@ -25,7 +25,9 @@
 
 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif
 
 
 // MARK: - CoreStore

CoreStore/Migrating/DataStack+Migration.swift

@@ -25,7 +25,9 @@
 
 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif
 
 
 // MARK: - DataStack
@@ -146,7 +148,8 @@ public extension DataStack {
             
             let metadata = try NSPersistentStoreCoordinator.metadataForPersistentStoreOfType(
                 NSSQLiteStoreType,
-                URL: fileURL
+                URL: fileURL,
+                options: self.optionsForSQLiteStore()
             )
             
             return self.upgradeSQLiteStoreIfNeeded(
@@ -265,7 +268,8 @@ public extension DataStack {
             
             metadata = try NSPersistentStoreCoordinator.metadataForPersistentStoreOfType(
                 NSSQLiteStoreType,
-                URL: fileURL
+                URL: fileURL,
+                options: self.optionsForSQLiteStore()
             )
         }
         catch {
@@ -323,7 +327,8 @@ public extension DataStack {
             
             metadata = try NSPersistentStoreCoordinator.metadataForPersistentStoreOfType(
                 NSSQLiteStoreType,
-                URL: fileURL
+                URL: fileURL,
+                options: self.optionsForSQLiteStore()
             )
         }
         catch {

CoreStore/NSError+CoreStore.swift

@@ -24,6 +24,7 @@
 //
 
 import Foundation
+import CoreData
 
 /**
 The `NSError` error domain for `CoreStore`.

CoreStore/Observing/CoreStore+Observing.swift

@@ -29,6 +29,7 @@ import CoreData
 
 // MARK: - CoreStore
 
+@available(OSX, unavailable)
 public extension CoreStore {
     
     // MARK: Public
@@ -51,7 +52,7 @@ public extension CoreStore {
     - parameter from: a `From` clause indicating the entity type
     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
     - returns: a `ListMonitor` instance that monitors changes to the list
-    */
+     */
     @warn_unused_result
     public static func monitorList<T: NSManagedObject>(from: From<T>, _ queryClauses: FetchClause...) -> ListMonitor<T> {
         
@@ -71,6 +72,30 @@ public extension CoreStore {
         return self.defaultStack.monitorList(from, queryClauses)
     }
     
+    /**
+     Using the `defaultStack`, asynchronously creates a `ListMonitor` for a list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list. Since `NSFetchedResultsController` greedily locks the persistent store on initial fetch, you may prefer this method instead of the synchronous counterpart to avoid deadlocks while background updates/saves are being executed.
+     
+     - parameter createAsynchronously: the closure that receives the created `ListMonitor` instance
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     */
+    public static func monitorList<T: NSManagedObject>(createAsynchronously createAsynchronously: (ListMonitor<T>) -> Void, _ from: From<T>, _ fetchClauses: FetchClause...) {
+        
+        self.defaultStack.monitorList(createAsynchronously: createAsynchronously, from, fetchClauses)
+    }
+    
+    /**
+     Using the `defaultStack`, asynchronously creates a `ListMonitor` for a list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list. Since `NSFetchedResultsController` greedily locks the persistent store on initial fetch, you may prefer this method instead of the synchronous counterpart to avoid deadlocks while background updates/saves are being executed.
+     
+     - parameter createAsynchronously: the closure that receives the created `ListMonitor` instance
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     */
+    public static func monitorList<T: NSManagedObject>(createAsynchronously createAsynchronously: (ListMonitor<T>) -> Void, _ from: From<T>, _ fetchClauses: [FetchClause])  {
+        
+        self.defaultStack.monitorList(createAsynchronously: createAsynchronously, from, fetchClauses)
+    }
+    
     /**
     Using the `defaultStack`, creates a `ListMonitor` for a sectioned list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list.
     
@@ -98,4 +123,30 @@ public extension CoreStore {
         
         return self.defaultStack.monitorSectionedList(from, sectionBy, fetchClauses)
     }
+    
+    /**
+     Using the `defaultStack`, asynchronously creates a `ListMonitor` for a sectioned list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list. Since `NSFetchedResultsController` greedily locks the persistent store on initial fetch, you may prefer this method instead of the synchronous counterpart to avoid deadlocks while background updates/saves are being executed.
+     
+     - parameter createAsynchronously: the closure that receives the created `ListMonitor` instance
+     - parameter from: a `From` clause indicating the entity type
+     - parameter sectionBy: a `SectionBy` clause indicating the keyPath for the attribute to use when sorting the list into sections.
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     */
+    public static func monitorSectionedList<T: NSManagedObject>(createAsynchronously createAsynchronously: (ListMonitor<T>) -> Void, _ from: From<T>, _ sectionBy: SectionBy, _ fetchClauses: FetchClause...) {
+        
+        self.defaultStack.monitorSectionedList(createAsynchronously: createAsynchronously, from, sectionBy, fetchClauses)
+    }
+    
+    /**
+     Using the `defaultStack`, asynchronously creates a `ListMonitor` for a sectioned list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list. Since `NSFetchedResultsController` greedily locks the persistent store on initial fetch, you may prefer this method instead of the synchronous counterpart to avoid deadlocks while background updates/saves are being executed.
+     
+     - parameter createAsynchronously: the closure that receives the created `ListMonitor` instance
+     - parameter from: a `From` clause indicating the entity type
+     - parameter sectionBy: a `SectionBy` clause indicating the keyPath for the attribute to use when sorting the list into sections.
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     */
+    public static func monitorSectionedList<T: NSManagedObject>(createAsynchronously createAsynchronously: (ListMonitor<T>) -> Void, _ from: From<T>, _ sectionBy: SectionBy, _ fetchClauses: [FetchClause]) {
+        
+        self.defaultStack.monitorSectionedList(createAsynchronously: createAsynchronously, from, sectionBy, fetchClauses)
+    }
 }

CoreStore/Observing/DataStack+Observing.swift

@@ -25,11 +25,14 @@
 
 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif
 
 
 // MARK: - DataStack
 
+@available(OSX, unavailable)
 public extension DataStack {
     
     // MARK: Public
@@ -60,7 +63,7 @@ public extension DataStack {
     - parameter from: a `From` clause indicating the entity type
     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
     - returns: a `ListMonitor` instance that monitors changes to the list
-    */
+     */
     @warn_unused_result
     public func monitorList<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> ListMonitor<T> {
         
@@ -73,7 +76,7 @@ public extension DataStack {
     - parameter from: a `From` clause indicating the entity type
     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
     - returns: a `ListMonitor` instance that monitors changes to the list
-    */
+     */
     @warn_unused_result
     public func monitorList<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> ListMonitor<T> {
         
@@ -94,6 +97,45 @@ public extension DataStack {
         )
     }
     
+    /**
+     Asynchronously creates a `ListMonitor` for a list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list. Since `NSFetchedResultsController` greedily locks the persistent store on initial fetch, you may prefer this method instead of the synchronous counterpart to avoid deadlocks while background updates/saves are being executed.
+     
+     - parameter createAsynchronously: the closure that receives the created `ListMonitor` instance
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     */
+    public func monitorList<T: NSManagedObject>(createAsynchronously createAsynchronously: (ListMonitor<T>) -> Void, _ from: From<T>, _ fetchClauses: FetchClause...) {
+        
+        self.monitorList(createAsynchronously: createAsynchronously, from, fetchClauses)
+    }
+    
+    /**
+     Asynchronously creates a `ListMonitor` for a list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list. Since `NSFetchedResultsController` greedily locks the persistent store on initial fetch, you may prefer this method instead of the synchronous counterpart to avoid deadlocks while background updates/saves are being executed.
+     
+     - parameter createAsynchronously: the closure that receives the created `ListMonitor` instance
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     */
+    public func monitorList<T: NSManagedObject>(createAsynchronously createAsynchronously: (ListMonitor<T>) -> Void, _ from: From<T>, _ fetchClauses: [FetchClause])  {
+        
+        CoreStore.assert(
+            NSThread.isMainThread(),
+            "Attempted to observe objects from \(typeName(self)) outside the main thread."
+        )
+        CoreStore.assert(
+            fetchClauses.filter { $0 is OrderBy }.count > 0,
+            "A ListMonitor requires an OrderBy clause."
+        )
+        
+        _ = ListMonitor(
+            dataStack: self,
+            from: from,
+            sectionBy: nil,
+            fetchClauses: fetchClauses,
+            createAsynchronously: createAsynchronously
+        )
+    }
+    
     /**
     Creates a `ListMonitor` for a sectioned list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list.
     
@@ -101,7 +143,7 @@ public extension DataStack {
     - parameter sectionBy: a `SectionBy` clause indicating the keyPath for the attribute to use when sorting the list into sections.
     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
     - returns: a `ListMonitor` instance that monitors changes to the list
-    */
+     */
     @warn_unused_result
     public func monitorSectionedList<T: NSManagedObject>(from: From<T>, _ sectionBy: SectionBy, _ fetchClauses: FetchClause...) -> ListMonitor<T> {
      
@@ -115,7 +157,7 @@ public extension DataStack {
     - parameter sectionBy: a `SectionBy` clause indicating the keyPath for the attribute to use when sorting the list into sections.
     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
     - returns: a `ListMonitor` instance that monitors changes to the list
-    */
+     */
     @warn_unused_result
     public func monitorSectionedList<T: NSManagedObject>(from: From<T>, _ sectionBy: SectionBy, _ fetchClauses: [FetchClause]) -> ListMonitor<T> {
         
@@ -135,4 +177,45 @@ public extension DataStack {
             fetchClauses: fetchClauses
         )
     }
+    
+    /**
+     Asynchronously creates a `ListMonitor` for a sectioned list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list. Since `NSFetchedResultsController` greedily locks the persistent store on initial fetch, you may prefer this method instead of the synchronous counterpart to avoid deadlocks while background updates/saves are being executed.
+     
+     - parameter createAsynchronously: the closure that receives the created `ListMonitor` instance
+     - parameter from: a `From` clause indicating the entity type
+     - parameter sectionBy: a `SectionBy` clause indicating the keyPath for the attribute to use when sorting the list into sections.
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     */
+    public func monitorSectionedList<T: NSManagedObject>(createAsynchronously createAsynchronously: (ListMonitor<T>) -> Void, _ from: From<T>, _ sectionBy: SectionBy, _ fetchClauses: FetchClause...) {
+        
+        self.monitorSectionedList(createAsynchronously: createAsynchronously, from, sectionBy, fetchClauses)
+    }
+    
+    /**
+     Asynchronously creates a `ListMonitor` for a sectioned list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list. Since `NSFetchedResultsController` greedily locks the persistent store on initial fetch, you may prefer this method instead of the synchronous counterpart to avoid deadlocks while background updates/saves are being executed.
+     
+     - parameter createAsynchronously: the closure that receives the created `ListMonitor` instance
+     - parameter from: a `From` clause indicating the entity type
+     - parameter sectionBy: a `SectionBy` clause indicating the keyPath for the attribute to use when sorting the list into sections.
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     */
+    public func monitorSectionedList<T: NSManagedObject>(createAsynchronously createAsynchronously: (ListMonitor<T>) -> Void, _ from: From<T>, _ sectionBy: SectionBy, _ fetchClauses: [FetchClause]) {
+        
+        CoreStore.assert(
+            NSThread.isMainThread(),
+            "Attempted to observe objects from \(typeName(self)) outside the main thread."
+        )
+        CoreStore.assert(
+            fetchClauses.filter { $0 is OrderBy }.count > 0,
+            "A ListMonitor requires an OrderBy clause."
+        )
+        
+        _ = ListMonitor(
+            dataStack: self,
+            from: from,
+            sectionBy: sectionBy,
+            fetchClauses: fetchClauses,
+            createAsynchronously: createAsynchronously
+        )
+    }
 }

CoreStore/Observing/ListMonitor.swift

@@ -25,7 +25,9 @@
 
 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif
 
 
 // MARK: - ListMonitor
@@ -67,6 +69,7 @@ Objects from `ListMonitor`s created this way can be accessed either by an `NSInd
 
 In the example above, both `person1` and `person2` will contain the object at section=2, index=3.
 */
+@available(OSX, unavailable)
 public final class ListMonitor<T: NSManagedObject> {
     
     // MARK: Public (Accessors)
@@ -102,7 +105,7 @@ public final class ListMonitor<T: NSManagedObject> {
     */
     public subscript(sectionIndex: Int, itemIndex: Int) -> T {
         
-        return self[NSIndexPath(forItem: itemIndex, inSection: sectionIndex)]
+        return self[NSIndexPath(indexes: [sectionIndex, itemIndex], length: 2)]
     }
     
     /**
@@ -157,7 +160,10 @@ public final class ListMonitor<T: NSManagedObject> {
     */
     public subscript(safeIndexPath indexPath: NSIndexPath) -> T? {
         
-        return self[safeSectionIndex: indexPath.section, safeItemIndex: indexPath.item]
+        return self[
+            safeSectionIndex: indexPath.indexAtPosition(0),
+            safeItemIndex: indexPath.indexAtPosition(1)
+        ]
     }
     
     /**
@@ -840,7 +846,7 @@ public final class ListMonitor<T: NSManagedObject> {
                 return
             }
             
-            strongSelf.fetchedResultsControllerDelegate.fetchedResultsController = nil
+            strongSelf.fetchedResultsControllerDelegate.enabled = false
             
             let fetchRequest = strongSelf.fetchedResultsController.fetchRequest
             for clause in fetchClauses {
@@ -864,7 +870,7 @@ public final class ListMonitor<T: NSManagedObject> {
                         return
                     }
                     
-                    strongSelf.fetchedResultsControllerDelegate.fetchedResultsController = strongSelf.fetchedResultsController
+                    strongSelf.fetchedResultsControllerDelegate.enabled = true
                     strongSelf.isPendingRefetch = false
                     
                     NSNotificationCenter.defaultCenter().postNotificationName(
@@ -879,29 +885,53 @@ public final class ListMonitor<T: NSManagedObject> {
     
     // MARK: Internal
     
-    internal init(dataStack: DataStack, from: From<T>, sectionBy: SectionBy?, fetchClauses: [FetchClause]) {
+    internal convenience init(dataStack: DataStack, from: From<T>, sectionBy: SectionBy?, fetchClauses: [FetchClause]) {
+     
+        self.init(
+            dataStack: dataStack,
+            from: from,
+            sectionBy: sectionBy,
+            fetchClauses: fetchClauses,
+            prepareFetch: { _, performFetch in performFetch() }
+        )
+    }
+    
+    internal convenience init(dataStack: DataStack, from: From<T>, sectionBy: SectionBy?, fetchClauses: [FetchClause], createAsynchronously: (ListMonitor<T>) -> Void) {
         
-        let context = dataStack.mainContext
+        self.init(
+            dataStack: dataStack,
+            from: from,
+            sectionBy: sectionBy,
+            fetchClauses: fetchClauses,
+            prepareFetch: { listMonitor, performFetch in
+                
+                dataStack.childTransactionQueue.async {
+                    
+                    performFetch()
+                    GCDQueue.Main.async {
+                        
+                        createAsynchronously(listMonitor)
+                    }
+                }
+            }
+        )
+    }
+    
+    private init(dataStack: DataStack, from: From<T>, sectionBy: SectionBy?, fetchClauses: [FetchClause], prepareFetch: (ListMonitor<T>, () -> Void) -> Void) {
         
         let fetchRequest = NSFetchRequest()
-        from.applyToFetchRequest(fetchRequest, context: context)
-        
         fetchRequest.fetchLimit = 0
         fetchRequest.resultType = .ManagedObjectResultType
         fetchRequest.fetchBatchSize = 20
         fetchRequest.includesPendingChanges = false
         fetchRequest.shouldRefreshRefetchedObjects = true
         
-        for clause in fetchClauses {
-            
-            clause.applyToFetchRequest(fetchRequest)
-        }
-        
         let fetchedResultsController = NSFetchedResultsController(
+            dataStack: dataStack,
             fetchRequest: fetchRequest,
-            managedObjectContext: context,
-            sectionNameKeyPath: sectionBy?.sectionKeyPath,
-            cacheName: nil
+            from: from,
+            sectionBy: sectionBy,
+            fetchClauses: fetchClauses
         )
         
         let fetchedResultsControllerDelegate = FetchedResultsControllerDelegate()
@@ -921,7 +951,13 @@ public final class ListMonitor<T: NSManagedObject> {
         
         fetchedResultsControllerDelegate.handler = self
         fetchedResultsControllerDelegate.fetchedResultsController = fetchedResultsController
-        try! fetchedResultsController.performFetch()
+        
+        prepareFetch(self, { try! fetchedResultsController.performFetch() })
+    }
+    
+    deinit {
+        
+        self.fetchedResultsControllerDelegate.fetchedResultsController = nil
     }
     
     
@@ -1024,16 +1060,19 @@ public final class ListMonitor<T: NSManagedObject> {
 
 // MARK: - ListMonitor: Equatable
 
+@available(OSX, unavailable)
 public func ==<T: NSManagedObject>(lhs: ListMonitor<T>, rhs: ListMonitor<T>) -> Bool {
     
     return lhs === rhs
 }
 
+@available(OSX, unavailable)
 extension ListMonitor: Equatable { }
 
 
 // MARK: - ListMonitor: FetchedResultsControllerHandler
 
+@available(OSX, unavailable)
 extension ListMonitor: FetchedResultsControllerHandler {
     
     // MARK: FetchedResultsControllerHandler
@@ -1133,7 +1172,7 @@ extension ListMonitor: FetchedResultsControllerHandler {
     }
     
    internal func controller(controller: NSFetchedResultsController, sectionIndexTitleForSectionName sectionName: String?) -> String? {
-        
+    
         return self.sectionIndexTransformer(sectionName: sectionName)
     }
 }

CoreStore/Observing/ListObserver.swift

@@ -38,6 +38,7 @@ Implement the `ListObserver` protocol to observe changes to a list of `NSManaged
     )
     monitor.addObserver(self)
 */
+@available(OSX, unavailable)
 public protocol ListObserver: class {
     
     /**
@@ -77,6 +78,7 @@ public protocol ListObserver: class {
 
 // MARK: - ListObserver (Default Implementations)
 
+@available(OSX, unavailable)
 public extension ListObserver {
     
     /**
@@ -112,6 +114,7 @@ Implement the `ListObjectObserver` protocol to observe detailed changes to a lis
     )
     monitor.addObserver(self)
 */
+@available(OSX, unavailable)
 public protocol ListObjectObserver: ListObserver {
     
     /**
@@ -155,6 +158,7 @@ public protocol ListObjectObserver: ListObserver {
 
 // MARK: - ListObjectObserver (Default Implementations)
 
+@available(OSX, unavailable)
 public extension ListObjectObserver {
     
     /**
@@ -191,6 +195,7 @@ Implement the `ListSectionObserver` protocol to observe changes to a list's sect
     )
     monitor.addObserver(self)
 */
+@available(OSX, unavailable)
 public protocol ListSectionObserver: ListObjectObserver {
     
     /**
@@ -199,7 +204,7 @@ public protocol ListSectionObserver: ListObjectObserver {
     - parameter monitor: the `ListMonitor` monitoring the list being observed
     - parameter sectionInfo: the `NSFetchedResultsSectionInfo` for the inserted section
     - parameter sectionIndex: the new section index for the new section
-    */
+     */
     func listMonitor(monitor: ListMonitor<ListEntityType>, didInsertSection sectionInfo: NSFetchedResultsSectionInfo, toSectionIndex sectionIndex: Int)
     
     /**
@@ -208,13 +213,14 @@ public protocol ListSectionObserver: ListObjectObserver {
     - parameter monitor: the `ListMonitor` monitoring the list being observed
     - parameter sectionInfo: the `NSFetchedResultsSectionInfo` for the deleted section
     - parameter sectionIndex: the previous section index for the deleted section
-    */
+     */
     func listMonitor(monitor: ListMonitor<ListEntityType>, didDeleteSection sectionInfo: NSFetchedResultsSectionInfo, fromSectionIndex sectionIndex: Int)
 }
 
 
 // MARK: - ListSectionObserver (Default Implementations)
 
+@available(OSX, unavailable)
 public extension ListSectionObserver {
     
     /**

CoreStore/Observing/ObjectMonitor.swift

@@ -25,7 +25,9 @@
 
 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif
 
 
 // MARK: - ObjectMonitor
@@ -40,6 +42,7 @@ The created `ObjectMonitor` instance needs to be held on (retained) for as long
 
 Observers registered via `addObserver(_:)` are not retained. `ObjectMonitor` only keeps a `weak` reference to all observers, thus keeping itself free from retain-cycles.
 */
+@available(OSX, unavailable)
 public final class ObjectMonitor<T: NSManagedObject> {
     
     // MARK: Public
@@ -164,25 +167,18 @@ public final class ObjectMonitor<T: NSManagedObject> {
     
     internal init(dataStack: DataStack, object: T) {
         
-        let context = dataStack.mainContext
-        
         let fetchRequest = NSFetchRequest()
         fetchRequest.entity = object.entity
-        
         fetchRequest.fetchLimit = 0
         fetchRequest.resultType = .ManagedObjectResultType
         fetchRequest.sortDescriptors = []
         fetchRequest.includesPendingChanges = false
         fetchRequest.shouldRefreshRefetchedObjects = true
         
-        let originalObjectID = object.objectID
-        Where("SELF", isEqualTo: originalObjectID).applyToFetchRequest(fetchRequest)
-        
         let fetchedResultsController = NSFetchedResultsController(
+            dataStack: dataStack,
             fetchRequest: fetchRequest,
-            managedObjectContext: context,
-            sectionNameKeyPath: nil,
-            cacheName: nil
+            fetchClauses: [Where("SELF", isEqualTo: object.objectID)]
         )
         
         let fetchedResultsControllerDelegate = FetchedResultsControllerDelegate()
@@ -198,6 +194,11 @@ public final class ObjectMonitor<T: NSManagedObject> {
         self.lastCommittedAttributes = (self.object?.committedValuesForKeys(nil) as? [String: NSObject]) ?? [:]
     }
     
+    deinit {
+        
+        self.fetchedResultsControllerDelegate.fetchedResultsController = nil
+    }
+    
     
     // MARK: Private
     
@@ -256,16 +257,19 @@ public final class ObjectMonitor<T: NSManagedObject> {
 
 // MARK: - ObjectMonitor: Equatable
 
+@available(OSX, unavailable)
 public func ==<T: NSManagedObject>(lhs: ObjectMonitor<T>, rhs: ObjectMonitor<T>) -> Bool {
     
     return lhs === rhs
 }
 
+@available(OSX, unavailable)
 extension ObjectMonitor: Equatable { }
 
 
 // MARK: - ObjectMonitor: FetchedResultsControllerHandler
 
+@available(OSX, unavailable)
 extension ObjectMonitor: FetchedResultsControllerHandler {
     
     // MARK: FetchedResultsControllerHandler

CoreStore/Observing/ObjectObserver.swift

@@ -35,6 +35,7 @@ Implement the `ObjectObserver` protocol to observe changes to a single `NSManage
     let monitor = CoreStore.monitorObject(object)
     monitor.addObserver(self)
 */
+@available(OSX, unavailable)
 public protocol ObjectObserver: class {
     
     /**
@@ -71,6 +72,7 @@ public protocol ObjectObserver: class {
 
 // MARK: - ObjectObserver (Default Implementations)
 
+@available(OSX, unavailable)
 public extension ObjectObserver {
     
     /**

CoreStore/Observing/SectionBy.swift

@@ -38,6 +38,7 @@ The `SectionBy` clause indicates the key path to use to group the `ListMonitor`
         OrderBy(.Ascending("lastName"))
     )
 */
+@available(OSX, unavailable)
 public struct SectionBy {
     
     // MARK: Public

CoreStore/Saving and Processing/AsynchronousDataTransaction.swift

@@ -25,7 +25,9 @@
 
 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif
 
 
 // MARK: - AsynchronousDataTransaction
@@ -171,7 +173,7 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
             "Attempted to delete an entities from an already committed \(typeName(self))."
         )
         
-        super.delete([object1, object2] + objects)
+        super.delete(([object1, object2] + objects).flatMap { $0 })
     }
     
     /**
@@ -179,7 +181,7 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
     
     - parameter objects: the `NSManagedObject`s type to be deleted
     */
-    public override func delete(objects: [NSManagedObject?]) {
+    public override func delete<S: SequenceType where S.Generator.Element: NSManagedObject>(objects: S) {
         
         CoreStore.assert(
             !self.isCommitted,
@@ -190,16 +192,21 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
     }
     
     /**
-    Rolls back the transaction by resetting the `NSManagedObjectContext`. After calling this method, all `NSManagedObjects` fetched within the transaction will become invalid. This method should not be used after the `commit()` method was already called once.
-    */
-    public override func rollback() {
+     Rolls back the transaction by resetting the `NSManagedObjectContext`. After calling this method, all `NSManagedObjects` fetched within the transaction will become invalid. This method should not be used after the `commit()` method was already called once.
+     */
+    @available(*, deprecated=1.3.4, message="Resetting the context is inherently unsafe. This method will be removed in the near future. Use `beginUnsafe()` to create transactions with `undo` support.")
+    public func rollback() {
         
         CoreStore.assert(
             !self.isCommitted,
             "Attempted to rollback an already committed \(typeName(self))."
         )
+        CoreStore.assert(
+            self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to rollback a \(typeName(self)) outside its designated queue."
+        )
         
-        super.rollback()
+        self.context.reset()
     }
     
     
@@ -209,7 +216,7 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
         
         self.closure = closure
         
-        super.init(mainContext: mainContext, queue: queue)
+        super.init(mainContext: mainContext, queue: queue, supportsUndo: false, bypassesQueueing: false)
     }
     
     internal func perform() {

CoreStore/Saving and Processing/BaseDataTransaction.swift

@@ -25,7 +25,9 @@
 
 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif
 
 
 // MARK: - BaseDataTransaction
@@ -167,7 +169,7 @@ public /*abstract*/ class BaseDataTransaction {
     */
     public func delete(object1: NSManagedObject?, _ object2: NSManagedObject?, _ objects: NSManagedObject?...) {
         
-        self.delete([object1, object2] + objects)
+        self.delete(([object1, object2] + objects).flatMap { $0 })
     }
     
     /**
@@ -175,7 +177,7 @@ public /*abstract*/ class BaseDataTransaction {
     
     - parameter objects: the `NSManagedObject`s to be deleted
     */
-    public func delete(objects: [NSManagedObject?]) {
+    public func delete<S: SequenceType where S.Generator.Element: NSManagedObject>(objects: S) {
         
         CoreStore.assert(
             self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
@@ -183,25 +185,7 @@ public /*abstract*/ class BaseDataTransaction {
         )
         
         let context = self.context
-        for case let object? in objects {
-            
-            context.fetchExisting(object)?.deleteFromContext()
-        }
-    }
-    
-    // MARK: Saving changes
-    
-    /**
-    Rolls back the transaction by resetting the `NSManagedObjectContext`. After calling this method, all `NSManagedObjects` fetched within the transaction will become invalid.
-    */
-    public func rollback() {
-        
-        CoreStore.assert(
-            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
-            "Attempted to rollback a \(typeName(self)) outside its designated queue."
-        )
-        
-        self.context.reset()
+        objects.forEach { context.fetchExisting($0)?.deleteFromContext() }
     }
     
     
@@ -210,26 +194,33 @@ public /*abstract*/ class BaseDataTransaction {
     internal let context: NSManagedObjectContext
     internal let transactionQueue: GCDQueue
     internal let childTransactionQueue: GCDQueue = .createSerial("com.corestore.datastack.childtransactionqueue")
+    internal let supportsUndo: Bool
+    internal let bypassesQueueing: Bool
+    
     
     internal var isCommitted = false
     internal var result: SaveResult?
     
-    internal init(mainContext: NSManagedObjectContext, queue: GCDQueue) {
-        
-        self.transactionQueue = queue
+    internal init(mainContext: NSManagedObjectContext, queue: GCDQueue, supportsUndo: Bool, bypassesQueueing: Bool) {
         
         let context = mainContext.temporaryContextInTransactionWithConcurrencyType(
             queue == .Main
                 ? .MainQueueConcurrencyType
                 : .PrivateQueueConcurrencyType
         )
+        self.transactionQueue = queue
         self.context = context
+        self.supportsUndo = supportsUndo
+        self.bypassesQueueing = bypassesQueueing
         
         context.parentTransaction = self
-    }
-    
-    internal var bypassesQueueing: Bool {
-        
-        return false
+        if !supportsUndo {
+            
+            context.undoManager = nil
+        }
+        else if context.undoManager == nil {
+            
+            context.undoManager = NSUndoManager()
+        }
     }
 }

CoreStore/Saving and Processing/CoreStore+Transaction.swift

@@ -43,24 +43,32 @@ public extension CoreStore {
     }
     
     /**
-    Using the `defaultStack`, begins a transaction asynchronously where `NSManagedObject` creates, updates, and deletes can be made.
-    
-    - parameter 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
-    */
+     Using the `defaultStack`, begins a transaction asynchronously where `NSManagedObject` creates, updates, and deletes can be made.
+     
+     - parameter 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 beginSynchronous(closure: (transaction: SynchronousDataTransaction) -> Void) -> SaveResult? {
         
         return self.defaultStack.beginSynchronous(closure)
     }
     
     /**
-    Using the `defaultStack`, begins a non-contiguous transaction where `NSManagedObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms. A detached transaction object should typically be only used from the main queue.
-    
-    - returns: a `DetachedDataTransaction` instance where creates, updates, and deletes can be made.
-    */
+     Using the `defaultStack`, begins a non-contiguous transaction where `NSManagedObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms. An unsafe transaction object should typically be only used from the main queue.
+     
+     - prameter supportsUndo: `undo()`, `redo()`, and `rollback()` methods are only available when this parameter is `true`, otherwise those method will raise an exception. Defaults to `false`. Note that turning on Undo support may heavily impact performance especially on iOS or watchOS where memory is limited.
+     - returns: a `UnsafeDataTransaction` instance where creates, updates, and deletes can be made.
+     */
     @warn_unused_result
-    public static func beginDetached() -> DetachedDataTransaction {
+    public static func beginUnsafe(supportsUndo supportsUndo: Bool = false) -> UnsafeDataTransaction {
         
-        return self.defaultStack.beginDetached()
+        return self.defaultStack.beginUnsafe(supportsUndo: supportsUndo)
+    }
+    
+    @available(*, deprecated=1.3.1, renamed="beginUnsafe")
+    @warn_unused_result
+    public static func beginDetached() -> UnsafeDataTransaction {
+        
+        return self.beginUnsafe()
     }
 }

CoreStore/Saving and Processing/DataStack+Transaction.swift

@@ -25,7 +25,9 @@
 
 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif
 
 
 // MARK: - DataStack
@@ -48,11 +50,11 @@ public extension DataStack {
     }
     
     /**
-    Begins a transaction synchronously where `NSManagedObject` creates, updates, and deletes can be made.
-    
-    - parameter 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
-    */
+     Begins a transaction synchronously where `NSManagedObject` creates, updates, and deletes can be made.
+     
+     - parameter 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 beginSynchronous(closure: (transaction: SynchronousDataTransaction) -> Void) -> SaveResult? {
         
         return SynchronousDataTransaction(
@@ -62,19 +64,28 @@ public extension DataStack {
     }
     
     /**
-    Begins a non-contiguous transaction where `NSManagedObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms.
-    
-    - returns: a `DetachedDataTransaction` instance where creates, updates, and deletes can be made.
-    */
+     Begins a non-contiguous transaction where `NSManagedObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms.
+     
+     - prameter supportsUndo: `undo()`, `redo()`, and `rollback()` methods are only available when this parameter is `true`, otherwise those method will raise an exception. Defaults to `false`. Note that turning on Undo support may heavily impact performance especially on iOS or watchOS where memory is limited.
+     - returns: a `UnsafeDataTransaction` instance where creates, updates, and deletes can be made.
+     */
     @warn_unused_result
-    public func beginDetached() -> DetachedDataTransaction {
+    public func beginUnsafe(supportsUndo supportsUndo: Bool = false) -> UnsafeDataTransaction {
         
-        return DetachedDataTransaction(
+        return UnsafeDataTransaction(
             mainContext: self.rootSavingContext,
             queue: .createSerial(
-                "com.coreStore.dataStack.detachedTransactionQueue",
+                "com.coreStore.dataStack.unsafeTransactionQueue",
                 targetQueue: .UserInitiated
-            )
+            ),
+            supportsUndo: supportsUndo
         )
     }
+    
+    @available(*, deprecated=1.3.1, renamed="beginUnsafe")
+    @warn_unused_result
+    public func beginDetached() -> UnsafeDataTransaction {
+        
+        return self.beginUnsafe()
+    }
 }

CoreStore/Saving and Processing/DetachedDataTransaction.swift

@@ -1,87 +0,0 @@
-//
-//  DetachedDataTransaction.swift
-//  CoreStore
-//
-//  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 GCDKit
-
-
-// MARK: - DetachedDataTransaction
-
-/**
-The `DetachedDataTransaction` provides an interface for non-contiguous `NSManagedObject` creates, updates, and deletes. This is useful for making temporary changes, such as partially filled forms. A detached transaction object should typically be only used from the main queue.
-*/
-public final class DetachedDataTransaction: BaseDataTransaction {
-    
-    // MARK: Public
-    
-    /**
-    Saves the transaction changes asynchronously. For a `DetachedDataTransaction`, multiple commits are allowed, although it is the developer's responsibility to ensure a reasonable leeway to prevent blocking the main thread.
-    
-    - parameter 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) -> Void) {
-        
-        self.context.saveAsynchronouslyWithCompletion { (result) -> Void in
-            
-            self.result = result
-            completion(result: result)
-        }
-    }
-    
-    /**
-    Begins a child transaction where `NSManagedObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms.
-    
-    - returns: a `DetachedDataTransaction` instance where creates, updates, and deletes can be made.
-    */
-    @warn_unused_result
-    public func beginDetached() -> DetachedDataTransaction {
-        
-        return DetachedDataTransaction(
-            mainContext: self.context,
-            queue: self.transactionQueue
-        )
-    }
-    
-    /**
-    Returns the `NSManagedObjectContext` for this detached transaction. Use only for cases where external frameworks need an `NSManagedObjectContext` instance to work with.
-    
-    Note that it is the developer's responsibility to ensure the following:
-    - that the `DetachedDataTransaction` that owns this context should be strongly referenced and prevented from being deallocated during the context's lifetime
-    - that all saves will be done either through the `DetachedDataTransaction`'s `commit(...)` method, or by calling `save()` manually on the context, its parent, and all other ancestor contexts if there are any.
-    */
-    public var internalContext: NSManagedObjectContext {
-        
-        return self.context
-    }
-    
-    
-    // MARK: Internal
-    
-    internal override var bypassesQueueing: Bool {
-        
-        return true
-    }
-}
-

CoreStore/Saving and Processing/SynchronousDataTransaction.swift

@@ -25,7 +25,9 @@
 
 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif
 
 
 // MARK: - SynchronousDataTransaction
@@ -161,7 +163,7 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
             "Attempted to delete an entities from an already committed \(typeName(self))."
         )
         
-        super.delete([object1, object2] + objects)
+        super.delete(([object1, object2] + objects).flatMap { $0 })
     }
     
     /**
@@ -169,7 +171,7 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
     
     - parameter objects: the `NSManagedObject`s to be deleted
     */
-    public override func delete(objects: [NSManagedObject?]) {
+    public override func delete<S: SequenceType where S.Generator.Element: NSManagedObject>(objects: S) {
         
         CoreStore.assert(
             !self.isCommitted,
@@ -181,20 +183,32 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
     
     /**
     Rolls back the transaction by resetting the `NSManagedObjectContext`. After calling this method, all `NSManagedObjects` fetched within the transaction will become invalid. This method should not be used after the `commit()` method was already called once.
-    */
-    public override func rollback() {
+     */
+    @available(*, deprecated=1.3.4, message="Resetting the context is inherently unsafe. This method will be removed in the near future. Use `beginUnsafe()` to create transactions with `undo` support.")
+    public func rollback() {
         
         CoreStore.assert(
             !self.isCommitted,
             "Attempted to rollback an already committed \(typeName(self))."
         )
+        CoreStore.assert(
+            self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to rollback a \(typeName(self)) outside its designated queue."
+        )
         
-        super.rollback()
+        self.context.reset()
     }
     
     
     // MARK: Internal
     
+    internal init(mainContext: NSManagedObjectContext, queue: GCDQueue, closure: (transaction: SynchronousDataTransaction) -> Void) {
+        
+        self.closure = closure
+        
+        super.init(mainContext: mainContext, queue: queue, supportsUndo: false, bypassesQueueing: false)
+    }
+    
     internal func performAndWait() -> SaveResult? {
         
         self.transactionQueue.sync {
@@ -212,13 +226,6 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
         return self.result
     }
     
-    internal init(mainContext: NSManagedObjectContext, queue: GCDQueue, closure: (transaction: SynchronousDataTransaction) -> Void) {
-        
-        self.closure = closure
-        
-        super.init(mainContext: mainContext, queue: queue)
-    }
-    
     
     // MARK: Private
     

CoreStore/Saving and Processing/UnsafeDataTransaction.swift

@@ -0,0 +1,138 @@
+//
+//  UnsafeDataTransaction.swift
+//  CoreStore
+//
+//  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
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif
+
+
+@available(*, deprecated=1.3.1, renamed="UnsafeDataTransaction")
+public typealias DetachedDataTransaction = UnsafeDataTransaction
+
+
+// MARK: - UnsafeDataTransaction
+
+/**
+The `UnsafeDataTransaction` provides an interface for non-contiguous `NSManagedObject` creates, updates, and deletes. This is useful for making temporary changes, such as partially filled forms. An unsafe transaction object should typically be only used from the main queue.
+*/
+public final class UnsafeDataTransaction: BaseDataTransaction {
+    
+    // MARK: Public
+    
+    /**
+    Saves the transaction changes asynchronously. For a `UnsafeDataTransaction`, multiple commits are allowed, although it is the developer's responsibility to ensure a reasonable leeway to prevent blocking the main thread.
+    
+    - parameter 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) -> Void) {
+        
+        self.context.saveAsynchronouslyWithCompletion { (result) -> Void in
+            
+            self.result = result
+            completion(result: result)
+        }
+    }
+    
+    /**
+     Rolls back the transaction.
+     */
+    public func rollback() {
+        
+        CoreStore.assert(
+            self.supportsUndo,
+            "Attempted to rollback a \(typeName(self)) with Undo support disabled."
+        )
+        self.context.rollback()
+    }
+    
+    /**
+     Undo's the last change made to the transaction.
+     */
+    public func undo() {
+        
+        CoreStore.assert(
+            self.supportsUndo,
+            "Attempted to undo a \(typeName(self)) with Undo support disabled."
+        )
+        self.context.undo()
+    }
+    
+    /**
+     Redo's the last undone change to the transaction.
+     */
+    public func redo() {
+        
+        CoreStore.assert(
+            self.supportsUndo,
+            "Attempted to redo a \(typeName(self)) with Undo support disabled."
+        )
+        self.context.redo()
+    }
+    
+    /**
+     Begins a child transaction where `NSManagedObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms.
+     
+     - prameter supportsUndo: `undo()`, `redo()`, and `rollback()` methods are only available when this parameter is `true`, otherwise those method will raise an exception. Defaults to `false`. Note that turning on Undo support may heavily impact performance especially on iOS or watchOS where memory is limited.
+     - returns: a `UnsafeDataTransaction` instance where creates, updates, and deletes can be made.
+     */
+    @warn_unused_result
+    public func beginUnsafe(supportsUndo supportsUndo: Bool = false) -> UnsafeDataTransaction {
+        
+        return UnsafeDataTransaction(
+            mainContext: self.context,
+            queue: self.transactionQueue,
+            supportsUndo: supportsUndo
+        )
+    }
+    
+    /**
+     Returns the `NSManagedObjectContext` for this unsafe transaction. Use only for cases where external frameworks need an `NSManagedObjectContext` instance to work with.
+     
+     Note that it is the developer's responsibility to ensure the following:
+     - that the `UnsafeDataTransaction` that owns this context should be strongly referenced and prevented from being deallocated during the context's lifetime
+     - that all saves will be done either through the `UnsafeDataTransaction`'s `commit(...)` method, or by calling `save()` manually on the context, its parent, and all other ancestor contexts if there are any.
+     */
+    public var internalContext: NSManagedObjectContext {
+        
+        return self.context
+    }
+    
+    @available(*, deprecated=1.3.1, renamed="beginUnsafe")
+    @warn_unused_result
+    public func beginDetached() -> UnsafeDataTransaction {
+        
+        return self.beginUnsafe()
+    }
+    
+    
+    // MARK: Internal
+    
+    internal init(mainContext: NSManagedObjectContext, queue: GCDQueue, supportsUndo: Bool) {
+        
+        super.init(mainContext: mainContext, queue: queue, supportsUndo: supportsUndo, bypassesQueueing: true)
+    }
+}

CoreStore/Setting Up/CoreStore+Setup.swift

@@ -25,7 +25,9 @@
 
 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif
 
 
 // MARK: - CoreStore

CoreStore/Setting Up/DataStack.swift

@@ -25,7 +25,9 @@
 
 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif
 
 
 internal let applicationSupportDirectory = NSFileManager.defaultManager().URLsForDirectory(.ApplicationSupportDirectory, inDomains: .UserDomainMask).first!
@@ -213,6 +215,7 @@ public final class DataStack {
         
         var store: NSPersistentStore?
         var storeError: NSError?
+        let options = self.optionsForSQLiteStore()
         coordinator.performBlockAndWait {
             
             do {
@@ -221,7 +224,7 @@ public final class DataStack {
                     NSSQLiteStoreType,
                     configuration: configuration,
                     URL: fileURL,
-                    options: [NSSQLitePragmasOption: ["journal_mode": "WAL"]]
+                    options: options
                 )
             }
             catch {
@@ -293,6 +296,11 @@ public final class DataStack {
         return migrationQueue
     }()
     
+    internal func optionsForSQLiteStore() -> [String: AnyObject] {
+        
+        return [NSSQLitePragmasOption: ["journal_mode": "WAL"]]
+    }
+    
     internal func entityNameForEntityClass(entityClass: AnyClass) -> String? {
         
         return self.model.entityNameForClass(entityClass)

CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj

@@ -35,10 +35,10 @@
 		B569651A1B30888A0075EE4A /* FetchingResultsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56965191B30888A0075EE4A /* FetchingResultsViewController.swift */; };
 		B569651C1B30889A0075EE4A /* QueryingResultsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B569651B1B30889A0075EE4A /* QueryingResultsViewController.swift */; };
 		B56965291B3582D30075EE4A /* MigrationDemo.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B56965271B3582D30075EE4A /* MigrationDemo.xcdatamodeld */; };
-		B583A9201AF5F542001F76AF /* CoreStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B583A91B1AF5F4F4001F76AF /* CoreStore.framework */; };
-		B583A9211AF5F542001F76AF /* CoreStore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B583A91B1AF5F4F4001F76AF /* CoreStore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		B5D9C9191B20AB1900E64F0E /* GCDKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5D9C9181B20AB1900E64F0E /* GCDKit.framework */; };
-		B5D9C91A1B20AB1900E64F0E /* GCDKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B5D9C9181B20AB1900E64F0E /* GCDKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		B5BDC9221C202429008147CD /* CoreStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC9211C202429008147CD /* CoreStore.framework */; };
+		B5BDC9231C202429008147CD /* CoreStore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC9211C202429008147CD /* CoreStore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		B5BDC9251C202429008147CD /* GCDKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC9241C202429008147CD /* GCDKit.framework */; };
+		B5BDC9261C202429008147CD /* GCDKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC9241C202429008147CD /* GCDKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		B5E599321B5240F50084BD5F /* OrganismTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E599311B5240F50084BD5F /* OrganismTableViewCell.swift */; };
 		B5EE25851B36E23C0000406B /* OrganismV1.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5EE25841B36E23C0000406B /* OrganismV1.swift */; };
 		B5EE25871B36E2520000406B /* OrganismV2.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5EE25861B36E2520000406B /* OrganismV2.swift */; };
@@ -47,37 +47,6 @@
 		B5EE259E1B3EC1B20000406B /* OrganismProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5EE259D1B3EC1B20000406B /* OrganismProtocol.swift */; };
 /* End PBXBuildFile section */
 
-/* Begin PBXContainerItemProxy section */
-		B583A91A1AF5F4F4001F76AF /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 2F03A53019C5C6DA005002A5;
-			remoteInfo = CoreStore;
-		};
-		B583A91C1AF5F4F4001F76AF /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 2F03A53B19C5C6DA005002A5;
-			remoteInfo = CoreStoreTests;
-		};
-		B583A91E1AF5F512001F76AF /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 2F03A52F19C5C6DA005002A5;
-			remoteInfo = CoreStore;
-		};
-		B583A9221AF5F542001F76AF /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 2F03A52F19C5C6DA005002A5;
-			remoteInfo = CoreStore;
-		};
-/* End PBXContainerItemProxy section */
-
 /* Begin PBXCopyFilesBuildPhase section */
 		B583A9241AF5F542001F76AF /* Embed Frameworks */ = {
 			isa = PBXCopyFilesBuildPhase;
@@ -85,8 +54,8 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				B5D9C91A1B20AB1900E64F0E /* GCDKit.framework in Embed Frameworks */,
-				B583A9211AF5F542001F76AF /* CoreStore.framework in Embed Frameworks */,
+				B5BDC9261C202429008147CD /* GCDKit.framework in Embed Frameworks */,
+				B5BDC9231C202429008147CD /* CoreStore.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -124,8 +93,8 @@
 		B56965191B30888A0075EE4A /* FetchingResultsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FetchingResultsViewController.swift; sourceTree = "<group>"; };
 		B569651B1B30889A0075EE4A /* QueryingResultsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QueryingResultsViewController.swift; sourceTree = "<group>"; };
 		B56965281B3582D30075EE4A /* MigrationDemo.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MigrationDemo.xcdatamodel; sourceTree = "<group>"; };
-		B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = CoreStore.xcodeproj; path = ../CoreStore.xcodeproj; sourceTree = "<group>"; };
-		B5D9C9181B20AB1900E64F0E /* GCDKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = GCDKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		B5BDC9211C202429008147CD /* CoreStore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = CoreStore.framework; path = "/Users/JohnEstropia/Library/Developer/Xcode/DerivedData/Build/Products/Debug-iphoneos/CoreStore.framework"; sourceTree = "<absolute>"; };
+		B5BDC9241C202429008147CD /* GCDKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = GCDKit.framework; path = "/Users/JohnEstropia/Library/Developer/Xcode/DerivedData/Build/Products/Debug-iphoneos/GCDKit.framework"; sourceTree = "<absolute>"; };
 		B5E599311B5240F50084BD5F /* OrganismTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OrganismTableViewCell.swift; path = "CoreStoreDemo/MIgrations Demo/OrganismTableViewCell.swift"; sourceTree = SOURCE_ROOT; };
 		B5EE25801B36E1B00000406B /* MigrationDemoV2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MigrationDemoV2.xcdatamodel; sourceTree = "<group>"; };
 		B5EE25841B36E23C0000406B /* OrganismV1.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrganismV1.swift; sourceTree = "<group>"; };
@@ -142,9 +111,9 @@
 			buildActionMask = 2147483647;
 			files = (
 				B52977E11B120F8A003D50A5 /* CoreLocation.framework in Frameworks */,
+				B5BDC9221C202429008147CD /* CoreStore.framework in Frameworks */,
+				B5BDC9251C202429008147CD /* GCDKit.framework in Frameworks */,
 				B52977DF1B120F83003D50A5 /* MapKit.framework in Frameworks */,
-				B5D9C9191B20AB1900E64F0E /* GCDKit.framework in Frameworks */,
-				B583A9201AF5F542001F76AF /* CoreStore.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -175,9 +144,9 @@
 		B52977E21B120F90003D50A5 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */,
-				B5D9C9181B20AB1900E64F0E /* GCDKit.framework */,
 				B52977E01B120F8A003D50A5 /* CoreLocation.framework */,
+				B5BDC9211C202429008147CD /* CoreStore.framework */,
+				B5BDC9241C202429008147CD /* GCDKit.framework */,
 				B52977DE1B120F83003D50A5 /* MapKit.framework */,
 			);
 			name = Frameworks;
@@ -275,15 +244,6 @@
 			path = "Migrations Demo";
 			sourceTree = "<group>";
 		};
-		B583A9151AF5F4F3001F76AF /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				B583A91B1AF5F4F4001F76AF /* CoreStore.framework */,
-				B583A91D1AF5F4F4001F76AF /* CoreStoreTests.xctest */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -299,8 +259,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				B583A91F1AF5F512001F76AF /* PBXTargetDependency */,
-				B583A9231AF5F542001F76AF /* PBXTargetDependency */,
 			);
 			name = CoreStoreDemo;
 			productName = CoreStoreDemo;
@@ -333,12 +291,6 @@
 			mainGroup = B54AAD401AF4D26E00848AE0;
 			productRefGroup = B54AAD4A1AF4D26E00848AE0 /* Products */;
 			projectDirPath = "";
-			projectReferences = (
-				{
-					ProductGroup = B583A9151AF5F4F3001F76AF /* Products */;
-					ProjectRef = B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */;
-				},
-			);
 			projectRoot = "";
 			targets = (
 				B54AAD481AF4D26E00848AE0 /* CoreStoreDemo */,
@@ -346,23 +298,6 @@
 		};
 /* End PBXProject section */
 
-/* Begin PBXReferenceProxy section */
-		B583A91B1AF5F4F4001F76AF /* CoreStore.framework */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.framework;
-			path = CoreStore.framework;
-			remoteRef = B583A91A1AF5F4F4001F76AF /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		B583A91D1AF5F4F4001F76AF /* CoreStoreTests.xctest */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = CoreStoreTests.xctest;
-			remoteRef = B583A91C1AF5F4F4001F76AF /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-/* End PBXReferenceProxy section */
-
 /* Begin PBXResourcesBuildPhase section */
 		B54AAD471AF4D26E00848AE0 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
@@ -415,19 +350,6 @@
 		};
 /* End PBXSourcesBuildPhase section */
 
-/* Begin PBXTargetDependency section */
-		B583A91F1AF5F512001F76AF /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = CoreStore;
-			targetProxy = B583A91E1AF5F512001F76AF /* PBXContainerItemProxy */;
-		};
-		B583A9231AF5F542001F76AF /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = CoreStore;
-			targetProxy = B583A9221AF5F542001F76AF /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
 /* Begin PBXVariantGroup section */
 		B54AAD571AF4D26E00848AE0 /* Main.storyboard */ = {
 			isa = PBXVariantGroup;

CoreStoreDemo/CoreStoreDemo/Transactions Demo/TransactionsDemoViewController.swift

@@ -78,7 +78,7 @@ class TransactionsDemoViewController: UIViewController, MKMapViewDelegate, Objec
         
         let alert = UIAlertController(
             title: "Transactions Demo",
-            message: "This demo shows how to use the 3 types of transactions to save updates: synchronous, asynchronous, and detached.\n\nTap and hold on the map to change the pin location.",
+            message: "This demo shows how to use the 3 types of transactions to save updates: synchronous, asynchronous, and unsafe.\n\nTap and hold on the map to change the pin location.",
             preferredStyle: .Alert
         )
         alert.addAction(UIAlertAction(title: "OK", style: .Cancel, handler: nil))
@@ -184,7 +184,7 @@ class TransactionsDemoViewController: UIViewController, MKMapViewDelegate, Objec
     
     func geocodePlace(place: Place) {
         
-        let transaction = CoreStore.beginDetached()
+        let transaction = CoreStore.beginUnsafe()
         
         self.geocoder?.cancelGeocode()
         

CoreStoreTests/CoreStoreTests.swift

@@ -23,7 +23,6 @@
 //  SOFTWARE.
 //
 
-import UIKit
 import XCTest
 
 @testable
@@ -103,7 +102,7 @@ class CoreStoreTests: XCTestCase {
             XCTFail(error.description)
         }
         
-        let detachedTransaction = CoreStore.beginDetached()
+        let unsafeTransaction = CoreStore.beginUnsafe()
         
         let createExpectation = self.expectationWithDescription("Entity creation")
         CoreStore.beginAsynchronous { (transaction) -> Void in
@@ -182,7 +181,7 @@ class CoreStoreTests: XCTestCase {
                 )
                 XCTAssertNil(objs4test, "objs4test == nil")
                 
-                let objs5test = detachedTransaction.fetchCount(From(TestEntity2))
+                let objs5test = unsafeTransaction.fetchCount(From(TestEntity2))
                 XCTAssertTrue(objs5test == 3, "objs5test == 3")
                 
                 XCTAssertTrue(NSThread.isMainThread(), "NSThread.isMainThread()")
@@ -289,15 +288,15 @@ class CoreStoreTests: XCTestCase {
         XCTAssertNotNil(objs2, "objs2 != nil")
         XCTAssertTrue(objs2?.count == 1, "objs2?.count == 1")
         
-        let detachedExpectation = self.expectationWithDescription("Query creation")
+        let unsafeExpectation = self.expectationWithDescription("Query creation")
         
-        let obj5 = detachedTransaction.create(Into<TestEntity1>("Config1"))
+        let obj5 = unsafeTransaction.create(Into<TestEntity1>("Config1"))
         obj5.testEntityID = 5
         obj5.testString = "hihihi"
         obj5.testNumber = 70
         obj5.testDate = NSDate()
         
-        detachedTransaction.commit { (result) -> Void in
+        unsafeTransaction.commit { (result) -> Void in
             
             XCTAssertTrue(NSThread.isMainThread(), "NSThread.isMainThread()")
             switch result {
@@ -322,13 +321,13 @@ class CoreStoreTests: XCTestCase {
                 )
                 XCTAssertTrue(count == 1, "count == 1 (actual: \(count))")
                 
-                let obj6 = detachedTransaction.create(Into<TestEntity1>())
+                let obj6 = unsafeTransaction.create(Into<TestEntity1>())
                 obj6.testEntityID = 6
                 obj6.testString = "huehuehue"
                 obj6.testNumber = 130
                 obj6.testDate = NSDate()
                 
-                detachedTransaction.commit { (result) -> Void in
+                unsafeTransaction.commit { (result) -> Void in
                     
                     XCTAssertTrue(NSThread.isMainThread(), "NSThread.isMainThread()")
                     switch result {
@@ -358,7 +357,7 @@ class CoreStoreTests: XCTestCase {
                         )
                         XCTAssertTrue(count2 == 0, "count == 0 (actual: \(count2))")
                         
-                        detachedExpectation.fulfill()
+                        unsafeExpectation.fulfill()
                         
                     case .Failure(let error):
                         XCTFail(error.description)

CoreStoreTests/Model.xcdatamodeld/Model.xcdatamodel/contents

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="7701" systemVersion="14D136" minimumToolsVersion="Xcode 4.3" macOSVersion="Automatic" iOSVersion="Automatic">
+<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="9057" systemVersion="15B42" minimumToolsVersion="Xcode 4.3">
     <entity name="TestEntity1AAA" representedClassName="CoreStoreTests.TestEntity1" syncable="YES">
         <attribute name="testDate" optional="YES" attributeType="Date" syncable="YES"/>
         <attribute name="testEntityID" attributeType="Integer 64" syncable="YES"/>

README.md

@@ -1,11 +1,12 @@
 # CoreStore
+[![Build Status](https://travis-ci.org/JohnEstropia/CoreStore.svg)](https://travis-ci.org/JohnEstropia/CoreStore)
 [![Version](https://img.shields.io/cocoapods/v/CoreStore.svg?style=flat)](http://cocoadocs.org/docsets/CoreStore)
 [![Platform](https://img.shields.io/cocoapods/p/CoreStore.svg?style=flat)](http://cocoadocs.org/docsets/CoreStore)
 [![License](https://img.shields.io/cocoapods/l/CoreStore.svg?style=flat)](https://raw.githubusercontent.com/JohnEstropia/CoreStore/master/LICENSE)
 [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 
 Unleashing the real power of Core Data with the elegance and safety of Swift
-* Swift 2.0 (XCode 7), iOS 8+ (or try out the [iOS 7 branch (alpha stage)](https://github.com/JohnEstropia/CoreStore/tree/ios7_support_alpha))
+* Swift 2.1 (XCode 7.1), iOS 8+/OSX 10.10+ (or try out the [iOS 7 branch](https://github.com/JohnEstropia/CoreStore/tree/ios7_support_alpha))
 
 [Click here for a wiki version of this README](https://github.com/JohnEstropia/CoreStore/wiki)
 
@@ -24,7 +25,7 @@ Unleashing the real power of Core Data with the elegance and safety of Swift
 - Documentation! No magic here; all public classes, functions, properties, etc. have detailed Apple Docs. This README also introduces a lot of concepts and explains a lot of CoreStore's behavior.
 - **New in 1.3.0:** Efficient importing utilities!
 
-**CoreStore's goal is not to expose shorter, magical syntax, but to provide an API that focuses on readability, consistency, and safety.**
+**[Or vote for the next feature!](http://goo.gl/RIiHMP)**
 
 
 
@@ -41,7 +42,7 @@ Unleashing the real power of Core Data with the elegance and safety of Swift
         - [Transaction types](#transaction-types)
             - [Asynchronous transactions](#asynchronous-transactions)
             - [Synchronous transactions](#synchronous-transactions)
-            - [Detached transactions](#detached-transactions)
+            - [Unsafe transactions](#unsafe-transactions)
         - [Creating objects](#creating-objects)
         - [Updating objects](#updating-objects)
         - [Deleting objects](#deleting-objects)
@@ -57,7 +58,7 @@ Unleashing the real power of Core Data with the elegance and safety of Swift
             - [`Select<T>` clause](#selectt-clause)
             - [`GroupBy` clause](#groupby-clause)
     - [Logging and error handling](#logging-and-error-handling)
-    - [Observing changes and notifications](#observing-changes-and-notifications)
+    - [Observing changes and notifications](#observing-changes-and-notifications) (unavailable on OSX)
         - [Observe a single object](#observe-a-single-object)
         - [Observe a list of objects](#observe-a-list-of-objects)
 - [Roadmap](#roadmap)
@@ -146,7 +147,7 @@ If you are already familiar with the inner workings of CoreData, here is a mappi
 | --- | --- |
 | `NSManagedObjectModel` / `NSPersistentStoreCoordinator`<br />(.xcdatamodeld file) | `DataStack` |
 | `NSPersistentStore`<br />("Configuration"s in the .xcdatamodeld file) | `DataStack` configuration<br />(multiple sqlite / in-memory stores per stack) |
-| `NSManagedObjectContext` | `BaseDataTransaction` subclasses<br />(`SynchronousDataTransaction`, `AsynchronousDataTransaction`, `DetachedDataTransaction`) |
+| `NSManagedObjectContext` | `BaseDataTransaction` subclasses<br />(`SynchronousDataTransaction`, `AsynchronousDataTransaction`, `UnsafeDataTransaction`) |
 
 Popular libraries [RestKit](https://github.com/RestKit/RestKit) and [MagicalRecord](https://github.com/magicalpanda/MagicalRecord) set up their `NSManagedObjectContext`s this way:
 
@@ -255,7 +256,7 @@ class MyViewController: UIViewController {
 
 
 ## Migrations
-So far we have only seen `addSQLiteStoreAndWait(...)` used to initialize our persistent store. As the method name's "AndWait" suffix suggests, this method will block, even if a migration occurs. If migrations are expected, the asynchronous variant `addSQLiteStore(... completion:)` method is recommended:
+So far we have only seen `addSQLiteStoreAndWait(...)` used to initialize our persistent store. As the method name's "AndWait" suffix suggests, this method blocks so it should not do long tasks such as store migrations (in fact CoreStore won't even attempt to, and any model mismatch will be reported as an error). If migrations are expected, the asynchronous variant `addSQLiteStore(... completion:)` method should be used instead:
 ```swift
 do {
     let progress: NSProgress = try dataStack.addSQLiteStore(
@@ -376,7 +377,7 @@ CoreStore.beginAsynchronous { (transaction) -> Void in
 ```
 The `commit()` method saves the changes to the persistent store. If `commit()` is not called when the transaction block completes, all changes within the transaction is discarded.
 
-The examples above use `beginAsynchronous(...)`, but there are actually 3 types of transactions at your disposal: *asynchronous*, *synchronous*, and *detached*.
+The examples above use `beginAsynchronous(...)`, but there are actually 3 types of transactions at your disposal: *asynchronous*, *synchronous*, and *unsafe*.
 
 ### Transaction types
 
@@ -402,10 +403,10 @@ CoreStore.beginSynchronous { (transaction) -> Void in
 
 Since `beginSynchronous(...)` technically blocks two queues (the caller's queue and the transaction's background queue), it is considered less safe as it's more prone to deadlock. Take special care that the closure does not block on any other external queues.
 
-#### Detached transactions
+#### Unsafe transactions
 are special in that they do not enclose updates within a closure:
 ```swift
-let transaction = CoreStore.beginDetached()
+let transaction = CoreStore.beginUnsafe()
 // make changes
 downloadJSONWithCompletion({ (json) -> Void in
 
@@ -420,7 +421,7 @@ downloadAnotherJSONWithCompletion({ (json) -> Void in
 ```
 This allows for non-contiguous updates. Do note that this flexibility comes with a price: you are now responsible for managing concurrency for the transaction. As uncle Ben said, "with great power comes great race conditions."
 
-As the above example also shows, only detached transactions are allowed to call `commit()` multiple times; doing so with synchronous and asynchronous transactions will trigger an assert. 
+As the above example also shows, only unsafe transactions are allowed to call `commit()` multiple times; doing so with synchronous and asynchronous transactions will trigger an assert. 
 
 
 You've seen how to create transactions, but we have yet to see how to make *creates*, *updates*, and *deletes*. The 3 types of transactions above are all subclasses of `BaseDataTransaction`, which implements the methods shown below.
@@ -618,7 +619,7 @@ public protocol ImportableObject: class {
 First, set `ImportSource` to the expected type of the data source:
 ```swift
 typealias ImportSource = [String: AnyObject]
-``
+```
 This lets us call `importObject(_:source:)` with any `[String: AnyObject]` type as the argument to `source`:
 ```swift
 CoreStore.beginAsynchronous { (transaction) -> Void in
@@ -1024,7 +1025,7 @@ Doing so channels all logging calls to your logger.
 
 Note that to keep the call stack information intact, all calls to these methods are **NOT** thread-managed. Therefore you have to make sure that your logger is thread-safe or you may otherwise have to dispatch your logging implementation to a serial queue.
 
-## Observing changes and notifications
+## Observing changes and notifications (unavailable on OSX)
 CoreStore provides type-safe wrappers for observing managed objects:
 
 - `ObjectMonitor`: use to monitor changes to a single `NSManagedObject` instance (instead of Key-Value Observing)
@@ -1181,6 +1182,7 @@ This installs CoreStore as a framework. Declare `import CoreStore` in your swift
 ### Install with Carthage
 ```
 github "JohnEstropia/CoreStore" >= 1.3.0
+github "JohnEstropia/GCDKit" >= 1.1.5
 ```
 
 ### Install as Git Submodule