Merge branch 'develop' into _corespotlight-test

Conflicts:
	CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj

.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,45 @@
+language: objective-c
+osx_image: xcode7.2
+sudo: false
+git:
+  submodules: false
+notifications:
+  email: false
+branches:
+  only:
+    - master
+    - develop
+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.resolved

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

CoreStore.podspec

@@ -1,16 +1,22 @@
 Pod::Spec.new do |s|
     s.name = "CoreStore"
-    s.version = "1.3.0"
+    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.frameworks = "Foundation", "UIKit", "CoreData"
+    s.osx.exclude_files = "CoreStore/Observing/*.{swift}", "CoreStore/Internal/FetchedResultsControllerDelegate.swift", "CoreStore/Convenience Helpers/NSFetchedResultsController+Convenience.swift"
+    s.frameworks = "Foundation", "CoreData"
     s.requires_arc = true
-    s.dependency "GCDKit", "1.1.1"
+    s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS' => '-D USE_FRAMEWORKS' }
+    
+    s.dependency "GCDKit", "1.1.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 iOS.xcscheme

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

CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore 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.xcodeproj/xcshareddata/xcschemes/CoreStore watchOS.xcscheme

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

CoreStore.xcworkspace/contents.xcworkspacedata

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

CoreStore.xcworkspace/xcshareddata/CoreStore.xcscmblueprint

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

CoreStore/Cartfile

@@ -0,0 +1 @@
+github "JohnEstropia/GCDKit" == 1.1.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/CoreSpotlight Indexing/CoreSpotlightSearchableObject.swift

@@ -1,8 +1,8 @@
 //
-//  NSManagedObject+Transaction.swift
+//  CoreSpotlightSearchableObject.swift
 //  CoreStore
 //
-//  Copyright (c) 2014 John Rommel Estropia
+//  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
@@ -26,23 +26,14 @@
 import Foundation
 import CoreData
 
+// MARK: - CoreSpotlightSearchableObject
 
