update README

Update .gitignore: Add .DS_Store

.gitignore

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

.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,41 @@
+language: objective-c
+osx_image: xcode7.2
+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.2,name=iPhone 6s"          SCHEME="CoreStore iOS"     SDK=iphonesimulator9.2  RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=9.0,name=iPhone 6 Plus"      SCHEME="CoreStore iOS"     SDK=iphonesimulator9.2  RUN_TESTS="YES" POD_LINT="NO"	
+    - DESTINATION="OS=8.4,name=iPhone 6"           SCHEME="CoreStore iOS"     SDK=iphonesimulator9.2  RUN_TESTS="YES" POD_LINT="NO"	
+    - DESTINATION="OS=8.3,name=iPhone 5S"          SCHEME="CoreStore iOS"     SDK=iphonesimulator9.2  RUN_TESTS="YES" POD_LINT="NO"	
+    - DESTINATION="OS=8.2,name=iPhone 5"           SCHEME="CoreStore iOS"     SDK=iphonesimulator9.2  RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=8.1,name=iPhone 4S"          SCHEME="CoreStore iOS"     SDK=iphonesimulator9.2  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.1,name=Apple Watch - 42mm" SCHEME="CoreStore watchOS" SDK=watchsimulator2.1   RUN_TESTS="NO"  POD_LINT="NO"
+    - DESTINATION="OS=9.1,name=Apple TV 1080p"     SCHEME="CoreStore tvOS"    SDK=appletvsimulator9.1 RUN_TESTS="YES" 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 clean test | xcpretty -c;
+      xcodebuild -workspace CoreStore.xcworkspace -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO clean test | xcpretty -c;
+    fi
+  - xcodebuild -workspace "CoreStore.xcworkspace" -scheme "CoreStore iOS" -sdk "iphonesimulator9.2" -destination "OS=9.2,name=iPhone 6s" -configuration Debug ONLY_ACTIVE_ARCH=NO clean test | xcpretty -c;
+  - xcodebuild -workspace "CoreStore.xcworkspace" -scheme "CoreStore iOS" -sdk "iphonesimulator9.2" -destination "OS=9.2,name=iPhone 6s" -configuration Release ONLY_ACTIVE_ARCH=NO clean test | xcpretty -c;
+  - if [ $POD_LINT == "YES" ]; then
+      pod lib lint --quick;
+    fi

Cartfile

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

Cartfile.resolved

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

CoreStore.podspec

@@ -1,17 +1,22 @@
 Pod::Spec.new do |s|
     s.name = "CoreStore"
-    s.version = "1.3.2"
+    s.version = "1.4.4"
     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.tvos.deployment_target = "9.0"
 
     s.source_files = "CoreStore", "CoreStore/**/*.{swift}"
+    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.3"
+    s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS' => '-D USE_FRAMEWORKS' }
+    
+    s.dependency "GCDKit", "1.1.7"
 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 tvOS.xcscheme

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0720"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "82BA18881C4BBCBA00A0916E"
+               BuildableName = "CoreStore.framework"
+               BlueprintName = "CoreStore tvOS"
+               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 = "82BA18911C4BBCBA00A0916E"
+               BuildableName = "CoreStoreTests.xctest"
+               BlueprintName = "CoreStoreTests tvOS"
+               ReferencedContainer = "container:CoreStore.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "82BA18881C4BBCBA00A0916E"
+            BuildableName = "CoreStore.framework"
+            BlueprintName = "CoreStore tvOS"
+            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 = "82BA18881C4BBCBA00A0916E"
+            BuildableName = "CoreStore.framework"
+            BlueprintName = "CoreStore tvOS"
+            ReferencedContainer = "container:CoreStore.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "82BA18881C4BBCBA00A0916E"
+            BuildableName = "CoreStore.framework"
+            BlueprintName = "CoreStore tvOS"
+            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.7

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.swift

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

CoreStore/Fetching and Querying/BaseDataTransaction+Querying.swift