-// MARK: - NSManagedObject
-
-internal extension NSManagedObject {
+public protocol CoreSpotlightSearchableObject: class {
     
-    // MARK: Internal
+    /**
+     The object's index value for CoreSpotlight
+     */
+    var coreSpotlightIndexValue: String? { get set }
     
-    internal dynamic class func createInContext(context: NSManagedObjectContext) -> Self {
-        
-        return self.init(
-            entity: context.entityDescriptionForEntityType(self)!,
-            insertIntoManagedObjectContext: context
-        )
-    }
     
-    internal func deleteFromContext() {
-        
-        self.managedObjectContext?.deleteObject(self)
-    }
 }

CoreStore/CoreStore.h

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

CoreStore/CoreStore.swift

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

CoreStore/Fetching and Querying/BaseDataTransaction+Querying.swift

@@ -78,17 +78,9 @@ public extension BaseDataTransaction {
     - returns: the `NSManagedObject` array for objects that exists in the transaction
     */
     @warn_unused_result
-    public func fetchExisting<T: NSManagedObject>(objects: [T]) -> [T] {
+    public func fetchExisting<T: NSManagedObject, S: SequenceType where S.Generator.Element == T>(objects: S) -> [T] {
         
-        var existingObjects = [T]()
-        for object in objects {
-            
-            if let existingObject = (try? self.context.existingObjectWithID(object.objectID)) as? T {
-                
-                existingObjects.append(existingObject)
-            }
-        }
-        return existingObjects
+        return objects.flatMap { (try? self.context.existingObjectWithID($0.objectID)) as? T }
     }
     
     /**
@@ -98,17 +90,9 @@ public extension BaseDataTransaction {
     - returns: the `NSManagedObject` array for objects that exists in the transaction
     */
     @warn_unused_result
-    public func fetchExisting<T: NSManagedObject>(objectIDs: [NSManagedObjectID]) -> [T] {
+    public func fetchExisting<T: NSManagedObject, S: SequenceType where S.Generator.Element == NSManagedObjectID>(objectIDs: S) -> [T] {
         
-        var existingObjects = [T]()
-        for objectID in objectIDs {
-            
-            if let existingObject = (try? self.context.existingObjectWithID(objectID)) as? T {
-                
-                existingObjects.append(existingObject)
-            }
-        }
-        return existingObjects
+        return objectIDs.flatMap { (try? self.context.existingObjectWithID($0)) as? T }
     }
     
     /**
@@ -122,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."
         )
         
@@ -140,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."
         )
         
@@ -158,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."
         )
         
@@ -176,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."
         )
         
@@ -194,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."
         )
         
@@ -212,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."
         )
         
@@ -230,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."
         )
         
@@ -248,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."
         )
         
@@ -266,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."
         )
         
@@ -284,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."
         )
         
@@ -301,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."
         )
         
@@ -318,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."
         )
         
@@ -339,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."
         )
         
@@ -360,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."
         )
         
@@ -381,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."
         )
         
@@ -402,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/Concrete Clauses/OrderBy.swift

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

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

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

CoreStore/Fetching and Querying/CoreStore+Querying.swift

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

CoreStore/Fetching and Querying/DataStack+Querying.swift

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

CoreStore/Importing Data/BaseDataTransaction+Importing.swift

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

CoreStore/Info.plist

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

CoreStore/Internal/Functions.swift

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

CoreStore/Internal/NSManagedObjectContext+CoreSpotlight.swift

@@ -0,0 +1,89 @@
+//
+//  NSManagedObjectContext+CoreSpotlight.swift
+//  CoreStore
+//
+//  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
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import Foundation
+import CoreData
+import CoreSpotlight
+import MobileCoreServices
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif
+
+
+// MARK: - NSManagedObjectContext
+
+internal extension NSManagedObjectContext {
+
+    // MARK: Internal
+    
+    internal func commitCompletionForSearchableItems() -> (() -> Void) {
+        
+        guard #available(iOS 9.0, *) else {
+            
+            return {}
+        }
+        
+        guard CSSearchableIndex.isIndexingAvailable() else {
+            
+            return {}
+        }
+
+        let searchableItems = self.insertedObjects.flatMap {
+            
+            let attributeSet = CSSearchableItemAttributeSet(itemContentType: kUTTypeJSON as String)
+            attributeSet.title = "aa"
+            attributeSet.contentDescription = "bb"
+            
+            let item = CSSearchableItem(
+                uniqueIdentifier: "aa",
+                domainIdentifier: "jp.eureka.sample",
+                attributeSet: attributeSet
+            )
+            return item
+        }
+        return {
+            
+            CSSearchableIndex.defaultSearchableIndex().indexSearchableItems(
+                searchableItems,
+                completionHandler: { (error) -> Void in
+                    
+                    //...
+                }
+            )
+        }
+        //
+        //
+        //        for case (let object as CoreSpotlightSearchableObject) in self.context.insertedObjects {
+        //
+        //            object.coreSpotlightIndexValue
+        //        }
+        //
+        //        public var insertedObjects: Set<NSManagedObject> { get }
+        //        public var updatedObjects: Set<NSManagedObject> { get }
+        //        public var deletedObjects: Set<NSManagedObject> { get }
+        //        public var registeredObjects: Set<NSManagedObject> { get }
+    }
+
+}

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)
@@ -156,6 +167,18 @@ internal extension NSManagedObjectContext {
         }
     }
     
+    internal func refreshAllObjectsAsFaults() {
+        
+        if #available(iOS 8.3, *) {
+            
+            self.refreshAllObjects()
+        }
+        else {
+            
+            self.registeredObjects.forEach { self.refreshObject($0, mergeChanges: false) }
+        }
+    }
+    
     
     // MARK: Private
     

CoreStore/Internal/NSManagedObjectModel+Setup.swift

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

CoreStore/Migrating/CoreStore+Migration.swift

@@ -25,7 +25,9 @@
 
 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif
 
 
 // MARK: - CoreStore
@@ -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.
@@ -146,7 +148,8 @@ public extension DataStack {
             
             let metadata = try NSPersistentStoreCoordinator.metadataForPersistentStoreOfType(
                 NSSQLiteStoreType,
-                URL: fileURL
+                URL: fileURL,
+                options: self.optionsForSQLiteStore()
             )
             
             return self.upgradeSQLiteStoreIfNeeded(
@@ -230,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()`.
@@ -239,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
             ),
@@ -252,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()`.
@@ -265,7 +268,8 @@ public extension DataStack {
             
             metadata = try NSPersistentStoreCoordinator.metadataForPersistentStoreOfType(
                 NSSQLiteStoreType,
-                URL: fileURL
+                URL: fileURL,
+                options: self.optionsForSQLiteStore()
             )
         }
         catch {
@@ -289,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.
@@ -298,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
             ),
@@ -323,7 +327,8 @@ public extension DataStack {
             
             metadata = try NSPersistentStoreCoordinator.metadataForPersistentStoreOfType(
                 NSSQLiteStoreType,
-                URL: fileURL
+                URL: fileURL,
+                options: self.optionsForSQLiteStore()
             )
         }
         catch {

CoreStore/NSError+CoreStore.swift

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

CoreStore/Observing/CoreStore+Observing.swift

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

CoreStore/Observing/DataStack+Observing.swift

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

CoreStore/Observing/ListMonitor.swift

@@ -25,7 +25,9 @@
 
 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif
 
 
 // MARK: - ListMonitor
@@ -67,6 +69,7 @@ Objects from `ListMonitor`s created this way can be accessed either by an `NSInd
 
 In the example above, both `person1` and `person2` will contain the object at section=2, index=3.
 */
+@available(OSX, unavailable)
 public final class ListMonitor<T: NSManagedObject> {
     
     // MARK: Public (Accessors)
@@ -102,7 +105,7 @@ public final class ListMonitor<T: NSManagedObject> {
     */
     public subscript(sectionIndex: Int, itemIndex: Int) -> T {
         
-        return self[NSIndexPath(forItem: itemIndex, inSection: sectionIndex)]
+        return self[NSIndexPath(indexes: [sectionIndex, itemIndex], length: 2)]
     }
     
     /**
@@ -157,7 +160,10 @@ public final class ListMonitor<T: NSManagedObject> {
     */
     public subscript(safeIndexPath indexPath: NSIndexPath) -> T? {
         
-        return self[safeSectionIndex: indexPath.section, safeItemIndex: indexPath.item]
+        return self[
+            safeSectionIndex: indexPath.indexAtPosition(0),
+            safeItemIndex: indexPath.indexAtPosition(1)
+        ]
     }
     
     /**
@@ -329,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.
     
@@ -840,7 +896,7 @@ public final class ListMonitor<T: NSManagedObject> {
                 return
             }
             
-            strongSelf.fetchedResultsControllerDelegate.fetchedResultsController = nil
+            strongSelf.fetchedResultsControllerDelegate.enabled = false
             
             let fetchRequest = strongSelf.fetchedResultsController.fetchRequest
             for clause in fetchClauses {
@@ -864,7 +920,7 @@ public final class ListMonitor<T: NSManagedObject> {
                         return
                     }
                     
-                    strongSelf.fetchedResultsControllerDelegate.fetchedResultsController = strongSelf.fetchedResultsController
+                    strongSelf.fetchedResultsControllerDelegate.enabled = true
                     strongSelf.isPendingRefetch = false
                     
                     NSNotificationCenter.defaultCenter().postNotificationName(
@@ -879,29 +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()
@@ -921,7 +1001,13 @@ public final class ListMonitor<T: NSManagedObject> {
         
         fetchedResultsControllerDelegate.handler = self
         fetchedResultsControllerDelegate.fetchedResultsController = fetchedResultsController
-        try! fetchedResultsController.performFetch()
+        
+        prepareFetch(self, { try! fetchedResultsController.performFetch() })
+    }
+    
+    deinit {
+        
+        self.fetchedResultsControllerDelegate.fetchedResultsController = nil
     }
     
     
@@ -1024,16 +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
@@ -1133,7 +1222,7 @@ extension ListMonitor: FetchedResultsControllerHandler {
     }
     
    internal func controller(controller: NSFetchedResultsController, sectionIndexTitleForSectionName sectionName: String?) -> String? {
-        
+    
         return self.sectionIndexTransformer(sectionName: sectionName)
     }
 }

CoreStore/Observing/ListObserver.swift

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

CoreStore/Observing/ObjectMonitor.swift

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

CoreStore/Observing/ObjectObserver.swift

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

CoreStore/Observing/SectionBy.swift

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

CoreStore/Saving and Processing/AsynchronousDataTransaction.swift

@@ -25,7 +25,11 @@
 
 import Foundation
 import CoreData
-import GCDKit
+import CoreSpotlight
+import MobileCoreServices
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif
 
 
 // MARK: - AsynchronousDataTransaction
@@ -54,11 +58,19 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
         )
         
         self.isCommitted = true
+        
+        let commitCompletionForSearchableItems = self.context.commitCompletionForSearchableItems()
+        
         let group = GCDGroup()
         group.enter()
         self.context.saveAsynchronouslyWithCompletion { (result) -> Void in
             
             self.result = result
+            if result {
+                
+                commitCompletionForSearchableItems()
+            }
+            
             completion(result: result)
             group.leave()
         }
@@ -171,7 +183,7 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
             "Attempted to delete an entities from an already committed \(typeName(self))."
         )
         
-        super.delete([object1, object2] + objects)
+        super.delete(([object1, object2] + objects).flatMap { $0 })
     }
     
     /**
@@ -179,7 +191,7 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
     
     - parameter objects: the `NSManagedObject`s type to be deleted
     */
-    public override func delete(objects: [NSManagedObject?]) {
+    public override func delete<S: SequenceType where S.Generator.Element: NSManagedObject>(objects: S) {
         
         CoreStore.assert(
             !self.isCommitted,
@@ -190,16 +202,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 +226,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 {
@@ -167,7 +169,7 @@ public /*abstract*/ class BaseDataTransaction {
     */
     public func delete(object1: NSManagedObject?, _ object2: NSManagedObject?, _ objects: NSManagedObject?...) {
         
-        self.delete([object1, object2] + objects)
+        self.delete(([object1, object2] + objects).flatMap { $0 })
     }
     
     /**
@@ -175,33 +177,28 @@ public /*abstract*/ class BaseDataTransaction {
     
     - parameter objects: the `NSManagedObject`s to be deleted
     */
-    public func delete(objects: [NSManagedObject?]) {
+    public func delete<S: SequenceType where S.Generator.Element: NSManagedObject>(objects: S) {
         
         CoreStore.assert(
-            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
             "Attempted to delete entities outside their designated queue."
         )
         
         let context = self.context
-        for case let object? in objects {
-            
-            context.fetchExisting(object)?.deleteFromContext()
-        }
+        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() {
+     Refreshes all registered objects `NSManagedObject`s in the transaction.
+     */
+    public func refreshAllObjectsAsFaults() {
         
         CoreStore.assert(
-            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
-            "Attempted to rollback a \(typeName(self)) outside its designated queue."
+            self.isRunningInAllowedQueue(),
+            "Attempted to refresh entities outside their designated queue."
         )
         
-        self.context.reset()
+        self.context.refreshAllObjectsAsFaults()
     }
     
     
@@ -210,26 +207,38 @@ public /*abstract*/ class BaseDataTransaction {
     internal let context: NSManagedObjectContext
     internal let transactionQueue: GCDQueue
     internal let childTransactionQueue: GCDQueue = .createSerial("com.corestore.datastack.childtransactionqueue")
+    internal let supportsUndo: Bool
+    internal let bypassesQueueing: Bool
+    
     
     internal var isCommitted = false
     internal var result: SaveResult?
     
-    internal init(mainContext: NSManagedObjectContext, queue: GCDQueue) {
-        
-        self.transactionQueue = queue
+    internal init(mainContext: NSManagedObjectContext, queue: GCDQueue, supportsUndo: Bool, bypassesQueueing: Bool) {
         
         let context = mainContext.temporaryContextInTransactionWithConcurrencyType(
             queue == .Main
                 ? .MainQueueConcurrencyType
                 : .PrivateQueueConcurrencyType
         )
+        self.transactionQueue = queue
         self.context = context
+        self.supportsUndo = supportsUndo
+        self.bypassesQueueing = bypassesQueueing
         
         context.parentTransaction = self
+        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,24 +43,40 @@ public extension CoreStore {
     }
     
     /**
-    Using the `defaultStack`, begins a transaction asynchronously where `NSManagedObject` creates, updates, and deletes can be made.
-    
-    - parameter closure: the block where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent `NSManagedObjectContext`.
-    - returns: a `SaveResult` value indicating success or failure, or `nil` if the transaction was not comitted synchronously
-    */
+     Using the `defaultStack`, begins a transaction asynchronously where `NSManagedObject` creates, updates, and deletes can be made.
+     
+     - parameter closure: the block where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent `NSManagedObjectContext`.
+     - returns: a `SaveResult` value indicating success or failure, or `nil` if the transaction was not comitted synchronously
+     */
     public static func beginSynchronous(closure: (transaction: SynchronousDataTransaction) -> Void) -> SaveResult? {
         
         return self.defaultStack.beginSynchronous(closure)
     }
     
     /**
-    Using the `defaultStack`, begins a non-contiguous transaction where `NSManagedObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms. A detached transaction object should typically be only used from the main queue.
-    
-    - returns: a `DetachedDataTransaction` instance where creates, updates, and deletes can be made.
-    */
+     Using the `defaultStack`, begins a non-contiguous transaction where `NSManagedObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms. An unsafe transaction object should typically be only used from the main queue.
+     
+     - prameter supportsUndo: `undo()`, `redo()`, and `rollback()` methods are only available when this parameter is `true`, otherwise those method will raise an exception. Defaults to `false`. Note that turning on Undo support may heavily impact performance especially on iOS or watchOS where memory is limited.
+     - returns: a `UnsafeDataTransaction` instance where creates, updates, and deletes can be made.
+     */
     @warn_unused_result
-    public static func beginDetached() -> DetachedDataTransaction {
+    public static func beginUnsafe(supportsUndo supportsUndo: Bool = false) -> UnsafeDataTransaction {
         
-        return self.defaultStack.beginDetached()
+        return self.defaultStack.beginUnsafe(supportsUndo: supportsUndo)
+    }
+    
+    /**
+     Refreshes all registered objects `NSManagedObject`s in the `DataStack`.
+     */
+    public static func refreshAllObjectsAsFaults() {
+        
+        self.defaultStack.refreshAllObjectsAsFaults()
+    }
+    
+    @available(*, deprecated=1.3.1, renamed="beginUnsafe")
+    @warn_unused_result
+    public static func beginDetached() -> UnsafeDataTransaction {
+        
+        return self.beginUnsafe()
     }
 }

CoreStore/Saving and Processing/DataStack+Transaction.swift

@@ -25,7 +25,9 @@
 
 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif
 
 
 // MARK: - DataStack
@@ -48,11 +50,11 @@ public extension DataStack {
     }
     
     /**
-    Begins a transaction synchronously where `NSManagedObject` creates, updates, and deletes can be made.
-    
-    - parameter closure: the block where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent `NSManagedObjectContext`.
-    - returns: a `SaveResult` value indicating success or failure, or `nil` if the transaction was not comitted synchronously
-    */
+     Begins a transaction synchronously where `NSManagedObject` creates, updates, and deletes can be made.
+     
+     - parameter closure: the block where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent `NSManagedObjectContext`.
+     - returns: a `SaveResult` value indicating success or failure, or `nil` if the transaction was not comitted synchronously
+     */
     public func beginSynchronous(closure: (transaction: SynchronousDataTransaction) -> Void) -> SaveResult? {
         
         return SynchronousDataTransaction(
@@ -62,19 +64,41 @@ public extension DataStack {
     }
     
     /**
-    Begins a non-contiguous transaction where `NSManagedObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms.
-    
-    - returns: a `DetachedDataTransaction` instance where creates, updates, and deletes can be made.
-    */
+     Begins a non-contiguous transaction where `NSManagedObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms.
+     
+     - prameter supportsUndo: `undo()`, `redo()`, and `rollback()` methods are only available when this parameter is `true`, otherwise those method will raise an exception. Defaults to `false`. Note that turning on Undo support may heavily impact performance especially on iOS or watchOS where memory is limited.
+     - returns: a `UnsafeDataTransaction` instance where creates, updates, and deletes can be made.
+     */
     @warn_unused_result
-    public func beginDetached() -> DetachedDataTransaction {
+    public func beginUnsafe(supportsUndo supportsUndo: Bool = false) -> UnsafeDataTransaction {
         
-        return DetachedDataTransaction(
+        return UnsafeDataTransaction(
             mainContext: self.rootSavingContext,
             queue: .createSerial(
-                "com.coreStore.dataStack.detachedTransactionQueue",
+                "com.coreStore.dataStack.unsafeTransactionQueue",
                 targetQueue: .UserInitiated
-            )
+            ),
+            supportsUndo: supportsUndo
         )
     }
+    
+    /**
+     Refreshes all registered objects `NSManagedObject`s in the `DataStack`.
+     */
+    public func refreshAllObjectsAsFaults() {
+        
+        CoreStore.assert(
+            NSThread.isMainThread(),
+            "Attempted to refresh entities outside their designated queue."
+        )
+        
+        self.mainContext.refreshAllObjectsAsFaults()
+    }
+    
+    @available(*, deprecated=1.3.1, renamed="beginUnsafe")
+    @warn_unused_result
+    public func beginDetached() -> UnsafeDataTransaction {
+        
+        return self.beginUnsafe()
+    }
 }

CoreStore/Saving and Processing/DetachedDataTransaction.swift

@@ -1,87 +0,0 @@
-//
-//  DetachedDataTransaction.swift
-//  CoreStore
-//
-//  Copyright (c) 2015 John Rommel Estropia
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to deal
-//  in the Software without restriction, including without limitation the rights
-//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included in all
-//  copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//  SOFTWARE.
-//
-
-import Foundation
-import GCDKit
-
-
-// MARK: - DetachedDataTransaction
-
-/**
-The `DetachedDataTransaction` provides an interface for non-contiguous `NSManagedObject` creates, updates, and deletes. This is useful for making temporary changes, such as partially filled forms. A detached transaction object should typically be only used from the main queue.
-*/
-public final class DetachedDataTransaction: BaseDataTransaction {
-    
-    // MARK: Public
-    
-    /**
-    Saves the transaction changes asynchronously. For a `DetachedDataTransaction`, multiple commits are allowed, although it is the developer's responsibility to ensure a reasonable leeway to prevent blocking the main thread.
-    
-    - parameter completion: the block executed after the save completes. Success or failure is reported by the `SaveResult` argument of the block.
-    */
-    public func commit(completion: (result: SaveResult) -> Void) {
-        
-        self.context.saveAsynchronouslyWithCompletion { (result) -> Void in
-            
-            self.result = result
-            completion(result: result)
-        }
-    }
-    
-    /**
-    Begins a child transaction where `NSManagedObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms.
-    
-    - returns: a `DetachedDataTransaction` instance where creates, updates, and deletes can be made.
-    */
-    @warn_unused_result
-    public func beginDetached() -> DetachedDataTransaction {
-        
-        return DetachedDataTransaction(
-            mainContext: self.context,
-            queue: self.transactionQueue
-        )
-    }
-    
-    /**
-    Returns the `NSManagedObjectContext` for this detached transaction. Use only for cases where external frameworks need an `NSManagedObjectContext` instance to work with.
-    
-    Note that it is the developer's responsibility to ensure the following:
-    - that the `DetachedDataTransaction` that owns this context should be strongly referenced and prevented from being deallocated during the context's lifetime
-    - that all saves will be done either through the `DetachedDataTransaction`'s `commit(...)` method, or by calling `save()` manually on the context, its parent, and all other ancestor contexts if there are any.
-    */
-    public var internalContext: NSManagedObjectContext {
-        
-        return self.context
-    }
-    
-    
-    // MARK: Internal
-    
-    internal override var bypassesQueueing: Bool {
-        
-        return true
-    }
-}
-

CoreStore/Saving and Processing/NSManagedObject+Transaction.swift

@@ -0,0 +1,62 @@
+//
+//  NSManagedObject+Transaction.swift
+//  CoreStore
+//
+//  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
+//  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: - 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
+    
+    internal dynamic class func createInContext(context: NSManagedObjectContext) -> Self {
+        
+        return self.init(
+            entity: context.entityDescriptionForEntityType(self)!,
+            insertIntoManagedObjectContext: context
+        )
+    }
+    
+    internal func deleteFromContext() {
+        
+        self.managedObjectContext?.deleteObject(self)
+    }
+}

CoreStore/Saving and Processing/SynchronousDataTransaction.swift

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

CoreStore/Saving and Processing/UnsafeDataTransaction.swift

@@ -0,0 +1,138 @@
+//
+//  UnsafeDataTransaction.swift
+//  CoreStore
+//
+//  Copyright (c) 2015 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import Foundation
+import CoreData
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif
+
+
+@available(*, deprecated=1.3.1, renamed="UnsafeDataTransaction")
+public typealias DetachedDataTransaction = UnsafeDataTransaction
+
+
+// MARK: - UnsafeDataTransaction
+
+/**
+The `UnsafeDataTransaction` provides an interface for non-contiguous `NSManagedObject` creates, updates, and deletes. This is useful for making temporary changes, such as partially filled forms. An unsafe transaction object should typically be only used from the main queue.
+*/
+public final class UnsafeDataTransaction: BaseDataTransaction {
+    
+    // MARK: Public
+    
+    /**
+    Saves the transaction changes asynchronously. For a `UnsafeDataTransaction`, multiple commits are allowed, although it is the developer's responsibility to ensure a reasonable leeway to prevent blocking the main thread.
+    
+    - parameter completion: the block executed after the save completes. Success or failure is reported by the `SaveResult` argument of the block.
+    */
+    public func commit(completion: (result: SaveResult) -> Void) {
+        
+        self.context.saveAsynchronouslyWithCompletion { (result) -> Void in
+            
+            self.result = result
+            completion(result: result)
+        }
+    }
+    
+    /**
+     Rolls back the transaction.
+     */
+    public func rollback() {
+        
+        CoreStore.assert(
+            self.supportsUndo,
+            "Attempted to rollback a \(typeName(self)) with Undo support disabled."
+        )
+        self.context.rollback()
+    }
+    
+    /**
+     Undo's the last change made to the transaction.
+     */
+    public func undo() {
+        
+        CoreStore.assert(
+            self.supportsUndo,
+            "Attempted to undo a \(typeName(self)) with Undo support disabled."
+        )
+        self.context.undo()
+    }
+    
+    /**
+     Redo's the last undone change to the transaction.
+     */
+    public func redo() {
+        
+        CoreStore.assert(
+            self.supportsUndo,
+            "Attempted to redo a \(typeName(self)) with Undo support disabled."
+        )
+        self.context.redo()
+    }
+    
+    /**
+     Begins a child transaction where `NSManagedObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms.
+     
+     - prameter supportsUndo: `undo()`, `redo()`, and `rollback()` methods are only available when this parameter is `true`, otherwise those method will raise an exception. Defaults to `false`. Note that turning on Undo support may heavily impact performance especially on iOS or watchOS where memory is limited.
+     - returns: a `UnsafeDataTransaction` instance where creates, updates, and deletes can be made.
+     */
+    @warn_unused_result
+    public func beginUnsafe(supportsUndo supportsUndo: Bool = false) -> UnsafeDataTransaction {
+        
+        return UnsafeDataTransaction(
+            mainContext: self.context,
+            queue: self.transactionQueue,
+            supportsUndo: supportsUndo
+        )
+    }
+    
+    /**
+     Returns the `NSManagedObjectContext` for this unsafe transaction. Use only for cases where external frameworks need an `NSManagedObjectContext` instance to work with.
+     
+     Note that it is the developer's responsibility to ensure the following:
+     - that the `UnsafeDataTransaction` that owns this context should be strongly referenced and prevented from being deallocated during the context's lifetime
+     - that all saves will be done either through the `UnsafeDataTransaction`'s `commit(...)` method, or by calling `save()` manually on the context, its parent, and all other ancestor contexts if there are any.
+     */
+    public var internalContext: NSManagedObjectContext {
+        
+        return self.context
+    }
+    
+    @available(*, deprecated=1.3.1, renamed="beginUnsafe")
+    @warn_unused_result
+    public func beginDetached() -> UnsafeDataTransaction {
+        
+        return self.beginUnsafe()
+    }
+    
+    
+    // MARK: Internal
+    
+    internal init(mainContext: NSManagedObjectContext, queue: GCDQueue, supportsUndo: Bool) {
+        
+        super.init(mainContext: mainContext, queue: queue, supportsUndo: supportsUndo, bypassesQueueing: true)
+    }
+}

CoreStore/Setting Up/CoreStore+Setup.swift

@@ -25,7 +25,9 @@
 
 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif
 
 
 // MARK: - CoreStore
@@ -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.
@@ -213,6 +221,7 @@ public final class DataStack {
         
         var store: NSPersistentStore?
         var storeError: NSError?
+        let options = self.optionsForSQLiteStore()
         coordinator.performBlockAndWait {
             
             do {
@@ -221,7 +230,7 @@ public final class DataStack {
                     NSSQLiteStoreType,
                     configuration: configuration,
                     URL: fileURL,
-                    options: [NSSQLitePragmasOption: ["journal_mode": "WAL"]]
+                    options: options
                 )
             }
             catch {
@@ -293,6 +302,11 @@ public final class DataStack {
         return migrationQueue
     }()
     
+    internal func optionsForSQLiteStore() -> [String: AnyObject] {
+        
+        return [NSSQLitePragmasOption: ["journal_mode": "WAL"]]
+    }
+    
     internal func entityNameForEntityClass(entityClass: AnyClass) -> String? {
         
         return self.model.entityNameForClass(entityClass)

CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj

@@ -35,11 +35,14 @@
 		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, ); }; };
+		B5A93A141C214E5900E47273 /* SpotlightDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A93A131C214E5900E47273 /* SpotlightDemoViewController.swift */; };
+		B5C12CE71C21B2F70098E05F /* CoreSpotlight.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5C12CE61C21B2F70098E05F /* CoreSpotlight.framework */; };
+		B5C12CE91C21B2FD0098E05F /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5C12CE81C21B2FD0098E05F /* MobileCoreServices.framework */; };
 		B5E599321B5240F50084BD5F /* OrganismTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E599311B5240F50084BD5F /* OrganismTableViewCell.swift */; };
+		B5E89ACD1C52929C003B04A9 /* GCDKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC9241C202429008147CD /* GCDKit.framework */; };
+		B5E89ACE1C52929C003B04A9 /* GCDKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC9241C202429008147CD /* GCDKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		B5E89AD01C5292A2003B04A9 /* CoreStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC9211C202429008147CD /* CoreStore.framework */; };
+		B5E89AD11C5292A2003B04A9 /* CoreStore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC9211C202429008147CD /* CoreStore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		B5EE25851B36E23C0000406B /* OrganismV1.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5EE25841B36E23C0000406B /* OrganismV1.swift */; };
 		B5EE25871B36E2520000406B /* OrganismV2.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5EE25861B36E2520000406B /* OrganismV2.swift */; };
 		B5EE258C1B36E40D0000406B /* MigrationsDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5EE258B1B36E40D0000406B /* MigrationsDemoViewController.swift */; };
@@ -47,46 +50,15 @@
 		B5EE259E1B3EC1B20000406B /* OrganismProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5EE259D1B3EC1B20000406B /* OrganismProtocol.swift */; };
 /* End PBXBuildFile section */
 
-/* Begin PBXContainerItemProxy section */
-		B583A91A1AF5F4F4001F76AF /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 2F03A53019C5C6DA005002A5;
-			remoteInfo = CoreStore;
-		};
-		B583A91C1AF5F4F4001F76AF /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 2F03A53B19C5C6DA005002A5;
-			remoteInfo = CoreStoreTests;
-		};
-		B583A91E1AF5F512001F76AF /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 2F03A52F19C5C6DA005002A5;
-			remoteInfo = CoreStore;
-		};
-		B583A9221AF5F542001F76AF /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 2F03A52F19C5C6DA005002A5;
-			remoteInfo = CoreStore;
-		};
-/* End PBXContainerItemProxy section */
-
 /* Begin PBXCopyFilesBuildPhase section */
-		B583A9241AF5F542001F76AF /* Embed Frameworks */ = {
+		B5E89ACF1C52929C003B04A9 /* Embed Frameworks */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				B5D9C91A1B20AB1900E64F0E /* GCDKit.framework in Embed Frameworks */,
-				B583A9211AF5F542001F76AF /* CoreStore.framework in Embed Frameworks */,
+				B5E89ACE1C52929C003B04A9 /* GCDKit.framework in Embed Frameworks */,
+				B5E89AD11C5292A2003B04A9 /* CoreStore.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -124,8 +96,11 @@
 		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; path = CoreStore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		B5BDC9241C202429008147CD /* GCDKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = GCDKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		B5A93A131C214E5900E47273 /* SpotlightDemoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SpotlightDemoViewController.swift; sourceTree = "<group>"; };
+		B5C12CE61C21B2F70098E05F /* CoreSpotlight.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreSpotlight.framework; path = System/Library/Frameworks/CoreSpotlight.framework; sourceTree = SDKROOT; };
+		B5C12CE81C21B2FD0098E05F /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
 		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>"; };
@@ -141,10 +116,12 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B5E89ACD1C52929C003B04A9 /* GCDKit.framework in Frameworks */,
+				B5E89AD01C5292A2003B04A9 /* CoreStore.framework in Frameworks */,
+				B5C12CE91C21B2FD0098E05F /* MobileCoreServices.framework in Frameworks */,
+				B5C12CE71C21B2F70098E05F /* CoreSpotlight.framework in Frameworks */,
 				B52977E11B120F8A003D50A5 /* CoreLocation.framework in Frameworks */,
 				B52977DF1B120F83003D50A5 /* MapKit.framework in Frameworks */,
-				B5D9C9191B20AB1900E64F0E /* GCDKit.framework in Frameworks */,
-				B583A9201AF5F542001F76AF /* CoreStore.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -175,9 +152,11 @@
 		B52977E21B120F90003D50A5 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */,
-				B5D9C9181B20AB1900E64F0E /* GCDKit.framework */,
+				B5C12CE81C21B2FD0098E05F /* MobileCoreServices.framework */,
+				B5C12CE61C21B2F70098E05F /* CoreSpotlight.framework */,
 				B52977E01B120F8A003D50A5 /* CoreLocation.framework */,
+				B5BDC9211C202429008147CD /* CoreStore.framework */,
+				B5BDC9241C202429008147CD /* GCDKit.framework */,
 				B52977DE1B120F83003D50A5 /* MapKit.framework */,
 			);
 			name = Frameworks;
@@ -204,6 +183,7 @@
 			isa = PBXGroup;
 			children = (
 				B54AAD4E1AF4D26E00848AE0 /* AppDelegate.swift */,
+				B5A93A121C214D9D00E47273 /* Spotlight Demo */,
 				B566E3271B117AE700F4F0C6 /* Stack Setup Demo */,
 				B503FADA1AFDC71700F90881 /* List and Object Observers Demo */,
 				B52977DB1B120F2C003D50A5 /* Transactions Demo */,
@@ -275,13 +255,12 @@
 			path = "Migrations Demo";
 			sourceTree = "<group>";
 		};
-		B583A9151AF5F4F3001F76AF /* Products */ = {
+		B5A93A121C214D9D00E47273 /* Spotlight Demo */ = {
 			isa = PBXGroup;
 			children = (
-				B583A91B1AF5F4F4001F76AF /* CoreStore.framework */,
-				B583A91D1AF5F4F4001F76AF /* CoreStoreTests.xctest */,
+				B5A93A131C214E5900E47273 /* SpotlightDemoViewController.swift */,
 			);
-			name = Products;
+			path = "Spotlight Demo";
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -294,13 +273,11 @@
 				B54AAD451AF4D26E00848AE0 /* Sources */,
 				B54AAD461AF4D26E00848AE0 /* Frameworks */,
 				B54AAD471AF4D26E00848AE0 /* Resources */,
-				B583A9241AF5F542001F76AF /* Embed Frameworks */,
+				B5E89ACF1C52929C003B04A9 /* Embed Frameworks */,
 			);
 			buildRules = (
 			);
 			dependencies = (
-				B583A91F1AF5F512001F76AF /* PBXTargetDependency */,
-				B583A9231AF5F542001F76AF /* PBXTargetDependency */,
 			);
 			name = CoreStoreDemo;
 			productName = CoreStoreDemo;
@@ -333,12 +310,6 @@
 			mainGroup = B54AAD401AF4D26E00848AE0;
 			productRefGroup = B54AAD4A1AF4D26E00848AE0 /* Products */;
 			projectDirPath = "";
-			projectReferences = (
-				{
-					ProductGroup = B583A9151AF5F4F3001F76AF /* Products */;
-					ProjectRef = B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */;
-				},
-			);
 			projectRoot = "";
 			targets = (
 				B54AAD481AF4D26E00848AE0 /* CoreStoreDemo */,
@@ -346,23 +317,6 @@
 		};
 /* End PBXProject section */
 
-/* Begin PBXReferenceProxy section */
-		B583A91B1AF5F4F4001F76AF /* CoreStore.framework */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.framework;
-			path = CoreStore.framework;
-			remoteRef = B583A91A1AF5F4F4001F76AF /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		B583A91D1AF5F4F4001F76AF /* CoreStoreTests.xctest */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = CoreStoreTests.xctest;
-			remoteRef = B583A91C1AF5F4F4001F76AF /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-/* End PBXReferenceProxy section */
-
 /* Begin PBXResourcesBuildPhase section */
 		B54AAD471AF4D26E00848AE0 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
@@ -407,6 +361,7 @@
 				B56964D71B231AE90075EE4A /* StackSetupDemo.xcdatamodeld in Sources */,
 				B56964DC1B231BCB0075EE4A /* FemaleAccount.swift in Sources */,
 				B5EE259E1B3EC1B20000406B /* OrganismProtocol.swift in Sources */,
+				B5A93A141C214E5900E47273 /* SpotlightDemoViewController.swift in Sources */,
 				B5EE258C1B36E40D0000406B /* MigrationsDemoViewController.swift in Sources */,
 				B569651C1B30889A0075EE4A /* QueryingResultsViewController.swift in Sources */,
 				B5125C121B521B78003A42C7 /* OrganismV2ToV3.xcmappingmodel in Sources */,
@@ -415,19 +370,6 @@
 		};
 /* End PBXSourcesBuildPhase section */
 
-/* Begin PBXTargetDependency section */
-		B583A91F1AF5F512001F76AF /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = CoreStore;
-			targetProxy = B583A91E1AF5F512001F76AF /* PBXContainerItemProxy */;
-		};
-		B583A9231AF5F542001F76AF /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = CoreStore;
-			targetProxy = B583A9221AF5F542001F76AF /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
 /* Begin PBXVariantGroup section */
 		B54AAD571AF4D26E00848AE0 /* Main.storyboard */ = {
 			isa = PBXVariantGroup;

CoreStoreDemo/CoreStoreDemo/AppDelegate.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import CoreSpotlight
 
 
 // MARK: - AppDelegate
@@ -23,5 +24,25 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         application.statusBarStyle = .LightContent
         return true
     }
+    
+    func application(application: UIApplication, continueUserActivity userActivity: NSUserActivity, restorationHandler: ([AnyObject]?) -> Void) -> Bool {
+        
+        guard #available(iOS 9.0, *) else {
+            
+            return false
+        }
+        
+        guard userActivity.activityType == CSSearchableItemActionType,
+            let identifier = userActivity.userInfo?[CSSearchableItemActivityIdentifier] as? String else {
+            
+            return false
+        }
+        
+        let alert = UIAlertController(title: identifier, message: "You have tapped \(identifier)", preferredStyle: .Alert)
+        alert.addAction(UIAlertAction(title: "OK", style: .Default, handler: nil))
+        self.window?.rootViewController?.presentViewController(alert, animated: true, completion: nil)
+        
+        return true
+    }
 }
 

CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8152.3" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="Ni8-QF-XHB">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="Ni8-QF-XHB">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8124.4"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
@@ -16,6 +16,7 @@
             <string>HelveticaNeue-Bold</string>
             <string>HelveticaNeue</string>
             <string>HelveticaNeue</string>
+            <string>HelveticaNeue</string>
         </mutableArray>
         <mutableArray key="HelveticaNeueLights.ttc">
             <string>HelveticaNeue-Light</string>
@@ -33,6 +34,7 @@
             <string>HelveticaNeue-Light</string>
             <string>HelveticaNeue-Light</string>
             <string>HelveticaNeue-Light</string>
+            <string>HelveticaNeue-Light</string>
         </mutableArray>
     </customFonts>
     <scenes>
@@ -297,7 +299,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Setting up multiple persistent store configurations" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Hbn-cf-Y7m">
-                                                    <rect key="frame" x="15" y="30" width="264" height="13.5"/>
+                                                    <rect key="frame" x="15" y="30" width="263.5" height="13.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                                     <color key="textColor" red="0.17254901959999999" green="0.24313725489999999" blue="0.31372549020000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -324,7 +326,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Observing list changes and single object changes" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ou9-TZ-8bf">
-                                                    <rect key="frame" x="15" y="30" width="261.5" height="13.5"/>
+                                                    <rect key="frame" x="15" y="30" width="260.5" height="13.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                                     <color key="textColor" red="0.17254901959999999" green="0.24313725489999999" blue="0.31372549020000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -351,7 +353,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Making changes with transactions" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="uP1-Jc-o9v">
-                                                    <rect key="frame" x="15" y="30" width="179.5" height="13.5"/>
+                                                    <rect key="frame" x="15" y="30" width="179" height="13.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                                     <color key="textColor" red="0.17254901959999999" green="0.24313725489999999" blue="0.31372549020000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -378,7 +380,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Fetching objects and raw values" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="jZw-qE-0ws">
-                                                    <rect key="frame" x="15" y="30" width="169" height="13.5"/>
+                                                    <rect key="frame" x="15" y="30" width="168.5" height="13.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                                     <color key="textColor" red="0.17254901959999999" green="0.24313725489999999" blue="0.31372549020000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -405,7 +407,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Implementing a custom logger" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="QzD-9b-k1j">
-                                                    <rect key="frame" x="15" y="30" width="159.5" height="13.5"/>
+                                                    <rect key="frame" x="15" y="30" width="159" height="13.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                                     <color key="textColor" red="0.17254901959999999" green="0.24313725489999999" blue="0.31372549020000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -444,6 +446,33 @@
                                             <segue destination="iVv-Vc-nCL" kind="show" id="HbO-rU-Qfj"/>
                                         </connections>
                                     </tableViewCell>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="Kbo-Ue-PVK" detailTextLabel="grJ-ZB-NmV" style="IBUITableViewCellStyleSubtitle" id="Yc3-hN-kGF">
+                                        <rect key="frame" x="0.0" y="399" width="600" height="50"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Yc3-hN-kGF" id="eQ3-C9-8sy">
+                                            <rect key="frame" x="0.0" y="0.0" width="567" height="49.5"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Spotlight Search" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Kbo-Ue-PVK">
+                                                    <rect key="frame" x="15" y="6" width="142.5" height="24"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="20"/>
+                                                    <color key="textColor" red="0.17254901959999999" green="0.24313725489999999" blue="0.31372549020000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Indexing objects for CoreSpotlight search" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="grJ-ZB-NmV">
+                                                    <rect key="frame" x="15" y="30" width="218" height="13.5"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                                                    <color key="textColor" red="0.17254901959999999" green="0.24313725489999999" blue="0.31372549020000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                        </tableViewCellContentView>
+                                        <connections>
+                                            <segue destination="rvO-rT-QbP" kind="show" id="A6e-J5-Bgv"/>
+                                        </connections>
+                                    </tableViewCell>
                                 </cells>
                             </tableViewSection>
                         </sections>
@@ -1093,11 +1122,75 @@
             </objects>
             <point key="canvasLocation" x="4404" y="3055"/>
         </scene>
+        <!--Spotlight Items-->
+        <scene sceneID="2O0-uM-CKG">
+            <objects>
+                <tableViewController id="rvO-rT-QbP" customClass="SpotlightDemoViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
+                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" allowsSelection="NO" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="TLr-Zy-NC6">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="556"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <prototypes>
+                            <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="PaletteTableViewCell" id="2KP-BI-oxb" customClass="PaletteTableViewCell" customModule="CoreStoreDemo" customModuleProvider="target">
+                                <rect key="frame" x="0.0" y="86" width="600" height="44"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="2KP-BI-oxb" id="kPu-7L-49q">
+                                    <rect key="frame" x="0.0" y="0.0" width="567" height="43.5"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <subviews>
+                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hTX-Dn-pv2">
+                                            <rect key="frame" x="8" y="8" width="27" height="27"/>
+                                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                            <constraints>
+                                                <constraint firstAttribute="width" secondItem="hTX-Dn-pv2" secondAttribute="height" multiplier="1:1" id="073-rz-szO"/>
+                                            </constraints>
+                                        </view>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="O5e-aP-R0t">
+                                            <rect key="frame" x="45" y="8" width="34.5" height="27"/>
+                                            <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/>
+                                            <color key="textColor" red="0.17254901959999999" green="0.24313725489999999" blue="0.31372549020000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                    </subviews>
+                                    <constraints>
+                                        <constraint firstItem="O5e-aP-R0t" firstAttribute="height" secondItem="hTX-Dn-pv2" secondAttribute="height" id="4Lt-tT-SDF"/>
+                                        <constraint firstItem="hTX-Dn-pv2" firstAttribute="leading" secondItem="kPu-7L-49q" secondAttribute="leadingMargin" id="imZ-w9-r9g"/>
+                                        <constraint firstAttribute="bottomMargin" secondItem="hTX-Dn-pv2" secondAttribute="bottom" id="k3I-MU-Z4p"/>
+                                        <constraint firstItem="O5e-aP-R0t" firstAttribute="leading" secondItem="hTX-Dn-pv2" secondAttribute="trailing" constant="10" id="sNZ-Ym-Pwm"/>
+                                        <constraint firstAttribute="centerY" secondItem="O5e-aP-R0t" secondAttribute="centerY" id="wvz-LF-25u"/>
+                                        <constraint firstItem="hTX-Dn-pv2" firstAttribute="top" secondItem="kPu-7L-49q" secondAttribute="topMargin" id="xNz-bS-ajl"/>
+                                    </constraints>
+                                </tableViewCellContentView>
+                                <connections>
+                                    <outlet property="colorView" destination="hTX-Dn-pv2" id="AgP-lI-5ea"/>
+                                    <outlet property="label" destination="O5e-aP-R0t" id="IYz-nE-xVN"/>
+                                </connections>
+                            </tableViewCell>
+                        </prototypes>
+                        <connections>
+                            <outlet property="dataSource" destination="rvO-rT-QbP" id="7kz-6g-mJK"/>
+                            <outlet property="delegate" destination="rvO-rT-QbP" id="iOM-iJ-jYn"/>
+                        </connections>
+                    </tableView>
+                    <extendedEdge key="edgesForExtendedLayout" top="YES"/>
+                    <toolbarItems/>
+                    <navigationItem key="navigationItem" title="Spotlight Items" id="Xbw-P1-gif">
+                        <barButtonItem key="rightBarButtonItem" style="plain" systemItem="add" id="PxN-1K-Npj">
+                            <connections>
+                                <action selector="addBarButtonTapped:" destination="rvO-rT-QbP" id="z4I-GZ-AfS"/>
+                            </connections>
+                        </barButtonItem>
+                    </navigationItem>
+                    <simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="KMF-5b-6U9" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="3694" y="4816"/>
+        </scene>
     </scenes>
     <resources>
         <image name="second" width="30" height="30"/>
     </resources>
     <inferredMetricsTieBreakers>