@@ -106,7 +106,7 @@ public extension BaseDataTransaction {
     public func fetchOne<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> T? {
         
         CoreStore.assert(
-            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
             "Attempted to fetch from a \(typeName(self)) outside its designated queue."
         )
         
@@ -124,7 +124,7 @@ public extension BaseDataTransaction {
     public func fetchOne<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> T? {
         
         CoreStore.assert(
-            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
             "Attempted to fetch from a \(typeName(self)) outside its designated queue."
         )
         
@@ -142,7 +142,7 @@ public extension BaseDataTransaction {
     public func fetchAll<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> [T]? {
         
         CoreStore.assert(
-            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
             "Attempted to fetch from a \(typeName(self)) outside its designated queue."
         )
         
@@ -160,7 +160,7 @@ public extension BaseDataTransaction {
     public func fetchAll<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> [T]? {
         
         CoreStore.assert(
-            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
             "Attempted to fetch from a \(typeName(self)) outside its designated queue."
         )
         
@@ -178,7 +178,7 @@ public extension BaseDataTransaction {
     public func fetchCount<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> Int? {
         
         CoreStore.assert(
-            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
             "Attempted to fetch from a \(typeName(self)) outside its designated queue."
         )
         
@@ -196,7 +196,7 @@ public extension BaseDataTransaction {
     public func fetchCount<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> Int? {
         
         CoreStore.assert(
-            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
             "Attempted to fetch from a \(typeName(self)) outside its designated queue."
         )
         
@@ -214,7 +214,7 @@ public extension BaseDataTransaction {
     public func fetchObjectID<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> NSManagedObjectID? {
         
         CoreStore.assert(
-            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
             "Attempted to fetch from a \(typeName(self)) outside its designated queue."
         )
         
@@ -232,7 +232,7 @@ public extension BaseDataTransaction {
     public func fetchObjectID<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> NSManagedObjectID? {
         
         CoreStore.assert(
-            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
             "Attempted to fetch from a \(typeName(self)) outside its designated queue."
         )
         
@@ -250,7 +250,7 @@ public extension BaseDataTransaction {
     public func fetchObjectIDs<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> [NSManagedObjectID]? {
         
         CoreStore.assert(
-            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
             "Attempted to fetch from a \(typeName(self)) outside its designated queue."
         )
         
@@ -268,7 +268,7 @@ public extension BaseDataTransaction {
     public func fetchObjectIDs<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> [NSManagedObjectID]? {
         
         CoreStore.assert(
-            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
             "Attempted to fetch from a \(typeName(self)) outside its designated queue."
         )
         
@@ -285,7 +285,7 @@ public extension BaseDataTransaction {
     public func deleteAll<T: NSManagedObject>(from: From<T>, _ deleteClauses: DeleteClause...) -> Int? {
         
         CoreStore.assert(
-            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
             "Attempted to delete from a \(typeName(self)) outside its designated queue."
         )
         
@@ -302,7 +302,7 @@ public extension BaseDataTransaction {
     public func deleteAll<T: NSManagedObject>(from: From<T>, _ deleteClauses: [DeleteClause]) -> Int? {
         
         CoreStore.assert(
-            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
             "Attempted to delete from a \(typeName(self)) outside its designated queue."
         )
         
@@ -323,7 +323,7 @@ public extension BaseDataTransaction {
     public func queryValue<T: NSManagedObject, U: SelectValueResultType>(from: From<T>, _ selectClause: Select<U>, _ queryClauses: QueryClause...) -> U? {
         
         CoreStore.assert(
-            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
             "Attempted to query from a \(typeName(self)) outside its designated queue."
         )
         
@@ -344,7 +344,7 @@ public extension BaseDataTransaction {
     public func queryValue<T: NSManagedObject, U: SelectValueResultType>(from: From<T>, _ selectClause: Select<U>, _ queryClauses: [QueryClause]) -> U? {
         
         CoreStore.assert(
-            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
             "Attempted to query from a \(typeName(self)) outside its designated queue."
         )
         
@@ -365,7 +365,7 @@ public extension BaseDataTransaction {
     public func queryAttributes<T: NSManagedObject>(from: From<T>, _ selectClause: Select<NSDictionary>, _ queryClauses: QueryClause...) -> [[NSString: AnyObject]]? {
         
         CoreStore.assert(
-            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
             "Attempted to query from a \(typeName(self)) outside its designated queue."
         )
         
@@ -386,7 +386,7 @@ public extension BaseDataTransaction {
     public func queryAttributes<T: NSManagedObject>(from: From<T>, _ selectClause: Select<NSDictionary>, _ queryClauses: [QueryClause]) -> [[NSString: AnyObject]]? {
         
         CoreStore.assert(
-            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
             "Attempted to query from a \(typeName(self)) outside its designated queue."
         )
         

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

CoreStore/Importing Data/BaseDataTransaction+Importing.swift

@@ -45,7 +45,7 @@ public extension BaseDataTransaction {
         source: T.ImportSource) throws -> T? {
             
             CoreStore.assert(
-                self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+                self.isRunningInAllowedQueue(),
                 "Attempted to import an object of type \(typeName(into.entityClass)) outside the transaction's designated queue."
             )
             
@@ -74,7 +74,7 @@ public extension BaseDataTransaction {
         sourceArray: S) throws -> [T] {
             
             CoreStore.assert(
-                self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+                self.isRunningInAllowedQueue(),
                 "Attempted to import an object of type \(typeName(into.entityClass)) outside the transaction's designated queue."
             )
             
@@ -109,7 +109,7 @@ public extension BaseDataTransaction {
         source: T.ImportSource) throws -> T?  {
             
             CoreStore.assert(
-                self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+                self.isRunningInAllowedQueue(),
                 "Attempted to import an object of type \(typeName(into.entityClass)) outside the transaction's designated queue."
             )
             
@@ -123,6 +123,11 @@ public extension BaseDataTransaction {
                 
                 if let object = self.fetchOne(From(T), Where(uniqueIDKeyPath, isEqualTo: uniqueIDValue)) {
                     
+                    guard T.shouldUpdateFromImportSource(source, inTransaction: self) else {
+                    
+                        return nil
+                    }
+                    
                     try object.updateFromImportSource(source, inTransaction: self)
                     return object
                 }
@@ -155,7 +160,7 @@ public extension BaseDataTransaction {
         @noescape preProcess: (mapping: [T.UniqueIDType: T.ImportSource]) throws -> [T.UniqueIDType: T.ImportSource] = { $0 }) throws -> [T] {
             
             CoreStore.assert(
-                self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+                self.isRunningInAllowedQueue(),
                 "Attempted to import an object of type \(typeName(into.entityClass)) outside the transaction's designated queue."
             )
             

CoreStore/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.2</string>
+	<string>1.4.4</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,6 +46,7 @@ internal protocol FetchedResultsControllerHandler: class {
 
 // MARK: - FetchedResultsControllerDelegate
 
+@available(OSX, unavailable)
 internal final class FetchedResultsControllerDelegate: NSObject, NSFetchedResultsControllerDelegate {
     
     // MARK: Internal

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
@@ -53,6 +55,15 @@ internal extension NSManagedObjectContext {
         }
     }
     
+    internal func isRunningInAllowedQueue() -> Bool {
+        
+        guard let parentTransaction = self.parentTransaction else {
+            
+            return false
+        }
+        return parentTransaction.isRunningInAllowedQueue()
+    }
+    
     internal func temporaryContextInTransactionWithConcurrencyType(concurrencyType: NSManagedObjectContextConcurrencyType) -> NSManagedObjectContext {
         
         let context = NSManagedObjectContext(concurrencyType: concurrencyType)

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 {

CoreStore/Migrating/CoreStore+Migration.swift

@@ -25,7 +25,9 @@
 
 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif
 
 
 // MARK: - CoreStore
@@ -35,7 +37,7 @@ public extension CoreStore {
     /**
     Asynchronously adds to the `defaultStack` an SQLite store from the given SQLite file name. Note that using `addSQLiteStore(...)` instead of `addSQLiteStoreAndWait(...)` implies that the migrations are allowed and expected (thus the asynchronous `completion`.)
     
-    - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory. A new SQLite file will be created if it does not exist. Note that if you have multiple configurations, you will need to specify a different `fileName` explicitly for each of them.
+    - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory (or the "Caches" directory on tvOS). A new SQLite file will be created if it does not exist. Note that if you have multiple configurations, you will need to specify a different `fileName` explicitly for each of them.
     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil`, the "Default" configuration. Note that if you have multiple configurations, you will need to specify a different `fileName` explicitly for each of them.
     - parameter mappingModelBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.allBundles()`.
     - parameter resetStoreOnModelMismatch: Set to true to delete the store on model mismatch; or set to false to report failure instead. Typically should only be set to true when debugging, or if the persistent store can be recreated easily. If not specified, defaults to false.
@@ -56,7 +58,7 @@ public extension CoreStore {
     /**
     Asynchronously adds to the `defaultStack` an SQLite store from the given SQLite file URL. Note that using `addSQLiteStore(...)` instead of `addSQLiteStoreAndWait(...)` implies that the migrations are allowed and expected (thus the asynchronous `completion`.)
     
-    - parameter fileURL: the local file URL for the SQLite persistent store. A new SQLite file will be created if it does not exist. If not specified, defaults to a file URL pointing to a "<Application name>.sqlite" file in the "Application Support" directory. Note that if you have multiple configurations, you will need to specify a different `fileURL` explicitly for each of them.
+    - parameter fileURL: the local file URL for the SQLite persistent store. A new SQLite file will be created if it does not exist. If not specified, defaults to a file URL pointing to a "<Application name>.sqlite" file in the "Application Support" directory (or the "Caches" directory on tvOS). Note that if you have multiple configurations, you will need to specify a different `fileURL` explicitly for each of them.
     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil`, the "Default" configuration. Note that if you have multiple configurations, you will need to specify a different `fileURL` explicitly for each of them.
     - parameter mappingModelBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.allBundles()`.
     - parameter resetStoreOnModelMismatch: Set to true to delete the store on model mismatch; or set to false to report failure instead. Typically should only be set to true when debugging, or if the persistent store can be recreated easily. If not specified, defaults to false.
@@ -77,7 +79,7 @@ public extension CoreStore {
     /**
     Using the `defaultStack`, migrates an SQLite store with the specified filename to the `DataStack`'s managed object model version WITHOUT adding the migrated store to the data stack.
     
-    - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory.
+    - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory (or the "Caches" directory on tvOS).
     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil` which indicates the "Default" configuration.
     - parameter mappingModelBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.mainBundle()`.
     - parameter sourceBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.mainBundle()`.
@@ -96,7 +98,7 @@ public extension CoreStore {
     /**
     Using the `defaultStack`, migrates an SQLite store at the specified file URL and configuration name to the `DataStack`'s managed object model version. This method does NOT add the migrated store to the data stack.
     
-    - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory.
+    - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory (or the "Caches" directory on tvOS).
     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil` which indicates the "Default" configuration.
     - parameter mappingModelBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.mainBundle()`.
     - parameter sourceBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.mainBundle()`.
@@ -115,7 +117,7 @@ public extension CoreStore {
     /**
     Using the `defaultStack`, checks for the required migrations needed for the store with the specified filename and configuration to be migrated to the `DataStack`'s managed object model version. This method throws an error if the store does not exist, if inspection of the store failed, or no mapping model was found/inferred.
     
-    - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory.
+    - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory (or the "Caches" directory on tvOS).
     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil` which indicates the "Default" configuration.
     - parameter mappingModelBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.allBundles()`.
     :return: an array of `MigrationType`s indicating the chain of migrations required for the store; or `nil` if either inspection of the store failed, or no mapping model was found/inferred. `MigrationType` acts as a `Bool` and evaluates to `false` if no migration is required, and `true` if either a lightweight or custom migration is needed.

CoreStore/Migrating/DataStack+Migration.swift

@@ -25,7 +25,9 @@
 
 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif
 
 
 // MARK: - DataStack
@@ -76,7 +78,7 @@ public extension DataStack {
     /**
     Asynchronously adds to the stack an SQLite store from the given SQLite file name. Note that using `addSQLiteStore(...)` instead of `addSQLiteStoreAndWait(...)` implies that the migrations are allowed and expected (thus the asynchronous `completion`.)
     
-    - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory. A new SQLite file will be created if it does not exist. Note that if you have multiple configurations, you will need to specify a different `fileName` explicitly for each of them.
+    - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory (or the "Caches" directory on tvOS). A new SQLite file will be created if it does not exist. Note that if you have multiple configurations, you will need to specify a different `fileName` explicitly for each of them.
     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil`, the "Default" configuration. Note that if you have multiple configurations, you will need to specify a different `fileName` explicitly for each of them.
     - parameter mappingModelBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.allBundles()`.
     - parameter resetStoreOnModelMismatch: Set to true to delete the store on model mismatch; or set to false to report failure instead. Typically should only be set to true when debugging, or if the persistent store can be recreated easily. If not specified, defaults to false.
@@ -86,7 +88,7 @@ public extension DataStack {
     public func addSQLiteStore(fileName fileName: String, configuration: String? = nil, mappingModelBundles: [NSBundle]? = nil, resetStoreOnModelMismatch: Bool = false, completion: (PersistentStoreResult) -> Void) throws -> NSProgress? {
         
         return try self.addSQLiteStore(
-            fileURL: applicationSupportDirectory.URLByAppendingPathComponent(
+            fileURL: defaultDirectory.URLByAppendingPathComponent(
                 fileName,
                 isDirectory: false
             ),
@@ -100,7 +102,7 @@ public extension DataStack {
     /**
     Asynchronously adds to the stack an SQLite store from the given SQLite file URL. Note that using `addSQLiteStore(...)` instead of `addSQLiteStoreAndWait(...)` implies that the migrations are allowed and expected (thus the asynchronous `completion`.)
     
-    - parameter fileURL: the local file URL for the SQLite persistent store. A new SQLite file will be created if it does not exist. If not specified, defaults to a file URL pointing to a "<Application name>.sqlite" file in the "Application Support" directory. Note that if you have multiple configurations, you will need to specify a different `fileURL` explicitly for each of them.
+    - parameter fileURL: the local file URL for the SQLite persistent store. A new SQLite file will be created if it does not exist. If not specified, defaults to a file URL pointing to a "<Application name>.sqlite" file in the "Application Support" directory (or the "Caches" directory on tvOS). Note that if you have multiple configurations, you will need to specify a different `fileURL` explicitly for each of them.
     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil`, the "Default" configuration. Note that if you have multiple configurations, you will need to specify a different `fileURL` explicitly for each of them.
     - parameter mappingModelBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.allBundles()`.
     - parameter resetStoreOnModelMismatch: Set to true to delete the store on model mismatch; or set to false to report failure instead. Typically should only be set to true when debugging, or if the persistent store can be recreated easily. If not specified, defaults to false.
@@ -231,7 +233,7 @@ public extension DataStack {
     /**
     Migrates an SQLite store with the specified filename to the `DataStack`'s managed object model version WITHOUT adding the migrated store to the data stack.
     
-    - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory.
+    - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory (or the "Caches" directory on tvOS).
     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil` which indicates the "Default" configuration.
     - parameter mappingModelBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.mainBundle()`.
     - parameter sourceBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.mainBundle()`.
@@ -240,7 +242,7 @@ public extension DataStack {
     public func upgradeSQLiteStoreIfNeeded(fileName fileName: String, configuration: String? = nil, mappingModelBundles: [NSBundle]? = nil, completion: (MigrationResult) -> Void) throws -> NSProgress? {
         
         return try self.upgradeSQLiteStoreIfNeeded(
-            fileURL: applicationSupportDirectory.URLByAppendingPathComponent(
+            fileURL: defaultDirectory.URLByAppendingPathComponent(
                 fileName,
                 isDirectory: false
             ),
@@ -253,7 +255,7 @@ public extension DataStack {
     /**
     Migrates an SQLite store at the specified file URL and configuration name to the `DataStack`'s managed object model version. This method does NOT add the migrated store to the data stack.
     
-    - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory.
+    - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory (or the "Caches" directory on tvOS).
     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil` which indicates the "Default" configuration.
     - parameter mappingModelBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.mainBundle()`.
     - parameter sourceBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.mainBundle()`.
@@ -291,7 +293,7 @@ public extension DataStack {
     /**
     Checks for the required migrations needed for the store with the specified filename and configuration to be migrated to the `DataStack`'s managed object model version. This method throws an error if the store does not exist, if inspection of the store failed, or no mapping model was found/inferred.
     
-    - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory.
+    - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory (or the "Caches" directory on tvOS).
     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil` which indicates the "Default" configuration.
     - parameter mappingModelBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.allBundles()`.
     :return: an array of `MigrationType`s indicating the chain of migrations required for the store; or `nil` if either inspection of the store failed, or no mapping model was found/inferred. `MigrationType` acts as a `Bool` and evaluates to `false` if no migration is required, and `true` if either a lightweight or custom migration is needed.
@@ -300,7 +302,7 @@ public extension DataStack {
     public func requiredMigrationsForSQLiteStore(fileName fileName: String, configuration: String? = nil, mappingModelBundles: [NSBundle] = NSBundle.allBundles() as [NSBundle]) throws -> [MigrationType] {
         
         return try requiredMigrationsForSQLiteStore(
-            fileURL: applicationSupportDirectory.URLByAppendingPathComponent(
+            fileURL: defaultDirectory.URLByAppendingPathComponent(
                 fileName,
                 isDirectory: false
             ),

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)
@@ -332,6 +335,56 @@ public final class ListMonitor<T: NSManagedObject> {
         return sections[section]
     }
     
+    /**
+     Returns the `NSFetchedResultsSectionInfo`s for all sections
+     
+     - returns: the `NSFetchedResultsSectionInfo`s for all sections
+     */
+    @warn_unused_result
+    public func sections() -> [NSFetchedResultsSectionInfo] {
+        
+        CoreStore.assert(
+            !self.isPendingRefetch || NSThread.isMainThread(),
+            "Attempted to access a \(typeName(self)) outside the main thread while a refetch is in progress."
+        )
+        
+        return self.fetchedResultsController.sections ?? []
+    }
+    
+    /**
+     Returns the target section for a specified "Section Index" title and index.
+     
+     - parameter title: the title of the Section Index
+     - parameter index: the index of the Section Index
+     - returns: the target section for the specified "Section Index" title and index.
+     */
+    @warn_unused_result
+    public func targetSectionForSectionIndex(title title: String, index: Int) -> Int {
+        
+        CoreStore.assert(
+            !self.isPendingRefetch || NSThread.isMainThread(),
+            "Attempted to access a \(typeName(self)) outside the main thread while a refetch is in progress."
+        )
+        
+        return self.fetchedResultsController.sectionForSectionIndexTitle(title, atIndex: index)
+    }
+    
+    /**
+     Returns the section index titles for all sections
+     
+     - returns: the section index titles for all sections
+     */
+    @warn_unused_result
+    public func sectionIndexTitles() -> [String] {
+        
+        CoreStore.assert(
+            !self.isPendingRefetch || NSThread.isMainThread(),
+            "Attempted to access a \(typeName(self)) outside the main thread while a refetch is in progress."
+        )
+        
+        return self.fetchedResultsController.sectionIndexTitles
+    }
+    
     /**
     Returns the index of the `NSManagedObject` if it exists in the `ListMonitor`'s fetched objects, or `nil` if not found.
     
@@ -882,29 +935,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()
@@ -924,7 +1001,8 @@ public final class ListMonitor<T: NSManagedObject> {
         
         fetchedResultsControllerDelegate.handler = self
         fetchedResultsControllerDelegate.fetchedResultsController = fetchedResultsController
-        try! fetchedResultsController.performFetch()
+        
+        prepareFetch(self, { try! fetchedResultsController.performFetch() })
     }
     
     deinit {
@@ -1032,16 +1110,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

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()
@@ -261,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
@@ -179,7 +181,7 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
     
     - parameter objects: the `NSManagedObject`s type to be deleted
     */
-    public override func delete<S: SequenceType where S.Generator.Element == NSManagedObject>(objects: S) {
+    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
@@ -54,7 +56,7 @@ public /*abstract*/ class BaseDataTransaction {
     public func create<T: NSManagedObject>(into: Into<T>) -> T {
         
         CoreStore.assert(
-            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
             "Attempted to create an entity of type \(typeName(T)) outside its designated queue."
         )
         
@@ -108,7 +110,7 @@ public /*abstract*/ class BaseDataTransaction {
     public func edit<T: NSManagedObject>(object: T?) -> T? {
         
         CoreStore.assert(
-            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
             "Attempted to update an entity of type \(typeName(object)) outside its designated queue."
         )
         guard let object = object else {
@@ -129,7 +131,7 @@ public /*abstract*/ class BaseDataTransaction {
     public func edit<T: NSManagedObject>(into: Into<T>, _ objectID: NSManagedObjectID) -> T? {
         
         CoreStore.assert(
-            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
             "Attempted to update an entity of type \(typeName(T)) outside its designated queue."
         )
         CoreStore.assert(
@@ -148,7 +150,7 @@ public /*abstract*/ class BaseDataTransaction {
     public func delete(object: NSManagedObject?) {
         
         CoreStore.assert(
-            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
             "Attempted to delete an entity outside its designated queue."
         )
         guard let object = object else {
@@ -175,10 +177,10 @@ public /*abstract*/ class BaseDataTransaction {
     
     - parameter objects: the `NSManagedObject`s to be deleted
     */
-    public func delete<S: SequenceType where S.Generator.Element == NSManagedObject>(objects: S) {
+    public func delete<S: SequenceType where S.Generator.Element: NSManagedObject>(objects: S) {
         
         CoreStore.assert(
-            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
             "Attempted to delete entities outside their designated queue."
         )
         
@@ -186,47 +188,44 @@ public /*abstract*/ class BaseDataTransaction {
         objects.forEach { context.fetchExisting($0)?.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()
-    }
-    
     
     // MARK: Internal
     
     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
+        if !supportsUndo {
+            
+            context.undoManager = nil
+        }
+        else if context.undoManager == nil {
+            
+            context.undoManager = NSUndoManager()
+        }
     }
     
-    internal var bypassesQueueing: Bool {
+    internal func isRunningInAllowedQueue() -> Bool {
         
-        return false
+        return self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext()
     }
 }

CoreStore/Saving and Processing/CoreStore+Transaction.swift

@@ -43,25 +43,26 @@ 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. An unsafe transaction object should typically be only used from the main queue.
-    
-    - returns: a `UnsafeDataTransaction` 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 beginUnsafe() -> UnsafeDataTransaction {
+    public static func beginUnsafe(supportsUndo supportsUndo: Bool = false) -> UnsafeDataTransaction {
         
-        return self.defaultStack.beginUnsafe()
+        return self.defaultStack.beginUnsafe(supportsUndo: supportsUndo)
     }
     
     @available(*, deprecated=1.3.1, renamed="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,21 @@ 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 `UnsafeDataTransaction` 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 beginUnsafe() -> UnsafeDataTransaction {
+    public func beginUnsafe(supportsUndo supportsUndo: Bool = false) -> UnsafeDataTransaction {
         
         return UnsafeDataTransaction(
             mainContext: self.rootSavingContext,
             queue: .createSerial(
                 "com.coreStore.dataStack.unsafeTransactionQueue",
                 targetQueue: .UserInitiated
-            )
+            ),
+            supportsUndo: supportsUndo
         )
     }
     

CoreStore/Saving and Processing/NSManagedObject+Transaction.swift

@@ -2,7 +2,7 @@
 //  NSManagedObject+Transaction.swift
 //  CoreStore
 //
-//  Copyright (c) 2014 John Rommel Estropia
+//  Copyright (c) 2016 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -26,10 +26,24 @@
 import Foundation
 import CoreData
 
-
 // MARK: - NSManagedObject
 
-internal extension NSManagedObject {
+public extension NSManagedObject {
+    
+    // MARK: Public
+    
+    /**
+     Returns this object's parent `UnsafeDataTransaction` instance if it was created from one. Returns `nil` if the parent transaction is either an `AsynchronousDataTransaction` or a `SynchronousDataTransaction`, or if the object is not managed by CoreStore.
+     
+     When using an `UnsafeDataTransaction` and passing around a temporary object, you can use this property to execute fetches and updates to the transaction without having to pass around both the object and the transaction instances.
+     
+     Note that the internal reference to the transaction is `weak`, and it is still the developer's responsibility to retain a strong reference to the `UnsafeDataTransaction`.
+     */
+    public var unsafeDataTransaction: UnsafeDataTransaction? {
+        
+        return self.managedObjectContext?.parentTransaction as? UnsafeDataTransaction
+    }
+    
     
     // MARK: Internal
     

CoreStore/Saving and Processing/SynchronousDataTransaction.swift

@@ -25,7 +25,9 @@
 
 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif
 
 
 // MARK: - SynchronousDataTransaction
@@ -169,7 +171,7 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
     
     - parameter objects: the `NSManagedObject`s to be deleted
     */
-    public override func delete<S: SequenceType where S.Generator.Element == NSManagedObject>(objects: S) {
+    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

@@ -25,7 +25,9 @@
 
 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif
 
 
 @available(*, deprecated=1.3.1, renamed="UnsafeDataTransaction")
@@ -56,26 +58,64 @@ public final class UnsafeDataTransaction: BaseDataTransaction {
     }
     
     /**
-    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.
+     Rolls back the transaction.
+     */
+    public func rollback() {
+        
+        CoreStore.assert(
+            self.supportsUndo,
+            "Attempted to rollback a \(typeName(self)) with Undo support disabled."
+        )
+        self.context.rollback()
+    }
     
-    - returns: a `UnsafeDataTransaction` instance where creates, updates, and deletes can be made.
-    */
+    /**
+     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() -> UnsafeDataTransaction {
+    public func beginUnsafe(supportsUndo supportsUndo: Bool = false) -> UnsafeDataTransaction {
         
         return UnsafeDataTransaction(
             mainContext: self.context,
-            queue: self.transactionQueue
+            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.
-    */
+     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
@@ -91,9 +131,8 @@ public final class UnsafeDataTransaction: BaseDataTransaction {
     
     // MARK: Internal
     
-    internal override var bypassesQueueing: Bool {
+    internal init(mainContext: NSManagedObjectContext, queue: GCDQueue, supportsUndo: Bool) {
         
-        return true
+        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
@@ -70,7 +72,7 @@ public extension CoreStore {
     /**
     Adds to the `defaultStack` an SQLite store from the given SQLite file name.
     
-    - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory. A new SQLite file will be created if it does not exist.
+    - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory (or the "Caches" directory on tvOS). A new SQLite file will be created if it does not exist.
     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to nil.
     - parameter resetStoreOnModelMismatch: Set to true to delete the store on model mismatch; or set to false to throw exceptions on failure instead. Typically should only be set to true when debugging, or if the persistent store can be recreated easily. If not specified, defaults to false
     - returns: the `NSPersistentStore` added to the stack.
@@ -87,7 +89,7 @@ public extension CoreStore {
     /**
     Adds to the `defaultStack` an SQLite store from the given SQLite file URL.
     
-    - parameter fileURL: the local file URL for the SQLite persistent store. A new SQLite file will be created if it does not exist. If not specified, defaults to a file URL pointing to a "<Application name>.sqlite" file in the "Application Support" directory.
+    - parameter fileURL: the local file URL for the SQLite persistent store. A new SQLite file will be created if it does not exist. If not specified, defaults to a file URL pointing to a "<Application name>.sqlite" file in the "Application Support" directory (or the "Caches" directory on tvOS).
     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to nil.
     - parameter resetStoreOnModelMismatch: Set to true to delete the store on model mismatch; or set to false to throw exceptions on failure instead. Typically should only be set to true when debugging, or if the persistent store can be recreated easily. If not specified, defaults to false.
     - returns: the `NSPersistentStore` added to the stack.

CoreStore/Setting Up/DataStack.swift

@@ -25,14 +25,22 @@
 
 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif
 
 
-internal let applicationSupportDirectory = NSFileManager.defaultManager().URLsForDirectory(.ApplicationSupportDirectory, inDomains: .UserDomainMask).first!
+#if os(tvOS)
+    internal let deviceDirectorySearchPath = NSSearchPathDirectory.CachesDirectory
+#else
+    internal let deviceDirectorySearchPath = NSSearchPathDirectory.ApplicationSupportDirectory
+#endif
+
+internal let defaultDirectory = NSFileManager.defaultManager().URLsForDirectory(deviceDirectorySearchPath, inDomains: .UserDomainMask).first!
 
 internal let applicationName = (NSBundle.mainBundle().objectForInfoDictionaryKey("CFBundleName") as? String) ?? "CoreData"
 
-internal let defaultSQLiteStoreURL = applicationSupportDirectory.URLByAppendingPathComponent(applicationName, isDirectory: false).URLByAppendingPathExtension("sqlite")
+internal let defaultSQLiteStoreURL = defaultDirectory.URLByAppendingPathComponent(applicationName, isDirectory: false).URLByAppendingPathExtension("sqlite")
 
 
 // MARK: - DataStack
@@ -154,7 +162,7 @@ public final class DataStack {
     /**
     Adds to the stack an SQLite store from the given SQLite file name.
     
-    - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory. A new SQLite file will be created if it does not exist. Note that if you have multiple configurations, you will need to specify a different `fileName` explicitly for each of them.
+    - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory (or the "Caches" directory on tvOS). A new SQLite file will be created if it does not exist. Note that if you have multiple configurations, you will need to specify a different `fileName` explicitly for each of them.
     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil`, the "Default" configuration. Note that if you have multiple configurations, you will need to specify a different `fileName` explicitly for each of them.
     - parameter resetStoreOnModelMismatch: Set to true to delete the store on model mismatch; or set to false to throw exceptions on failure instead. Typically should only be set to true when debugging, or if the persistent store can be recreated easily. If not specified, defaults to false
     - returns: the `NSPersistentStore` added to the stack.
@@ -162,7 +170,7 @@ public final class DataStack {
     public func addSQLiteStoreAndWait(fileName fileName: String, configuration: String? = nil, resetStoreOnModelMismatch: Bool = false) throws -> NSPersistentStore {
         
         return try self.addSQLiteStoreAndWait(
-            fileURL: applicationSupportDirectory.URLByAppendingPathComponent(
+            fileURL: defaultDirectory.URLByAppendingPathComponent(
                 fileName,
                 isDirectory: false
             ),
@@ -174,7 +182,7 @@ public final class DataStack {
     /**
     Adds to the stack an SQLite store from the given SQLite file URL.
     
-    - parameter fileURL: the local file URL for the SQLite persistent store. A new SQLite file will be created if it does not exist. If not specified, defaults to a file URL pointing to a "<Application name>.sqlite" file in the "Application Support" directory. Note that if you have multiple configurations, you will need to specify a different `fileURL` explicitly for each of them.
+    - parameter fileURL: the local file URL for the SQLite persistent store. A new SQLite file will be created if it does not exist. If not specified, defaults to a file URL pointing to a "<Application name>.sqlite" file in the "Application Support" directory (or the "Caches" directory on tvOS). Note that if you have multiple configurations, you will need to specify a different `fileURL` explicitly for each of them.
     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil`, the "Default" configuration. Note that if you have multiple configurations, you will need to specify a different `fileURL` explicitly for each of them.
     - parameter resetStoreOnModelMismatch: Set to true to delete the store on model mismatch; or set to false to throw exceptions on failure instead. Typically should only be set to true when debugging, or if the persistent store can be recreated easily. If not specified, defaults to false.
     - returns: the `NSPersistentStore` added to the stack.

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,44 +47,6 @@
 		B5EE259E1B3EC1B20000406B /* OrganismProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5EE259D1B3EC1B20000406B /* OrganismProtocol.swift */; };
 /* End PBXBuildFile section */
 
-/* Begin PBXContainerItemProxy section */
-		B56321C51BD65965006C9394 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = B563216F1BD65082006C9394;
-			remoteInfo = "CoreStore watchOS";
-		};
-		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;
@@ -92,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;
@@ -131,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>"; };
@@ -149,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;
 		};
@@ -182,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;
@@ -282,16 +244,6 @@
 			path = "Migrations Demo";
 			sourceTree = "<group>";
 		};
-		B583A9151AF5F4F3001F76AF /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				B583A91B1AF5F4F4001F76AF /* CoreStore.framework */,
-				B583A91D1AF5F4F4001F76AF /* CoreStoreTests iOS.xctest */,
-				B56321C61BD65965006C9394 /* CoreStore.framework */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -307,8 +259,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				B583A91F1AF5F512001F76AF /* PBXTargetDependency */,
-				B583A9231AF5F542001F76AF /* PBXTargetDependency */,
 			);
 			name = CoreStoreDemo;
 			productName = CoreStoreDemo;
@@ -341,12 +291,6 @@
 			mainGroup = B54AAD401AF4D26E00848AE0;
 			productRefGroup = B54AAD4A1AF4D26E00848AE0 /* Products */;
 			projectDirPath = "";
-			projectReferences = (
-				{
-					ProductGroup = B583A9151AF5F4F3001F76AF /* Products */;
-					ProjectRef = B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */;
-				},
-			);
 			projectRoot = "";
 			targets = (
 				B54AAD481AF4D26E00848AE0 /* CoreStoreDemo */,
@@ -354,30 +298,6 @@
 		};
 /* End PBXProject section */
 
-/* Begin PBXReferenceProxy section */
-		B56321C61BD65965006C9394 /* CoreStore.framework */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.framework;
-			path = CoreStore.framework;
-			remoteRef = B56321C51BD65965006C9394 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		B583A91B1AF5F4F4001F76AF /* CoreStore.framework */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.framework;
-			path = CoreStore.framework;
-			remoteRef = B583A91A1AF5F4F4001F76AF /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		B583A91D1AF5F4F4001F76AF /* CoreStoreTests iOS.xctest */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = "CoreStoreTests iOS.xctest";
-			remoteRef = B583A91C1AF5F4F4001F76AF /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-/* End PBXReferenceProxy section */
-
 /* Begin PBXResourcesBuildPhase section */
 		B54AAD471AF4D26E00848AE0 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
@@ -430,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;

CoreStoreTests/CoreStoreTests.swift

@@ -295,6 +295,7 @@ class CoreStoreTests: XCTestCase {
         obj5.testString = "hihihi"
         obj5.testNumber = 70
         obj5.testDate = NSDate()
+        XCTAssert(unsafeTransaction === obj5.unsafeDataTransaction, "unsafeTransaction === obj5.unsafeDataTransaction")
         
         unsafeTransaction.commit { (result) -> Void in
             
@@ -309,6 +310,7 @@ class CoreStoreTests: XCTestCase {
                     let obj5Copy1 = transaction.edit(obj5)
                     XCTAssertTrue(obj5.objectID == obj5Copy1?.objectID, "obj5.objectID == obj5Copy1?.objectID")
                     XCTAssertFalse(obj5 == obj5Copy1, "obj5 == obj5Copy1")
+                    XCTAssertNil(obj5Copy1?.unsafeDataTransaction)
                     
                     let obj5Copy2 = transaction.edit(Into(TestEntity1), obj5.objectID)
                     XCTAssertTrue(obj5.objectID == obj5Copy2?.objectID, "obj5.objectID == obj5Copy2?.objectID")
@@ -326,6 +328,7 @@ class CoreStoreTests: XCTestCase {
                 obj6.testString = "huehuehue"
                 obj6.testNumber = 130
                 obj6.testDate = NSDate()
+                XCTAssert(unsafeTransaction === obj6.unsafeDataTransaction, "unsafeTransaction === obj6.unsafeDataTransaction")
                 
                 unsafeTransaction.commit { (result) -> Void in
                     
@@ -378,7 +381,7 @@ class CoreStoreTests: XCTestCase {
             
             let fileManager = NSFileManager.defaultManager()
             try fileManager.removeItemAtURL(
-                fileManager.URLsForDirectory(.ApplicationSupportDirectory, inDomains: .UserDomainMask).first!
+                fileManager.URLsForDirectory(deviceDirectorySearchPath, inDomains: .UserDomainMask).first!
             )
         }
         catch _ { }

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://img.shields.io/travis/JohnEstropia/CoreStore/master.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)**
 
 
 
@@ -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)
@@ -173,7 +174,7 @@ catch {
 This one-liner does the following:
 - Triggers the lazy-initialization of `CoreStore.defaultStack` with a default `DataStack`
 - Sets up the stack's `NSPersistentStoreCoordinator`, the root saving `NSManagedObjectContext`, and the read-only main `NSManagedObjectContext`
-- Adds an SQLite store in the *"Application Support"* directory with the file name *"[App bundle name].sqlite"*
+- Adds an SQLite store in the *"Application Support"* directory (or the *"Caches"* directory on tvOS) with the file name *"[App bundle name].sqlite"*
 - Creates and returns the `NSPersistentStore` instance on success, or an `NSError` on failure
 
 For most cases, this configuration is usable as it is. But for more hardcore settings, refer to this extensive example:
@@ -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(
@@ -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