-        <segue reference="fIB-GS-Ppk"/>
+        <segue reference="hyN-De-zte"/>
     </inferredMetricsTieBreakers>
 </document>

CoreStoreDemo/CoreStoreDemo/CoreStoreDemo.xcdatamodeld/CoreStoreDemo.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="Automatic" macOSVersion="Automatic" iOSVersion="Automatic">
+<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="9525" systemVersion="15C50" minimumToolsVersion="Automatic">
     <entity name="Palette" representedClassName="CoreStoreDemo.Palette">
         <attribute name="brightness" optional="YES" attributeType="Float" defaultValueString="0.0" syncable="YES"/>
         <attribute name="colorName" optional="YES" transient="YES" attributeType="String" syncable="YES"/>
@@ -26,6 +26,9 @@
     <configuration name="ObservingDemo">
         <memberEntity name="Palette"/>
     </configuration>
+    <configuration name="SpotlightDemo">
+        <memberEntity name="Palette"/>
+    </configuration>
     <configuration name="TransactionsDemo">
         <memberEntity name="Place"/>
     </configuration>

CoreStoreDemo/CoreStoreDemo/Spotlight Demo/SpotlightDemoViewController.swift

@@ -0,0 +1,288 @@
+//
+//  SpotlightDemoViewController.swift
+//  CoreStoreDemo
+//
+//  Created by John Estropia on 2015/12/16.
+//  Copyright © 2015年 John Rommel Estropia. All rights reserved.
+//
+
+import UIKit
+import CoreStore
+import CoreSpotlight
+import MobileCoreServices
+
+
+private enum Static {
+    
+    static let palettes: ListMonitor<Palette> = {
+        
+        try! CoreStore.addSQLiteStoreAndWait(
+            fileName: "SpotlightDemo.sqlite",
+            configuration: "SpotlightDemo",
+            resetStoreOnModelMismatch: true
+        )
+        
+        return CoreStore.monitorSectionedList(
+            From(Palette),
+            SectionBy("colorName"),
+            OrderBy(.Ascending("hue"))
+        )
+    }()
+}
+
+
+// MARK: - SpotlightDemoViewController
+
+class SpotlightDemoViewController: UITableViewController, ListSectionObserver {
+    
+    // MARK: NSObject
+    
+    deinit {
+        
+        Static.palettes.removeObserver(self)
+    }
+    
+    
+    // MARK: UIViewController
+    
+    override func viewDidLoad() {
+        
+        super.viewDidLoad()
+        
+        let navigationItem = self.navigationItem
+        navigationItem.leftBarButtonItem = UIBarButtonItem(
+            barButtonSystemItem: .Trash,
+            target: self,
+            action: "resetBarButtonItemTouched:"
+        )
+        
+        navigationItem.rightBarButtonItem = UIBarButtonItem(
+            barButtonSystemItem: .Add,
+            target: self,
+            action: "addBarButtonItemTouched:"
+        )
+        
+        Static.palettes.addObserver(self)
+    }
+    
+    
+    // MARK: UITableViewDataSource
+    
+    override func numberOfSectionsInTableView(tableView: UITableView) -> Int {
+        
+        return Static.palettes.numberOfSections()
+    }
+    
+    override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        
+        return Static.palettes.numberOfObjectsInSection(section)
+    }
+    
+    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+        
+        let cell = tableView.dequeueReusableCellWithIdentifier("PaletteTableViewCell") as! PaletteTableViewCell
+        
+        let palette = Static.palettes[indexPath]
+        cell.colorView?.backgroundColor = palette.color
+        cell.label?.text = palette.colorText
+        
+        return cell
+    }
+    
+    
+    // MARK: UITableViewDelegate
+    
+    override func tableView(tableView: UITableView, commitEditingStyle editingStyle: UITableViewCellEditingStyle, forRowAtIndexPath indexPath: NSIndexPath) {
+        
+        switch editingStyle {
+            
+        case .Delete:
+            let palette = Static.palettes[indexPath]
+            CoreStore.beginAsynchronous{ (transaction) -> Void in
+                
+                transaction.delete(palette)
+                transaction.commit { (result) -> Void in }
+            }
+            
+        default:
+            break
+        }
+    }
+    
+    override func tableView(tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
+        
+        return Static.palettes.sectionInfoAtIndex(section).name
+    }
+    
+    
+    // MARK: ListObserver
+    
+    func listMonitorWillChange(monitor: ListMonitor<Palette>) {
+        
+        self.tableView.beginUpdates()
+    }
+    
+    func listMonitorDidChange(monitor: ListMonitor<Palette>) {
+        
+        self.tableView.endUpdates()
+    }
+    
+    
+    // MARK: ListObjectObserver
+    
+    func listMonitor(monitor: ListMonitor<Palette>, didInsertObject object: Palette, toIndexPath indexPath: NSIndexPath) {
+        
+        self.tableView.insertRowsAtIndexPaths([indexPath], withRowAnimation: .Automatic)
+    }
+    
+    func listMonitor(monitor: ListMonitor<Palette>, didDeleteObject object: Palette, fromIndexPath indexPath: NSIndexPath) {
+        
+        self.tableView.deleteRowsAtIndexPaths([indexPath], withRowAnimation: .Automatic)
+    }
+    
+    func listMonitor(monitor: ListMonitor<Palette>, didUpdateObject object: Palette, atIndexPath indexPath: NSIndexPath) {
+        
+        if let cell = self.tableView.cellForRowAtIndexPath(indexPath) as? PaletteTableViewCell {
+            
+            let palette = Static.palettes[indexPath]
+            cell.colorView?.backgroundColor = palette.color
+            cell.label?.text = palette.colorText
+        }
+    }
+    
+    func listMonitor(monitor: ListMonitor<Palette>, didMoveObject object: Palette, fromIndexPath: NSIndexPath, toIndexPath: NSIndexPath) {
+        
+        self.tableView.deleteRowsAtIndexPaths([fromIndexPath], withRowAnimation: .Automatic)
+        self.tableView.insertRowsAtIndexPaths([toIndexPath], withRowAnimation: .Automatic)
+    }
+    
+    
+    // MARK: ListSectionObserver
+    
+    func listMonitor(monitor: ListMonitor<Palette>, didInsertSection sectionInfo: NSFetchedResultsSectionInfo, toSectionIndex sectionIndex: Int) {
+        
+        self.tableView.insertSections(NSIndexSet(index: sectionIndex), withRowAnimation: .Automatic)
+    }
+    
+    func listMonitor(monitor: ListMonitor<Palette>, didDeleteSection sectionInfo: NSFetchedResultsSectionInfo, fromSectionIndex sectionIndex: Int) {
+        
+        self.tableView.deleteSections(NSIndexSet(index: sectionIndex), withRowAnimation: .Automatic)
+    }
+    
+    
+    // MARK: Private
+    
+    @IBAction private dynamic func resetBarButtonItemTouched(sender: AnyObject?) {
+        
+        CoreStore.beginAsynchronous { (transaction) -> Void in
+            
+            transaction.deleteAll(From(Palette))
+            transaction.commit()
+        }
+    }
+    
+    @IBAction private dynamic func addBarButtonItemTouched(sender: AnyObject?) {
+        
+        CoreStore.beginAsynchronous { (transaction) -> Void in
+            
+            let palette = transaction.create(Into(Palette))
+            palette.setInitialValues()
+            
+            transaction.commit()
+        }
+    }
+
+//    private var dataSource = [(String, String)]()
+//    
+//    // MARK: UITableViewDataSource
+//    
+//    override func numberOfSectionsInTableView(tableView: UITableView) -> Int {
+//        
+//        return 1
+//    }
+//    
+//    override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+//        
+//        return self.dataSource.count
+//    }
+//    
+//    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+//        
+//        let cell = tableView.dequeueReusableCellWithIdentifier("SpotlightItemCell")!
+//        let item = self.dataSource[indexPath.row]
+//        cell.textLabel?.text = item.0
+//        cell.detailTextLabel?.text = item.1
+//        return cell
+//    }
+//    
+//    // MARK: UITableViewDelegate
+//    
+//    override func tableView(tableView: UITableView, commitEditingStyle editingStyle: UITableViewCellEditingStyle, forRowAtIndexPath indexPath: NSIndexPath) {
+//        
+//        guard case .Delete = editingStyle else {
+//            
+//            return
+//        }
+//        
+//        let identifier = self.dataSource[indexPath.row].0
+//        if #available(iOS 9.0, *) {
+//            
+//            CSSearchableIndex.defaultSearchableIndex().deleteSearchableItemsWithIdentifiers(
+//                [identifier],
+//                completionHandler: { error in
+//                
+//                    // ...
+//                }
+//            )
+//        }
+//        
+//        tableView.beginUpdates()
+//        tableView.deleteRowsAtIndexPaths([indexPath], withRowAnimation: .Automatic)
+//        self.dataSource.removeAtIndex(indexPath.row)
+//        tableView.endUpdates()
+//    }
+//    
+//    // MARK: Private
+//    
+//    @IBAction private dynamic func addBarButtonTapped(sender: UIBarButtonItem) {
+//        
+//        let items = [
+//            ("John", "iOS team"),
+//            ("Bob", "Android team"),
+//            ("Joe", "Infra team"),
+//            ("Ryan", "Director"),
+//            ("Jake", "Design team"),
+//            ("Mark", "Testing team")
+//        ]
+//        guard let nextItem = items.filter({ !self.dataSource.map({ $0.0 }).contains($0.0) }).first else {
+//            
+//            return
+//        }
+//        
+//        if #available(iOS 9.0, *) {
+//            
+//            let attributeSet = CSSearchableItemAttributeSet(itemContentType: kUTTypeJSON as String)
+//            attributeSet.title = nextItem.0
+//            attributeSet.contentDescription = nextItem.1
+//            
+//            let item = CSSearchableItem(
+//                uniqueIdentifier: nextItem.0,
+//                domainIdentifier: "jp.eureka.sample",
+//                attributeSet: attributeSet
+//            )
+//            CSSearchableIndex.defaultSearchableIndex().indexSearchableItems(
+//                [item],
+//                completionHandler: { (error) -> Void in
+//                    
+//                    //...
+//                }
+//            )
+//        }
+//        
+//        let tableView = self.tableView
+//        tableView.beginUpdates()
+//        tableView.insertRowsAtIndexPaths([NSIndexPath(forRow: self.dataSource.count, inSection: 0)], withRowAnimation: .Automatic)
+//        self.dataSource.append(nextItem)
+//        tableView.endUpdates()
+//    }
+}

CoreStoreDemo/CoreStoreDemo/Transactions Demo/TransactionsDemoViewController.swift

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

CoreStoreTests/CoreStoreTests.swift

@@ -23,7 +23,6 @@
 //  SOFTWARE.
 //
 
-import UIKit
 import XCTest
 
 @testable
@@ -103,7 +102,7 @@ class CoreStoreTests: XCTestCase {
             XCTFail(error.description)
         }
         
-        let detachedTransaction = CoreStore.beginDetached()
+        let unsafeTransaction = CoreStore.beginUnsafe()
         
         let createExpectation = self.expectationWithDescription("Entity creation")
         CoreStore.beginAsynchronous { (transaction) -> Void in
@@ -182,7 +181,7 @@ class CoreStoreTests: XCTestCase {
                 )
                 XCTAssertNil(objs4test, "objs4test == nil")
                 
-                let objs5test = detachedTransaction.fetchCount(From(TestEntity2))
+                let objs5test = unsafeTransaction.fetchCount(From(TestEntity2))
                 XCTAssertTrue(objs5test == 3, "objs5test == 3")
                 
                 XCTAssertTrue(NSThread.isMainThread(), "NSThread.isMainThread()")
@@ -289,15 +288,16 @@ class CoreStoreTests: XCTestCase {
         XCTAssertNotNil(objs2, "objs2 != nil")
         XCTAssertTrue(objs2?.count == 1, "objs2?.count == 1")
         
-        let detachedExpectation = self.expectationWithDescription("Query creation")
+        let unsafeExpectation = self.expectationWithDescription("Query creation")
         
-        let obj5 = detachedTransaction.create(Into<TestEntity1>("Config1"))
+        let obj5 = unsafeTransaction.create(Into<TestEntity1>("Config1"))
         obj5.testEntityID = 5
         obj5.testString = "hihihi"
         obj5.testNumber = 70
         obj5.testDate = NSDate()
+        XCTAssert(unsafeTransaction === obj5.unsafeDataTransaction, "unsafeTransaction === obj5.unsafeDataTransaction")
         
-        detachedTransaction.commit { (result) -> Void in
+        unsafeTransaction.commit { (result) -> Void in
             
             XCTAssertTrue(NSThread.isMainThread(), "NSThread.isMainThread()")
             switch result {
@@ -310,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")
@@ -322,13 +323,14 @@ class CoreStoreTests: XCTestCase {
                 )
                 XCTAssertTrue(count == 1, "count == 1 (actual: \(count))")
                 
-                let obj6 = detachedTransaction.create(Into<TestEntity1>())
+                let obj6 = unsafeTransaction.create(Into<TestEntity1>())
                 obj6.testEntityID = 6
                 obj6.testString = "huehuehue"
                 obj6.testNumber = 130
                 obj6.testDate = NSDate()
+                XCTAssert(unsafeTransaction === obj6.unsafeDataTransaction, "unsafeTransaction === obj6.unsafeDataTransaction")
                 
-                detachedTransaction.commit { (result) -> Void in
+                unsafeTransaction.commit { (result) -> Void in
                     
                     XCTAssertTrue(NSThread.isMainThread(), "NSThread.isMainThread()")
                     switch result {
@@ -358,7 +360,7 @@ class CoreStoreTests: XCTestCase {
                         )
                         XCTAssertTrue(count2 == 0, "count == 0 (actual: \(count2))")
                         
-                        detachedExpectation.fulfill()
+                        unsafeExpectation.fulfill()
                         
                     case .Failure(let error):
                         XCTFail(error.description)
@@ -379,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/develop.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)
 
@@ -13,18 +14,18 @@ Unleashing the real power of Core Data with the elegance and safety of Swift
 
 ## What CoreStore does better:
 
-- Heavily supports multiple persistent stores per data stack, just the way *.xcdatamodeld* files are designed to. CoreStore will also manage one data stack by default, but you can create and manage as many as you need.
-- Incremental Migrations! Just tell the data stack the sequence of model versions and CoreStore will automatically use incremental migrations if needed on stores added to that stack.
-- Ability to plug-in your own logging framework
-- Gets around a limitation with other Core Data wrappers where the entity name should be the same as the `NSManagedObject` subclass name. CoreStore loads entity-to-class mappings from the managed object model file, so you are free to name them independently.
-- Provides type-safe, easy to configure observers to replace `NSFetchedResultsController` and KVO
-- Exposes API not just for fetching, but also for querying aggregates and property values
-- Makes it hard to fall into common concurrency mistakes. All `NSManagedObjectContext` tasks are encapsulated into safer, higher-level abstractions without sacrificing flexibility and customizability.
-- Exposes clean and convenient API designed around Swift’s code elegance and type safety.
-- 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!
+- **Heavily supports multiple persistent stores per data stack**, just the way *.xcdatamodeld* files are designed to. CoreStore will also manage one data stack by default, but you can create and manage as many as you need.
+- **Incremental Migrations!** Just tell the data stack the sequence of model versions and CoreStore will automatically use incremental migrations if needed on stores added to that stack.
+- Ability to **plug-in your own logging framework**
+- Gets around a limitation with other Core Data wrappers where the entity name should be the same as the `NSManagedObject` subclass name. CoreStore loads entity-to-class mappings from the managed object model file, so you are **free to name entities and their class names independently**.
+- Provides type-safe, easy to configure **observers to replace `NSFetchedResultsController` and KVO**
+- Exposes **API not just for fetching, but also for querying aggregates and property values**
+- Makes it hard to fall into common concurrency mistakes. All `NSManagedObjectContext` tasks are encapsulated into **safer, higher-level abstractions** without sacrificing flexibility and customizability.
+- Exposes clean and convenient API designed around **Swift’s code elegance and type safety**.
+- **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.
+- **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.**
+**[Vote for the next feature!](http://goo.gl/RIiHMP)**
 
 
 
@@ -41,7 +42,7 @@ Unleashing the real power of Core Data with the elegance and safety of Swift
         - [Transaction types](#transaction-types)
             - [Asynchronous transactions](#asynchronous-transactions)
             - [Synchronous transactions](#synchronous-transactions)
-            - [Detached transactions](#detached-transactions)
+            - [Unsafe transactions](#unsafe-transactions)
         - [Creating objects](#creating-objects)
         - [Updating objects](#updating-objects)
         - [Deleting objects](#deleting-objects)
@@ -57,7 +58,7 @@ Unleashing the real power of Core Data with the elegance and safety of Swift
             - [`Select<T>` clause](#selectt-clause)
             - [`GroupBy` clause](#groupby-clause)
     - [Logging and error handling](#logging-and-error-handling)
-    - [Observing changes and notifications](#observing-changes-and-notifications)
+    - [Observing changes and notifications](#observing-changes-and-notifications) (unavailable on OSX)
         - [Observe a single object](#observe-a-single-object)
         - [Observe a list of objects](#observe-a-list-of-objects)
 - [Roadmap](#roadmap)
@@ -146,7 +147,7 @@ If you are already familiar with the inner workings of CoreData, here is a mappi
 | --- | --- |
 | `NSManagedObjectModel` / `NSPersistentStoreCoordinator`<br />(.xcdatamodeld file) | `DataStack` |
 | `NSPersistentStore`<br />("Configuration"s in the .xcdatamodeld file) | `DataStack` configuration<br />(multiple sqlite / in-memory stores per stack) |
-| `NSManagedObjectContext` | `BaseDataTransaction` subclasses<br />(`SynchronousDataTransaction`, `AsynchronousDataTransaction`, `DetachedDataTransaction`) |
+| `NSManagedObjectContext` | `BaseDataTransaction` subclasses<br />(`SynchronousDataTransaction`, `AsynchronousDataTransaction`, `UnsafeDataTransaction`) |
 
 Popular libraries [RestKit](https://github.com/RestKit/RestKit) and [MagicalRecord](https://github.com/magicalpanda/MagicalRecord) set up their `NSManagedObjectContext`s this way:
 
@@ -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(
@@ -376,7 +377,7 @@ CoreStore.beginAsynchronous { (transaction) -> Void in
 ```
 The `commit()` method saves the changes to the persistent store. If `commit()` is not called when the transaction block completes, all changes within the transaction is discarded.
 
-The examples above use `beginAsynchronous(...)`, but there are actually 3 types of transactions at your disposal: *asynchronous*, *synchronous*, and *detached*.
+The examples above use `beginAsynchronous(...)`, but there are actually 3 types of transactions at your disposal: *asynchronous*, *synchronous*, and *unsafe*.
 
 ### Transaction types
 
@@ -402,10 +403,10 @@ CoreStore.beginSynchronous { (transaction) -> Void in
 
 Since `beginSynchronous(...)` technically blocks two queues (the caller's queue and the transaction's background queue), it is considered less safe as it's more prone to deadlock. Take special care that the closure does not block on any other external queues.
 
-#### Detached transactions
+#### Unsafe transactions
 are special in that they do not enclose updates within a closure:
 ```swift
-let transaction = CoreStore.beginDetached()
+let transaction = CoreStore.beginUnsafe()
 // make changes
 downloadJSONWithCompletion({ (json) -> Void in
 
@@ -420,7 +421,7 @@ downloadAnotherJSONWithCompletion({ (json) -> Void in
 ```
 This allows for non-contiguous updates. Do note that this flexibility comes with a price: you are now responsible for managing concurrency for the transaction. As uncle Ben said, "with great power comes great race conditions."
 
-As the above example also shows, only detached transactions are allowed to call `commit()` multiple times; doing so with synchronous and asynchronous transactions will trigger an assert. 
+As the above example also shows, only unsafe transactions are allowed to call `commit()` multiple times; doing so with synchronous and asynchronous transactions will trigger an assert. 
 
 
 You've seen how to create transactions, but we have yet to see how to make *creates*, *updates*, and *deletes*. The 3 types of transactions above are all subclasses of `BaseDataTransaction`, which implements the methods shown below.
@@ -618,7 +619,7 @@ public protocol ImportableObject: class {
 First, set `ImportSource` to the expected type of the data source:
 ```swift
 typealias ImportSource = [String: AnyObject]
-``
+```
 This lets us call `importObject(_:source:)` with any `[String: AnyObject]` type as the argument to `source`:
 ```swift
 CoreStore.beginAsynchronous { (transaction) -> Void in
@@ -1024,7 +1025,7 @@ Doing so channels all logging calls to your logger.
 
 Note that to keep the call stack information intact, all calls to these methods are **NOT** thread-managed. Therefore you have to make sure that your logger is thread-safe or you may otherwise have to dispatch your logging implementation to a serial queue.
 
-## Observing changes and notifications
+## Observing changes and notifications (unavailable on OSX)
 CoreStore provides type-safe wrappers for observing managed objects:
 
 - `ObjectMonitor`: use to monitor changes to a single `NSManagedObject` instance (instead of Key-Value Observing)
@@ -1161,8 +1162,8 @@ let person2 = self.monitor[1, 2]
 
 
 # Roadmap
-- Data importing utilities for transactions
 - Support iCloud stores
+- CoreSpotlight auto-indexing (experimental)
 
 
 # Installation
@@ -1179,8 +1180,14 @@ pod 'CoreStore'
 This installs CoreStore as a framework. Declare `import CoreStore` in your swift file to use the library.
 
 ### Install with Carthage
+In your `Cartfile`, add
 ```
-github "JohnEstropia/CoreStore" >= 1.3.0
+github "JohnEstropia/CoreStore" >= 1.4.4
+github "JohnEstropia/GCDKit" >= 1.1.7
+```
+and run 
+```
+carthage update
 ```
 
 ### Install as Git Submodule