Swift 3 master candidate

# Conflicts:
#	.travis.yml
#	CoreStore.podspec
#	CoreStore.xcodeproj/project.pbxproj
#	Sources/Info.plist

.gitmodules

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

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode7.3
+osx_image: xcode8.2
 sudo: false
 git:
   submodules: false
@@ -10,20 +10,21 @@ env:
   - LC_CTYPE=en_US.UTF-8
   - LANG=en_US.UTF-8
   matrix:
-    - DESTINATION="OS=9.3,name=iPhone 6s"          SCHEME="CoreStore iOS"     SDK=iphonesimulator9.3  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=9.0,name=iPhone 6 Plus"      SCHEME="CoreStore iOS"     SDK=iphonesimulator9.3  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=8.4,name=iPhone 6"           SCHEME="CoreStore iOS"     SDK=iphonesimulator9.3  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=8.3,name=iPhone 5S"          SCHEME="CoreStore iOS"     SDK=iphonesimulator9.3  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=8.2,name=iPhone 5"           SCHEME="CoreStore iOS"     SDK=iphonesimulator9.3  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=8.1,name=iPhone 4S"          SCHEME="CoreStore iOS"     SDK=iphonesimulator9.3  RUN_TESTS="YES" POD_LINT="YES"
-    - DESTINATION="OS=8.1,name=iPhone 4S"          SCHEME="CoreStore iOS7"    SDK=iphonesimulator9.3  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.2,name=Apple Watch - 42mm" SCHEME="CoreStore watchOS" SDK=watchsimulator2.2   RUN_TESTS="NO"  POD_LINT="NO"
-    - DESTINATION="OS=9.2,name=Apple TV 1080p"     SCHEME="CoreStore tvOS"    SDK=appletvsimulator9.2 RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=10.1,name=iPhone 7"          SCHEME="CoreStore iOS"     SDK=iphonesimulator10.2  RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=9.0,name=iPhone 6 Plus"      SCHEME="CoreStore iOS"     SDK=iphonesimulator10.2  RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=8.4,name=iPhone 6"           SCHEME="CoreStore iOS"     SDK=iphonesimulator10.2  RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=8.3,name=iPhone 5S"          SCHEME="CoreStore iOS"     SDK=iphonesimulator10.2  RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=8.3,name=iPhone 5"           SCHEME="CoreStore iOS"     SDK=iphonesimulator10.2  RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=8.3,name=iPhone 4S"          SCHEME="CoreStore iOS"     SDK=iphonesimulator10.2  RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="arch=x86_64"                    SCHEME="CoreStore OSX"     SDK=macosx10.12          RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=3.1,name=Apple Watch - 42mm" SCHEME="CoreStore watchOS" SDK=watchsimulator3.1    RUN_TESTS="NO"  POD_LINT="NO"
+    - DESTINATION="OS=2.2,name=Apple Watch - 42mm" SCHEME="CoreStore watchOS" SDK=watchsimulator3.1    RUN_TESTS="NO"  POD_LINT="NO"
+    - DESTINATION="OS=10.1,name=Apple TV 1080p"    SCHEME="CoreStore tvOS"    SDK=appletvsimulator10.1 RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=9.2,name=Apple TV 1080p"     SCHEME="CoreStore tvOS"    SDK=appletvsimulator10.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
-  - curl -OlL "https://github.com/Carthage/Carthage/releases/download/0.11/Carthage.pkg"
+  - curl -OlL "https://github.com/Carthage/Carthage/releases/download/0.18/Carthage.pkg"
   - sudo installer -pkg "Carthage.pkg" -target /
   - rm "Carthage.pkg"
 before_script:
@@ -36,8 +37,8 @@ script:
       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.3" -destination "OS=9.3,name=iPhone 6s" -configuration Debug ONLY_ACTIVE_ARCH=NO clean test | xcpretty -c;
-  - xcodebuild -workspace "CoreStore.xcworkspace" -scheme "CoreStore iOS" -sdk "iphonesimulator9.3" -destination "OS=9.3,name=iPhone 6s" -configuration Release ONLY_ACTIVE_ARCH=NO clean test | xcpretty -c;
+  - xcodebuild -workspace "CoreStore.xcworkspace" -scheme "CoreStore iOS" -sdk "iphonesimulator10.2" -destination "OS=10.1,name=iPhone 7" -configuration Debug ONLY_ACTIVE_ARCH=NO clean test | xcpretty -c;
+  - xcodebuild -workspace "CoreStore.xcworkspace" -scheme "CoreStore iOS" -sdk "iphonesimulator10.2" -destination "OS=10.1,name=iPhone 7" -configuration Release ONLY_ACTIVE_ARCH=NO clean test | xcpretty -c;
   - if [ $POD_LINT == "YES" ]; then
       pod lib lint --quick;
     fi

Cartfile

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

Cartfile.resolved

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

CoreStore.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name = "CoreStore"
-    s.version = "1.6.9"
+    s.version = "3.0.0"
     s.license = "MIT"
     s.summary = "Unleashing the real power of Core Data with the elegance and safety of Swift"
     s.homepage = "https://github.com/JohnEstropia/CoreStore"
@@ -12,11 +12,11 @@ Pod::Spec.new do |s|
     s.watchos.deployment_target = "2.0"
     s.tvos.deployment_target = "9.0"
 
-    s.source_files = "CoreStore", "CoreStore/**/*.{swift}"
-    s.osx.exclude_files = "CoreStore/Observing/*.{swift}", "CoreStore/Internal/FetchedResultsControllerDelegate.swift", "CoreStore/Internal/CoreStoreFetchedResultsController.swift", "CoreStore/Convenience Helpers/NSFetchedResultsController+Convenience.swift"
+    s.source_files = "Sources", "Sources/**/*.{swift,h,m}"
+    s.public_header_files = "Sources/**/*.h"
     s.frameworks = "Foundation", "CoreData"
     s.requires_arc = true
-    s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS' => '-D USE_FRAMEWORKS' }
-    
-    s.dependency "GCDKit", "1.2.5"
-end
+    s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS[config=Debug]' => '-D USE_FRAMEWORKS -D DEBUG',
+                              'OTHER_SWIFT_FLAGS[config=Release]' => '-D USE_FRAMEWORKS',
+                              'GCC_PREPROCESSOR_DEFINITIONS' => 'USE_FRAMEWORKS=1' }
+end

CoreStore.xcodeproj/project.xcworkspace/xcshareddata/CoreStore.xcscmblueprint

@@ -10,10 +10,10 @@
   "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "F347F55F-7F5C-4476-9148-6E902F06E4AD",
   "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
     "8B2E522D57154DFA93A06982C36315ECBEA4FA97" : "CoreStoreLibraries\/GCDKit",
-    "4B60F1BCB491FF717C56441AE7783C74F417BE48" : "CoreStore"
+    "4B60F1BCB491FF717C56441AE7783C74F417BE48" : "CoreStore\/"
   },
   "DVTSourceControlWorkspaceBlueprintNameKey" : "CoreStore",
-  "DVTSourceControlWorkspaceBlueprintVersion" : 203,
+  "DVTSourceControlWorkspaceBlueprintVersion" : 204,
   "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "CoreStore.xcodeproj",
   "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
     {

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0710"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore tvOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

CoreStore.xcworkspace/contents.xcworkspacedata

@@ -7,7 +7,4 @@
    <FileRef
       location = "group:CoreStoreDemo/CoreStoreDemo.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:Carthage/Checkouts/GCDKit/GCDKit.xcodeproj">
-   </FileRef>
 </Workspace>

CoreStore.xcworkspace/xcshareddata/CoreStore.xcscmblueprint

@@ -5,11 +5,13 @@
   },
   "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
     "8B2E522D57154DFA93A06982C36315ECBEA4FA97" : 0,
+    "95438028B10BBB846574013D29F154A00556A9D1" : 0,
     "4B60F1BCB491FF717C56441AE7783C74F417BE48" : 0
   },
   "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "EBFDEFFE-8BA0-441A-862A-1DE28AA5CD21",
   "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
     "8B2E522D57154DFA93A06982C36315ECBEA4FA97" : "CoreStore\/Carthage\/Checkouts\/GCDKit\/",
+    "95438028B10BBB846574013D29F154A00556A9D1" : "CoreStore\/Carthage\/Checkouts\/Nimble\/",
     "4B60F1BCB491FF717C56441AE7783C74F417BE48" : "CoreStore\/"
   },
   "DVTSourceControlWorkspaceBlueprintNameKey" : "CoreStore",
@@ -25,6 +27,11 @@
       "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/JohnEstropia\/GCDKit.git",
       "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
       "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "8B2E522D57154DFA93A06982C36315ECBEA4FA97"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/Quick\/Nimble.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "95438028B10BBB846574013D29F154A00556A9D1"
     }
   ]
 }

CoreStore/Convenience Helpers/NSFetchedResultsController+Convenience.swift

@@ -1,255 +0,0 @@
-//
-//  NSManagedObject+Convenience.swift
-//  CoreStore
-//
-//  Copyright © 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 {
-    
-    /**
-     Utility for creating an `NSFetchedResultsController` from a `DataStack`. This is useful when an `NSFetchedResultsController` is preferred over the overhead of `ListMonitor`s abstraction.
-     
-     - parameter dataStack: the `DataStack` to observe objects from
-     - 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.
-     - returns: an `NSFetchedResultsController` that observes a `DataStack`
-     */
-    @nonobjc
-    public static func createFor<T: NSManagedObject>(dataStack: DataStack, _ from: From<T>, _ sectionBy: SectionBy, _ fetchClauses: FetchClause...) -> NSFetchedResultsController {
-        
-        return CoreStoreFetchedResultsController<T>(
-            context: dataStack.mainContext,
-            fetchRequest: CoreStoreFetchRequest(),
-            from: from,
-            sectionBy: sectionBy,
-            fetchClauses: fetchClauses
-        )
-    }
-    
-    /**
-     Utility for creating an `NSFetchedResultsController` from a `DataStack`. This is useful when an `NSFetchedResultsController` is preferred over the overhead of `ListMonitor`s abstraction.
-     
-     - parameter dataStack: the `DataStack` to observe objects from
-     - 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.
-     - returns: an `NSFetchedResultsController` that observes a `DataStack`
-     */
-    @nonobjc
-    public static func createFor<T: NSManagedObject>(dataStack: DataStack, _ from: From<T>, _ sectionBy: SectionBy, _ fetchClauses: [FetchClause]) -> NSFetchedResultsController {
-        
-        return CoreStoreFetchedResultsController<T>(
-            context: dataStack.mainContext,
-            fetchRequest: CoreStoreFetchRequest(),
-            from: from,
-            sectionBy: sectionBy,
-            fetchClauses: fetchClauses
-        )
-    }
-    
-    /**
-     Utility for creating an `NSFetchedResultsController` from a `DataStack`. This is useful when an `NSFetchedResultsController` is preferred over the overhead of `ListMonitor`s abstraction.
-     
-     - parameter dataStack: the `DataStack` to observe objects from
-     - 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: an `NSFetchedResultsController` that observes a `DataStack`
-     */
-    @nonobjc
-    public static func createFor<T: NSManagedObject>(dataStack: DataStack, _ from: From<T>, _ fetchClauses: FetchClause...) -> NSFetchedResultsController {
-        
-        return CoreStoreFetchedResultsController<T>(
-            context: dataStack.mainContext,
-            fetchRequest: CoreStoreFetchRequest(),
-            from: from,
-            sectionBy: nil,
-            fetchClauses: fetchClauses
-        )
-    }
-    
-    /**
-     Utility for creating an `NSFetchedResultsController` from a `DataStack`. This is useful when an `NSFetchedResultsController` is preferred over the overhead of `ListMonitor`s abstraction.
-     
-     - parameter dataStack: the `DataStack` to observe objects from
-     - 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: an `NSFetchedResultsController` that observes a `DataStack`
-     */
-    @nonobjc
-    public static func createFor<T: NSManagedObject>(dataStack: DataStack, _ from: From<T>, _ fetchClauses: [FetchClause]) -> NSFetchedResultsController {
-        
-        return CoreStoreFetchedResultsController<T>(
-            context: dataStack.mainContext,
-            fetchRequest: CoreStoreFetchRequest(),
-            from: from,
-            sectionBy: nil,
-            fetchClauses: fetchClauses
-        )
-    }
-    
-    /**
-     Utility for creating an `NSFetchedResultsController` from an `UnsafeDataTransaction`. This is useful when an `NSFetchedResultsController` is preferred over the overhead of `ListMonitor`s abstraction.
-     
-     - parameter transaction: the `UnsafeDataTransaction` to observe objects from
-     - 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.
-     - returns: an `NSFetchedResultsController` that observes an `UnsafeDataTransaction`
-     */
-    @nonobjc
-    public static func createFor<T: NSManagedObject>(transaction: UnsafeDataTransaction, _ from: From<T>, _ sectionBy: SectionBy, _ fetchClauses: FetchClause...) -> NSFetchedResultsController {
-        
-        return CoreStoreFetchedResultsController<T>(
-            context: transaction.context,
-            fetchRequest: CoreStoreFetchRequest(),
-            from: from,
-            sectionBy: sectionBy,
-            fetchClauses: fetchClauses
-        )
-    }
-    
-    /**
-     Utility for creating an `NSFetchedResultsController` from an `UnsafeDataTransaction`. This is useful when an `NSFetchedResultsController` is preferred over the overhead of `ListMonitor`s abstraction.
-     
-     - parameter transaction: the `UnsafeDataTransaction` to observe objects from
-     - 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.
-     - returns: an `NSFetchedResultsController` that observes an `UnsafeDataTransaction`
-     */
-    @nonobjc
-    public static func createFor<T: NSManagedObject>(transaction: UnsafeDataTransaction, _ from: From<T>, _ sectionBy: SectionBy, _ fetchClauses: [FetchClause]) -> NSFetchedResultsController {
-        
-        return CoreStoreFetchedResultsController<T>(
-            context: transaction.context,
-            fetchRequest: CoreStoreFetchRequest(),
-            from: from,
-            sectionBy: sectionBy,
-            fetchClauses: fetchClauses
-        )
-    }
-    
-    /**
-     Utility for creating an `NSFetchedResultsController` from an `UnsafeDataTransaction`. This is useful when an `NSFetchedResultsController` is preferred over the overhead of `ListMonitor`s abstraction.
-     
-     - parameter transaction: the `UnsafeDataTransaction` to observe objects from
-     - 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: an `NSFetchedResultsController` that observes an `UnsafeDataTransaction`
-     */
-    @nonobjc
-    public static func createFor<T: NSManagedObject>(transaction: UnsafeDataTransaction, _ from: From<T>, _ fetchClauses: FetchClause...) -> NSFetchedResultsController {
-        
-        return CoreStoreFetchedResultsController<T>(
-            context: transaction.context,
-            fetchRequest: CoreStoreFetchRequest(),
-            from: from,
-            sectionBy: nil,
-            fetchClauses: fetchClauses
-        )
-    }
-    
-    /**
-     Utility for creating an `NSFetchedResultsController` from an `UnsafeDataTransaction`. This is useful when an `NSFetchedResultsController` is preferred over the overhead of `ListMonitor`s abstraction.
-     
-     - parameter transaction: the `UnsafeDataTransaction` to observe objects from
-     - 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.
-     */
-    @nonobjc
-    public static func createFor<T: NSManagedObject>(transaction: UnsafeDataTransaction, _ from: From<T>, _ fetchClauses: [FetchClause]) -> NSFetchedResultsController {
-        
-        return CoreStoreFetchedResultsController<T>(
-            context: transaction.context,
-            fetchRequest: CoreStoreFetchRequest(),
-            from: from,
-            sectionBy: nil,
-            fetchClauses: fetchClauses
-        )
-    }
-    
-    @available(*, deprecated=1.6.8, message="Use NSFetchedResultsController.createFor(_:_:_:_:)  instead.")
-    @nonobjc
-    public static func createForStack<T: NSManagedObject>(dataStack: DataStack, fetchRequest: NSFetchRequest, from: From<T>? = nil, sectionBy: SectionBy? = nil, fetchClauses: [FetchClause]) -> NSFetchedResultsController {
-        
-        return CoreStoreFetchedResultsController<T>(
-            context: dataStack.mainContext,
-            fetchRequest: fetchRequest,
-            from: from,
-            sectionBy: sectionBy,
-            fetchClauses: fetchClauses
-        )
-    }
-    
-    @available(*, deprecated=1.5.2, message="Use NSFetchedResultsController.createFor(_:_:_:_:) to create NSFetchedResultsControllers directly")
-    @nonobjc
-    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, applyAffectedStores: false)
-        for clause in fetchClauses {
-            
-            clause.applyToFetchRequest(fetchRequest)
-        }
-        
-        if let from = from {
-            
-            from.applyAffectedStoresForFetchedRequest(fetchRequest, context: context)
-        }
-        else {
-            
-            guard let from = (fetchRequest.entity.flatMap { $0.managedObjectClassName }).flatMap(NSClassFromString).flatMap(From.init) else {
-                
-                fatalError("Attempted to create an \(typeName(NSFetchedResultsController)) without a  From clause or an NSEntityDescription.")
-            }
-            from.applyAffectedStoresForFetchedRequest(fetchRequest, context: context)
-        }
-        
-        self.init(
-            fetchRequest: fetchRequest,
-            managedObjectContext: context,
-            sectionNameKeyPath: sectionBy?.sectionKeyPath,
-            cacheName: nil
-        )
-    }
-    
-    
-    // MARK: Internal
-    
-    internal static func createFromContext<T: NSManagedObject>(context: NSManagedObjectContext, fetchRequest: NSFetchRequest, from: From<T>? = nil, sectionBy: SectionBy? = nil, fetchClauses: [FetchClause]) -> NSFetchedResultsController {
-        
-        return CoreStoreFetchedResultsController<T>(
-            context: context,
-            fetchRequest: fetchRequest,
-            from: from,
-            sectionBy: sectionBy,
-            fetchClauses: fetchClauses
-        )
-    }
-}

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

@@ -1,374 +0,0 @@
-//
-//  From.swift
-//  CoreStore
-//
-//  Copyright © 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: - From
-
-/**
- A `From` clause specifies the source entity and source persistent store for fetch and query methods. A common usage is to just indicate the entity:
- ```
- let person = transaction.fetchOne(From(MyPersonEntity))
- ```
- For cases where multiple `NSPersistentStore`s contain the same entity, the source configuration's name needs to be specified as well:
- ```
- let person = transaction.fetchOne(From<MyPersonEntity>("Configuration1"))
- ```
- */
-public struct From<T: NSManagedObject> {
-    
-    /**
-     Initializes a `From` clause.
-     Sample Usage:
-     ```
-     let people = transaction.fetchAll(From<MyPersonEntity>())
-     ```
-     */
-    public init(){
-        
-        self.init(entityClass: T.self)
-    }
-    
-    /**
-     Initializes a `From` clause with the specified entity type.
-     Sample Usage:
-     ```
-     let people = transaction.fetchAll(From<MyPersonEntity>())
-     ```
-     - parameter entity: the `NSManagedObject` type to be created
-     */
-    public init(_ entity: T.Type) {
-        
-        self.init(entityClass: entity)
-    }
-    
-    /**
-     Initializes a `From` clause with the specified entity class.
-     Sample Usage:
-     ```
-     let people = transaction.fetchAll(From<MyPersonEntity>())
-     ```
-     - parameter entityClass: the `NSManagedObject` class type to be created
-     */
-    public init(_ entityClass: AnyClass) {
-        
-        self.init(entityClass: entityClass)
-    }
-    
-    /**
-     Initializes a `From` clause with the specified configurations.
-     Sample Usage:
-     ```
-     let people = transaction.fetchAll(From<MyPersonEntity>(nil, "Configuration1"))
-     ```
-     - parameter configuration: the `NSPersistentStore` configuration name to associate objects from. This parameter is required if multiple configurations contain the created `NSManagedObject`'s entity type. Set to `nil` to use the default configuration.
-     - parameter otherConfigurations: an optional list of other configuration names to associate objects from (see `configuration` parameter)
-     */
-    public init(_ configuration: String?, otherConfigurations: String?...) {
-        
-        self.init(entityClass: T.self, configurations: [configuration] + otherConfigurations)
-    }
-    
-    /**
-     Initializes a `From` clause with the specified configurations.
-     Sample Usage:
-     ```
-     let people = transaction.fetchAll(From<MyPersonEntity>(["Configuration1", "Configuration2"]))
-     ```
-     - parameter configurations: a list of `NSPersistentStore` configuration names to associate objects from. This parameter is required if multiple configurations contain the created `NSManagedObject`'s entity type. Set to `nil` to use the default configuration.
-     */
-    public init(_ configurations: [String?]) {
-        
-        self.init(entityClass: T.self, configurations: configurations)
-    }
-    
-    /**
-     Initializes a `From` clause with the specified configurations.
-     Sample Usage:
-     ```
-     let people = transaction.fetchAll(From(MyPersonEntity.self, nil, "Configuration1"))
-     ```
-     - parameter entity: the associated `NSManagedObject` type
-     - parameter configuration: the `NSPersistentStore` configuration name to associate objects from. This parameter is required if multiple configurations contain the created `NSManagedObject`'s entity type. Set to `nil` to use the default configuration.
-     - parameter otherConfigurations: an optional list of other configuration names to associate objects from (see `configuration` parameter)
-     */
-    public init(_ entity: T.Type, _ configuration: String?, _ otherConfigurations: String?...) {
-        
-        self.init(entityClass: entity, configurations: [configuration] + otherConfigurations)
-    }
-    
-    /**
-     Initializes a `From` clause with the specified configurations.
-     Sample Usage:
-     ```
-     let people = transaction.fetchAll(From(MyPersonEntity.self, ["Configuration1", "Configuration1"]))
-     ```
-     - parameter entity: the associated `NSManagedObject` type
-     - parameter configurations: a list of `NSPersistentStore` configuration names to associate objects from. This parameter is required if multiple configurations contain the created `NSManagedObject`'s entity type. Set to `nil` to use the default configuration.
-     */
-    public init(_ entity: T.Type, _ configurations: [String?]) {
-        
-        self.init(entityClass: entity, configurations: configurations)
-    }
-    
-    /**
-     Initializes a `From` clause with the specified configurations.
-     Sample Usage:
-     ```
-     let people = transaction.fetchAll(From(MyPersonEntity.self, nil, "Configuration1"))
-     ```
-     - parameter entity: the associated `NSManagedObject` entity class
-     - parameter configuration: the `NSPersistentStore` configuration name to associate objects from. This parameter is required if multiple configurations contain the created `NSManagedObject`'s entity type. Set to `nil` to use the default configuration.
-     - parameter otherConfigurations: an optional list of other configuration names to associate objects from (see `configuration` parameter)
-     */
-    public init(_ entityClass: AnyClass, _ configuration: String?, _ otherConfigurations: String?...) {
-        
-        self.init(entityClass: entityClass, configurations: [configuration] + otherConfigurations)
-    }
-    
-    /**
-     Initializes a `From` clause with the specified configurations.
-     Sample Usage:
-     ```
-     let people = transaction.fetchAll(From(MyPersonEntity.self, ["Configuration1", "Configuration1"]))
-     ```
-     - parameter entity: the associated `NSManagedObject` entity class
-     - parameter configurations: a list of `NSPersistentStore` configuration names to associate objects from. This parameter is required if multiple configurations contain the created `NSManagedObject`'s entity type. Set to `nil` to use the default configuration.
-     */
-    public init(_ entityClass: AnyClass, _ configurations: [String?]) {
-        
-        self.init(entityClass: entityClass, configurations: configurations)
-    }
-    
-    /**
-     Initializes a `From` clause with the specified store URLs.
-     
-     - parameter storeURL: the persistent store URL to associate objects from.
-     - parameter otherStoreURLs: an optional list of other persistent store URLs to associate objects from (see `storeURL` parameter)
-     */
-    public init(_ storeURL: NSURL, _ otherStoreURLs: NSURL...) {
-        
-        self.init(entityClass: T.self, storeURLs: [storeURL] + otherStoreURLs)
-    }
-    
-    /**
-     Initializes a `From` clause with the specified store URLs.
-     
-     - parameter storeURLs: the persistent store URLs to associate objects from.
-     */
-    public init(_ storeURLs: [NSURL]) {
-        
-        self.init(entityClass: T.self, storeURLs: storeURLs)
-    }
-    
-    /**
-     Initializes a `From` clause with the specified store URLs.
-     
-     - parameter entity: the associated `NSManagedObject` type
-     - parameter storeURL: the persistent store URL to associate objects from.
-     - parameter otherStoreURLs: an optional list of other persistent store URLs to associate objects from (see `storeURL` parameter)
-     */
-    public init(_ entity: T.Type, _ storeURL: NSURL, _ otherStoreURLs: NSURL...) {
-        
-        self.init(entityClass: entity, storeURLs: [storeURL] + otherStoreURLs)
-    }
-    
-    /**
-     Initializes a `From` clause with the specified store URLs.
-     
-     - parameter entity: the associated `NSManagedObject` type
-     - parameter storeURLs: the persistent store URLs to associate objects from.
-     */
-    public init(_ entity: T.Type, _ storeURLs: [NSURL]) {
-        
-        self.init(entityClass: entity, storeURLs: storeURLs)
-    }
-    
-    /**
-     Initializes a `From` clause with the specified store URLs.
-     
-     - parameter entity: the associated `NSManagedObject` entity class
-     - parameter storeURL: the persistent store URL to associate objects from.
-     - parameter otherStoreURLs: an optional list of other persistent store URLs to associate objects from (see `storeURL` parameter)
-     */
-    public init(_ entityClass: AnyClass, _ storeURL: NSURL, _ otherStoreURLs: NSURL...) {
-        
-        self.init(entityClass: entityClass, storeURLs: [storeURL] + otherStoreURLs)
-    }
-    
-    /**
-     Initializes a `From` clause with the specified store URLs.
-     
-     - parameter entity: the associated `NSManagedObject` entity class
-     - parameter storeURLs: the persistent store URLs to associate objects from.
-     */
-    public init(_ entityClass: AnyClass, _ storeURLs: [NSURL]) {
-        
-        self.init(entityClass: entityClass, storeURLs: storeURLs)
-    }
-    
-    /**
-     Initializes a `From` clause with the specified `NSPersistentStore`s.
-     
-     - parameter persistentStore: the `NSPersistentStore` to associate objects from.
-     - parameter otherPersistentStores: an optional list of other `NSPersistentStore`s to associate objects from (see `persistentStore` parameter)
-     */
-    public init(_ persistentStore: NSPersistentStore, _ otherPersistentStores: NSPersistentStore...) {
-        
-        self.init(entityClass: T.self, persistentStores: [persistentStore] + otherPersistentStores)
-    }
-    
-    /**
-     Initializes a `From` clause with the specified `NSPersistentStore`s.
-     
-     - parameter persistentStores: the `NSPersistentStore`s to associate objects from.
-     */
-    public init(_ persistentStores: [NSPersistentStore]) {
-        
-        self.init(entityClass: T.self, persistentStores: persistentStores)
-    }
-    
-    /**
-     Initializes a `From` clause with the specified `NSPersistentStore`s.
-     
-     - parameter entity: the associated `NSManagedObject` type
-     - parameter persistentStore: the `NSPersistentStore` to associate objects from.
-     - parameter otherPersistentStores: an optional list of other `NSPersistentStore`s to associate objects from (see `persistentStore` parameter)
-     */
-    public init(_ entity: T.Type, _ persistentStore: NSPersistentStore, _ otherPersistentStores: NSPersistentStore...) {
-        
-        self.init(entityClass: entity, persistentStores: [persistentStore] + otherPersistentStores)
-    }
-    
-    /**
-     Initializes a `From` clause with the specified `NSPersistentStore`s.
-     
-     - parameter entity: the associated `NSManagedObject` type
-     - parameter persistentStores: the `NSPersistentStore`s to associate objects from.
-     */
-    public init(_ entity: T.Type, _ persistentStores: [NSPersistentStore]) {
-        
-        self.init(entityClass: entity, persistentStores: persistentStores)
-    }
-    
-    /**
-     Initializes a `From` clause with the specified `NSPersistentStore`s.
-     
-     - parameter entity: the associated `NSManagedObject` entity class
-     - parameter persistentStore: the `NSPersistentStore` to associate objects from.
-     - parameter otherPersistentStores: an optional list of other `NSPersistentStore`s to associate objects from (see `persistentStore` parameter)
-     */
-    public init(_ entityClass: AnyClass, _ persistentStore: NSPersistentStore, _ otherPersistentStores: NSPersistentStore...) {
-        
-        self.init(entityClass: entityClass, persistentStores: [persistentStore] + otherPersistentStores)
-    }
-    
-    /**
-     Initializes a `From` clause with the specified `NSPersistentStore`s.
-     
-     - parameter entity: the associated `NSManagedObject` entity class
-     - parameter persistentStores: the `NSPersistentStore`s to associate objects from.
-     */
-    public init(_ entityClass: AnyClass, _ persistentStores: [NSPersistentStore]) {
-        
-        self.init(entityClass: entityClass, persistentStores: persistentStores)
-    }
-    
-    
-    // MARK: Internal
-    
-    internal func applyToFetchRequest(fetchRequest: NSFetchRequest, context: NSManagedObjectContext, applyAffectedStores: Bool = true) {
-        
-        fetchRequest.entity = context.entityDescriptionForEntityClass(self.entityClass)
-        if applyAffectedStores {
-            
-            self.applyAffectedStoresForFetchedRequest(fetchRequest, context: context)
-        }
-    }
-    
-    internal func applyAffectedStoresForFetchedRequest(fetchRequest: NSFetchRequest, context: NSManagedObjectContext) -> Bool {
-        
-        let stores = self.findPersistentStores(context: context)
-        fetchRequest.affectedStores = stores
-        return stores?.isEmpty == false
-    }
-    
-    
-    // MARK: Private
-    
-    private let entityClass: AnyClass
-    
-    private let findPersistentStores: (context: NSManagedObjectContext) -> [NSPersistentStore]?
-    
-    private init(entityClass: AnyClass) {
-        
-        self.entityClass = entityClass
-        self.findPersistentStores = { (context: NSManagedObjectContext) -> [NSPersistentStore]? in
-            
-            return context.parentStack?.persistentStoresForEntityClass(entityClass)
-        }
-    }
-    
-    private init(entityClass: AnyClass, configurations: [String?]) {
-        
-        let configurationsSet = Set(configurations.map { $0 ?? Into.defaultConfigurationName })
-        self.entityClass = entityClass
-        self.findPersistentStores = { (context: NSManagedObjectContext) -> [NSPersistentStore]? in
-            
-            return context.parentStack?.persistentStoresForEntityClass(entityClass)?.filter {
-                
-                return configurationsSet.contains($0.configurationName)
-            }
-        }
-    }
-    
-    private init(entityClass: AnyClass, storeURLs: [NSURL]) {
-        
-        let storeURLsSet = Set(storeURLs)
-        self.entityClass = entityClass
-        self.findPersistentStores = { (context: NSManagedObjectContext) -> [NSPersistentStore]? in
-            
-            return context.parentStack?.persistentStoresForEntityClass(entityClass)?.filter {
-                
-                return $0.URL != nil && storeURLsSet.contains($0.URL!)
-            }
-        }
-    }
-    
-    private init(entityClass: AnyClass, persistentStores: [NSPersistentStore]) {
-        
-        let persistentStores = Set(persistentStores)
-        self.entityClass = entityClass
-        self.findPersistentStores = { (context: NSManagedObjectContext) -> [NSPersistentStore]? in
-            
-            return context.parentStack?.persistentStoresForEntityClass(entityClass)?.filter {
-                
-                return persistentStores.contains($0)
-            }
-        }
-    }
-}

CoreStore/Internal/NSFileManager+Setup.swift

@@ -1,26 +0,0 @@
-//
-//  NSFileManager+Setup.swift
-//  CoreStore
-//
-//  Created by John Rommel Estropia on 2015/07/19.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
-//
-
-import Foundation
-
-
-// MARK: - NSFileManager
-
-internal extension NSFileManager {
-    
-    // MARK: Internal
-    
-    internal func removeSQLiteStoreAtURL(fileURL: NSURL) {
-        
-        _ = try? self.removeItemAtURL(fileURL)
-        
-        let filePath = fileURL.path!
-        _ = try? self.removeItemAtPath(filePath.stringByAppendingString("-shm"))
-        _ = try? self.removeItemAtPath(filePath.stringByAppendingString("-wal"))
-    }
-}

CoreStore/Internal/NSManagedObjectContext+Querying.swift

@@ -1,422 +0,0 @@
-//
-//  NSManagedObjectContext+Querying.swift
-//  CoreStore
-//
-//  Copyright © 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: - NSManagedObjectContext
-
-internal extension NSManagedObjectContext {
-    
-    // MARK: Internal
-    
-    internal func fetchExisting<T: NSManagedObject>(object: T) -> T? {
-        
-        if object.objectID.temporaryID {
-            
-            do {
-                
-                try withExtendedLifetime(self) { (context: NSManagedObjectContext) -> Void in
-                    
-                    try context.obtainPermanentIDsForObjects([object])
-                }
-            }
-            catch {
-                
-                CoreStore.handleError(
-                    error as NSError,
-                    "Failed to obtain permanent ID for object."
-                )
-                return nil
-            }
-        }
-        
-        do {
-            
-            let existingObject = try self.existingObjectWithID(object.objectID)
-            return (existingObject as! T)
-        }
-        catch {
-            
-            CoreStore.handleError(
-                error as NSError,
-                "Failed to load existing \(typeName(object)) in context."
-            )
-            return nil
-        }
-    }
-    
-    internal func fetchOne<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> T? {
-        
-        return self.fetchOne(from, fetchClauses)
-    }
-    
-    internal func fetchOne<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> T? {
-        
-        let fetchRequest = CoreStoreFetchRequest()
-        from.applyToFetchRequest(fetchRequest, context: self)
-        
-        fetchRequest.fetchLimit = 1
-        fetchRequest.resultType = .ManagedObjectResultType
-        
-        for clause in fetchClauses {
-            
-            clause.applyToFetchRequest(fetchRequest)
-        }
-        
-        var fetchResults: [T]?
-        var fetchError: NSError?
-        self.performBlockAndWait {
-            
-            do {
-                
-                fetchResults = try self.executeFetchRequest(fetchRequest) as? [T]
-            }
-            catch {
-                
-                fetchError = error as NSError
-            }
-        }
-        if fetchResults == nil {
-            
-            CoreStore.handleError(
-                fetchError ?? NSError(coreStoreErrorCode: .UnknownError),
-                "Failed executing fetch request."
-            )
-            return nil
-        }
-        
-        return fetchResults?.first
-    }
-    
-    internal func fetchAll<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> [T]? {
-        
-        return self.fetchAll(from, fetchClauses)
-    }
-    
-    internal func fetchAll<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> [T]? {
-        
-        let fetchRequest = CoreStoreFetchRequest()
-        from.applyToFetchRequest(fetchRequest, context: self)
-        
-        fetchRequest.fetchLimit = 0
-        fetchRequest.resultType = .ManagedObjectResultType
-        
-        for clause in fetchClauses {
-            
-            clause.applyToFetchRequest(fetchRequest)
-        }
-        
-        var fetchResults: [T]?
-        var fetchError: NSError?
-        self.performBlockAndWait {
-            
-            do {
-                
-                fetchResults = try self.executeFetchRequest(fetchRequest) as? [T]
-            }
-            catch {
-                
-                fetchError = error as NSError
-            }
-        }
-        if fetchResults == nil {
-            
-            CoreStore.handleError(
-                fetchError ?? NSError(coreStoreErrorCode: .UnknownError),
-                "Failed executing fetch request."
-            )
-            return nil
-        }
-        
-        return fetchResults
-    }
-    
-    internal func fetchCount<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> Int? {
-    
-        return self.fetchCount(from, fetchClauses)
-    }
-    
-    internal func fetchCount<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> Int? {
-        
-        let fetchRequest = CoreStoreFetchRequest()
-        from.applyToFetchRequest(fetchRequest, context: self)
-        
-        for clause in fetchClauses {
-            
-            clause.applyToFetchRequest(fetchRequest)
-        }
-        
-        var count = 0
-        var error: NSError?
-        self.performBlockAndWait {
-            
-            count = self.countForFetchRequest(fetchRequest, error: &error)
-        }
-        if count == NSNotFound {
-            
-            CoreStore.handleError(
-                error ?? NSError(coreStoreErrorCode: .UnknownError),
-                "Failed executing fetch request."
-            )
-            return nil
-        }
-        
-        return count
-    }
-    
-    internal func fetchObjectID<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> NSManagedObjectID? {
-        
-        return self.fetchObjectID(from, fetchClauses)
-    }
-    
-    internal func fetchObjectID<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> NSManagedObjectID? {
-        
-        let fetchRequest = CoreStoreFetchRequest()
-        from.applyToFetchRequest(fetchRequest, context: self)
-        
-        fetchRequest.fetchLimit = 1
-        fetchRequest.resultType = .ManagedObjectIDResultType
-        
-        for clause in fetchClauses {
-            
-            clause.applyToFetchRequest(fetchRequest)
-        }
-        
-        var fetchResults: [NSManagedObjectID]?
-        var fetchError: NSError?
-        self.performBlockAndWait {
-            
-            do {
-                
-                fetchResults = try self.executeFetchRequest(fetchRequest) as? [NSManagedObjectID]
-            }
-            catch {
-                
-                fetchError = error as NSError
-            }
-        }
-        if fetchResults == nil {
-            
-            CoreStore.handleError(
-                fetchError ?? NSError(coreStoreErrorCode: .UnknownError),
-                "Failed executing fetch request."
-            )
-            return nil
-        }
-        
-        return fetchResults?.first
-    }
-    
-    internal func fetchObjectIDs<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> [NSManagedObjectID]? {
-        
-        return self.fetchObjectIDs(from, fetchClauses)
-    }
-    
-    internal func fetchObjectIDs<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> [NSManagedObjectID]? {
-        
-        let fetchRequest = CoreStoreFetchRequest()
-        from.applyToFetchRequest(fetchRequest, context: self)
-        
-        fetchRequest.fetchLimit = 0
-        fetchRequest.resultType = .ManagedObjectIDResultType
-        
-        for clause in fetchClauses {
-            
-            clause.applyToFetchRequest(fetchRequest)
-        }
-        
-        var fetchResults: [NSManagedObjectID]?
-        var fetchError: NSError?
-        self.performBlockAndWait {
-            
-            do {
-                
-                fetchResults = try self.executeFetchRequest(fetchRequest) as? [NSManagedObjectID]
-            }
-            catch {
-                
-                fetchError = error as NSError
-            }
-        }
-        if fetchResults == nil {
-            
-            CoreStore.handleError(
-                fetchError ?? NSError(coreStoreErrorCode: .UnknownError),
-                "Failed executing fetch request."
-            )
-            return nil
-        }
-        
-        return fetchResults
-    }
-    
-    internal func deleteAll<T: NSManagedObject>(from: From<T>, _ deleteClauses: DeleteClause...) -> Int? {
-        
-        return self.deleteAll(from, deleteClauses)
-    }
-    
-    internal func deleteAll<T: NSManagedObject>(from: From<T>, _ deleteClauses: [DeleteClause]) -> Int? {
-        
-        let fetchRequest = CoreStoreFetchRequest()
-        from.applyToFetchRequest(fetchRequest, context: self)
-        
-        fetchRequest.fetchLimit = 0
-        fetchRequest.resultType = .ManagedObjectResultType
-        fetchRequest.returnsObjectsAsFaults = true
-        fetchRequest.includesPropertyValues = false
-        
-        for clause in deleteClauses {
-            
-            clause.applyToFetchRequest(fetchRequest)
-        }
-        
-        var numberOfDeletedObjects: Int?
-        var fetchError: NSError?
-        self.performBlockAndWait {
-            
-            autoreleasepool {
-                
-                do {
-                    
-                    let fetchResults = try self.executeFetchRequest(fetchRequest) as? [T] ?? []
-                    for object in fetchResults {
-                        
-                        self.deleteObject(object)
-                    }
-                    numberOfDeletedObjects = fetchResults.count
-                }
-                catch {
-                    
-                    fetchError = error as NSError
-                }
-            }
-        }
-        if numberOfDeletedObjects == nil {
-            
-            CoreStore.handleError(
-                fetchError ?? NSError(coreStoreErrorCode: .UnknownError),
-                "Failed executing fetch request."
-            )
-            return nil
-        }
-        
-        return numberOfDeletedObjects
-    }
-    
-    internal func queryValue<T: NSManagedObject, U: SelectValueResultType>(from: From<T>, _ selectClause: Select<U>, _ queryClauses: QueryClause...) -> U? {
-        
-        return self.queryValue(from, selectClause, queryClauses)
-    }
-    
-    internal func queryValue<T: NSManagedObject, U: SelectValueResultType>(from: From<T>, _ selectClause: Select<U>, _ queryClauses: [QueryClause]) -> U? {
-        
-        let fetchRequest = CoreStoreFetchRequest()
-        from.applyToFetchRequest(fetchRequest, context: self)
-        
-        fetchRequest.fetchLimit = 0
-        
-        selectClause.applyToFetchRequest(fetchRequest)
-        
-        for clause in queryClauses {
-            
-            clause.applyToFetchRequest(fetchRequest)
-        }
-        
-        var fetchResults: [AnyObject]?
-        var fetchError: NSError?
-        self.performBlockAndWait {
-            
-            do {
-                
-                fetchResults = try self.executeFetchRequest(fetchRequest)
-            }
-            catch {
-                
-                fetchError = error as NSError
-            }
-        }
-        if let fetchResults = fetchResults {
-            
-            if let rawResult = fetchResults.first as? NSDictionary,
-                let rawObject: AnyObject = rawResult[selectClause.keyPathForFirstSelectTerm()] {
-                    
-                    return Select<U>.ReturnType.fromResultObject(rawObject)
-            }
-            return nil
-        }
-        
-        CoreStore.handleError(
-            fetchError ?? NSError(coreStoreErrorCode: .UnknownError),
-            "Failed executing fetch request."
-        )
-        return nil
-    }
-    
-    internal func queryAttributes<T: NSManagedObject>(from: From<T>, _ selectClause: Select<NSDictionary>, _ queryClauses: QueryClause...) -> [[NSString: AnyObject]]? {
-        
-        return self.queryAttributes(from, selectClause, queryClauses)
-    }
-    
-    internal func queryAttributes<T: NSManagedObject>(from: From<T>, _ selectClause: Select<NSDictionary>, _ queryClauses: [QueryClause]) -> [[NSString: AnyObject]]? {
-        
-        let fetchRequest = CoreStoreFetchRequest()
-        from.applyToFetchRequest(fetchRequest, context: self)
-        
-        fetchRequest.fetchLimit = 0
-        
-        selectClause.applyToFetchRequest(fetchRequest)
-        
-        for clause in queryClauses {
-            
-            clause.applyToFetchRequest(fetchRequest)
-        }
-        
-        var fetchResults: [AnyObject]?
-        var fetchError: NSError?
-        self.performBlockAndWait {
-            
-            do {
-                
-                fetchResults = try self.executeFetchRequest(fetchRequest)
-            }
-            catch {
-                
-                fetchError = error as NSError
-            }
-        }
-        if let fetchResults = fetchResults {
-            
-            return Select<NSDictionary>.ReturnType.fromResultObjects(fetchResults)
-        }
-        
-        CoreStore.handleError(
-            fetchError ?? NSError(coreStoreErrorCode: .UnknownError),
-            "Failed executing fetch request."
-        )
-        return nil
-    }
-}

CoreStore/Logging/CoreStoreLogger.swift

@@ -1,105 +0,0 @@
-//
-//  CoreStoreLogger.swift
-//  CoreStore
-//
-//  Copyright © 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
-
-
-// MARK: - LogLevel
-
-/**
- The `LogLevel` indicates the severity of a log message.
- */
-public enum LogLevel {
-    
-    case Trace
-    case Notice
-    case Warning
-    case Fatal
-}
-
-
-// MARK: - CoreStoreLogger
-
-/**
- Custom loggers should implement the `CoreStoreLogger` protocol and pass its instance to `CoreStore.logger`. Calls to `log(...)`, `handleError(...)`, and `assert(...)` are not tied to a specific queue/thread, so it is the implementer's job to handle thread-safety.
- */
-public protocol CoreStoreLogger {
-    
-    /**
-     Handles log messages sent by the `CoreStore` framework.
-     
-     :level: the severity of the log message
-     :message: the log message
-     :fileName: the source file name
-     :lineNumber: the source line number
-     :functionName: the source function name
-     */
-    func log(level level: LogLevel, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString)
-    
-    /**
-     Handles errors sent by the `CoreStore` framework.
-     
-     :error: the error
-     :message: the error message
-     :fileName: the source file name
-     :lineNumber: the source line number
-     :functionName: the source function name
-     */
-    func handleError(error error: NSError, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString)
-    
-    /**
-     Handles assertions made throughout the `CoreStore` framework.
-     
-     :condition: the assertion condition
-     :message: the assertion message
-     :fileName: the source file name
-     :lineNumber: the source line number
-     :functionName: the source function name
-     */
-    func assert(@autoclosure condition: () -> Bool, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString)
-}
-
-
-// MARK: - Utilities
-
-internal func typeName<T>(value: T) -> String {
-    
-    return "'\(String(reflecting: value.dynamicType))'"
-}
-
-internal func typeName<T>(value: T.Type) -> String {
-    
-    return "'\(value)'"
-}
-
-internal func typeName(value: AnyClass) -> String {
-    
-    return "'\(value)'"
-}
-
-internal func typeName(name: String?) -> String {
-    
-    return "<\(name ?? "unknown")>"
-}

CoreStore/Logging/DefaultLogger.swift

@@ -1,87 +0,0 @@
-//
-//  DefaultLogger.swift
-//  CoreStore
-//
-//  Copyright © 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
-
-
-// MARK: - DefaultLogger
-
-/**
- The `DefaultLogger` is a basic implementation of the `CoreStoreLogger` protocol.
- 
- - The `log(...)` method calls `print(...)` to print the level, source file name, line number, function name, and the log message.
- - The `handleError(...)` method calls `print(...)` to print the source file name, line number, function name, and the error message.
- - The `assert(...)` method calls `assert(...)` on the arguments.
- */
-public final class DefaultLogger: CoreStoreLogger {
-    
-    public init() { }
-   
-    public func log(level level: LogLevel, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
-        
-        #if DEBUG
-            let icon: String
-            let levelString: String
-            switch level {
-                
-            case .Trace:
-                icon = "🔹"
-                levelString = "Trace"
-                
-            case .Notice:
-                icon = "🔸"
-                levelString = "Notice"
-                
-            case .Warning:
-                icon = "⚠️"
-                levelString = "Warning"
-                
-            case .Fatal:
-                icon = "❗"
-                levelString = "Fatal"
-            }
-            Swift.print("\(icon) [CoreStore: \(levelString)] \((fileName.stringValue as NSString).lastPathComponent):\(lineNumber) \(functionName)\n  ↪︎ \(message)\n")
-        #endif
-    }
-    
-    public func handleError(error error: NSError, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
-        
-        #if DEBUG
-            Swift.print("⚠️ [CoreStore: Error] \((fileName.stringValue as NSString).lastPathComponent):\(lineNumber) \(functionName)\n  ↪︎ \(message)\n    \(error)\n")
-        #endif
-    }
-    
-    public func assert(@autoclosure condition: () -> Bool, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
-        
-        #if DEBUG
-            if condition() {
-                
-                return
-            }
-            Swift.print("❗ [CoreStore: Assertion Failure] \((fileName.stringValue as NSString).lastPathComponent):\(lineNumber) \(functionName)\n  ↪︎ \(message)\n")
-            Swift.fatalError()
-        #endif
-    }
-}

CoreStore/Migrating/CoreStore+Migration.swift

@@ -1,152 +0,0 @@
-//
-//  CoreStore+Migration.swift
-//  CoreStore
-//
-//  Copyright © 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
-
-
-// MARK: - CoreStore
-
-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 (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.
-     - parameter completion: the closure to be executed on the main queue when the process completes, either due to success or failure. The closure's `PersistentStoreResult` argument indicates the result. This closure is NOT executed if an error is thrown, but will be executed with a `.Failure` result if an error occurs asynchronously.
-     - returns: an `NSProgress` instance if a migration has started, or `nil` is no migrations are required
-     */
-    public static func addSQLiteStore(fileName fileName: String, configuration: String? = nil, mappingModelBundles: [NSBundle]? = nil, resetStoreOnModelMismatch: Bool = false, completion: (PersistentStoreResult) -> Void) throws -> NSProgress? {
-        
-        return try self.defaultStack.addSQLiteStore(
-            fileName: fileName,
-            configuration: configuration,
-            mappingModelBundles: mappingModelBundles,
-            resetStoreOnModelMismatch: resetStoreOnModelMismatch,
-            completion: completion
-        )
-    }
-    
-    /**
-     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 (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.
-     - parameter completion: the closure to be executed on the main queue when the process completes, either due to success or failure. The closure's `PersistentStoreResult` argument indicates the result. This closure is NOT executed if an error is thrown, but will be executed with a `.Failure` result if an error occurs asynchronously.
-     - returns: an `NSProgress` instance if a migration has started, or `nil` is no migrations are required
-     */
-    public static func addSQLiteStore(fileURL fileURL: NSURL = defaultSQLiteStoreURL, configuration: String? = nil, mappingModelBundles: [NSBundle]? = NSBundle.allBundles(), resetStoreOnModelMismatch: Bool = false, completion: (PersistentStoreResult) -> Void) throws -> NSProgress? {
-        
-        return try self.defaultStack.addSQLiteStore(
-            fileURL: fileURL,
-            configuration: configuration,
-            mappingModelBundles: mappingModelBundles,
-            resetStoreOnModelMismatch: resetStoreOnModelMismatch,
-            completion: completion
-        )
-    }
-    
-    /**
-     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 (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()`.
-     - returns: an `NSProgress` instance if a migration has started, or `nil` is no migrations are required
-     */
-    public static func upgradeSQLiteStoreIfNeeded(fileName fileName: String, configuration: String? = nil, mappingModelBundles: [NSBundle]? = nil, completion: (MigrationResult) -> Void) throws -> NSProgress? {
-        
-        return try self.defaultStack.upgradeSQLiteStoreIfNeeded(
-            fileName: fileName,
-            configuration: configuration,
-            mappingModelBundles: mappingModelBundles,
-            completion: completion
-        )
-    }
-    
-    /**
-     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 (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()`.
-     - returns: an `NSProgress` instance if a migration has started, or `nil` is no migrations are required
-     */
-    public static func upgradeSQLiteStoreIfNeeded(fileURL fileURL: NSURL = defaultSQLiteStoreURL, configuration: String? = nil, mappingModelBundles: [NSBundle]? = nil, completion: (MigrationResult) -> Void) throws -> NSProgress? {
-        
-        return try self.defaultStack.upgradeSQLiteStoreIfNeeded(
-            fileURL: fileURL,
-            configuration: configuration,
-            mappingModelBundles: mappingModelBundles,
-            completion: completion
-        )
-    }
-    
-    /**
-     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 (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.
-     */
-    @warn_unused_result
-    public static func requiredMigrationsForSQLiteStore(fileName fileName: String, configuration: String? = nil, mappingModelBundles: [NSBundle] = NSBundle.allBundles() as [NSBundle]) throws -> [MigrationType] {
-        
-        return try self.defaultStack.requiredMigrationsForSQLiteStore(
-            fileName: fileName,
-            configuration: configuration,
-            mappingModelBundles: mappingModelBundles
-        )
-    }
-    
-    /**
-     Using the `defaultStack`, checks if the store at the specified file URL and configuration needs to be migrated to the `DataStack`'s managed object model version.
-     
-     - parameter fileURL: the local file URL for the SQLite persistent store.
-     - 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: a `MigrationType` indicating the type of migration 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.
-     */
-    @warn_unused_result
-    public static func requiredMigrationsForSQLiteStore(fileURL fileURL: NSURL = defaultSQLiteStoreURL, configuration: String? = nil, mappingModelBundles: [NSBundle] = NSBundle.allBundles() as [NSBundle]) throws -> [MigrationType] {
-        
-        return try self.defaultStack.requiredMigrationsForSQLiteStore(
-            fileURL: fileURL,
-            configuration: configuration,
-            mappingModelBundles: mappingModelBundles
-        )
-    }
-}

CoreStore/Migrating/DataStack+Migration.swift

@@ -1,644 +0,0 @@
-//
-//  DataStack+Migration.swift
-//  CoreStore
-//
-//  Copyright © 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
-
-
-// MARK: - DataStack
-
-public extension DataStack {
-    
-    /**
-     Asynchronously adds an in-memory store to the stack.
-     
-     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil`.
-     - parameter completion: the closure to be executed on the main queue when the process completes, either due to success or failure. The closure's `PersistentStoreResult` argument indicates the result.
-     */
-    public func addInMemoryStore(configuration configuration: String? = nil, completion: (PersistentStoreResult) -> Void) {
-        
-        self.coordinator.performAsynchronously {
-            
-            do {
-                
-                let store = try self.coordinator.addPersistentStoreWithType(
-                    NSInMemoryStoreType,
-                    configuration: configuration,
-                    URL: nil,
-                    options: nil
-                )
-                self.updateMetadataForPersistentStore(store)
-                
-                GCDQueue.Main.async {
-                    
-                    completion(PersistentStoreResult(store))
-                }
-            }
-            catch {
-                
-                let storeError = error as NSError
-                CoreStore.handleError(
-                    storeError,
-                    "Failed to add in-memory \(typeName(NSPersistentStore)) to the stack."
-                )
-                
-                GCDQueue.Main.async {
-                    
-                    completion(PersistentStoreResult(storeError))
-                }
-            }
-        }
-    }
-    
-    /**
-     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 (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.
-     - parameter completion: the closure to be executed on the main queue when the process completes, either due to success or failure. The closure's `PersistentStoreResult` argument indicates the result. This closure is NOT executed if an error is thrown, but will be executed with a `.Failure` result if an error occurs asynchronously.
-     - returns: an `NSProgress` instance if a migration has started, or `nil` is no migrations are required
-     */
-    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: defaultDirectory.URLByAppendingPathComponent(
-                fileName,
-                isDirectory: false
-            ),
-            configuration: configuration,
-            mappingModelBundles: mappingModelBundles,
-            resetStoreOnModelMismatch: resetStoreOnModelMismatch,
-            completion: completion
-        )
-    }
-    
-    /**
-     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 (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.
-     - parameter completion: the closure to be executed on the main queue when the process completes, either due to success or failure. The closure's `PersistentStoreResult` argument indicates the result. This closure is NOT executed if an error is thrown, but will be executed with a `.Failure` result if an error occurs asynchronously.
-     - returns: an `NSProgress` instance if a migration has started, or `nil` is no migrations are required
-     */
-    public func addSQLiteStore(fileURL fileURL: NSURL = defaultSQLiteStoreURL, configuration: String? = nil, mappingModelBundles: [NSBundle]? = NSBundle.allBundles(), resetStoreOnModelMismatch: Bool = false, completion: (PersistentStoreResult) -> Void) throws -> NSProgress? {
-        
-        CoreStore.assert(
-            fileURL.fileURL,
-            "The specified file URL for the SQLite store is invalid: \"\(fileURL)\""
-        )
-        
-        let coordinator = self.coordinator;
-        if let store = coordinator.persistentStoreForURL(fileURL) {
-            
-            guard store.type == NSSQLiteStoreType
-                && store.configurationName == (configuration ?? Into.defaultConfigurationName) else {
-                    
-                    let error = NSError(coreStoreErrorCode: .DifferentPersistentStoreExistsAtURL)
-                    CoreStore.handleError(
-                        error,
-                        "Failed to add SQLite \(typeName(NSPersistentStore)) at \"\(fileURL)\" because a different \(typeName(NSPersistentStore)) at that URL already exists."
-                    )
-                    throw error
-            }
-            
-            GCDQueue.Main.async {
-                
-                completion(PersistentStoreResult(store))
-            }
-            return nil
-        }
-        
-        let fileManager = NSFileManager.defaultManager()
-        _ = try? fileManager.createDirectoryAtURL(
-            fileURL.URLByDeletingLastPathComponent!,
-            withIntermediateDirectories: true,
-            attributes: nil
-        )
-        
-        do {
-            
-            let metadata = try NSPersistentStoreCoordinator.metadataForPersistentStoreOfType(
-                NSSQLiteStoreType,
-                URL: fileURL,
-                options: self.optionsForSQLiteStore()
-            )
-            
-            return self.upgradeSQLiteStoreIfNeeded(
-                fileURL: fileURL,
-                metadata: metadata,
-                configuration: configuration,
-                mappingModelBundles: mappingModelBundles,
-                completion: { (result) -> Void in
-                    
-                    if case .Failure(let error) = result {
-                        
-                        if resetStoreOnModelMismatch && error.isCoreDataMigrationError {
-                            
-                            fileManager.removeSQLiteStoreAtURL(fileURL)
-                            do {
-                                
-                                let store = try self.addSQLiteStoreAndWait(
-                                    fileURL: fileURL,
-                                    configuration: configuration,
-                                    resetStoreOnModelMismatch: false
-                                )
-                                
-                                GCDQueue.Main.async {
-                                    
-                                    completion(PersistentStoreResult(store))
-                                }
-                            }
-                            catch {
-                                
-                                completion(PersistentStoreResult(error as NSError))
-                            }
-                            return
-                        }
-                        
-                        completion(PersistentStoreResult(error))
-                        return
-                    }
-                    
-                    do {
-                        
-                        let store = try self.addSQLiteStoreAndWait(
-                            fileURL: fileURL,
-                            configuration: configuration,
-                            resetStoreOnModelMismatch: false
-                        )
-                        
-                        completion(PersistentStoreResult(store))
-                    }
-                    catch {
-                        
-                        completion(PersistentStoreResult(error as NSError))
-                    }
-                }
-            )
-        }
-        catch let error as NSError
-            where error.code == NSFileReadNoSuchFileError && error.domain == NSCocoaErrorDomain {
-                
-                let store = try self.addSQLiteStoreAndWait(
-                    fileURL: fileURL,
-                    configuration: configuration,
-                    resetStoreOnModelMismatch: false
-                )
-                
-                GCDQueue.Main.async {
-                    
-                    completion(PersistentStoreResult(store))
-                }
-                return nil
-        }
-        catch {
-            
-            CoreStore.handleError(
-                error as NSError,
-                "Failed to load SQLite \(typeName(NSPersistentStore)) metadata."
-            )
-            throw error
-        }
-    }
-    
-    /**
-     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 (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()`.
-     - returns: an `NSProgress` instance if a migration has started, or `nil` is no migrations are required
-     */
-    public func upgradeSQLiteStoreIfNeeded(fileName fileName: String, configuration: String? = nil, mappingModelBundles: [NSBundle]? = nil, completion: (MigrationResult) -> Void) throws -> NSProgress? {
-        
-        return try self.upgradeSQLiteStoreIfNeeded(
-            fileURL: defaultDirectory.URLByAppendingPathComponent(
-                fileName,
-                isDirectory: false
-            ),
-            configuration: configuration,
-            mappingModelBundles: mappingModelBundles,
-            completion: completion
-        )
-    }
-    
-    /**
-     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 (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()`.
-     - returns: an `NSProgress` instance if a migration has started, or `nil` is no migrations are required
-     */
-    public func upgradeSQLiteStoreIfNeeded(fileURL fileURL: NSURL = defaultSQLiteStoreURL, configuration: String? = nil, mappingModelBundles: [NSBundle]? = nil, completion: (MigrationResult) -> Void) throws -> NSProgress? {
-        
-        let metadata: [String: AnyObject]
-        do {
-            
-            metadata = try NSPersistentStoreCoordinator.metadataForPersistentStoreOfType(
-                NSSQLiteStoreType,
-                URL: fileURL,
-                options: self.optionsForSQLiteStore()
-            )
-        }
-        catch {
-            
-            CoreStore.handleError(
-                error as NSError,
-                "Failed to load SQLite \(typeName(NSPersistentStore)) metadata."
-            )
-            throw error
-        }
-        
-        return self.upgradeSQLiteStoreIfNeeded(
-            fileURL: fileURL,
-            metadata: metadata,
-            configuration: configuration,
-            mappingModelBundles: mappingModelBundles,
-            completion: completion
-        )
-    }
-    
-    /**
-     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 (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.
-     */
-    @warn_unused_result
-    public func requiredMigrationsForSQLiteStore(fileName fileName: String, configuration: String? = nil, mappingModelBundles: [NSBundle] = NSBundle.allBundles() as [NSBundle]) throws -> [MigrationType] {
-        
-        return try requiredMigrationsForSQLiteStore(
-            fileURL: defaultDirectory.URLByAppendingPathComponent(
-                fileName,
-                isDirectory: false
-            ),
-            configuration: configuration,
-            mappingModelBundles: mappingModelBundles
-        )
-    }
-    
-    /**
-     Checks if the store at the specified file URL and configuration needs to be migrated to the `DataStack`'s managed object model version.
-     
-     - parameter fileURL: the local file URL for the SQLite persistent store.
-     - 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: a `MigrationType` indicating the type of migration 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.
-     */
-    @warn_unused_result
-    public func requiredMigrationsForSQLiteStore(fileURL fileURL: NSURL = defaultSQLiteStoreURL, configuration: String? = nil, mappingModelBundles: [NSBundle] = NSBundle.allBundles() as [NSBundle]) throws -> [MigrationType] {
-        
-        let metadata: [String : AnyObject]
-        do {
-            
-            metadata = try NSPersistentStoreCoordinator.metadataForPersistentStoreOfType(
-                NSSQLiteStoreType,
-                URL: fileURL,
-                options: self.optionsForSQLiteStore()
-            )
-        }
-        catch {
-            
-            CoreStore.handleError(
-                error as NSError,
-                "Failed to load SQLite \(typeName(NSPersistentStore)) metadata."
-            )
-            throw error
-        }
-        
-        guard let migrationSteps = self.computeMigrationFromStoreMetadata(metadata, configuration: configuration, mappingModelBundles: mappingModelBundles) else {
-            
-            let error = NSError(coreStoreErrorCode: .MappingModelNotFound)
-            CoreStore.handleError(
-                error,
-                "Failed to find migration steps from the store at URL \"\(fileURL)\" to version model \"\(self.modelVersion)\"."
-            )
-            throw error
-        }
-        
-        return migrationSteps.map { $0.migrationType }
-    }
-    
-    
-    // MARK: Private
-    
-    private func upgradeSQLiteStoreIfNeeded(fileURL fileURL: NSURL, metadata: [String: AnyObject], configuration: String?, mappingModelBundles: [NSBundle]?, completion: (MigrationResult) -> Void) -> NSProgress? {
-        
-        guard let migrationSteps = self.computeMigrationFromStoreMetadata(metadata, configuration: configuration, mappingModelBundles: mappingModelBundles) else {
-            
-            CoreStore.handleError(
-                NSError(coreStoreErrorCode: .MappingModelNotFound),
-                "Failed to find migration steps from the store at URL \"\(fileURL)\" to version model \"\(model)\"."
-            )
-            
-            GCDQueue.Main.async {
-                
-                completion(MigrationResult(.MappingModelNotFound))
-            }
-            return nil
-        }
-        
-        let numberOfMigrations: Int64 = Int64(migrationSteps.count)
-        if numberOfMigrations == 0 {
-            
-            GCDQueue.Main.async {
-                
-                completion(MigrationResult([]))
-                return
-            }
-            return nil
-        }
-        
-        let migrationTypes = migrationSteps.map { $0.migrationType }
-        var migrationResult: MigrationResult?
-        var operations = [NSOperation]()
-        var cancelled = false
-        
-        let progress = NSProgress(parent: nil, userInfo: nil)
-        progress.totalUnitCount = numberOfMigrations
-        
-        // todo nsprogress crashing sometimes
-        for (sourceModel, destinationModel, mappingModel, _) in migrationSteps {
-            
-            progress.becomeCurrentWithPendingUnitCount(1)
-            
-            let childProgress = NSProgress(parent: progress, userInfo: nil)
-            childProgress.totalUnitCount = 100
-            
-            operations.append(
-                NSBlockOperation { [weak self] in
-                    
-                    guard let strongSelf = self where !cancelled else {
-                        
-                        return
-                    }
-                    
-                    autoreleasepool {
-                        
-                        do {
-                            
-                            try strongSelf.startMigrationForSQLiteStore(
-                                fileURL: fileURL,
-                                sourceModel: sourceModel,
-                                destinationModel: destinationModel,
-                                mappingModel: mappingModel,
-                                progress: childProgress
-                            )
-                        }
-                        catch {
-                            
-                            migrationResult = MigrationResult(error as NSError)
-                            cancelled = true
-                        }
-                    }
-                    
-                    GCDQueue.Main.async {
-                        
-                        withExtendedLifetime(childProgress) { (_: NSProgress) -> Void in }
-                        return
-                    }
-                }
-            )
-            
-            progress.resignCurrent()
-        }
-        
-        let migrationOperation = NSBlockOperation()
-        #if USE_FRAMEWORKS
-            
-            migrationOperation.qualityOfService = .Utility
-        #else
-            
-            if #available(iOS 8.0, *) {
-                
-                migrationOperation.qualityOfService = .Utility
-            }
-        #endif
-        operations.forEach { migrationOperation.addDependency($0) }
-        migrationOperation.addExecutionBlock { () -> Void in
-            
-            GCDQueue.Main.async {
-                
-                progress.setProgressHandler(nil)
-                completion(migrationResult ?? MigrationResult(migrationTypes))
-                return
-            }
-        }
-        
-        operations.append(migrationOperation)
-        
-        self.migrationQueue.addOperations(operations, waitUntilFinished: false)
-        
-        return progress
-    }
-    
-    private func computeMigrationFromStoreMetadata(metadata: [String: AnyObject], configuration: String? = nil, mappingModelBundles: [NSBundle]? = nil) -> [(sourceModel: NSManagedObjectModel, destinationModel: NSManagedObjectModel, mappingModel: NSMappingModel, migrationType: MigrationType)]? {
-        
-        let model = self.model
-        if model.isConfiguration(configuration, compatibleWithStoreMetadata: metadata) {
-            
-            return []
-        }
-        
-        guard let initialModel = model[metadata],
-            var currentVersion = initialModel.currentModelVersion else {
-                
-                return nil
-        }
-        
-        let migrationChain: MigrationChain = self.migrationChain.empty
-            ? [currentVersion: model.currentModelVersion!]
-            : self.migrationChain
-        
-        var migrationSteps = [(sourceModel: NSManagedObjectModel, destinationModel: NSManagedObjectModel, mappingModel: NSMappingModel, migrationType: MigrationType)]()
-        
-        while let nextVersion = migrationChain.nextVersionFrom(currentVersion),
-            let sourceModel = model[currentVersion],
-            let destinationModel = model[nextVersion] where sourceModel != model {
-                
-                if let mappingModel = NSMappingModel(
-                    fromBundles: mappingModelBundles,
-                    forSourceModel: sourceModel,
-                    destinationModel: destinationModel) {
-                        
-                        migrationSteps.append(
-                            (
-                                sourceModel: sourceModel,
-                                destinationModel: destinationModel,
-                                mappingModel: mappingModel,
-                                migrationType: .Heavyweight(
-                                    sourceVersion: currentVersion,
-                                    destinationVersion: nextVersion
-                                )
-                            )
-                        )
-                }
-                else {
-                    
-                    do {
-                        
-                        let mappingModel = try NSMappingModel.inferredMappingModelForSourceModel(
-                            sourceModel,
-                            destinationModel: destinationModel
-                        )
-                        
-                        migrationSteps.append(
-                            (
-                                sourceModel: sourceModel,
-                                destinationModel: destinationModel,
-                                mappingModel: mappingModel,
-                                migrationType: .Lightweight(
-                                    sourceVersion: currentVersion,
-                                    destinationVersion: nextVersion
-                                )
-                            )
-                        )
-                    }
-                    catch {
-                        
-                        return nil
-                    }
-                }
-                currentVersion = nextVersion
-        }
-        
-        if migrationSteps.last?.destinationModel == model {
-            
-            return migrationSteps
-        }
-        
-        return nil
-    }
-    
-    private func startMigrationForSQLiteStore(fileURL fileURL: NSURL, sourceModel: NSManagedObjectModel, destinationModel: NSManagedObjectModel, mappingModel: NSMappingModel, progress: NSProgress) throws {
-        
-        autoreleasepool {
-            
-            let journalUpdatingCoordinator = NSPersistentStoreCoordinator(managedObjectModel: sourceModel)
-            let store = try! journalUpdatingCoordinator.addPersistentStoreWithType(
-                NSSQLiteStoreType,
-                configuration: nil,
-                URL: fileURL,
-                options: [NSSQLitePragmasOption: ["journal_mode": "DELETE"]]
-            )
-            try! journalUpdatingCoordinator.removePersistentStore(store)
-        }
-        
-        let migrationManager = MigrationManager(
-            sourceModel: sourceModel,
-            destinationModel: destinationModel,
-            progress: progress
-        )
-        
-        let temporaryDirectoryURL = NSURL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true).URLByAppendingPathComponent(NSProcessInfo().globallyUniqueString)
-        
-        let fileManager = NSFileManager.defaultManager()
-        try! fileManager.createDirectoryAtURL(
-            temporaryDirectoryURL,
-            withIntermediateDirectories: true,
-            attributes: nil
-        )
-        
-        let temporaryFileURL = temporaryDirectoryURL.URLByAppendingPathComponent(fileURL.lastPathComponent!, isDirectory: false)
-        
-        do {
-            
-            try migrationManager.migrateStoreFromURL(
-                fileURL,
-                type: NSSQLiteStoreType,
-                options: nil,
-                withMappingModel: mappingModel,
-                toDestinationURL: temporaryFileURL,
-                destinationType: NSSQLiteStoreType,
-                destinationOptions: nil
-            )
-        }
-        catch {
-            
-            do {
-                
-                try fileManager.removeItemAtURL(temporaryDirectoryURL)
-            }
-            catch _ { }
-            
-            let sourceVersion = migrationManager.sourceModel.currentModelVersion ?? "???"
-            let destinationVersion = migrationManager.destinationModel.currentModelVersion ?? "???"
-            CoreStore.handleError(
-                error as NSError,
-                "Failed to migrate from version model \"\(sourceVersion)\" to version model \"\(destinationVersion)\"."
-            )
-            
-            throw error
-        }
-        
-        do {
-            
-            try fileManager.replaceItemAtURL(
-                fileURL,
-                withItemAtURL: temporaryFileURL,
-                backupItemName: nil,
-                options: [],
-                resultingItemURL: nil
-            )
-            
-            progress.completedUnitCount = progress.totalUnitCount
-            
-            do {
-                
-                try fileManager.removeItemAtPath(fileURL.path! + "-shm")
-            }
-            catch _ { }
-        }
-        catch {
-            
-            do {
-                
-                try fileManager.removeItemAtURL(temporaryDirectoryURL)
-            }
-            catch _ { }
-            
-            let sourceVersion = migrationManager.sourceModel.currentModelVersion ?? "???"
-            let destinationVersion = migrationManager.destinationModel.currentModelVersion ?? "???"
-            CoreStore.handleError(
-                error as NSError,
-                "Failed to save store after migrating from version model \"\(sourceVersion)\" to version model \"\(destinationVersion)\"."
-            )
-            
-            throw error
-        }
-    }
-}

CoreStore/NSError+CoreStore.swift

@@ -1,102 +0,0 @@
-//
-//  NSError+CoreStore.swift
-//  CoreStore
-//
-//  Copyright © 2014 John Rommel Estropia
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to deal
-//  in the Software without restriction, including without limitation the rights
-//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included in all
-//  copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//  SOFTWARE.
-//
-
-import Foundation
-import CoreData
-
-
-// MARK: - CoreStoreError
-
-/**
- The `NSError` error domain for `CoreStore`.
- */
-public let CoreStoreErrorDomain = "com.corestore.error"
-
-/**
- The `NSError` error codes for `CoreStoreErrorDomain`.
- */
-public enum CoreStoreErrorCode: Int {
-    
-    /**
-     A failure occured because of an unknown error.
-     */
-    case UnknownError
-    
-    /**
-     The `NSPersistentStore` could note be initialized because another store existed at the specified `NSURL`.
-     */
-    case DifferentPersistentStoreExistsAtURL
-    
-    /**
-     The `NSPersistentStore` specified could not be found.
-     */
-    case PersistentStoreNotFound
-    
-    /**
-     An `NSMappingModel` could not be found for a specific source and destination model versions.
-     */
-    case MappingModelNotFound
-}
-
-
-// MARK: - NSError
-
-public extension NSError {
-    
-    /**
-     If the error's domain is equal to `CoreStoreErrorDomain`, returns the associated `CoreStoreErrorCode`. For other domains, returns `nil`.
-     */
-    public var coreStoreErrorCode: CoreStoreErrorCode? {
-        
-        return (self.domain == CoreStoreErrorDomain
-            ? CoreStoreErrorCode(rawValue: self.code)
-            : nil)
-    }
-    
-    
-    // MARK: Internal
-    
-    internal convenience init(coreStoreErrorCode: CoreStoreErrorCode) {
-        
-        self.init(coreStoreErrorCode: coreStoreErrorCode, userInfo: nil)
-    }
-    
-    internal convenience init(coreStoreErrorCode: CoreStoreErrorCode, userInfo: [NSObject: AnyObject]?) {
-        
-        self.init(
-            domain: CoreStoreErrorDomain,
-            code: coreStoreErrorCode.rawValue,
-            userInfo: userInfo)
-    }
-    
-    internal var isCoreDataMigrationError: Bool {
-        
-        let code = self.code
-        return (code == NSPersistentStoreIncompatibleVersionHashError
-            || code == NSMigrationMissingSourceModelError
-            || code == NSMigrationError)
-            && self.domain == NSCocoaErrorDomain
-    }
-}

CoreStore/Setting Up/CoreStore+Setup.swift

@@ -1,105 +0,0 @@
-//
-//  CoreStore+Setup.swift
-//  CoreStore
-//
-//  Copyright © 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
-
-
-// MARK: - CoreStore
-
-public extension CoreStore {
-    
-    /**
-     Returns the `defaultStack`'s model version. The version string is the same as the name of the version-specific .xcdatamodeld file.
-     */
-    public static var modelVersion: String {
-        
-        return self.defaultStack.modelVersion
-    }
-    
-    /**
-     Returns the entity name-to-class type mapping from the `defaultStack`'s model.
-     */
-    public static var entityTypesByName: [String: NSManagedObject.Type] {
-        
-        return self.defaultStack.entityTypesByName
-    }
-    
-    /**
-     Returns the `NSEntityDescription` for the specified `NSManagedObject` subclass from `defaultStack`'s model.
-     */
-    public static func entityDescriptionForType(type: NSManagedObject.Type) -> NSEntityDescription? {
-        
-        return self.defaultStack.entityDescriptionForType(type)
-    }
-    
-    /**
-     Adds an in-memory store to the `defaultStack`.
-     
-     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil`.
-     - returns: the `NSPersistentStore` added to the stack.
-     */
-    public static func addInMemoryStoreAndWait(configuration configuration: String? = nil) throws -> NSPersistentStore {
-        
-        return try self.defaultStack.addInMemoryStoreAndWait(configuration: configuration)
-    }
-    
-    /**
-     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 (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.
-     */
-    public static func addSQLiteStoreAndWait(fileName fileName: String, configuration: String? = nil, resetStoreOnModelMismatch: Bool = false) throws -> NSPersistentStore {
-        
-        return try self.defaultStack.addSQLiteStoreAndWait(
-            fileName: fileName,
-            configuration: configuration,
-            resetStoreOnModelMismatch: resetStoreOnModelMismatch
-        )
-    }
-    
-    /**
-     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 (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.
-     */
-    public static func addSQLiteStoreAndWait(fileURL: NSURL = defaultSQLiteStoreURL, configuration: String? = nil, resetStoreOnModelMismatch: Bool = false) throws -> NSPersistentStore {
-        
-        return try self.defaultStack.addSQLiteStoreAndWait(
-            fileURL: fileURL,
-            configuration: configuration,
-            resetStoreOnModelMismatch: resetStoreOnModelMismatch
-        )
-    }
-}

CoreStore/Setting Up/DataStack.swift

@@ -1,414 +0,0 @@
-//
-//  DataStack.swift
-//  CoreStore
-//
-//  Copyright © 2014 John Rommel Estropia
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to deal
-//  in the Software without restriction, including without limitation the rights
-//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included in all
-//  copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//  SOFTWARE.
-//
-
-import Foundation
-import CoreData
-#if USE_FRAMEWORKS
-    import GCDKit
-#endif
-
-
-#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 = defaultDirectory.URLByAppendingPathComponent(applicationName, isDirectory: false).URLByAppendingPathExtension("sqlite")
-
-
-// MARK: - DataStack
-
-/**
- The `DataStack` encapsulates the data model for the Core Data stack. Each `DataStack` can have multiple data stores, usually specified as a "Configuration" in the model editor. Behind the scenes, the DataStack manages its own `NSPersistentStoreCoordinator`, a root `NSManagedObjectContext` for disk saves, and a shared `NSManagedObjectContext` designed as a read-only model interface for `NSManagedObjects`.
- */
-public final class DataStack {
-    
-    /**
-     Initializes a `DataStack` from an `NSManagedObjectModel`.
-     
-     - parameter modelName: the name of the (.xcdatamodeld) model file. If not specified, the application name will be used.
-     - parameter bundle: an optional bundle to load models from. If not specified, the main bundle will be used.
-     - parameter migrationChain: the `MigrationChain` that indicates the sequence of model versions to be used as the order for progressive migrations. If not specified, will default to a non-migrating data stack.
-     */
-    public required init(modelName: String = applicationName, bundle: NSBundle = NSBundle.mainBundle(), migrationChain: MigrationChain = nil) {
-        
-        CoreStore.assert(
-            migrationChain.valid,
-            "Invalid migration chain passed to the \(typeName(DataStack)). Check that the model versions' order is correct and that no repetitions or ambiguities exist."
-        )
-        
-        let model = NSManagedObjectModel.fromBundle(
-            bundle,
-            modelName: modelName,
-            modelVersionHints: migrationChain.leafVersions
-        )
-        
-        self.coordinator = NSPersistentStoreCoordinator(managedObjectModel: model)
-        self.rootSavingContext = NSManagedObjectContext.rootSavingContextForCoordinator(self.coordinator)
-        self.mainContext = NSManagedObjectContext.mainContextForRootContext(self.rootSavingContext)
-        self.model = model
-        self.migrationChain = migrationChain
-        
-        self.rootSavingContext.parentStack = self
-    }
-    
-    /**
-     Returns the `DataStack`'s model version. The version string is the same as the name of the version-specific .xcdatamodeld file.
-     */
-    public var modelVersion: String {
-        
-        return self.model.currentModelVersion!
-    }
-    
-    /**
-     Returns the entity name-to-class type mapping from the `DataStack`'s model.
-     */
-    public var entityTypesByName: [String: NSManagedObject.Type] {
-        
-        return self.model.entityTypesMapping()
-    }
-    
-    /**
-     Returns the `NSEntityDescription` for the specified `NSManagedObject` subclass.
-     */
-    public func entityDescriptionForType(type: NSManagedObject.Type) -> NSEntityDescription? {
-        
-        return NSEntityDescription.entityForName(
-            self.model.entityNameForClass(type),
-            inManagedObjectContext: self.mainContext
-        )
-    }
-    
-    /**
-     Returns the `NSManagedObjectID` for the specified object URI if it exists in the persistent store.
-     */
-    public func objectIDForURIRepresentation(url: NSURL) -> NSManagedObjectID? {
-        
-        return self.coordinator.managedObjectIDForURIRepresentation(url)
-    }
-    
-    /**
-     Adds an in-memory store to the stack.
-     
-     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil`.
-     - returns: the `NSPersistentStore` added to the stack.
-     */
-    public func addInMemoryStoreAndWait(configuration configuration: String? = nil) throws -> NSPersistentStore {
-        
-        let coordinator = self.coordinator;
-        
-        var store: NSPersistentStore?
-        var storeError: NSError?
-        coordinator.performSynchronously {
-            
-            do {
-                
-                store = try coordinator.addPersistentStoreWithType(
-                    NSInMemoryStoreType,
-                    configuration: configuration,
-                    URL: nil,
-                    options: nil
-                )
-            }
-            catch {
-                
-                storeError = error as NSError
-            }
-        }
-        
-        if let store = store {
-            
-            self.updateMetadataForPersistentStore(store)
-            return store
-        }
-        
-        let error = storeError ?? NSError(coreStoreErrorCode: .UnknownError)
-        CoreStore.handleError(
-            error,
-            "Failed to add in-memory \(typeName(NSPersistentStore)) to the stack."
-        )
-        throw error
-    }
-    
-    /**
-     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 (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.
-     */
-    public func addSQLiteStoreAndWait(fileName fileName: String, configuration: String? = nil, resetStoreOnModelMismatch: Bool = false) throws -> NSPersistentStore {
-        
-        return try self.addSQLiteStoreAndWait(
-            fileURL: defaultDirectory.URLByAppendingPathComponent(
-                fileName,
-                isDirectory: false
-            ),
-            configuration: configuration,
-            resetStoreOnModelMismatch: resetStoreOnModelMismatch
-        )
-    }
-    
-    /**
-     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 (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.
-     */
-    public func addSQLiteStoreAndWait(fileURL fileURL: NSURL = defaultSQLiteStoreURL, configuration: String? = nil, resetStoreOnModelMismatch: Bool = false) throws -> NSPersistentStore {
-        
-        CoreStore.assert(
-            fileURL.fileURL,
-            "The specified file URL for the SQLite store is invalid: \"\(fileURL)\""
-        )
-        
-        let coordinator = self.coordinator;
-        if let store = coordinator.persistentStoreForURL(fileURL) {
-            
-            guard store.type == NSSQLiteStoreType
-                && store.configurationName == (configuration ?? Into.defaultConfigurationName) else {
-                    
-                    let error = NSError(coreStoreErrorCode: .DifferentPersistentStoreExistsAtURL)
-                    CoreStore.handleError(
-                        error,
-                        "Failed to add SQLite \(typeName(NSPersistentStore)) at \"\(fileURL)\" because a different \(typeName(NSPersistentStore)) at that URL already exists."
-                    )
-                    
-                    throw error
-            }
-            
-            return store
-        }
-        
-        let fileManager = NSFileManager.defaultManager()
-        _ = try? fileManager.createDirectoryAtURL(
-            fileURL.URLByDeletingLastPathComponent!,
-            withIntermediateDirectories: true,
-            attributes: nil
-        )
-        
-        var store: NSPersistentStore?
-        var storeError: NSError?
-        let options = self.optionsForSQLiteStore()
-        coordinator.performSynchronously {
-            
-            do {
-                
-                store = try coordinator.addPersistentStoreWithType(
-                    NSSQLiteStoreType,
-                    configuration: configuration,
-                    URL: fileURL,
-                    options: options
-                )
-            }
-            catch {
-                
-                storeError = error as NSError
-            }
-        }
-        
-        if let store = store {
-            
-            self.updateMetadataForPersistentStore(store)
-            return store
-        }
-        
-        if let error = storeError
-            where (resetStoreOnModelMismatch && error.isCoreDataMigrationError) {
-                
-                fileManager.removeSQLiteStoreAtURL(fileURL)
-                
-                var store: NSPersistentStore?
-                coordinator.performSynchronously {
-                    
-                    do {
-                        
-                        store = try coordinator.addPersistentStoreWithType(
-                            NSSQLiteStoreType,
-                            configuration: configuration,
-                            URL: fileURL,
-                            options: [NSSQLitePragmasOption: ["journal_mode": "WAL"]]
-                        )
-                    }
-                    catch {
-                        
-                        storeError = error as NSError
-                    }
-                }
-                
-                if let store = store {
-                    
-                    self.updateMetadataForPersistentStore(store)
-                    return store
-                }
-        }
-        
-        let error = storeError ?? NSError(coreStoreErrorCode: .UnknownError)
-        CoreStore.handleError(
-            error,
-            "Failed to add SQLite \(typeName(NSPersistentStore)) at \"\(fileURL)\"."
-        )
-        throw error
-    }
-    
-    
-    // MARK: Internal
-    
-    internal let coordinator: NSPersistentStoreCoordinator
-    internal let rootSavingContext: NSManagedObjectContext
-    internal let mainContext: NSManagedObjectContext
-    internal let model: NSManagedObjectModel
-    internal let migrationChain: MigrationChain
-    internal let childTransactionQueue: GCDQueue = .createSerial("com.coreStore.dataStack.childTransactionQueue")
-    internal let migrationQueue: NSOperationQueue = {
-        
-        let migrationQueue = NSOperationQueue()
-        migrationQueue.maxConcurrentOperationCount = 1
-        migrationQueue.name = "com.coreStore.migrationOperationQueue"
-        #if USE_FRAMEWORKS
-            
-            migrationQueue.qualityOfService = .Utility
-            migrationQueue.underlyingQueue = dispatch_queue_create("com.coreStore.migrationQueue", DISPATCH_QUEUE_SERIAL)
-        #else
-            
-            if #available(iOS 8.0, *) {
-                
-                migrationQueue.qualityOfService = .Utility
-                migrationQueue.underlyingQueue = dispatch_queue_create("com.coreStore.migrationQueue", DISPATCH_QUEUE_SERIAL)
-            }
-        #endif
-        return migrationQueue
-    }()
-    
-    internal func optionsForSQLiteStore() -> [String: AnyObject] {
-        
-        return [NSSQLitePragmasOption: ["journal_mode": "WAL"]]
-    }
-    
-    internal func entityNameForEntityClass(entityClass: AnyClass) -> String? {
-        
-        return self.model.entityNameForClass(entityClass)
-    }
-    
-    internal func persistentStoresForEntityClass(entityClass: AnyClass) -> [NSPersistentStore]? {
-        
-        var returnValue: [NSPersistentStore]? = nil
-        self.storeMetadataUpdateQueue.barrierSync {
-            
-            returnValue = self.entityConfigurationsMapping[NSStringFromClass(entityClass)]?.map {
-                
-                return self.configurationStoreMapping[$0]!
-            } ?? []
-        }
-        return returnValue
-    }
-    
-    internal func persistentStoreForEntityClass(entityClass: AnyClass, configuration: String?, inferStoreIfPossible: Bool) -> (store: NSPersistentStore?, isAmbiguous: Bool) {
-        
-        var returnValue: (store: NSPersistentStore?, isAmbiguous: Bool) = (store: nil, isAmbiguous: false)
-        self.storeMetadataUpdateQueue.barrierSync {
-            
-            let configurationsForEntity = self.entityConfigurationsMapping[NSStringFromClass(entityClass)] ?? []
-            if let configuration = configuration {
-                
-                if configurationsForEntity.contains(configuration) {
-                    
-                    returnValue = (store: self.configurationStoreMapping[configuration], isAmbiguous: false)
-                    return
-                }
-                else if !inferStoreIfPossible {
-                    
-                    return
-                }
-            }
-            
-            switch configurationsForEntity.count {
-                
-            case 0:
-                return
-                
-            case 1 where inferStoreIfPossible:
-                returnValue = (store: self.configurationStoreMapping[configurationsForEntity.first!], isAmbiguous: false)
-                
-            default:
-                returnValue = (store: nil, isAmbiguous: true)
-            }
-        }
-        return returnValue
-    }
-    
-    internal func updateMetadataForPersistentStore(persistentStore: NSPersistentStore) {
-        
-        self.storeMetadataUpdateQueue.barrierAsync {
-            
-            let configurationName = persistentStore.configurationName
-            self.configurationStoreMapping[configurationName] = persistentStore
-            for entityDescription in (self.coordinator.managedObjectModel.entitiesForConfiguration(configurationName) ?? []) {
-                
-                let managedObjectClassName = entityDescription.managedObjectClassName
-                CoreStore.assert(
-                    NSClassFromString(managedObjectClassName) != nil,
-                    "The class \(typeName(managedObjectClassName)) for the entity \(typeName(entityDescription.name)) does not exist. Check if the subclass type and module name are properly configured."
-                )
-                
-                if self.entityConfigurationsMapping[managedObjectClassName] == nil {
-                    
-                    self.entityConfigurationsMapping[managedObjectClassName] = []
-                }
-                self.entityConfigurationsMapping[managedObjectClassName]?.insert(configurationName)
-            }
-        }
-    }
-    
-    
-    // MARK: Private
-    
-    private let storeMetadataUpdateQueue = GCDQueue.createConcurrent("com.coreStore.persistentStoreBarrierQueue")
-    private var configurationStoreMapping = [String: NSPersistentStore]()
-    private var entityConfigurationsMapping = [String: Set<String>]()
-    
-    deinit {
-        
-        let coordinator = self.coordinator
-        coordinator.performAsynchronously {
-            
-            withExtendedLifetime(coordinator) { coordinator in
-                
-                coordinator.persistentStores.forEach {
-                    
-                    _ = try? coordinator.removePersistentStore($0)
-                }
-            }
-        }
-    }
-}

CoreStore/Setting Up/PersistentStoreResult.swift

@@ -1,106 +0,0 @@
-//
-//  PersistentStoreResult.swift
-//  CoreStore
-//
-//  Copyright © 2014 John Rommel Estropia
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to deal
-//  in the Software without restriction, including without limitation the rights
-//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included in all
-//  copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//  SOFTWARE.
-//
-
-import Foundation
-import CoreData
-
-
-// MARK: - PersistentStoreResult
-
-/**
- The `PersistentStoreResult` indicates the result of an asynchronous initialization of a persistent store.
- The `PersistentStoreResult` can be treated as a boolean:
- ```
- try! CoreStore.addSQLiteStore(completion: { (result: PersistentStoreResult) -> Void in
-     if result {
-        // succeeded
-     }
-     else {
-        // failed
-     }
- })
- ```
- or as an `enum`, where the resulting associated object can also be inspected:
- ```
- try! CoreStore.addSQLiteStore(completion: { (result: PersistentStoreResult) -> Void in
-     switch result {
-     case .Success(let persistentStore):
-        // persistentStore is the related NSPersistentStore instance
-     case .Failure(let error):
-        // error is the NSError instance for the failure
-     }
- })
- ```
- */
-public enum PersistentStoreResult {
-    
-    /**
-     `PersistentStoreResult.Success` indicates that the persistent store process succeeded. The associated object for this `enum` value is the related `NSPersistentStore` instance.
-     */
-    case Success(NSPersistentStore)
-    
-    /**
-     `PersistentStoreResult.Failure` indicates that the persistent store process failed. The associated object for this value is the related `NSError` instance.
-     */
-    case Failure(NSError)
-    
-    
-    // MARK: Internal
-    
-    internal init(_ store: NSPersistentStore) {
-        
-        self = .Success(store)
-    }
-    
-    internal init(_ error: NSError) {
-        
-        self = .Failure(error)
-    }
-    
-    internal init(_ errorCode: CoreStoreErrorCode) {
-        
-        self.init(errorCode, userInfo: nil)
-    }
-    
-    internal init(_ errorCode: CoreStoreErrorCode, userInfo: [NSObject: AnyObject]?) {
-        
-        self.init(NSError(coreStoreErrorCode: errorCode, userInfo: userInfo))
-    }
-}
-
-
-// MARK: - PersistentStoreResult: BooleanType
-
-extension PersistentStoreResult: BooleanType {
-    
-    public var boolValue: Bool {
-        
-        switch self {
-            
-        case .Success: return true
-        case .Failure: return false
-        }
-    }
-}

CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj

@@ -36,8 +36,6 @@
 		B569651C1B30889A0075EE4A /* QueryingResultsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B569651B1B30889A0075EE4A /* QueryingResultsViewController.swift */; };
 		B56965291B3582D30075EE4A /* MigrationDemo.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B56965271B3582D30075EE4A /* MigrationDemo.xcdatamodeld */; };
 		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 */; };
@@ -54,7 +52,6 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				B5E89ACE1C52929C003B04A9 /* GCDKit.framework in Embed Frameworks */,
 				B5E89AD11C5292A2003B04A9 /* CoreStore.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
@@ -94,7 +91,6 @@
 		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>"; };
 		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; };
 		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>"; };
@@ -110,7 +106,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				B5E89ACD1C52929C003B04A9 /* GCDKit.framework in Frameworks */,
 				B5E89AD01C5292A2003B04A9 /* CoreStore.framework in Frameworks */,
 				B52977E11B120F8A003D50A5 /* CoreLocation.framework in Frameworks */,
 				B52977DF1B120F83003D50A5 /* MapKit.framework in Frameworks */,
@@ -146,7 +141,6 @@
 			children = (
 				B52977E01B120F8A003D50A5 /* CoreLocation.framework */,
 				B5BDC9211C202429008147CD /* CoreStore.framework */,
-				B5BDC9241C202429008147CD /* GCDKit.framework */,
 				B52977DE1B120F83003D50A5 /* MapKit.framework */,
 			);
 			name = Frameworks;
@@ -272,11 +266,12 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0700;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = "John Rommel Estropia";
 				TargetAttributes = {
 					B54AAD481AF4D26E00848AE0 = {
 						CreatedOnToolsVersion = 6.3;
+						LastSwiftMigration = 0800;
 					};
 				};
 			};
@@ -459,8 +454,9 @@
 				INFOPLIST_FILE = CoreStoreDemo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.CoreStoreDemo;
+				PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.corestore.demo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -471,8 +467,10 @@
 				INFOPLIST_FILE = CoreStoreDemo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.CoreStoreDemo;
+				PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.corestore.demo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};

CoreStoreDemo/CoreStoreDemo.xcodeproj/xcshareddata/xcschemes/CoreStoreDemo.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,24 +14,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "B5D9E2ED1CA2C317007A9D52"
-               BuildableName = "CoreStore_iOS7.framework"
-               BlueprintName = "CoreStore iOS7"
-               ReferencedContainer = "container:CoreStore.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "NO"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "2F03A53A19C5C6DA005002A5"
-               BuildableName = "CoreStoreTests.xctest"
-               BlueprintName = "CoreStoreTests iOS"
-               ReferencedContainer = "container:CoreStore.xcodeproj">
+               BlueprintIdentifier = "B54AAD481AF4D26E00848AE0"
+               BuildableName = "CoreStoreDemo.app"
+               BlueprintName = "CoreStoreDemo"
+               ReferencedContainer = "container:CoreStoreDemo.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -42,24 +28,14 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "2F03A53A19C5C6DA005002A5"
-               BuildableName = "CoreStoreTests.xctest"
-               BlueprintName = "CoreStoreTests iOS"
-               ReferencedContainer = "container:CoreStore.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "2F03A52F19C5C6DA005002A5"
-            BuildableName = "CoreStore.framework"
-            BlueprintName = "CoreStore iOS"
-            ReferencedContainer = "container:CoreStore.xcodeproj">
+            BlueprintIdentifier = "B54AAD481AF4D26E00848AE0"
+            BuildableName = "CoreStoreDemo.app"
+            BlueprintName = "CoreStoreDemo"
+            ReferencedContainer = "container:CoreStoreDemo.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -75,15 +51,16 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <MacroExpansion>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "B5D9E2ED1CA2C317007A9D52"
-            BuildableName = "CoreStore_iOS7.framework"
-            BlueprintName = "CoreStore iOS7"
-            ReferencedContainer = "container:CoreStore.xcodeproj">
+            BlueprintIdentifier = "B54AAD481AF4D26E00848AE0"
+            BuildableName = "CoreStoreDemo.app"
+            BlueprintName = "CoreStoreDemo"
+            ReferencedContainer = "container:CoreStoreDemo.xcodeproj">
          </BuildableReference>
-      </MacroExpansion>
+      </BuildableProductRunnable>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
@@ -93,9 +70,19 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B54AAD481AF4D26E00848AE0"
+            BuildableName = "CoreStoreDemo.app"
+            BlueprintName = "CoreStoreDemo"
+            ReferencedContainer = "container:CoreStoreDemo.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
    </ProfileAction>
    <AnalyzeAction
-      buildConfiguration = "Release">
+      buildConfiguration = "Debug">
    </AnalyzeAction>
    <ArchiveAction
       buildConfiguration = "Release"

CoreStoreDemo/CoreStoreDemo/AppDelegate.swift

@@ -18,9 +18,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     
     var window: UIWindow?
 
-    func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]? = nil) -> Bool {
+        
+        application.statusBarStyle = .lightContent
         
-        application.statusBarStyle = .LightContent
         return true
     }
 }

CoreStoreDemo/CoreStoreDemo/Base.lproj/LaunchScreen.xib

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10112" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10083"/>
         <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
     </dependencies>
     <objects>
@@ -11,14 +12,17 @@
             <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2015 John Rommel Estropia. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright © 2015 John Rommel Estropia. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
                     <rect key="frame" x="20" y="439" width="441" height="21"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                     <color key="textColor" red="0.92549019607843142" green="0.94117647058823528" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="CoreStore" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
-                    <rect key="frame" x="20" y="140" width="441" height="43"/>
+                <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="CoreStoreIcon" translatesAutoresizingMaskIntoConstraints="NO" id="q8C-V6-gXH">
+                    <rect key="frame" x="155" y="83" width="170" height="170"/>
+                </imageView>
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CoreStore" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
+                    <rect key="frame" x="20" y="273" width="440" height="57.5"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue-UltraLight" family="Helvetica Neue" pointSize="50"/>
                     <color key="textColor" red="0.92549019607843142" green="0.94117647058823528" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
@@ -26,16 +30,21 @@
             </subviews>
             <color key="backgroundColor" red="0.20392156862745098" green="0.28627450980392155" blue="0.36862745098039218" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
-                <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
                 <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
                 <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l"/>
                 <constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0"/>
+                <constraint firstItem="q8C-V6-gXH" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" multiplier="0.7" id="QW6-8Y-w15"/>
                 <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/>
+                <constraint firstItem="q8C-V6-gXH" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="fRb-1V-9iD"/>
                 <constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g"/>
+                <constraint firstItem="kId-c2-rCX" firstAttribute="top" secondItem="q8C-V6-gXH" secondAttribute="bottom" constant="20" id="s63-MP-ush"/>
             </constraints>
             <nil key="simulatedStatusBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <point key="canvasLocation" x="548" y="455"/>
         </view>
     </objects>
+    <resources>
+        <image name="CoreStoreIcon" width="170" height="170"/>
+    </resources>
 </document>

CoreStoreDemo/CoreStoreDemo/Base.lproj/LaunchScreen.xib.orig

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< Updated upstream
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
+=======
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
+>>>>>>> Stashed changes
+        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB">
+            <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+<<<<<<< Updated upstream
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright © 2015 John Rommel Estropia. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
+                    <rect key="frame" x="20" y="439" width="441" height="21"/>
+=======
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2015 John Rommel Estropia. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
+                    <rect key="frame" x="20" y="439.5" width="441" height="20.5"/>
+>>>>>>> Stashed changes
+                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                    <color key="textColor" red="0.92549019607843142" green="0.94117647058823528" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CoreStore" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
+                    <rect key="frame" x="20" y="133" width="441" height="57.5"/>
+                    <fontDescription key="fontDescription" name="HelveticaNeue-UltraLight" family="Helvetica Neue" pointSize="50"/>
+                    <color key="textColor" red="0.92549019607843142" green="0.94117647058823528" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <nil key="highlightedColor"/>
+                </label>
+            </subviews>
+            <color key="backgroundColor" red="0.20392156862745098" green="0.28627450980392155" blue="0.36862745098039218" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
+                <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
+                <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l"/>
+                <constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0"/>
+                <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/>
+                <constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g"/>
+            </constraints>
+            <nil key="simulatedStatusBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <point key="canvasLocation" x="548" y="455"/>
+        </view>
+    </objects>
+</document>

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="10112" systemVersion="15D21" 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="10083"/>
         <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"/>
@@ -297,7 +297,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 +324,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 +351,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 +378,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 +405,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"/>

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="10169.1" systemVersion="15D21" 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"/>

CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/FetchingAndQueryingDemoViewController.swift

@@ -15,29 +15,31 @@ private struct Static {
     static let timeZonesStack: DataStack = {
         
         let dataStack = DataStack()
-        try! dataStack.addSQLiteStoreAndWait(
-            fileName: "TimeZoneDemo.sqlite",
-            configuration: "FetchingAndQueryingDemo",
-            resetStoreOnModelMismatch: true
+        try! dataStack.addStorageAndWait(
+            SQLiteStore(
+                fileName: "TimeZoneDemo.sqlite",
+                configuration: "FetchingAndQueryingDemo",
+                localStorageOptions: .recreateStoreOnModelMismatch
+            )
         )
     
-        dataStack.beginSynchronous { (transaction) -> Void in
+        _ = dataStack.beginSynchronous { (transaction) -> Void in
             
-            transaction.deleteAll(From(TimeZone))
+            transaction.deleteAll(From<TimeZone>())
             
-            for name in NSTimeZone.knownTimeZoneNames() {
+            for name in NSTimeZone.knownTimeZoneNames {
                 
                 let rawTimeZone = NSTimeZone(name: name)!
-                let cachedTimeZone = transaction.create(Into(TimeZone))
+                let cachedTimeZone = transaction.create(Into<TimeZone>())
                 
                 cachedTimeZone.name = rawTimeZone.name
                 cachedTimeZone.abbreviation = rawTimeZone.abbreviation ?? ""
                 cachedTimeZone.secondsFromGMT = Int32(rawTimeZone.secondsFromGMT)
-                cachedTimeZone.hasDaylightSavingTime = rawTimeZone.daylightSavingTime
+                cachedTimeZone.hasDaylightSavingTime = rawTimeZone.isDaylightSavingTime
                 cachedTimeZone.daylightSavingTimeOffset = rawTimeZone.daylightSavingTimeOffset
             }
             
-            transaction.commitAndWait()
+            _ = transaction.commitAndWait()
         }
         
         return dataStack
@@ -51,7 +53,7 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
     
     // MARK: UIViewController
     
-    override func viewDidAppear(animated: Bool) {
+    override func viewDidAppear(_ animated: Bool) {
         
         super.viewDidAppear(animated)
         
@@ -65,27 +67,27 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
         let alert = UIAlertController(
             title: "Fetch and Query Demo",
             message: "This demo shows how to execute fetches and queries.\n\nEach menu item executes and displays a preconfigured fetch/query.",
-            preferredStyle: .Alert
+            preferredStyle: .alert
         )
-        alert.addAction(UIAlertAction(title: "OK", style: .Cancel, handler: nil))
-        self.presentViewController(alert, animated: true, completion: nil)
+        alert.addAction(UIAlertAction(title: "OK", style: .cancel, handler: nil))
+        self.present(alert, animated: true, completion: nil)
     }
     
-    override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
         
-        super.prepareForSegue(segue, sender: sender)
+        super.prepare(for: segue, sender: sender)
         
-        if let indexPath = sender as? NSIndexPath {
+        if let indexPath = sender as? IndexPath {
             
-            switch segue.destinationViewController {
+            switch segue.destination {
                 
             case let controller as FetchingResultsViewController:
                 let item = self.fetchingItems[indexPath.row]
-                controller.setTimeZones(item.fetch(), title: item.title)
+                controller.set(timeZones: item.fetch(), title: item.title)
                 
             case let controller as QueryingResultsViewController:
                 let item = self.queryingItems[indexPath.row]
-                controller.setValue(item.query(), title: item.title)
+                controller.set(value: item.query(), title: item.title)
                 
             default:
                 break
@@ -96,13 +98,14 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
     
     // MARK: UITableViewDataSource
     
-    func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        
         switch self.segmentedControl?.selectedSegmentIndex {
             
-        case Section.Fetching.rawValue?:
+        case Section.fetching.rawValue?:
             return self.fetchingItems.count
             
-        case Section.Querying.rawValue?:
+        case Section.querying.rawValue?:
             return self.queryingItems.count
             
         default:
@@ -110,16 +113,16 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
         }
     }
     
-    func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
-        let cell = tableView.dequeueReusableCellWithIdentifier("UITableViewCell")!
+        let cell = tableView.dequeueReusableCell(withIdentifier: "UITableViewCell")!
         
         switch self.segmentedControl?.selectedSegmentIndex {
             
-        case Section.Fetching.rawValue?:
+        case Section.fetching.rawValue?:
             cell.textLabel?.text = self.fetchingItems[indexPath.row].title
             
-        case Section.Querying.rawValue?:
+        case Section.querying.rawValue?:
             cell.textLabel?.text = self.queryingItems[indexPath.row].title
             
         default:
@@ -132,17 +135,17 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
     
     // MARK: UITableViewDelegate
     
-    func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         
-        tableView.deselectRowAtIndexPath(indexPath, animated: true)
+        tableView.deselectRow(at: indexPath, animated: true)
         
         switch self.segmentedControl?.selectedSegmentIndex {
             
-        case Section.Fetching.rawValue?:
-            self.performSegueWithIdentifier("FetchingResultsViewController", sender: indexPath)
+        case Section.fetching.rawValue?:
+            self.performSegue(withIdentifier: "FetchingResultsViewController", sender: indexPath)
             
-        case Section.Querying.rawValue?:
-            self.performSegueWithIdentifier("QueryingResultsViewController", sender: indexPath)
+        case Section.querying.rawValue?:
+            self.performSegue(withIdentifier: "QueryingResultsViewController", sender: indexPath)
             
         default:
             break
@@ -154,8 +157,8 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
     
     private enum Section: Int {
         
-        case Fetching
-        case Querying
+        case fetching
+        case querying
     }
     
     private let fetchingItems = [
@@ -164,8 +167,8 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
             fetch: { () -> [TimeZone] in
                 
                 return Static.timeZonesStack.fetchAll(
-                    From(TimeZone),
-                    OrderBy(.Ascending("name"))
+                    From<TimeZone>(),
+                    OrderBy(.ascending(#keyPath(TimeZone.name)))
                 )!
             }
         ),
@@ -174,9 +177,9 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
             fetch: { () -> [TimeZone] in
                 
                 return Static.timeZonesStack.fetchAll(
-                    From(TimeZone),
-                    Where("%K BEGINSWITH[c] %@", "name", "Asia"),
-                    OrderBy(.Ascending("secondsFromGMT"))
+                    From<TimeZone>(),
+                    Where("%K BEGINSWITH[c] %@", #keyPath(TimeZone.name), "Asia"),
+                    OrderBy(.ascending(#keyPath(TimeZone.secondsFromGMT)))
                 )!
             }
         ),
@@ -185,10 +188,10 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
             fetch: { () -> [TimeZone] in
                 
                 return Static.timeZonesStack.fetchAll(
-                    From(TimeZone),
-                    Where("%K BEGINSWITH[c] %@", "name", "America")
-                        || Where("%K BEGINSWITH[c] %@", "name", "Europe"),
-                    OrderBy(.Ascending("secondsFromGMT"))
+                    From<TimeZone>(),
+                    Where("%K BEGINSWITH[c] %@", #keyPath(TimeZone.name), "America")
+                        || Where("%K BEGINSWITH[c] %@", #keyPath(TimeZone.name), "Europe"),
+                    OrderBy(.ascending(#keyPath(TimeZone.secondsFromGMT)))
                 )!
             }
         ),
@@ -197,9 +200,9 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
             fetch: { () -> [TimeZone] in
                 
                 return Static.timeZonesStack.fetchAll(
-                    From(TimeZone),
-                    !Where("%K BEGINSWITH[c] %@", "name", "America"),
-                    OrderBy(.Ascending("secondsFromGMT"))
+                    From<TimeZone>(),
+                    !Where("%K BEGINSWITH[c] %@", #keyPath(TimeZone.name), "America"),
+                    OrderBy(.ascending(#keyPath(TimeZone.secondsFromGMT)))
                     )!
             }
         ),
@@ -208,9 +211,9 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
             fetch: { () -> [TimeZone] in
                 
                 return Static.timeZonesStack.fetchAll(
-                    From(TimeZone),
+                    From<TimeZone>(),
                     Where("hasDaylightSavingTime", isEqualTo: true),
-                    OrderBy(.Ascending("name"))
+                    OrderBy(.ascending(#keyPath(TimeZone.name)))
                 )!
             }
         )
@@ -219,60 +222,60 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
     private let queryingItems = [
         (
             title: "Number of Time Zones",
-            query: { () -> AnyObject in
+            query: { () -> Any in
                 
                 return Static.timeZonesStack.queryValue(
-                    From(TimeZone),
-                    Select<NSNumber>(.Count("name"))
+                    From<TimeZone>(),
+                    Select<NSNumber>(.count(#keyPath(TimeZone.name)))
                 )!
             }
         ),
         (
             title: "Abbreviation For Tokyo's Time Zone",
-            query: { () -> AnyObject in
+            query: { () -> Any in
                 
                 return Static.timeZonesStack.queryValue(
-                    From(TimeZone),
-                    Select<String>("abbreviation"),
-                    Where("%K ENDSWITH[c] %@", "name", "Tokyo")
+                    From<TimeZone>(),
+                    Select<String>(#keyPath(TimeZone.abbreviation)),
+                    Where("%K ENDSWITH[c] %@", #keyPath(TimeZone.name), "Tokyo")
                 )!
             }
         ),
         (
             title: "All Abbreviations",
-            query: { () -> AnyObject in
+            query: { () -> Any in
                 
                 return Static.timeZonesStack.queryAttributes(
-                    From(TimeZone),
-                    Select<NSDictionary>("name", "abbreviation"),
-                    OrderBy(.Ascending("name"))
+                    From<TimeZone>(),
+                    Select<NSDictionary>(#keyPath(TimeZone.name), #keyPath(TimeZone.abbreviation)),
+                    OrderBy(.ascending(#keyPath(TimeZone.name)))
                 )!
             }
         ),
         (
             title: "Number of Countries per Time Zone",
-            query: { () -> AnyObject in
+            query: { () -> Any in
                 
                 return Static.timeZonesStack.queryAttributes(
-                    From(TimeZone),
-                    Select<NSDictionary>(.Count("abbreviation"), "abbreviation"),
-                    GroupBy("abbreviation"),
-                    OrderBy(.Ascending("secondsFromGMT"), .Ascending("name"))
+                    From<TimeZone>(),
+                    Select<NSDictionary>(.count(#keyPath(TimeZone.abbreviation)), #keyPath(TimeZone.abbreviation)),
+                    GroupBy(#keyPath(TimeZone.abbreviation)),
+                    OrderBy(.ascending(#keyPath(TimeZone.secondsFromGMT)), .ascending(#keyPath(TimeZone.name)))
                 )!
             }
         ),
         (
             title: "Number of Countries with Summer Time",
-            query: { () -> AnyObject in
+            query: { () -> Any in
                 
                 return Static.timeZonesStack.queryAttributes(
-                    From(TimeZone),
+                    From<TimeZone>(),
                     Select<NSDictionary>(
-                        .Count("hasDaylightSavingTime", As: "numberOfCountries"),
-                        "hasDaylightSavingTime"
+                        .count(#keyPath(TimeZone.hasDaylightSavingTime), as: "numberOfCountries"),
+                        #keyPath(TimeZone.hasDaylightSavingTime)
                     ),
-                    GroupBy("hasDaylightSavingTime"),
-                    OrderBy(.Descending("hasDaylightSavingTime"))
+                    GroupBy(#keyPath(TimeZone.hasDaylightSavingTime)),
+                    OrderBy(.descending(#keyPath(TimeZone.hasDaylightSavingTime)))
                 )!
             }
         )
@@ -283,7 +286,7 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
     @IBOutlet dynamic weak var segmentedControl: UISegmentedControl?
     @IBOutlet dynamic weak var tableView: UITableView?
     
-    @IBAction dynamic func segmentedControlValueChanged(sender: AnyObject?) {
+    @IBAction dynamic func segmentedControlValueChanged(_ sender: AnyObject?) {
         
         self.tableView?.reloadData()
     }

CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/FetchingResultsViewController.swift

@@ -14,7 +14,7 @@ class FetchingResultsViewController: UITableViewController {
 
     // MARK: Public
     
-    func setTimeZones(timeZones: [TimeZone]?, title: String) {
+    func set(timeZones: [TimeZone]?, title: String) {
         
         self.timeZones += timeZones ?? []
         self.sectionTitle = title
@@ -36,14 +36,14 @@ class FetchingResultsViewController: UITableViewController {
     
     // MARK: UITableViewDataSource
     
-    override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         
         return self.timeZones.count
     }
     
-    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
-        let cell = tableView.dequeueReusableCellWithIdentifier("UITableViewCell", forIndexPath: indexPath)
+        let cell = tableView.dequeueReusableCell(withIdentifier: "UITableViewCell", for: indexPath)
         
         let timeZone = self.timeZones[indexPath.row]
         cell.textLabel?.text = timeZone.name
@@ -55,7 +55,7 @@ class FetchingResultsViewController: UITableViewController {
     
     // MARK: UITableViewDelegate
     
-    override func tableView(tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
+    override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
         
         return self.sectionTitle
     }

CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/QueryingResultsViewController.swift

@@ -12,23 +12,23 @@ class QueryingResultsViewController: UITableViewController {
     
     // MARK: Public
     
-    func setValue(value: AnyObject?, title: String) {
+    func set(value: Any?, title: String) {
         
         switch value {
             
-        case (let array as [AnyObject])?:
-            self.values = array.map { (item: AnyObject) -> (title: String, detail: String) in
+        case (let array as [Any])?:
+            self.values = array.map { (item: Any) -> (title: String, detail: String) in
                 (
-                    title: item.description,
-                    detail: String(reflecting: item.dynamicType)
+                    title: String(describing: item),
+                    detail: String(reflecting: type(of: item))
                 )
             }
             
         case let item?:
             self.values = [
                 (
-                    title: item.description,
-                    detail: String(reflecting: item.dynamicType)
+                    title: String(describing: item),
+                    detail: String(reflecting: type(of: item))
                 )
             ]
             
@@ -55,14 +55,14 @@ class QueryingResultsViewController: UITableViewController {
     
     // MARK: UITableViewDataSource
     
-    override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         
         return self.values.count
     }
     
-    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
-        let cell = tableView.dequeueReusableCellWithIdentifier("UITableViewCell", forIndexPath: indexPath)
+        let cell = tableView.dequeueReusableCell(withIdentifier: "UITableViewCell", for: indexPath)
         
         let value = self.values[indexPath.row]
         
@@ -75,7 +75,7 @@ class QueryingResultsViewController: UITableViewController {
     
     // MARK: UITableViewDelegate
     
-    override func tableView(tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
+    override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
         
         return self.sectionTitle
     }

CoreStoreDemo/CoreStoreDemo/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -21,13 +21,33 @@
       "scale" : "3x"
     },
     {
-      "idiom" : "iphone",
       "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "Icon-60@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "Icon-60@3x-1.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "Icon-76.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "Icon-76@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "car",
+      "filename" : "Icon-60@3x.png",
       "scale" : "3x"
     }
   ],

CoreStoreDemo/CoreStoreDemo/Images.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

CoreStoreDemo/CoreStoreDemo/Images.xcassets/CoreStoreIcon.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "CoreStoreIcon@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

CoreStoreDemo/CoreStoreDemo/Info.plist

@@ -4,6 +4,8 @@
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
+	<key>CFBundleDisplayName</key>
+	<string>CoreStore</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>

CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift

@@ -14,17 +14,17 @@ private struct Static {
     
     enum Filter: String {
         
-        case All = "All Colors"
-        case Light = "Light Colors"
-        case Dark = "Dark Colors"
+        case all = "All Colors"
+        case light = "Light Colors"
+        case dark = "Dark Colors"
         
         func next() -> Filter {
             
             switch self {
                 
-            case All: return .Light
-            case Light: return .Dark
-            case Dark: return .All
+            case .all: return .light
+            case .light: return .dark
+            case .dark: return .all
             }
         }
         
@@ -32,14 +32,14 @@ private struct Static {
             
             switch self {
                 
-            case .All: return Where(true)
-            case .Light: return Where("brightness >= 0.9")
-            case .Dark: return Where("brightness <= 0.4")
+            case .all: return Where(true)
+            case .light: return Where("%K >= %@", #keyPath(Palette.brightness), 0.9)
+            case .dark: return Where("%K <= %@", #keyPath(Palette.brightness), 0.4)
             }
         }
     }
     
-    static var filter = Filter.All {
+    static var filter = Filter.all {
         
         didSet {
             
@@ -49,16 +49,18 @@ private struct Static {
     
     static let palettes: ListMonitor<Palette> = {
         
-        try! CoreStore.addSQLiteStoreAndWait(
-            fileName: "ColorsDemo.sqlite",
-            configuration: "ObservingDemo",
-            resetStoreOnModelMismatch: true
+        try! CoreStore.addStorageAndWait(
+            SQLiteStore(
+                fileName: "ColorsDemo.sqlite",
+                configuration: "ObservingDemo",
+                localStorageOptions: .recreateStoreOnModelMismatch
+            )
         )
         
         return CoreStore.monitorSectionedList(
-            From(Palette),
-            SectionBy("colorName"),
-            OrderBy(.Ascending("hue"))
+            From<Palette>(),
+            SectionBy(#keyPath(Palette.colorName)),
+            OrderBy(.ascending(#keyPath(Palette.hue)))
         )
     }()
 }
@@ -84,9 +86,9 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
         
         let navigationItem = self.navigationItem
         navigationItem.leftBarButtonItems = [
-            self.editButtonItem(),
+            self.editButtonItem,
             UIBarButtonItem(
-                barButtonSystemItem: .Trash,
+                barButtonSystemItem: .trash,
                 target: self,
                 action: #selector(self.resetBarButtonItemTouched(_:))
             )
@@ -94,13 +96,13 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
         
         let filterBarButton = UIBarButtonItem(
             title: Static.filter.rawValue,
-            style: .Plain,
+            style: .plain,
             target: self,
             action: #selector(self.filterBarButtonItemTouched(_:))
         )
         navigationItem.rightBarButtonItems = [
             UIBarButtonItem(
-                barButtonSystemItem: .Add,
+                barButtonSystemItem: .add,
                 target: self,
                 action: #selector(self.addBarButtonItemTouched(_:))
             ),
@@ -110,14 +112,14 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
         
         Static.palettes.addObserver(self)
         
-        self.setTableEnabled(!Static.palettes.isPendingRefetch)
+        self.setTable(enabled: !Static.palettes.isPendingRefetch)
     }
     
-    override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
         
-        super.prepareForSegue(segue, sender: sender)
+        super.prepare(for: segue, sender: sender)
         
-        switch (segue.identifier, segue.destinationViewController, sender) {
+        switch (segue.identifier, segue.destination, sender) {
             
         case ("ObjectObserverDemoViewController"?, let destinationViewController as ObjectObserverDemoViewController, let palette as Palette):
             destinationViewController.palette = palette
@@ -130,19 +132,19 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
     
     // MARK: UITableViewDataSource
     
-    override func numberOfSectionsInTableView(tableView: UITableView) -> Int {
+    override func numberOfSections(in tableView: UITableView) -> Int {
         
         return Static.palettes.numberOfSections()
     }
 
-    override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         
         return Static.palettes.numberOfObjectsInSection(section)
     }
     
-    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
-        let cell = tableView.dequeueReusableCellWithIdentifier("PaletteTableViewCell") as! PaletteTableViewCell
+        let cell = tableView.dequeueReusableCell(withIdentifier: "PaletteTableViewCell") as! PaletteTableViewCell
         
         let palette = Static.palettes[indexPath]
         cell.colorView?.backgroundColor = palette.color
@@ -154,21 +156,21 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
     
     // MARK: UITableViewDelegate
     
-    override func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
+    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         
-        tableView.deselectRowAtIndexPath(indexPath, animated: true)
+        tableView.deselectRow(at: indexPath, animated: true)
         
-        self.performSegueWithIdentifier(
-            "ObjectObserverDemoViewController",
+        self.performSegue(
+            withIdentifier: "ObjectObserverDemoViewController",
             sender: Static.palettes[indexPath]
         )
     }
     
-    override func tableView(tableView: UITableView, commitEditingStyle editingStyle: UITableViewCellEditingStyle, forRowAtIndexPath indexPath: NSIndexPath) {
+    override func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCellEditingStyle, forRowAt indexPath: IndexPath) {
         
         switch editingStyle {
             
-        case .Delete:
+        case .delete:
             let palette = Static.palettes[indexPath]
             CoreStore.beginAsynchronous{ (transaction) -> Void in
                 
@@ -181,7 +183,7 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
         }
     }
     
-    override func tableView(tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
+    override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
         
         return Static.palettes.sectionInfoAtIndex(section).name
     }
@@ -189,44 +191,44 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
     
     // MARK: ListObserver
     
-    func listMonitorWillChange(monitor: ListMonitor<Palette>) {
+    func listMonitorWillChange(_ monitor: ListMonitor<Palette>) {
         
         self.tableView.beginUpdates()
     }
     
-    func listMonitorDidChange(monitor: ListMonitor<Palette>) {
+    func listMonitorDidChange(_ monitor: ListMonitor<Palette>) {
         
         self.tableView.endUpdates()
     }
     
-    func listMonitorWillRefetch(monitor: ListMonitor<Palette>) {
+    func listMonitorWillRefetch(_ monitor: ListMonitor<Palette>) {
         
-        self.setTableEnabled(false)
+        self.setTable(enabled: false)
     }
     
-    func listMonitorDidRefetch(monitor: ListMonitor<Palette>) {
+    func listMonitorDidRefetch(_ monitor: ListMonitor<Palette>) {
         
         self.filterBarButton?.title = Static.filter.rawValue
         self.tableView.reloadData()
-        self.setTableEnabled(true)
+        self.setTable(enabled: true)
     }
     
     
     // MARK: ListObjectObserver
     
-    func listMonitor(monitor: ListMonitor<Palette>, didInsertObject object: Palette, toIndexPath indexPath: NSIndexPath) {
+    func listMonitor(_ monitor: ListMonitor<Palette>, didInsertObject object: Palette, toIndexPath indexPath: IndexPath) {
         
-        self.tableView.insertRowsAtIndexPaths([indexPath], withRowAnimation: .Automatic)
+        self.tableView.insertRows(at: [indexPath], with: .automatic)
     }
     
-    func listMonitor(monitor: ListMonitor<Palette>, didDeleteObject object: Palette, fromIndexPath indexPath: NSIndexPath) {
+    func listMonitor(_ monitor: ListMonitor<Palette>, didDeleteObject object: Palette, fromIndexPath indexPath: IndexPath) {
         
-        self.tableView.deleteRowsAtIndexPaths([indexPath], withRowAnimation: .Automatic)
+        self.tableView.deleteRows(at: [indexPath], with: .automatic)
     }
     
-    func listMonitor(monitor: ListMonitor<Palette>, didUpdateObject object: Palette, atIndexPath indexPath: NSIndexPath) {
+    func listMonitor(_ monitor: ListMonitor<Palette>, didUpdateObject object: Palette, atIndexPath indexPath: IndexPath) {
         
-        if let cell = self.tableView.cellForRowAtIndexPath(indexPath) as? PaletteTableViewCell {
+        if let cell = self.tableView.cellForRow(at: indexPath) as? PaletteTableViewCell {
             
             let palette = Static.palettes[indexPath]
             cell.colorView?.backgroundColor = palette.color
@@ -234,23 +236,24 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
         }
     }
     
-    func listMonitor(monitor: ListMonitor<Palette>, didMoveObject object: Palette, fromIndexPath: NSIndexPath, toIndexPath: NSIndexPath) {
+    func listMonitor(_ monitor: ListMonitor<Palette>, didMoveObject object: Palette, fromIndexPath: IndexPath, toIndexPath: IndexPath) {
         
-        self.tableView.deleteRowsAtIndexPaths([fromIndexPath], withRowAnimation: .Automatic)
-        self.tableView.insertRowsAtIndexPaths([toIndexPath], withRowAnimation: .Automatic)
+        self.tableView.deleteRows(at: [fromIndexPath], with: .automatic)
+        self.tableView.insertRows(at: [toIndexPath], with: .automatic)
     }
     
     
     // MARK: ListSectionObserver
     
-    func listMonitor(monitor: ListMonitor<Palette>, didInsertSection sectionInfo: NSFetchedResultsSectionInfo, toSectionIndex sectionIndex: Int) {
+    func listMonitor(_ monitor: ListMonitor<Palette>, didInsertSection sectionInfo: NSFetchedResultsSectionInfo, toSectionIndex sectionIndex: Int) {
         
-        self.tableView.insertSections(NSIndexSet(index: sectionIndex), withRowAnimation: .Automatic)
+        self.tableView.insertSections(IndexSet(integer: sectionIndex), with: .automatic)
     }
     
-    func listMonitor(monitor: ListMonitor<Palette>, didDeleteSection sectionInfo: NSFetchedResultsSectionInfo, fromSectionIndex sectionIndex: Int) {
+    
+    func listMonitor(_ monitor: ListMonitor<Palette>, didDeleteSection sectionInfo: NSFetchedResultsSectionInfo, fromSectionIndex sectionIndex: Int) {
         
-        self.tableView.deleteSections(NSIndexSet(index: sectionIndex), withRowAnimation: .Automatic)
+        self.tableView.deleteSections(IndexSet(integer: sectionIndex), with: .automatic)
     }
     
     
@@ -258,43 +261,43 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
     
     private var filterBarButton: UIBarButtonItem?
     
-    @IBAction private dynamic func resetBarButtonItemTouched(sender: AnyObject?) {
+    @IBAction private dynamic func resetBarButtonItemTouched(_ sender: AnyObject?) {
         
         CoreStore.beginAsynchronous { (transaction) -> Void in
             
-            transaction.deleteAll(From(Palette))
+            transaction.deleteAll(From<Palette>())
             transaction.commit()
         }
     }
     
-    @IBAction private dynamic func filterBarButtonItemTouched(sender: AnyObject?) {
+    @IBAction private dynamic func filterBarButtonItemTouched(_ sender: AnyObject?) {
         
         Static.filter = Static.filter.next()
     }
     
-    @IBAction private dynamic func addBarButtonItemTouched(sender: AnyObject?) {
+    @IBAction private dynamic func addBarButtonItemTouched(_ sender: AnyObject?) {
         
         CoreStore.beginAsynchronous { (transaction) -> Void in
             
-            let palette = transaction.create(Into(Palette))
+            let palette = transaction.create(Into<Palette>())
             palette.setInitialValues()
             
             transaction.commit()
         }
     }
     
-    private func setTableEnabled(enabled: Bool) {
+    private func setTable(enabled: Bool) {
         
-        UIView.animateWithDuration(
-            0.2,
+        UIView.animate(
+            withDuration: 0.2,
             delay: 0,
-            options: .BeginFromCurrentState,
+            options: .beginFromCurrentState,
             animations: { () -> Void in
                 
                 if let tableView = self.tableView {
                     
                     tableView.alpha = enabled ? 1.0 : 0.5
-                    tableView.userInteractionEnabled = enabled
+                    tableView.isUserInteractionEnabled = enabled
                 }
             },
             completion: nil

CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObjectObserverDemoViewController.swift

@@ -50,7 +50,7 @@ class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
     
     required init?(coder aDecoder: NSCoder) {
         
-        if let palette = CoreStore.fetchOne(From(Palette), OrderBy(.Ascending("hue"))) {
+        if let palette = CoreStore.fetchOne(From<Palette>(), OrderBy(.ascending(#keyPath(Palette.hue)))) {
             
             self.monitor = CoreStore.monitorObject(palette)
         }
@@ -58,13 +58,13 @@ class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
             
             CoreStore.beginSynchronous { (transaction) -> Void in
                 
-                let palette = transaction.create(Into(Palette))
+                let palette = transaction.create(Into(Palette.self))
                 palette.setInitialValues()
                 
-                transaction.commitAndWait()
+                _ = transaction.commitAndWait()
             }
             
-            let palette = CoreStore.fetchOne(From(Palette), OrderBy(.Ascending("hue")))!
+            let palette = CoreStore.fetchOne(From<Palette>(), OrderBy(.ascending(#keyPath(Palette.hue))))!
             self.monitor = CoreStore.monitorObject(palette)
         }
         
@@ -85,24 +85,24 @@ class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
     
     // MARK: ObjectObserver
     
-    func objectMonitor(monitor: ObjectMonitor<Palette>, didUpdateObject object: Palette, changedPersistentKeys: Set<KeyPath>) {
+    func objectMonitor(_ monitor: ObjectMonitor<Palette>, didUpdateObject object: Palette, changedPersistentKeys: Set<KeyPath>) {
         
         self.reloadPaletteInfo(object, changedKeys: changedPersistentKeys)
     }
     
-    func objectMonitor(monitor: ObjectMonitor<Palette>, didDeleteObject object: Palette) {
+    func objectMonitor(_ monitor: ObjectMonitor<Palette>, didDeleteObject object: Palette) {
         
-        self.navigationItem.rightBarButtonItem?.enabled = false
+        self.navigationItem.rightBarButtonItem?.isEnabled = false
         
         self.colorNameLabel?.alpha = 0.3
         self.colorView?.alpha = 0.3
         
         self.hsbLabel?.text = "Deleted"
-        self.hsbLabel?.textColor = UIColor.redColor()
+        self.hsbLabel?.textColor = UIColor.red
         
-        self.hueSlider?.enabled = false
-        self.saturationSlider?.enabled = false
-        self.brightnessSlider?.enabled = false
+        self.hueSlider?.isEnabled = false
+        self.saturationSlider?.isEnabled = false
+        self.brightnessSlider?.isEnabled = false
     }
 
     
@@ -118,7 +118,7 @@ class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
     @IBOutlet weak var saturationSlider: UISlider?
     @IBOutlet weak var brightnessSlider: UISlider?
     
-    @IBAction dynamic func hueSliderValueDidChange(sender: AnyObject?) {
+    @IBAction dynamic func hueSliderValueDidChange(_ sender: AnyObject?) {
         
         let hue = self.hueSlider?.value ?? 0
         CoreStore.beginAsynchronous { [weak self] (transaction) -> Void in
@@ -131,7 +131,7 @@ class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
         }
     }
     
-    @IBAction dynamic func saturationSliderValueDidChange(sender: AnyObject?) {
+    @IBAction dynamic func saturationSliderValueDidChange(_ sender: AnyObject?) {
         
         let saturation = self.saturationSlider?.value ?? 0
         CoreStore.beginAsynchronous { [weak self] (transaction) -> Void in
@@ -144,7 +144,7 @@ class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
         }
     }
     
-    @IBAction dynamic func brightnessSliderValueDidChange(sender: AnyObject?) {
+    @IBAction dynamic func brightnessSliderValueDidChange(_ sender: AnyObject?) {
         
         let brightness = self.brightnessSlider?.value ?? 0
         CoreStore.beginAsynchronous { [weak self] (transaction) -> Void in
@@ -157,7 +157,7 @@ class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
         }
     }
     
-    @IBAction dynamic func deleteBarButtonTapped(sender: AnyObject?) {
+    @IBAction dynamic func deleteBarButtonTapped(_ sender: AnyObject?) {
         
         CoreStore.beginAsynchronous { [weak self] (transaction) -> Void in
             
@@ -166,7 +166,7 @@ class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
         }
     }
     
-    func reloadPaletteInfo(palette: Palette, changedKeys: Set<String>?) {
+    func reloadPaletteInfo(_ palette: Palette, changedKeys: Set<String>?) {
         
         self.colorNameLabel?.text = palette.colorName
         
@@ -176,15 +176,15 @@ class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
         
         self.hsbLabel?.text = palette.colorText
         
-        if changedKeys == nil || changedKeys?.contains("hue") == true {
+        if changedKeys == nil || changedKeys?.contains(#keyPath(Palette.hue)) == true {
             
             self.hueSlider?.value = Float(palette.hue)
         }
-        if changedKeys == nil || changedKeys?.contains("saturation") == true {
+        if changedKeys == nil || changedKeys?.contains(#keyPath(Palette.saturation)) == true {
             
             self.saturationSlider?.value = palette.saturation
         }
-        if changedKeys == nil || changedKeys?.contains("brightness") == true {
+        if changedKeys == nil || changedKeys?.contains(#keyPath(Palette.brightness)) == true {
             
             self.brightnessSlider?.value = palette.brightness
         }

CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObserversViewController.swift

@@ -15,16 +15,16 @@ class ObserversViewController: UIViewController {
     
     // MARK: UIViewController
     
-    override func viewDidAppear(animated: Bool) {
+    override func viewDidAppear(_ animated: Bool) {
         
         super.viewDidAppear(animated)
         
         let alert = UIAlertController(
             title: "Observers Demo",
             message: "This demo shows how to observe changes to a list of objects. The top and bottom view controllers both observe a single shared \"ListMonitor\" instance.\n\nTap on a row to see how to observe changes made to a single object using a \"ObjectMonitor\".",
-            preferredStyle: .Alert
+            preferredStyle: .alert
         )
-        alert.addAction(UIAlertAction(title: "OK", style: .Cancel, handler: nil))
-        self.presentViewController(alert, animated: true, completion: nil)
+        alert.addAction(UIAlertAction(title: "OK", style: .cancel, handler: nil))
+        self.present(alert, animated: true, completion: nil)
     }
 }

CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/Palette.swift

@@ -24,7 +24,7 @@ class Palette: NSManagedObject {
         
         get {
             
-            let KVCKey = "colorName"
+            let KVCKey = #keyPath(Palette.colorName)
             if let colorName = self.accessValueForKVCKey(KVCKey) as? String {
                 
                 return colorName
@@ -49,7 +49,7 @@ class Palette: NSManagedObject {
         }
         set {
             
-            self.setValue(newValue, forKVCKey: "colorName")
+            self.setValue(newValue, forKVCKey: #keyPath(Palette.colorName))
         }
     }
     

CoreStoreDemo/CoreStoreDemo/Loggers Demo/CustomLoggerViewController.swift

@@ -8,7 +8,6 @@
 
 import UIKit
 import CoreStore
-import GCDKit
 
 
 // MARK: - CustomLoggerViewController
@@ -30,90 +29,87 @@ class CustomLoggerViewController: UIViewController, CoreStoreLogger {
         
         super.viewDidLoad()
         
-        try! self.dataStack.addSQLiteStoreAndWait(fileName: "emptyStore.sqlite")
+        try! self.dataStack.addStorageAndWait(SQLiteStore(fileName: "emptyStore.sqlite"))
         CoreStore.logger = self
     }
     
-    override func viewDidAppear(animated: Bool) {
+    override func viewDidAppear(_ animated: Bool) {
         
         super.viewDidAppear(animated)
         
         let alert = UIAlertController(
             title: "Logger Demo",
             message: "This demo shows how to plug-in any logging framework to CoreStore.\n\nThe view controller implements CoreStoreLogger and appends all logs to the text view.",
-            preferredStyle: .Alert
+            preferredStyle: .alert
         )
-        alert.addAction(UIAlertAction(title: "OK", style: .Cancel, handler: nil))
-        self.presentViewController(alert, animated: true, completion: nil)
+        alert.addAction(UIAlertAction(title: "OK", style: .cancel, handler: nil))
+        self.present(alert, animated: true, completion: nil)
     }
 
     
     // MARK: CoreStoreLogger
     
-    func log(level level: LogLevel, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
+    func log(level: LogLevel, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
         
-        GCDQueue.Main.async { [weak self] in
+        DispatchQueue.main.async { [weak self] in
             
             let levelString: String
             switch level {
                 
-            case .Trace: levelString = "Trace"
-            case .Notice: levelString = "Notice"
-            case .Warning: levelString = "Warning"
-            case .Fatal: levelString = "Fatal"
+            case .trace: levelString = "Trace"
+            case .notice: levelString = "Notice"
+            case .warning: levelString = "Warning"
+            case .fatal: levelString = "Fatal"
             }
-            self?.textView?.insertText("\((fileName.stringValue as NSString).lastPathComponent):\(lineNumber) \(functionName)\n  ↪︎ [Log:\(levelString)] \(message)\n\n")
+            self?.textView?.insertText("\((String(describing: fileName) as NSString).lastPathComponent):\(lineNumber) \(functionName)\n  ↪︎ [Log:\(levelString)] \(message)\n\n")
         }
     }
     
-    func handleError(error error: NSError, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
+    func log(error: CoreStoreError, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
         
-        GCDQueue.Main.async { [weak self] in
+        DispatchQueue.main.async { [weak self] in
             
-            self?.textView?.insertText("\((fileName.stringValue as NSString).lastPathComponent):\(lineNumber) \(functionName)\n  ↪︎ [Error] \(message): \(error)\n\n")
+            self?.textView?.insertText("\((String(describing: fileName) as NSString).lastPathComponent):\(lineNumber) \(functionName)\n  ↪︎ [Error] \(message): \(error)\n\n")
         }
     }
     
-    func assert(@autoclosure condition: () -> Bool, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
+    func assert(_ condition: @autoclosure () -> Bool, message: @autoclosure () -> String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
         
         if condition() {
             
             return
         }
         
-        GCDQueue.Main.async { [weak self] in
+        let messageString = message()
+        DispatchQueue.main.async { [weak self] in
             
-            self?.textView?.insertText("\((fileName.stringValue as NSString).lastPathComponent):\(lineNumber) \(functionName)\n  ↪︎ [Assert] \(message)\n\n")
+            self?.textView?.insertText("\((String(describing: fileName) as NSString).lastPathComponent):\(lineNumber) \(functionName)\n  ↪︎ [Assert] \(messageString)\n\n")
         }
     }
     
-    @noreturn func fatalError(message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
-        
-        Swift.fatalError("\((fileName.stringValue as NSString).lastPathComponent):\(lineNumber) \(functionName)\n  ↪︎ [Abort] \(message)")
-    }
-    
     
     // MARK: Private
     
     @IBOutlet dynamic weak var textView: UITextView?
     @IBOutlet dynamic weak var segmentedControl: UISegmentedControl?
     
-    @IBAction dynamic func segmentedControlValueChanged(sender: AnyObject?) {
+    @IBAction dynamic func segmentedControlValueChanged(_ sender: AnyObject?) {
         
         switch self.segmentedControl?.selectedSegmentIndex {
             
         case 0?:
             self.dataStack.beginAsynchronous { (transaction) -> Void in
                 
-                transaction.create(Into(Palette))
+                _ = transaction.create(Into<Palette>())
             }
             
         case 1?:
-            do {
-                
-                try self.dataStack.addSQLiteStoreAndWait(fileName: "emptyStore.sqlite", configuration: "invalidStore")
-            }
-            catch _ { }
+            _ = try? dataStack.addStorageAndWait(
+                SQLiteStore(
+                    fileName: "emptyStore.sqlite",
+                    configuration: "invalidStore"
+                )
+            )
             
         case 2?:
             self.dataStack.beginAsynchronous { (transaction) -> Void in

CoreStoreDemo/CoreStoreDemo/MIgrations Demo/MigrationsDemoViewController.swift

@@ -12,7 +12,7 @@ import CoreStore
 
 // MARK: - MigrationsDemoViewController
 
-class MigrationsDemoViewController: UIViewController {
+class MigrationsDemoViewController: UIViewController, ListObserver, UITableViewDataSource, UITableViewDelegate {
     
     // MARK: UIViewController
     
@@ -22,50 +22,49 @@ class MigrationsDemoViewController: UIViewController {
         
         if let segmentedControl = self.segmentedControl {
             
-            for (index, model) in self.models.enumerate() {
+            for (index, model) in self.models.enumerated() {
                 
                 segmentedControl.setTitle(
                     model.label,
-                    forSegmentAtIndex: index
+                    forSegmentAt: index
                 )
             }
         }
-        self.setDataStack(nil, model: nil, scrollToSelection: false)
+        self.set(dataStack: nil, model: nil, scrollToSelection: false)
     }
     
-    override func viewDidAppear(animated: Bool) {
+    override func viewDidAppear(_ animated: Bool) {
         
         super.viewDidAppear(animated)
         
         let alert = UIAlertController(
             title: "Migrations Demo",
             message: "This demo shows how to run progressive migrations and how to support multiple model versions in a single project.\n\nThe persistent store contains 10000 organisms, which gain/lose properties when the migration evolves/devolves them.\n\nYou can use the \"mutate\" button to change an organism's properties then migrate to a different model to see how its value gets affected.",
-            preferredStyle: .Alert
+            preferredStyle: .alert
         )
-        alert.addAction(UIAlertAction(title: "OK", style: .Cancel, handler: nil))
-        self.presentViewController(alert, animated: true, completion: nil)
+        alert.addAction(UIAlertAction(title: "OK", style: .cancel, handler: nil))
+        self.present(alert, animated: true, completion: nil)
         
         
         let modelMetadata = withExtendedLifetime(DataStack(modelName: "MigrationDemo")) {
             (dataStack: DataStack) -> ModelMetadata in
             
             let models = self.models
-            do {
+            let migrations = try! dataStack.requiredMigrationsForStorage(
+                SQLiteStore(fileName: "MigrationDemo.sqlite")
+            )
+            
+            guard let storeVersion = migrations.first?.sourceVersion else {
+            
+                return models.first!
+            }
+            for model in models {
                 
-                let migrations = try dataStack.requiredMigrationsForSQLiteStore(
-                    fileName: "MigrationDemo.sqlite"
-                )
-                
-                let storeVersion = migrations.first?.sourceVersion ?? dataStack.modelVersion
-                for model in models {
+                if model.version == storeVersion {
                     
-                    if model.version == storeVersion {
-                        
-                        return model
-                    }
+                    return model
                 }
             }
-            catch _ { }
             
             return models.first!
         }
@@ -73,6 +72,71 @@ class MigrationsDemoViewController: UIViewController {
         self.selectModelVersion(modelMetadata)
     }
     
+    // MARK: ListObserver
+    
+    func listMonitorWillChange(_ monitor: ListMonitor<NSManagedObject>) { }
+    
+    func listMonitorDidChange(_ monitor: ListMonitor<NSManagedObject>) {
+        
+        if self.lastSelectedIndexPath == nil,
+            let numberOfObjectsInSection = self.listMonitor?.numberOfObjectsInSection(0),
+            numberOfObjectsInSection > 0 {
+            
+            self.tableView?.reloadData()
+            self.setSelectedIndexPath(IndexPath(row: 0, section: 0), scrollToSelection: false)
+        }
+        else {
+            
+            self.updateDisplay(reloadData: true, scrollToSelection: true, animated: true)
+        }
+    }
+    
+    // MARK: UITableViewDataSource
+    
+    @objc dynamic func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        
+        return self.listMonitor?.numberOfObjectsInSection(0) ?? 0
+    }
+    
+    @objc dynamic func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        
+        let cell = tableView.dequeueReusableCell(withIdentifier: "OrganismTableViewCell", for: indexPath) as! OrganismTableViewCell
+        
+        let dna = (self.listMonitor?[indexPath] as? OrganismProtocol)?.dna.description ?? ""
+        cell.dnaLabel?.text = "DNA: \(dna)"
+        cell.mutateButtonHandler = { [weak self] _ -> Void in
+            
+            guard let `self` = self,
+                let dataStack = self.dataStack,
+                let organism = self.listMonitor?[indexPath] else {
+                    
+                    return
+            }
+            
+            self.setSelectedIndexPath(indexPath, scrollToSelection: false)
+            self.setEnabled(false)
+            dataStack.beginAsynchronous { [weak self] (transaction) -> Void in
+                
+                let organism = transaction.edit(organism) as! OrganismProtocol
+                organism.mutate()
+                
+                transaction.commit { _ -> Void in
+                    
+                    self?.setEnabled(true)
+                }
+            }
+        }
+        return cell
+    }
+    
+    
+    // MARK: UITableViewDelegate
+    
+    @objc dynamic func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        
+        self.setSelectedIndexPath(indexPath, scrollToSelection: false)
+    }
+    
     
     // MARK: Private
     
@@ -114,13 +178,13 @@ class MigrationsDemoViewController: UIViewController {
         return self._dataStack
     }
     
-    private var _lastSelectedIndexPath: NSIndexPath?
-    private var lastSelectedIndexPath: NSIndexPath? {
+    private var _lastSelectedIndexPath: IndexPath?
+    private var lastSelectedIndexPath: IndexPath? {
         
         return self._lastSelectedIndexPath
     }
     
-    private func setSelectedIndexPath(indexPath: NSIndexPath, scrollToSelection: Bool) {
+    private func setSelectedIndexPath(_ indexPath: IndexPath, scrollToSelection: Bool) {
         
         self._lastSelectedIndexPath = indexPath
         self.updateDisplay(reloadData: false, scrollToSelection: scrollToSelection, animated: true)
@@ -133,7 +197,7 @@ class MigrationsDemoViewController: UIViewController {
     @IBOutlet private dynamic weak var progressView: UIProgressView?
     @IBOutlet private dynamic weak var tableView: UITableView?
     
-    @IBAction private dynamic func segmentedControlValueChanged(sender: AnyObject?) {
+    @IBAction private dynamic func segmentedControlValueChanged(_ sender: AnyObject?) {
         
         guard let index = self.segmentedControl?.selectedSegmentIndex else {
             
@@ -143,14 +207,14 @@ class MigrationsDemoViewController: UIViewController {
         self.selectModelVersion(self.models[index])
     }
     
-    private func selectModelVersion(model: ModelMetadata) {
+    private func selectModelVersion(_ model: ModelMetadata) {
         
         if self.dataStack?.modelVersion == model.version {
             
             return
         }
         
-        self.setDataStack(nil, model: nil, scrollToSelection: false) // explicitly trigger NSPersistentStore cleanup by deallocating the stack
+        self.set(dataStack: nil, model: nil, scrollToSelection: false) // explicitly trigger NSPersistentStore cleanup by deallocating the stack
         
         let dataStack = DataStack(
             modelName: "MigrationDemo",
@@ -158,8 +222,8 @@ class MigrationsDemoViewController: UIViewController {
         )
         
         self.setEnabled(false)
-        let progress = try! dataStack.addSQLiteStore(
-            fileName: "MigrationDemo.sqlite",
+        let progress = dataStack.addStorage(
+            SQLiteStore(fileName: "MigrationDemo.sqlite"),
             completion: { [weak self] (result) -> Void in
                 
                 guard let `self` = self else {
@@ -167,18 +231,17 @@ class MigrationsDemoViewController: UIViewController {
                     return
                 }
                 
-                guard case .Success = result else {
+                guard case .success = result else {
                     
                     self.setEnabled(true)
                     return
                 }
                 
-                self.setDataStack(dataStack, model: model, scrollToSelection: true)
+                self.set(dataStack: dataStack, model: model, scrollToSelection: true)
                 
                 let count = dataStack.queryValue(
                     From(model.entityType),
-                    Select<Int>(.Count("dna"))
-                )
+                    Select<Int>(.count(#keyPath(OrganismV1.dna))))!
                 if count > 0 {
                     
                     self.setEnabled(true)
@@ -219,39 +282,39 @@ class MigrationsDemoViewController: UIViewController {
         }
     }
     
-    private func setEnabled(enabled: Bool) {
+    private func setEnabled(_ enabled: Bool) {
         
-        UIView.animateWithDuration(
-            0.2,
+        UIView.animate(
+            withDuration: 0.2,
             delay: 0,
-            options: .BeginFromCurrentState,
+            options: .beginFromCurrentState,
             animations: { () -> Void in
                 
                 let navigationItem = self.navigationItem
-                navigationItem.leftBarButtonItem?.enabled = enabled
-                navigationItem.rightBarButtonItem?.enabled = enabled
+                navigationItem.leftBarButtonItem?.isEnabled = enabled
+                navigationItem.rightBarButtonItem?.isEnabled = enabled
                 navigationItem.hidesBackButton = !enabled
                 
-                self.segmentedControl?.enabled = enabled
+                self.segmentedControl?.isEnabled = enabled
                 
                 if let tableView = self.tableView {
                     
                     tableView.alpha = enabled ? 1.0 : 0.5
-                    tableView.userInteractionEnabled = enabled
+                    tableView.isUserInteractionEnabled = enabled
                 }
             },
             completion: nil
         )
     }
     
-    private func setDataStack(dataStack: DataStack?, model: ModelMetadata?, scrollToSelection: Bool) {
+    private func set(dataStack: DataStack?, model: ModelMetadata?, scrollToSelection: Bool) {
         
         if let dataStack = dataStack, let model = model {
             
-            self.segmentedControl?.selectedSegmentIndex = self.models.map { $0.version }.indexOf(model.version)!
+            self.segmentedControl?.selectedSegmentIndex = self.models.map { $0.version }.index(of: model.version)!
             
             self._dataStack = dataStack
-            let listMonitor = dataStack.monitorList(From(model.entityType), OrderBy(.Descending("dna")))
+            let listMonitor = dataStack.monitorList(From(model.entityType), OrderBy(.descending("dna")))
             listMonitor.addObserver(self)
             self._listMonitor = listMonitor
             
@@ -259,28 +322,28 @@ class MigrationsDemoViewController: UIViewController {
                 
                 if listMonitor.numberOfObjectsInSection(0) > 0 {
                     
-                    self.setSelectedIndexPath(NSIndexPath(forRow: 0, inSection: 0), scrollToSelection: true)
+                    self.setSelectedIndexPath(IndexPath(row: 0, section: 0), scrollToSelection: true)
                 }
             }
         }
         else {
            
             self.segmentedControl?.selectedSegmentIndex = UISegmentedControlNoSegment
-            self._dataStack = nil
             self._listMonitor = nil
+            self._dataStack = nil
         }
         
         self.updateDisplay(reloadData: true, scrollToSelection: scrollToSelection, animated: false)
     }
     
-    private func reloadTableHeaderWithProgress(progress: NSProgress) {
+    private func reloadTableHeaderWithProgress(_ progress: Progress) {
         
         self.progressView?.setProgress(Float(progress.fractionCompleted), animated: true)
-        self.titleLabel?.text = "Migrating: \(progress.localizedDescription)"
-        self.organismLabel?.text = "Progressive step \(progress.localizedAdditionalDescription)"
+        self.titleLabel?.text = "Migrating: \(progress.localizedDescription ?? "")"
+        self.organismLabel?.text = "Progressive step \(progress.localizedAdditionalDescription ?? "")"
     }
     
-    private func updateDisplay(reloadData reloadData: Bool, scrollToSelection: Bool, animated: Bool) {
+    private func updateDisplay(reloadData: Bool, scrollToSelection: Bool, animated: Bool) {
         
         var lines = [String]()
         var organismType = ""
@@ -288,14 +351,14 @@ class MigrationsDemoViewController: UIViewController {
             
             for property in organism.entity.properties {
                 
-                let value: AnyObject = organism.valueForKey(property.name) ?? NSNull()
+                let value = organism.value(forKey: property.name) ?? NSNull()
                 lines.append("\(property.name): \(value)")
             }
             organismType = organism.entity.managedObjectClassName
         }
         
         self.titleLabel?.text = organismType
-        self.organismLabel?.text = lines.joinWithSeparator("\n")
+        self.organismLabel?.text = lines.joined(separator: "\n")
         self.progressView?.progress = 0
         
         self.headerContainer?.setNeedsLayout()
@@ -312,87 +375,13 @@ class MigrationsDemoViewController: UIViewController {
         
         tableView.layoutIfNeeded()
         
-        if let indexPath = self.lastSelectedIndexPath where indexPath.row < tableView.numberOfRowsInSection(0) {
+        if let indexPath = self.lastSelectedIndexPath,
+            indexPath.row < tableView.numberOfRows(inSection: 0) {
             
-            tableView.selectRowAtIndexPath(indexPath,
+            tableView.selectRow(at: indexPath,
                 animated: scrollToSelection && animated,
-                scrollPosition: scrollToSelection ? .Middle : .None
+                scrollPosition: scrollToSelection ? .middle : .none
             )
         }
     }
 }
-
-
-// MARK: - MigrationsDemoViewController: ListObserver
-
-extension MigrationsDemoViewController: ListObserver {
-    
-    // MARK: ListObserver
-    
-    func listMonitorWillChange(monitor: ListMonitor<NSManagedObject>) { }
-    
-    func listMonitorDidChange(monitor: ListMonitor<NSManagedObject>) {
-        
-        if self.lastSelectedIndexPath == nil && self.listMonitor?.numberOfObjectsInSection(0) > 0 {
-            
-            self.tableView?.reloadData()
-            self.setSelectedIndexPath(NSIndexPath(forRow: 0, inSection: 0), scrollToSelection: false)
-        }
-        else {
-            
-            self.updateDisplay(reloadData: true, scrollToSelection: true, animated: true)
-        }
-    }
-}
-
-
-// MARK: - MigrationsDemoViewController: UITableViewDataSource, UITableViewDelegate
-
-extension MigrationsDemoViewController: UITableViewDataSource, UITableViewDelegate {
-    
-    // MARK: UITableViewDataSource
-    
-    @objc dynamic func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        
-        return self.listMonitor?.numberOfObjectsInSection(0) ?? 0
-    }
-    
-    @objc dynamic func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
-        
-        let cell = tableView.dequeueReusableCellWithIdentifier("OrganismTableViewCell", forIndexPath: indexPath) as! OrganismTableViewCell
-        
-        let dna = (self.listMonitor?[indexPath] as? OrganismProtocol)?.dna.description ?? ""
-        cell.dnaLabel?.text = "DNA: \(dna)"
-        cell.mutateButtonHandler = { [weak self] _ -> Void in
-            
-            guard let strongSelf = self,
-                let dataStack = strongSelf.dataStack,
-                let organism = strongSelf.listMonitor?[indexPath] else {
-                    
-                    return
-            }
-            
-            strongSelf.setSelectedIndexPath(indexPath, scrollToSelection: false)
-            strongSelf.setEnabled(false)
-            dataStack.beginAsynchronous { (transaction) -> Void in
-                
-                let organism = transaction.edit(organism) as! OrganismProtocol
-                organism.mutate()
-                
-                transaction.commit { _ -> Void in
-                    
-                    self?.setEnabled(true)
-                }
-            }
-        }
-        return cell
-    }
-    
-    
-    // MARK: UITableViewDelegate
-    
-    @objc dynamic func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
-        
-        self.setSelectedIndexPath(indexPath, scrollToSelection: false)
-    }
-}

CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismProtocol.swift

@@ -13,4 +13,4 @@ protocol OrganismProtocol: class {
     var dna: Int64 { get set }
     
     func mutate()
-}
+}

CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismTableViewCell.swift

@@ -15,7 +15,7 @@ class OrganismTableViewCell: UITableViewCell {
     
     var mutateButtonHandler: (() -> Void)?
 
-    @IBAction dynamic func mutateButtonTouchUpInside(sender: UIButton?) {
+    @IBAction dynamic func mutateButtonTouchUpInside(_ sender: UIButton?) {
      
         self.mutateButtonHandler?()
     }

CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV2ToV3MigrationPolicy.swift

@@ -10,14 +10,20 @@ import CoreData
 
 class OrganismV2ToV3MigrationPolicy: NSEntityMigrationPolicy {
     
-    override func createDestinationInstancesForSourceInstance(sInstance: NSManagedObject, entityMapping mapping: NSEntityMapping, manager: NSMigrationManager) throws {
+    override func createDestinationInstances(forSource sInstance: NSManagedObject, in mapping: NSEntityMapping, manager: NSMigrationManager) throws {
         
-        try super.createDestinationInstancesForSourceInstance(sInstance, entityMapping: mapping, manager: manager)
+        try super.createDestinationInstances(forSource: sInstance, in: mapping, manager: manager)
         
-        for dInstance in manager.destinationInstancesForEntityMappingNamed(mapping.name, sourceInstances: [sInstance]) {
+        for dInstance in manager.destinationInstances(forEntityMappingName: mapping.name, sourceInstances: [sInstance]) {
             
-            dInstance.setValue(false, forKey: "hasVertebrae")
-            dInstance.setValue(sInstance.valueForKey("numberOfFlippers"), forKey: "numberOfLimbs")
+            dInstance.setValue(
+                false,
+                forKey: #keyPath(OrganismV3.hasVertebrae)
+            )
+            dInstance.setValue(
+                sInstance.value(forKey: #keyPath(OrganismV2.numberOfFlippers)),
+                forKey: #keyPath(OrganismV3.numberOfLimbs)
+            )
         }
     }
 }

CoreStoreDemo/CoreStoreDemo/MigrationDemo.xcdatamodeld/MigrationDemo.xcdatamodel/contents

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="7701" systemVersion="14E46" minimumToolsVersion="Xcode 4.3">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="11198.3" systemVersion="15F34" minimumToolsVersion="Xcode 4.3" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
     <entity name="Organism" representedClassName="CoreStoreDemo.OrganismV1" syncable="YES">
-        <attribute name="dna" optional="YES" attributeType="Integer 64" syncable="YES"/>
-        <attribute name="hasHead" optional="YES" attributeType="Boolean" syncable="YES"/>
-        <attribute name="hasTail" optional="YES" attributeType="Boolean" syncable="YES"/>
+        <attribute name="dna" optional="YES" attributeType="Integer 64" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="hasHead" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="hasTail" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
     </entity>
     <elements>
         <element name="Organism" positionX="-36" positionY="9" width="128" height="90"/>

CoreStoreDemo/CoreStoreDemo/MigrationDemo.xcdatamodeld/MigrationDemoV2.xcdatamodel/contents

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="7701" systemVersion="14E46" minimumToolsVersion="Xcode 4.3">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="11198.3" systemVersion="15F34" minimumToolsVersion="Xcode 4.3" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
     <entity name="Organism" representedClassName="CoreStoreDemo.OrganismV2" syncable="YES">
-        <attribute name="dna" optional="YES" attributeType="Integer 64" syncable="YES"/>
-        <attribute name="hasHead" attributeType="Boolean" syncable="YES"/>
-        <attribute name="hasTail" attributeType="Boolean" syncable="YES"/>
-        <attribute name="numberOfFlippers" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
+        <attribute name="dna" optional="YES" attributeType="Integer 64" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="hasHead" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="hasTail" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="numberOfFlippers" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
     </entity>
     <elements>
         <element name="Organism" positionX="-36" positionY="9" width="128" height="105"/>

CoreStoreDemo/CoreStoreDemo/MigrationDemo.xcdatamodeld/MigrationDemoV3.xcdatamodel/contents

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="7701" systemVersion="14E46" minimumToolsVersion="Xcode 4.3">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="11198.3" systemVersion="15F34" minimumToolsVersion="Xcode 4.3" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
     <entity name="Organism" representedClassName="CoreStoreDemo.OrganismV3" syncable="YES">
-        <attribute name="dna" optional="YES" attributeType="Integer 64" syncable="YES"/>
-        <attribute name="hasHead" attributeType="Boolean" syncable="YES"/>
-        <attribute name="hasTail" attributeType="Boolean" syncable="YES"/>
-        <attribute name="hasVertebrae" attributeType="Boolean" syncable="YES"/>
-        <attribute name="numberOfLimbs" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
+        <attribute name="dna" optional="YES" attributeType="Integer 64" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="hasHead" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="hasTail" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="hasVertebrae" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="numberOfLimbs" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
     </entity>
     <elements>
         <element name="Organism" positionX="-36" positionY="9" width="128" height="120"/>

CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/StackSetupDemoViewController.swift

@@ -18,20 +18,24 @@ private struct Static {
     static let facebookStack: DataStack = {
         
         let dataStack = DataStack(modelName: "StackSetupDemo")
-        try! dataStack.addSQLiteStoreAndWait(
-            fileName: "AccountsDemo_FB_Male.sqlite",
-            configuration: maleConfiguration,
-            resetStoreOnModelMismatch: true
+        try! dataStack.addStorageAndWait(
+            SQLiteStore(
+                fileName: "AccountsDemo_FB_Male.sqlite",
+                configuration: maleConfiguration,
+                localStorageOptions: .recreateStoreOnModelMismatch
+            )
         )
-        try! dataStack.addSQLiteStoreAndWait(
-            fileName: "AccountsDemo_FB_Female.sqlite",
-            configuration: femaleConfiguration,
-            resetStoreOnModelMismatch: true
+        try! dataStack.addStorageAndWait(
+            SQLiteStore(
+                fileName: "AccountsDemo_FB_Female.sqlite",
+                configuration: femaleConfiguration,
+                localStorageOptions: .recreateStoreOnModelMismatch
+            )
         )
         
-        dataStack.beginSynchronous { (transaction) -> Void in
+        _ = dataStack.beginSynchronous { (transaction) -> Void in
             
-            transaction.deleteAll(From(UserAccount))
+            transaction.deleteAll(From<UserAccount>())
             
             let account1 = transaction.create(Into<MaleAccount>(maleConfiguration))
             account1.accountType = "Facebook"
@@ -43,7 +47,7 @@ private struct Static {
             account2.name = "Jane Doe HCD"
             account2.friends = 314
             
-            transaction.commitAndWait()
+            _ = transaction.commitAndWait()
         }
         
         return dataStack
@@ -52,20 +56,24 @@ private struct Static {
     static let twitterStack: DataStack = {
         
         let dataStack = DataStack(modelName: "StackSetupDemo")
-        try! dataStack.addSQLiteStoreAndWait(
-            fileName: "AccountsDemo_TW_Male.sqlite",
-            configuration: maleConfiguration,
-            resetStoreOnModelMismatch: true
+        try! dataStack.addStorageAndWait(
+            SQLiteStore(
+                fileName: "AccountsDemo_TW_Male.sqlite",
+                configuration: maleConfiguration,
+                localStorageOptions: .recreateStoreOnModelMismatch
+            )
         )
-        try! dataStack.addSQLiteStoreAndWait(
-            fileName: "AccountsDemo_TW_Female.sqlite",
-            configuration: femaleConfiguration,
-            resetStoreOnModelMismatch: true
+        try! dataStack.addStorageAndWait(
+            SQLiteStore(
+                fileName: "AccountsDemo_TW_Female.sqlite",
+                configuration: femaleConfiguration,
+                localStorageOptions: .recreateStoreOnModelMismatch
+            )
         )
         
-        dataStack.beginSynchronous { (transaction) -> Void in
+        _ = dataStack.beginSynchronous { (transaction) -> Void in
             
-            transaction.deleteAll(From(UserAccount))
+            transaction.deleteAll(From<UserAccount>())
             
             let account1 = transaction.create(Into<MaleAccount>(maleConfiguration))
             account1.accountType = "Twitter"
@@ -77,7 +85,7 @@ private struct Static {
             account2.name = "#janedoe_hcd"
             account2.friends = 100
             
-            transaction.commitAndWait()
+            _ = transaction.commitAndWait()
         }
         
         return dataStack
@@ -92,53 +100,53 @@ private struct Static {
 class StackSetupDemoViewController: UITableViewController {
     
     let accounts = [
-        Static.facebookStack.fetchAll(From(UserAccount)) ?? [],
-        Static.twitterStack.fetchAll(From(UserAccount)) ?? []
+        Static.facebookStack.fetchAll(From(UserAccount.self)) ?? [],
+        Static.twitterStack.fetchAll(From(UserAccount.self)) ?? []
     ]
     
     
     // MARK: UIViewController
     
-    override func viewWillAppear(animated: Bool) {
+    override func viewWillAppear(_ animated: Bool) {
         
         super.viewWillAppear(animated)
         
         self.tableView.reloadData()
         
-        let indexPath = NSIndexPath(forRow: 0, inSection: 0)
-        self.tableView.selectRowAtIndexPath(indexPath, animated: false, scrollPosition: .None)
-        self.updateDetailsWithAccount(self.accounts[indexPath.section][indexPath.row])
+        let indexPath = IndexPath(row: 0, section: 0)
+        self.tableView.selectRow(at: indexPath, animated: false, scrollPosition: .none)
+        self.updateDetails(account: self.accounts[indexPath.section][indexPath.row])
     }
     
-    override func viewDidAppear(animated: Bool) {
+    override func viewDidAppear(_ animated: Bool) {
         
         super.viewDidAppear(animated)
         
         let alert = UIAlertController(
             title: "Setup Demo",
             message: "This demo shows how to initialize 2 DataStacks with 2 configurations each, for a total of 4 SQLite files, each with 1 instance of a \"UserAccount\" entity.",
-            preferredStyle: .Alert
+            preferredStyle: .alert
         )
-        alert.addAction(UIAlertAction(title: "OK", style: .Cancel, handler: nil))
-        self.presentViewController(alert, animated: true, completion: nil)
+        alert.addAction(UIAlertAction(title: "OK", style: .cancel, handler: nil))
+        self.present(alert, animated: true, completion: nil)
     }
     
     
     // MARK: UITableViewDataSource
     
-    override func numberOfSectionsInTableView(tableView: UITableView) -> Int {
+    override func numberOfSections(in tableView: UITableView) -> Int {
         
         return self.accounts.count
     }
     
-    override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         
         return self.accounts[section].count
     }
     
-    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
-        let cell = tableView.dequeueReusableCellWithIdentifier("UITableViewCell")!
+        let cell = tableView.dequeueReusableCell(withIdentifier: "UITableViewCell")!
         
         let account = self.accounts[indexPath.section][indexPath.row]
         cell.textLabel?.text = account.name
@@ -150,13 +158,13 @@ class StackSetupDemoViewController: UITableViewController {
     
     // MARK: UITableViewDelegate
     
-    override func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
+    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         
         let account = self.accounts[indexPath.section][indexPath.row]
-        self.updateDetailsWithAccount(account)
+        self.updateDetails(account: account)
     }
     
-    override func tableView(tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
+    override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
         
         switch section {
             
@@ -180,7 +188,7 @@ class StackSetupDemoViewController: UITableViewController {
     @IBOutlet private dynamic weak var nameLabel: UILabel?
     @IBOutlet private dynamic weak var friendsLabel: UILabel?
     
-    private func updateDetailsWithAccount(account: UserAccount) {
+    private func updateDetails(account: UserAccount) {
         
         self.accountTypeLabel?.text = account.accountType
         self.nameLabel?.text = account.name

CoreStoreDemo/CoreStoreDemo/Transactions Demo/TransactionsDemoViewController.swift

@@ -11,30 +11,31 @@ import CoreLocation
 import MapKit
 import AddressBookUI
 import CoreStore
-import GCDKit
 
 
 private struct Static {
     
     static let placeController: ObjectMonitor<Place> = {
         
-        try! CoreStore.addSQLiteStoreAndWait(
-            fileName: "PlaceDemo.sqlite",
-            configuration: "TransactionsDemo",
-            resetStoreOnModelMismatch: true
+        try! CoreStore.addStorageAndWait(
+            SQLiteStore(
+                fileName: "PlaceDemo.sqlite",
+                configuration: "TransactionsDemo",
+                localStorageOptions: .recreateStoreOnModelMismatch
+            )
         )
         
-        var place = CoreStore.fetchOne(From(Place))
+        var place = CoreStore.fetchOne(From<Place>())
         if place == nil {
             
-            CoreStore.beginSynchronous { (transaction) -> Void in
+            _ = CoreStore.beginSynchronous { (transaction) -> Void in
                 
-                let place = transaction.create(Into(Place))
+                let place = transaction.create(Into<Place>())
                 place.setInitialValues()
                 
-                transaction.commitAndWait()
+                _ = transaction.commitAndWait()
             }
-            place = CoreStore.fetchOne(From(Place))
+            place = CoreStore.fetchOne(From<Place>())
         }
         
         return CoreStore.monitorObject(place!)
@@ -60,39 +61,42 @@ class TransactionsDemoViewController: UIViewController, MKMapViewDelegate, Objec
         
         super.viewDidLoad()
         
-        let longPressGesture = UILongPressGestureRecognizer(target: self, action: #selector(self.longPressGestureRecognized(_:)))
+        let longPressGesture = UILongPressGestureRecognizer(
+            target: self,
+            action: #selector(self.longPressGestureRecognized(_:))
+        )
         self.mapView?.addGestureRecognizer(longPressGesture)
         
         Static.placeController.addObserver(self)
         
         self.navigationItem.rightBarButtonItem = UIBarButtonItem(
-            barButtonSystemItem: .Refresh,
+            barButtonSystemItem: .refresh,
             target: self,
             action: #selector(self.refreshButtonTapped(_:))
         )
     }
     
-    override func viewDidAppear(animated: Bool) {
+    override func viewDidAppear(_ animated: Bool) {
         
         super.viewDidAppear(animated)
         
         let alert = UIAlertController(
             title: "Transactions Demo",
             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
+            preferredStyle: .alert
         )
-        alert.addAction(UIAlertAction(title: "OK", style: .Cancel, handler: nil))
-        self.presentViewController(alert, animated: true, completion: nil)
+        alert.addAction(UIAlertAction(title: "OK", style: .cancel, handler: nil))
+        self.present(alert, animated: true, completion: nil)
     }
     
-    override func viewWillAppear(animated: Bool) {
+    override func viewWillAppear(_ animated: Bool) {
         
         super.viewWillAppear(animated)
         
         if let mapView = self.mapView, let place = Static.placeController.object {
             
             mapView.addAnnotation(place)
-            mapView.setCenterCoordinate(place.coordinate, animated: false)
+            mapView.setCenter(place.coordinate, animated: false)
             mapView.selectAnnotation(place, animated: false)
         }
     }
@@ -100,14 +104,14 @@ class TransactionsDemoViewController: UIViewController, MKMapViewDelegate, Objec
     
     // MARK: MKMapViewDelegate
     
-    func mapView(mapView: MKMapView, viewForAnnotation annotation: MKAnnotation) -> MKAnnotationView? {
+    func mapView(_ mapView: MKMapView, viewFor annotation: MKAnnotation) -> MKAnnotationView? {
         
         let identifier = "MKAnnotationView"
-        var annotationView: MKPinAnnotationView! = mapView.dequeueReusableAnnotationViewWithIdentifier(identifier) as? MKPinAnnotationView
+        var annotationView: MKPinAnnotationView! = mapView.dequeueReusableAnnotationView(withIdentifier: identifier) as? MKPinAnnotationView
         if annotationView == nil {
             
             annotationView = MKPinAnnotationView(annotation: annotation, reuseIdentifier: identifier)
-            annotationView.enabled = true
+            annotationView.isEnabled = true
             annotationView.canShowCallout = true
             annotationView.animatesDrop = true
         }
@@ -122,28 +126,28 @@ class TransactionsDemoViewController: UIViewController, MKMapViewDelegate, Objec
     
     // MARK: ObjectObserver
     
-    func objectMonitor(monitor: ObjectMonitor<Place>, willUpdateObject object: Place) {
+    func objectMonitor(_ monitor: ObjectMonitor<Place>, willUpdateObject object: Place) {
         
         // none
     }
     
-    func objectMonitor(monitor: ObjectMonitor<Place>, didUpdateObject object: Place, changedPersistentKeys: Set<KeyPath>) {
+    func objectMonitor(_ monitor: ObjectMonitor<Place>, didUpdateObject object: Place, changedPersistentKeys: Set<KeyPath>) {
         
         if let mapView = self.mapView {
             
-            mapView.removeAnnotations(mapView.annotations ?? [])
+            mapView.removeAnnotations(mapView.annotations)
             mapView.addAnnotation(object)
-            mapView.setCenterCoordinate(object.coordinate, animated: true)
+            mapView.setCenter(object.coordinate, animated: true)
             mapView.selectAnnotation(object, animated: true)
             
-            if changedPersistentKeys.contains("latitude") || changedPersistentKeys.contains("longitude") {
+            if changedPersistentKeys.contains(#keyPath(Place.latitude)) || changedPersistentKeys.contains(#keyPath(Place.longitude)) {
                 
-                self.geocodePlace(object)
+                self.geocode(place: object)
             }
         }
     }
     
-    func objectMonitor(monitor: ObjectMonitor<Place>, didDeleteObject object: Place) {
+    func objectMonitor(_ monitor: ObjectMonitor<Place>, didDeleteObject object: Place) {
         
         // none
     }
@@ -155,13 +159,15 @@ class TransactionsDemoViewController: UIViewController, MKMapViewDelegate, Objec
     
     @IBOutlet weak var mapView: MKMapView?
     
-    @IBAction dynamic func longPressGestureRecognized(sender: AnyObject?) {
+    @IBAction dynamic func longPressGestureRecognized(_ sender: AnyObject?) {
         
-        if let mapView = self.mapView, let gesture = sender as? UILongPressGestureRecognizer where gesture.state == .Began {
+        if let mapView = self.mapView,
+            let gesture = sender as? UILongPressGestureRecognizer,
+            gesture.state == .began {
             
-            let coordinate = mapView.convertPoint(
-                gesture.locationInView(mapView),
-                toCoordinateFromView: mapView
+            let coordinate = mapView.convert(
+                gesture.location(in: mapView),
+                toCoordinateFrom: mapView
             )
             CoreStore.beginAsynchronous { (transaction) -> Void in
                 
@@ -172,17 +178,17 @@ class TransactionsDemoViewController: UIViewController, MKMapViewDelegate, Objec
         }
     }
     
-    @IBAction dynamic func refreshButtonTapped(sender: AnyObject?) {
+    @IBAction dynamic func refreshButtonTapped(_ sender: AnyObject?) {
         
-        CoreStore.beginSynchronous { (transaction) -> Void in
+        _ = CoreStore.beginSynchronous { (transaction) -> Void in
             
             let place = transaction.edit(Static.placeController.object)
             place?.setInitialValues()
-            transaction.commitAndWait()
+            _ = transaction.commitAndWait()
         }
     }
     
-    func geocodePlace(place: Place) {
+    func geocode(place: Place) {
         
         let transaction = CoreStore.beginUnsafe()
         

CoreStoreTests/BaseTests/BaseTestCase.swift

@@ -0,0 +1,202 @@
+//
+//  BaseTestCase.swift
+//  CoreStore
+//
+//  Copyright © 2016 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import XCTest
+
+@testable
+import CoreStore
+
+
+// MARK: - BaseTestCase
+
+class BaseTestCase: XCTestCase {
+    
+    // MARK: Internal
+    
+    @nonobjc
+    @discardableResult
+    func prepareStack<T>(configurations: [String?] = [nil], _ closure: (_ dataStack: DataStack) -> T) -> T {
+        
+        let stack = DataStack(
+            modelName: "Model",
+            bundle: Bundle(for: type(of: self))
+        )
+        do {
+            
+            try configurations.forEach {
+                
+                try stack.addStorageAndWait(
+                    SQLiteStore(
+                        fileURL: SQLiteStore.defaultRootDirectory
+                            .appendingPathComponent(UUID().uuidString)
+                            .appendingPathComponent("\(type(of: self))_\(($0 ?? "-null-")).sqlite"),
+                        configuration: $0,
+                        localStorageOptions: .recreateStoreOnModelMismatch
+                    )
+                )
+            }
+        }
+        catch let error as NSError {
+            
+            XCTFail(error.coreStoreDumpString)
+        }
+        return closure(stack)
+    }
+    
+    @nonobjc
+    func expectLogger<T>(_ expectations: [TestLogger.Expectation], closure: () -> T) -> T {
+        
+        CoreStore.logger = TestLogger(self.prepareLoggerExpectations(expectations))
+        defer {
+            
+            self.checkExpectationsImmediately()
+            CoreStore.logger = TestLogger([:])
+        }
+        return closure()
+    }
+    
+    @nonobjc
+    func expectLogger(_ expectations: [TestLogger.Expectation: XCTestExpectation]) {
+        
+        CoreStore.logger = TestLogger(expectations)
+    }
+    
+    @nonobjc
+    func prepareLoggerExpectations(_ expectations: [TestLogger.Expectation]) -> [TestLogger.Expectation: XCTestExpectation] {
+        
+        var testExpectations: [TestLogger.Expectation: XCTestExpectation] = [:]
+        for expectation in expectations {
+            
+            testExpectations[expectation] = self.expectation(description: "Logger Expectation: \(expectation)")
+        }
+        return testExpectations
+    }
+    
+    @nonobjc
+    func checkExpectationsImmediately() {
+        
+        self.waitForExpectations(timeout: 0, handler: { _ in })
+    }
+    
+    @nonobjc
+    func waitAndCheckExpectations() {
+        
+        self.waitForExpectations(timeout: 10, handler: {_ in })
+    }
+    
+    // MARK: XCTestCase
+    
+    override func setUp() {
+        
+        super.setUp()
+        self.deleteStores()
+        CoreStore.logger = TestLogger([:])
+    }
+    
+    override func tearDown() {
+        
+        CoreStore.logger = DefaultLogger()
+        self.deleteStores()
+        super.tearDown()
+    }
+    
+    
+    // MARK: Private
+    
+    private func deleteStores() {
+        
+        _ = try? FileManager.default.removeItem(at: SQLiteStore.defaultRootDirectory)
+    }
+}
+
+
+// MARK: - TestLogger
+
+class TestLogger: CoreStoreLogger {
+    
+    enum Expectation {
+        
+        case logWarning
+        case logFatal
+        case logError
+        case assertionFailure
+        case fatalError
+    }
+    
+    init(_ expectations: [Expectation: XCTestExpectation]) {
+        
+        self.expectations = expectations
+    }
+    
+    
+    // MARK: CoreStoreLogger
+    
+    func log(level: LogLevel, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
+        
+        switch level {
+            
+        case .warning:  self.fulfill(.logWarning)
+        case .fatal:    self.fulfill(.logFatal)
+        default:        break
+        }
+    }
+    
+    func log(error: CoreStoreError, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
+        
+        self.fulfill(.logError)
+    }
+    
+    func assert(_ condition: @autoclosure () -> Bool, message: @autoclosure () -> String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
+        
+        if condition() {
+            
+            return
+        }
+        self.fulfill(.assertionFailure)
+    }
+    
+    func abort(_ message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
+        
+        self.fulfill(.fatalError)
+    }
+    
+    
+    // MARK: Private
+    
+    private var expectations: [Expectation: XCTestExpectation]
+    
+    private func fulfill(_ expectation: Expectation) {
+        
+        if let instance = self.expectations[expectation] {
+            
+            instance.fulfill()
+            self.expectations[expectation] = nil
+        }
+        else {
+            
+            XCTFail("Unexpected Logger Action: \(expectation)")
+        }
+    }
+}

CoreStoreTests/BaseTests/BaseTestDataTestCase.swift

@@ -0,0 +1,76 @@
+//
+//  BaseTestDataTestCase.swift
+//  CoreStore
+//
+//  Created by John Rommel Estropia on 2016/06/11.
+//  Copyright © 2016 John Rommel Estropia. All rights reserved.
+//
+
+import Foundation
+
+@testable
+import CoreStore
+
+
+// MARK: - BaseTestDataTestCase
+
+class BaseTestDataTestCase: BaseTestCase {
+    
+    @nonobjc
+    let dateFormatter: DateFormatter = {
+        
+        let formatter = DateFormatter()
+        formatter.locale = Locale(identifier: "en_US_POSIX")
+        formatter.timeZone = TimeZone(identifier: "UTC")
+        formatter.calendar = Calendar(identifier: Calendar.Identifier.gregorian)
+        formatter.dateFormat = "yyyy'-'MM'-'dd'T'HH':'mm':'ssZ"
+        return formatter
+    }()
+    
+    @nonobjc
+    func prepareTestDataForStack(_ stack: DataStack, configurations: [String?] = [nil]) {
+        
+        stack.beginSynchronous { (transaction) in
+            
+            for (configurationIndex, configuration) in configurations.enumerated() {
+                
+                let configurationOrdinal = configurationIndex + 1
+                if configuration == nil || configuration == "Config1" {
+                    
+                    for idIndex in 1 ... 5 {
+                        
+                        let object = transaction.create(Into<TestEntity1>(configuration))
+                        object.testEntityID = NSNumber(value: (configurationOrdinal * 100) + idIndex)
+                        
+                        object.testNumber = NSNumber(value: idIndex)
+                        object.testDate = self.dateFormatter.date(from: "2000-\(configurationOrdinal)-\(idIndex)T00:00:00Z")
+                        object.testBoolean = NSNumber(value: (idIndex % 2) == 1)
+                        object.testDecimal = NSDecimalNumber(string: "\(idIndex)")
+                        
+                        let string = "\(configuration ?? "nil"):TestEntity1:\(idIndex)"
+                        object.testString = string
+                        object.testData = (string as NSString).data(using: String.Encoding.utf8.rawValue)
+                    }
+                }
+                if configuration == nil || configuration == "Config2" {
+                    
+                    for idIndex in 1 ... 5 {
+                        
+                        let object = transaction.create(Into<TestEntity2>(configuration))
+                        object.testEntityID = NSNumber(value: (configurationOrdinal * 200) + idIndex)
+                        
+                        object.testNumber = NSNumber(value: idIndex)
+                        object.testDate = self.dateFormatter.date(from: "2000-\(configurationOrdinal)-\(idIndex)T00:00:00Z")
+                        object.testBoolean = NSNumber(value: (idIndex % 2) == 1)
+                        object.testDecimal = NSDecimalNumber(string: "\(idIndex)")
+                        
+                        let string = "\(configuration ?? "nil"):TestEntity2:\(idIndex)"
+                        object.testString = string
+                        object.testData = (string as NSString).data(using: String.Encoding.utf8.rawValue)
+                    }
+                }
+            }
+            _ = transaction.commitAndWait()
+        }
+    }
+}

CoreStoreTests/BridgingTests.h

@@ -0,0 +1,30 @@
+//
+//  BridgingTests.h
+//  CoreStore
+//
+//  Copyright © 2016 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+#import <XCTest/XCTest.h>
+
+@interface BridgingTests : XCTestCase
+
+@end

CoreStoreTests/BridgingTests.m

@@ -0,0 +1,269 @@
+//
+//  BridgingTests.m
+//  CoreStore
+//
+//  Copyright © 2016 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+#import "BridgingTests.h"
+#import <CoreStore/CoreStore.h>
+#import <CoreStore/CoreStore-Swift.h>
+#import "CoreStoreTests-Swift.h"
+
+@import CoreData;
+
+// MARK: - BridgingTests
+
+@implementation BridgingTests
+
+- (void)test_ThatFlags_HaveCorrectValues {
+    
+    XCTAssertEqual(CSLocalStorageOptionsNone, 0);
+    XCTAssertEqual(CSLocalStorageOptionsRecreateStoreOnModelMismatch, 1);
+    XCTAssertEqual(CSLocalStorageOptionsPreventProgressiveMigration, 2);
+    XCTAssertEqual(CSLocalStorageOptionsAllowSynchronousLightweightMigration, 4);
+}
+
+- (void)test_ThatKeyPaths_AreCorrect {
+    
+    XCTAssertEqualObjects(CSKeyPath(TestEntity1, testNumber), @"testNumber");
+    XCTAssertEqualObjects(CSKeyPath(TestEntity1, testString), @"testString");
+    XCTAssertEqualObjects(CSKeyPathOperator(count, TestEntity1, testString), @"@count.testString");
+    XCTAssertEqualObjects(CSKeyPathOperator(max, TestEntity1, testNumber), @"@max.testNumber");
+}
+
+- (void)test_ThatFromClauses_BridgeCorrectly {
+    
+    {
+        CSFrom *from = CSFromClass([TestEntity1 class]);
+        XCTAssertEqualObjects(from.entityClass, [TestEntity1 class]);
+        XCTAssertNil(from.configurations);
+    }
+    {
+        CSFrom *from = CSFromClass([TestEntity1 class], [NSNull null]);
+        XCTAssertEqualObjects(from.entityClass, [TestEntity1 class]);
+        
+        NSArray *configurations = @[[NSNull null]];
+        XCTAssertEqualObjects(from.configurations, configurations);
+    }
+    {
+        CSFrom *from = CSFromClass([TestEntity1 class], @"Config1");
+        XCTAssertEqualObjects(from.entityClass, [TestEntity1 class]);
+        
+        NSArray *configurations = @[@"Config1"];
+        XCTAssertEqualObjects(from.configurations, configurations);
+    }
+    {
+        CSFrom *from = CSFromClass([TestEntity1 class], @[[NSNull null], @"Config2"]);
+        XCTAssertEqualObjects(from.entityClass, [TestEntity1 class]);
+        
+        NSArray *configurations = @[[NSNull null], @"Config2"];
+        XCTAssertEqualObjects(from.configurations, configurations);
+    }
+}
+
+- (void)test_ThatWhereClauses_BridgeCorrectly {
+    
+    {
+        CSWhere *where = CSWhereFormat(@"%K == %@", @"key", @"value");
+        NSPredicate *predicate = [NSPredicate predicateWithFormat:@"%K == %@", @"key", @"value"];
+        XCTAssertEqualObjects(where.predicate, predicate);
+    }
+    {
+        CSWhere *where = CSWhereValue(YES);
+        NSPredicate *predicate = [NSPredicate predicateWithValue:YES];
+        XCTAssertEqualObjects(where.predicate, predicate);
+    }
+    {
+        CSWhere *where = CSWherePredicate([NSPredicate predicateWithFormat:@"%K == %@", @"key", @"value"]);
+        NSPredicate *predicate = [NSPredicate predicateWithFormat:@"%K == %@", @"key", @"value"];
+        XCTAssertEqualObjects(where.predicate, predicate);
+    }
+}
+
+- (void)test_ThatOrderByClauses_BridgeCorrectly {
+    
+    {
+        CSOrderBy *orderBy = CSOrderByKey(CSSortAscending(@"key"));
+        XCTAssertEqualObjects(orderBy.sortDescriptors, @[[NSSortDescriptor sortDescriptorWithKey:@"key" ascending:YES]]);
+    }
+    {
+        CSOrderBy *orderBy = CSOrderByKey(CSSortDescending(@"key"));
+        XCTAssertEqualObjects(orderBy.sortDescriptors, @[[NSSortDescriptor sortDescriptorWithKey:@"key" ascending:NO]]);
+    }
+    {
+        CSOrderBy *orderBy = CSOrderByKeys(CSSortAscending(@"key1"), CSSortDescending(@"key2"), nil);
+        NSArray *sortDescriptors = @[[NSSortDescriptor sortDescriptorWithKey:@"key1" ascending:YES],
+                                     [NSSortDescriptor sortDescriptorWithKey:@"key2" ascending:NO]];
+        XCTAssertEqualObjects(orderBy.sortDescriptors, sortDescriptors);
+    }
+}
+
+- (void)test_ThatGroupByClauses_BridgeCorrectly {
+    
+    {
+        CSGroupBy *groupBy = CSGroupByKeyPath(@"key");
+        XCTAssertEqualObjects(groupBy.keyPaths, @[@"key"]);
+    }
+    {
+        CSGroupBy *groupBy = CSGroupByKeyPaths(@[@"key1", @"key2"]);
+        
+        NSArray *keyPaths = @[@"key1", @"key2"];
+        XCTAssertEqualObjects(groupBy.keyPaths, keyPaths);
+    }
+}
+
+- (void)test_ThatTweakClauses_BridgeCorrectly {
+    
+    CSTweak *tweak = CSTweakRequest(^(NSFetchRequest * _Nonnull fetchRequest) {
+        
+        fetchRequest.fetchLimit = 100;
+    });
+    NSFetchRequest *request = [NSFetchRequest new];
+    tweak.block(request);
+    XCTAssertEqual(request.fetchLimit, 100);
+}
+
+- (void)test_ThatIntoClauses_BridgeCorrectly {
+    
+    {
+        CSInto *into = CSIntoClass([TestEntity1 class]);
+        XCTAssertEqualObjects(into.entityClass, [TestEntity1 class]);
+    }
+    {
+        CSInto *into = CSIntoClass([TestEntity1 class], [NSNull null]);
+        XCTAssertEqualObjects(into.entityClass, [TestEntity1 class]);
+        XCTAssertNil(into.configuration);
+    }
+    {
+        CSInto *into = CSIntoClass([TestEntity1 class], @"Config1");
+        XCTAssertEqualObjects(into.entityClass, [TestEntity1 class]);
+        XCTAssertEqualObjects(into.configuration, @"Config1");
+    }
+}
+
+- (void)test_ThatDataStacks_BridgeCorrectly {
+    
+    CSDataStack *dataStack = [[CSDataStack alloc]
+                              initWithModelName:@"Model"
+                              bundle:[NSBundle bundleForClass:[self class]]
+                              versionChain:nil];
+    XCTAssertNotNil(dataStack);
+    
+    [CSCoreStore setDefaultStack:dataStack];
+    XCTAssertTrue([dataStack isEqual:[CSCoreStore defaultStack]]);
+}
+
+- (void)test_ThatStorages_BridgeCorrectly {
+    
+    NSError *memoryError;
+    CSInMemoryStore *memoryStorage = [CSCoreStore
+                                      addInMemoryStorageAndWait:[CSInMemoryStore new]
+                                      error:&memoryError];
+    XCTAssertNotNil(memoryStorage);
+    XCTAssertEqualObjects([[memoryStorage class] storeType], [CSInMemoryStore storeType]);
+    XCTAssertEqualObjects([[memoryStorage class] storeType], NSInMemoryStoreType);
+    XCTAssertNil(memoryStorage.configuration);
+    XCTAssertNil(memoryStorage.storeOptions);
+    XCTAssertNil(memoryError);
+    
+    NSError *sqliteError;
+    CSSQLiteStore *sqliteStorage = [CSCoreStore
+                                    addSQLiteStorageAndWait:[CSSQLiteStore new]
+                                    error:&sqliteError];
+    XCTAssertNotNil(sqliteStorage);
+    XCTAssertEqualObjects([[sqliteStorage class] storeType], [CSSQLiteStore storeType]);
+    XCTAssertEqualObjects([[sqliteStorage class] storeType], NSSQLiteStoreType);
+    XCTAssertNil(sqliteStorage.configuration);
+    XCTAssertEqualObjects(sqliteStorage.storeOptions, @{ NSSQLitePragmasOption: @{ @"journal_mode": @"WAL" } });
+    XCTAssertNil(sqliteError);
+}
+
+- (void)test_ThatTransactions_BridgeCorrectly {
+    
+    [CSCoreStore
+     setDefaultStack:[[CSDataStack alloc]
+                      initWithModelName:@"Model"
+                      bundle:[NSBundle bundleForClass:[self class]]
+                      versionChain:nil]];
+    [CSCoreStore
+     addInMemoryStorageAndWait:[CSInMemoryStore new]
+     error:nil];
+    
+    {
+        CSUnsafeDataTransaction *transaction = [CSCoreStore beginUnsafe];
+        XCTAssertNotNil(transaction);
+        XCTAssert([transaction isKindOfClass:[CSUnsafeDataTransaction class]]);
+    }
+    {
+        XCTestExpectation *expectation = [self expectationWithDescription:@"sync"];
+        [CSCoreStore beginSynchronous:^(CSSynchronousDataTransaction * _Nonnull transaction) {
+            
+            XCTAssertNotNil(transaction);
+            XCTAssert([transaction isKindOfClass:[CSSynchronousDataTransaction class]]);
+            [expectation fulfill];
+        }];
+    }
+    {
+        XCTestExpectation *expectation = [self expectationWithDescription:@"async"];
+        [CSCoreStore beginAsynchronous:^(CSAsynchronousDataTransaction * _Nonnull transaction) {
+            
+            XCTAssertNotNil(transaction);
+            XCTAssert([transaction isKindOfClass:[CSAsynchronousDataTransaction class]]);
+            [expectation fulfill];
+        }];
+    }
+    [self waitForExpectationsWithTimeout:10 handler:nil];
+}
+    
+#if TARGET_OS_IOS || TARGET_OS_WATCHOS || TARGET_OS_TV
+
+- (void)test_ThatDataStacks_CanCreateCustomFetchedResultsControllers {
+    
+    [CSCoreStore
+     setDefaultStack:[[CSDataStack alloc]
+                      initWithModelName:@"Model"
+                      bundle:[NSBundle bundleForClass:[self class]]
+                      versionChain:nil]];
+    [CSCoreStore
+     addInMemoryStorageAndWait:[CSInMemoryStore new]
+     error:nil];
+    NSFetchedResultsController *controller =
+    [[CSCoreStore defaultStack]
+     createFetchedResultsControllerFrom:CSFromClass([TestEntity1 class])
+     sectionBy:[CSSectionBy keyPath:CSKeyPath(TestEntity1, testString)]
+     fetchClauses:@[CSWhereFormat(@"%K > %d", CSKeyPath(TestEntity1, testEntityID), 100),
+                    CSOrderByKeys(CSSortAscending(CSKeyPath(TestEntity1, testString)), nil),
+                    CSTweakRequest(^(NSFetchRequest *fetchRequest) { fetchRequest.fetchLimit = 10; })]];
+    
+    XCTAssertNotNil(controller);
+    XCTAssertEqualObjects(controller.fetchRequest.entity.managedObjectClassName, [[TestEntity1 class] description]);
+    XCTAssertEqualObjects(controller.sectionNameKeyPath, CSKeyPath(TestEntity1, testString));
+    XCTAssertEqualObjects(controller.fetchRequest.predicate,
+                          CSWhereFormat(@"%K > %d", CSKeyPath(TestEntity1, testEntityID), 100).predicate);
+    XCTAssertEqualObjects(controller.fetchRequest.sortDescriptors,
+                   CSOrderByKeys(CSSortAscending(CSKeyPath(TestEntity1, testString)), nil).sortDescriptors);
+    XCTAssertEqual(controller.fetchRequest.fetchLimit, 10);
+}
+    
+#endif
+
+@end

CoreStoreTests/ConvenienceTests.swift

@@ -0,0 +1,94 @@
+//
+//  ConvenienceTests.swift
+//  CoreStore
+//
+//  Copyright © 2016 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+@testable
+import CoreStore
+
+
+#if os(iOS) || os(watchOS) || os(tvOS)
+
+// MARK: - ConvenienceTests
+
+class ConvenienceTests: BaseTestCase {
+    
+    @objc
+    dynamic func test_ThatDataStacks_CanCreateFetchedResultsControllers() {
+
+        self.prepareStack { (stack) in
+            
+            let controller = stack.createFetchedResultsController(
+                From<TestEntity1>(),
+                SectionBy(#keyPath(TestEntity1.testString)),
+                Where("%@ > %d", #keyPath(TestEntity1.testEntityID), 100),
+                OrderBy(.ascending(#keyPath(TestEntity1.testString))),
+                Tweak { $0.fetchLimit = 10 }
+            )
+            XCTAssertEqual(controller.managedObjectContext, stack.mainContext)
+            XCTAssertEqual(controller.fetchRequest.entity?.managedObjectClassName, NSStringFromClass(TestEntity1.self))
+            XCTAssertEqual(controller.sectionNameKeyPath, #keyPath(TestEntity1.testString))
+            XCTAssertEqual(
+                controller.fetchRequest.sortDescriptors!,
+                OrderBy(.ascending(#keyPath(TestEntity1.testString))).sortDescriptors
+            )
+            XCTAssertEqual(
+                controller.fetchRequest.predicate,
+                Where("%@ > %d", #keyPath(TestEntity1.testEntityID), 100).predicate
+            )
+            XCTAssertEqual(controller.fetchRequest.fetchLimit, 10)
+        }
+    }
+    
+    @objc
+    dynamic func test_ThatUnsafeDataTransactions_CanCreateFetchedResultsControllers() {
+        
+        self.prepareStack { (stack) in
+            
+            _ = withExtendedLifetime(stack.beginUnsafe()) { (transaction: UnsafeDataTransaction) in
+                
+                let controller = transaction.createFetchedResultsController(
+                    From<TestEntity1>(),
+                    SectionBy(#keyPath(TestEntity1.testString)),
+                    Where("%@ > %d", #keyPath(TestEntity1.testEntityID), 100),
+                    OrderBy(.ascending(#keyPath(TestEntity1.testString))),
+                    Tweak { $0.fetchLimit = 10 }
+                )
+                XCTAssertEqual(controller.managedObjectContext, transaction.context)
+                XCTAssertEqual(controller.fetchRequest.entity?.managedObjectClassName, NSStringFromClass(TestEntity1.self))
+                XCTAssertEqual(controller.sectionNameKeyPath, #keyPath(TestEntity1.testString))
+                XCTAssertEqual(
+                    controller.fetchRequest.sortDescriptors!,
+                    OrderBy(.ascending(#keyPath(TestEntity1.testString))).sortDescriptors
+                )
+                XCTAssertEqual(
+                    controller.fetchRequest.predicate,
+                    Where("%@ > %d", #keyPath(TestEntity1.testEntityID), 100).predicate
+                )
+                XCTAssertEqual(controller.fetchRequest.fetchLimit, 10)
+            }
+        }
+    }
+}
+
+#endif

CoreStoreTests/CoreStoreTests-Bridging-Header.h

@@ -0,0 +1,5 @@
+//
+//  Use this file to import your target's public headers that you would like to expose to Swift.
+//
+
+#import "BridgingTests.h"

CoreStoreTests/CoreStoreTests.swift

@@ -1,389 +0,0 @@
-//
-//  CoreStoreTests.swift
-//  CoreStoreTests
-//
-//  Copyright © 2014 John Rommel Estropia
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to deal
-//  in the Software without restriction, including without limitation the rights
-//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included in all
-//  copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//  SOFTWARE.
-//
-
-import XCTest
-
-@testable
-import CoreStore
-
-class CoreStoreTests: XCTestCase {
-    
-    override func setUp() {
-        
-        super.setUp()
-        self.deleteStores()
-    }
-    
-    override func tearDown() {
-        
-        self.deleteStores()
-        super.tearDown()
-    }
-    
-    func testMigrationChains() {
-        
-        let emptyChain: MigrationChain = nil
-        XCTAssertTrue(emptyChain.valid, "emptyChain.valid")
-        XCTAssertTrue(emptyChain.empty, "emptyChain.empty")
-        
-        let normalChain: MigrationChain = "version1"
-        XCTAssertTrue(normalChain.valid, "normalChain.valid")
-        XCTAssertTrue(normalChain.empty, "normalChain.empty")
-        
-        let linearChain: MigrationChain = ["version1", "version2", "version3", "version4"]
-        XCTAssertTrue(linearChain.valid, "linearChain.valid")
-        XCTAssertFalse(linearChain.empty, "linearChain.empty")
-        
-        let treeChain: MigrationChain = [
-            "version1": "version4",
-            "version2": "version3",
-            "version3": "version4"
-        ]
-        XCTAssertTrue(treeChain.valid, "treeChain.valid")
-        XCTAssertFalse(treeChain.empty, "treeChain.empty")
-
-        // The cases below will trigger assertion failures internally
-        
-//        let linearLoopChain: MigrationChain = ["version1", "version2", "version1", "version3", "version4"]
-//        XCTAssertFalse(linearLoopChain.valid, "linearLoopChain.valid")
-//        
-//        let treeAmbiguousChain: MigrationChain = [
-//            "version1": "version4",
-//            "version2": "version3",
-//            "version1": "version2",
-//            "version3": "version4"
-//        ]
-//        XCTAssertFalse(treeAmbiguousChain.valid, "treeAmbiguousChain.valid")
-    }
-    
-    func testExample() {
-        
-        let stack = DataStack(modelName: "Model", bundle: NSBundle(forClass: self.dynamicType))
-        CoreStore.defaultStack = stack
-        XCTAssert(CoreStore.defaultStack === stack, "CoreStore.defaultStack === stack")
-        
-        do {
-            
-            try stack.addSQLiteStoreAndWait(fileName: "ConfigStore1.sqlite", configuration: "Config1", resetStoreOnModelMismatch: true)
-        }
-        catch let error as NSError {
-            
-            XCTFail(error.description)
-        }
-        
-        do {
-            
-            try stack.addSQLiteStoreAndWait(fileName: "ConfigStore2.sqlite", configuration: "Config2", resetStoreOnModelMismatch: true)
-        }
-        catch let error as NSError {
-            
-            XCTFail(error.description)
-        }
-        
-        let unsafeTransaction = CoreStore.beginUnsafe()
-        
-        let createExpectation = self.expectationWithDescription("Entity creation")
-        CoreStore.beginAsynchronous { (transaction) -> Void in
-        
-            let obj1 = transaction.create(Into(TestEntity1))
-            obj1.testEntityID = 1
-            obj1.testString = "lololol"
-            obj1.testNumber = 42
-            obj1.testDate = NSDate()
-            
-            let count = transaction.queryValue(
-                From<TestEntity1>(),
-                Select<Int>(.Count("testNumber"))
-            )
-            XCTAssertTrue(count == 0, "count == 0 (actual: \(count))") // counts only objects in store
-            
-            let obj2 = transaction.create(Into<TestEntity2>())
-            obj2.testEntityID = 2
-            obj2.testString = "hahaha"
-            obj2.testNumber = 100
-            obj2.testDate = NSDate()
-            
-            let obj3 = transaction.create(Into<TestEntity2>("Config2"))
-            obj3.testEntityID = 3
-            obj3.testString = "hahaha"
-            obj3.testNumber = 90
-            obj3.testDate = NSDate()
-            
-            let obj4 = transaction.create(Into(TestEntity2.self, "Config2"))
-            obj4.testEntityID = 5
-            obj4.testString = "hohoho"
-            obj4.testNumber = 80
-            obj4.testDate = NSDate()
-            
-        
-            transaction.beginSynchronous { (transaction) -> Void in
-                
-                let obj4 = transaction.create(Into<TestEntity2>())
-                obj4.testEntityID = 4
-                obj4.testString = "hehehehe"
-                obj4.testNumber = 80
-                obj4.testDate = NSDate()
-                
-                let objs4test = transaction.fetchOne(
-                    From<TestEntity2>("Config2"),
-                    Where("testEntityID", isEqualTo: 4),
-                    Tweak { (fetchRequest) -> Void in
-                        
-                        fetchRequest.includesPendingChanges = true
-                    }
-                )
-                XCTAssertNotNil(objs4test, "objs4test != nil")
-                
-                let objs5test = transaction.fetchOne(
-                    From(TestEntity2),
-                    Where("testEntityID", isEqualTo: 4),
-                    Tweak { (fetchRequest) -> Void in
-                        
-                        fetchRequest.includesPendingChanges = false
-                    }
-                )
-                XCTAssertNil(objs5test, "objs5test == nil")
-                
-                // Dont commit1
-            }
-            
-            transaction.commit { (result) -> Void in
-                
-                let objs4test = CoreStore.fetchOne(
-                    From(TestEntity2),
-                    Where("testEntityID", isEqualTo: 4),
-                    Tweak { (fetchRequest) -> Void in
-                        
-                        fetchRequest.includesPendingChanges = false
-                    }
-                )
-                XCTAssertNil(objs4test, "objs4test == nil")
-                
-                let objs5test = unsafeTransaction.fetchCount(From(TestEntity2))
-                XCTAssertTrue(objs5test == 3, "objs5test == 3")
-                
-                XCTAssertTrue(NSThread.isMainThread(), "NSThread.isMainThread()")
-                switch result {
-                    
-                case .Success(let hasChanges):
-                    XCTAssertTrue(hasChanges, "hasChanges == true")
-                    createExpectation.fulfill()
-                    
-                case .Failure(let error):
-                    XCTFail(error.description)
-                }
-            }
-        }
-        
-        let queryExpectation = self.expectationWithDescription("Query creation")
-        CoreStore.beginAsynchronous { (transaction) -> Void in
-            
-            let obj1 = transaction.fetchOne(From(TestEntity1))
-            XCTAssertNotNil(obj1, "obj1 != nil")
-            
-            var orderBy = OrderBy(.Ascending("testEntityID"))
-            orderBy += OrderBy(.Descending("testString"))
-            let objs2 = transaction.fetchAll(
-                From(TestEntity2),
-                Where("testNumber", isEqualTo: 100) || Where("%K == %@", "testNumber", 90),
-                orderBy,
-                Tweak { (fetchRequest) -> Void in
-                    
-                    fetchRequest.includesPendingChanges = true
-                }
-            )
-            XCTAssertNotNil(objs2, "objs2 != nil")
-            XCTAssertTrue(objs2?.count == 2, "objs2?.count == 2")
-            
-            transaction.commit { (result) -> Void in
-                
-                let counts = CoreStore.queryAttributes(
-                    From(TestEntity2),
-                    Select("testString", .Count("testString", As: "count")),
-                    GroupBy("testString")
-                )
-                print(counts)
-                
-                XCTAssertTrue(NSThread.isMainThread(), "NSThread.isMainThread()")
-                switch result {
-                    
-                case .Success(let hasChanges):
-                    XCTAssertFalse(hasChanges, "hasChanges == false")
-                    queryExpectation.fulfill()
-                    
-                case .Failure(let error):
-                    XCTFail(error.description)
-                }
-            }
-        }
-        
-        self.waitForExpectationsWithTimeout(100, handler: nil)
-        
-        let max1 = CoreStore.queryValue(
-            From(TestEntity2),
-            Select<Int>(.Maximum("testNumber"))
-        )
-        XCTAssertTrue(max1 == 100, "max == 100 (actual: \(max1))")
-        
-        let max2 = CoreStore.queryValue(
-            From(TestEntity2),
-            Select<NSNumber>(.Maximum("testNumber")),
-            Where("%K > %@", "testEntityID", 2)
-        )
-        XCTAssertTrue(max2 == 90, "max == 90 (actual: \(max2))")
-        
-        CoreStore.beginSynchronous { (transaction) -> Void in
-            
-            let numberOfDeletedObjects1 = transaction.deleteAll(From(TestEntity1))
-            XCTAssertTrue(numberOfDeletedObjects1 == 1, "numberOfDeletedObjects1 == 1 (actual: \(numberOfDeletedObjects1))")
-            
-            let numberOfDeletedObjects2 = transaction.deleteAll(
-                From(TestEntity2),
-                Where("%K > %@", "testEntityID", 2)
-            )
-            XCTAssertTrue(numberOfDeletedObjects2 == 2, "numberOfDeletedObjects2 == 2 (actual: \(numberOfDeletedObjects2))")
-            
-            transaction.commitAndWait()
-        }
-        
-        CoreStore.beginSynchronous({ (transaction) -> Void in
-            
-            if let obj = CoreStore.fetchOne(From(TestEntity2)) {
-                
-                let oldID = obj.testEntityID
-                obj.testEntityID = 0
-                obj.testEntityID = oldID
-            }
-            
-            transaction.commitAndWait()
-        })
-        
-        let objs1 = CoreStore.fetchAll(From(TestEntity1))
-        XCTAssertNotNil(objs1, "objs1 != nil")
-        XCTAssertTrue(objs1?.count == 0, "objs1?.count == 0")
-        
-        let objs2 = CoreStore.fetchAll(From(TestEntity2))
-        XCTAssertNotNil(objs2, "objs2 != nil")
-        XCTAssertTrue(objs2?.count == 1, "objs2?.count == 1")
-        
-        let unsafeExpectation = self.expectationWithDescription("Query creation")
-        
-        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")
-        
-        unsafeTransaction.commit { (result) -> Void in
-            
-            XCTAssertTrue(NSThread.isMainThread(), "NSThread.isMainThread()")
-            switch result {
-                
-            case .Success(let hasChanges):
-                XCTAssertTrue(hasChanges, "hasChanges == true")
-                
-                CoreStore.beginSynchronous { (transaction) -> Void in
-                    
-                    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")
-                    XCTAssertFalse(obj5 == obj5Copy2, "obj5 == obj5Copy2")
-                }
-                
-                let count: Int? = CoreStore.queryValue(
-                    From(TestEntity1),
-                    Select(.Count("testNumber"))
-                )
-                XCTAssertTrue(count == 1, "count == 1 (actual: \(count))")
-                
-                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")
-                
-                unsafeTransaction.commit { (result) -> Void in
-                    
-                    XCTAssertTrue(NSThread.isMainThread(), "NSThread.isMainThread()")
-                    switch result {
-                        
-                    case .Success(let hasChanges):
-                        XCTAssertTrue(hasChanges, "hasChanges == true")
-                        
-                        let count = CoreStore.queryValue(
-                            From(TestEntity1),
-                            Select<Int>(.Count("testNumber"))
-                        )
-                        XCTAssertTrue(count == 2, "count == 2 (actual: \(count))")
-                        
-                        
-                        CoreStore.beginSynchronous { (transaction) -> Void in
-                            
-                            let obj6 = transaction.edit(obj6)
-                            let obj5 = transaction.edit(obj5)
-                            transaction.delete(obj5, obj6)
-                            
-                            transaction.commitAndWait()
-                        }
-                        
-                        let count2 = CoreStore.queryValue(
-                            From(TestEntity1),
-                            Select<Int>(.Count("testNumber"))
-                        )
-                        XCTAssertTrue(count2 == 0, "count == 0 (actual: \(count2))")
-                        
-                        unsafeExpectation.fulfill()
-                        
-                    case .Failure(let error):
-                        XCTFail(error.description)
-                    }
-                }
-                
-            case .Failure(let error):
-                XCTFail(error.description)
-            }
-        }
-        
-        self.waitForExpectationsWithTimeout(100, handler: nil)
-    }
-    
-    private func deleteStores() {
-        
-        do {
-            
-            let fileManager = NSFileManager.defaultManager()
-            try fileManager.removeItemAtURL(
-                fileManager.URLsForDirectory(deviceDirectorySearchPath, inDomains: .UserDomainMask).first!
-            )
-        }
-        catch _ { }
-    }
-}

CoreStoreTests/ErrorTests.swift

@@ -0,0 +1,169 @@
+//
+//  ErrorTests.swift
+//  CoreStore
+//
+//  Copyright © 2016 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import XCTest
+
+@testable
+import CoreStore
+
+
+// MARK: - ErrorTests
+
+final class ErrorTests: XCTestCase {
+
+    @objc
+    dynamic func test_ThatUnknownErrors_BridgeCorrectly() {
+        
+        let error = CoreStoreError.unknown
+        XCTAssertEqual((error as NSError).domain, CoreStoreErrorDomain)
+        XCTAssertEqual((error as NSError).code, CoreStoreErrorCode.unknownError.rawValue)
+        
+        let userInfo: NSDictionary = [:]
+        
+        let objcError = error.bridgeToObjectiveC
+        XCTAssertEqual(error, objcError.bridgeToSwift)
+        XCTAssertEqual(objcError.domain, CoreStoreErrorDomain)
+        XCTAssertEqual(objcError.code, CoreStoreErrorCode.unknownError.rawValue)
+        XCTAssertEqual(objcError.userInfo as NSDictionary, userInfo)
+        
+        let objcError2 = objcError.bridgeToSwift.bridgeToObjectiveC
+        XCTAssertEqual(error, objcError2.bridgeToSwift)
+        XCTAssertEqual(objcError2.domain, CoreStoreErrorDomain)
+        XCTAssertEqual(objcError2.code, CoreStoreErrorCode.unknownError.rawValue)
+        XCTAssertEqual(objcError2.userInfo as NSDictionary, userInfo)
+    }
+    
+    @objc
+    dynamic func test_ThatDifferentStorageExistsAtURLErrors_BridgeCorrectly() {
+        
+        let dummyURL = URL(string: "file:///test1/test2.sqlite")!
+        
+        let error = CoreStoreError.differentStorageExistsAtURL(existingPersistentStoreURL: dummyURL)
+        XCTAssertEqual((error as NSError).domain, CoreStoreErrorDomain)
+        XCTAssertEqual((error as NSError).code, CoreStoreErrorCode.differentStorageExistsAtURL.rawValue)
+        
+        let userInfo: NSDictionary = [
+            "existingPersistentStoreURL": dummyURL
+        ]
+        let objcError = error.bridgeToObjectiveC
+        XCTAssertEqual(error, objcError.bridgeToSwift)
+        XCTAssertEqual(objcError.domain, CoreStoreErrorDomain)
+        XCTAssertEqual(objcError.code, CoreStoreErrorCode.differentStorageExistsAtURL.rawValue)
+        XCTAssertEqual(objcError.userInfo as NSDictionary, userInfo)
+        
+        let objcError2 = objcError.bridgeToSwift.bridgeToObjectiveC
+        XCTAssertEqual(error, objcError2.bridgeToSwift)
+        XCTAssertEqual(objcError2.domain, CoreStoreErrorDomain)
+        XCTAssertEqual(objcError2.code, CoreStoreErrorCode.differentStorageExistsAtURL.rawValue)
+        XCTAssertEqual(objcError2.userInfo as NSDictionary, userInfo)
+    }
+    
+    @objc
+    dynamic func test_ThatMappingModelNotFoundErrors_BridgeCorrectly() {
+        
+        let dummyURL = URL(string: "file:///test1/test2.sqlite")!
+        
+        let model = NSManagedObjectModel.fromBundle(Bundle(for: type(of: self)), modelName: "Model")
+        let version = "1.0.0"
+        
+        let error = CoreStoreError.mappingModelNotFound(localStoreURL: dummyURL, targetModel: model, targetModelVersion: version)
+        XCTAssertEqual((error as NSError).domain, CoreStoreErrorDomain)
+        XCTAssertEqual((error as NSError).code, CoreStoreErrorCode.mappingModelNotFound.rawValue)
+        
+        let userInfo: NSDictionary = [
+            "localStoreURL": dummyURL,
+            "targetModel": model,
+            "targetModelVersion": version
+        ]
+        let objcError = error.bridgeToObjectiveC
+        XCTAssertEqual(error, objcError.bridgeToSwift)
+        XCTAssertEqual(objcError.domain, CoreStoreErrorDomain)
+        XCTAssertEqual(objcError.code, CoreStoreErrorCode.mappingModelNotFound.rawValue)
+        XCTAssertEqual(objcError.userInfo as NSDictionary, userInfo)
+        
+        let objcError2 = objcError.bridgeToSwift.bridgeToObjectiveC
+        XCTAssertEqual(error, objcError2.bridgeToSwift)
+        XCTAssertEqual(objcError2.domain, CoreStoreErrorDomain)
+        XCTAssertEqual(objcError2.code, CoreStoreErrorCode.mappingModelNotFound.rawValue)
+        XCTAssertEqual(objcError2.userInfo as NSDictionary, userInfo)
+    }
+    
+    @objc
+    dynamic func test_ThatProgressiveMigrationRequiredErrors_BridgeCorrectly() {
+        
+        let dummyURL = URL(string: "file:///test1/test2.sqlite")!
+        
+        let error = CoreStoreError.progressiveMigrationRequired(localStoreURL: dummyURL)
+        XCTAssertEqual((error as NSError).domain, CoreStoreErrorDomain)
+        XCTAssertEqual((error as NSError).code, CoreStoreErrorCode.progressiveMigrationRequired.rawValue)
+        
+        let userInfo: NSDictionary = [
+            "localStoreURL": dummyURL
+        ]
+        let objcError = error.bridgeToObjectiveC
+        XCTAssertEqual(error, objcError.bridgeToSwift)
+        XCTAssertEqual(objcError.domain, CoreStoreErrorDomain)
+        XCTAssertEqual(objcError.code, CoreStoreErrorCode.progressiveMigrationRequired.rawValue)
+        XCTAssertEqual(objcError.userInfo as NSDictionary, userInfo)
+        
+        let objcError2 = objcError.bridgeToSwift.bridgeToObjectiveC
+        XCTAssertEqual(error, objcError2.bridgeToSwift)
+        XCTAssertEqual(objcError2.domain, CoreStoreErrorDomain)
+        XCTAssertEqual(objcError2.code, CoreStoreErrorCode.progressiveMigrationRequired.rawValue)
+        XCTAssertEqual(objcError2.userInfo as NSDictionary, userInfo)
+    }
+    
+    @objc
+    dynamic func test_ThatInternalErrorErrors_BridgeCorrectly() {
+        
+        let internalError = NSError(
+            domain: "com.dummy",
+            code: 123,
+            userInfo: [
+                "key1": "value1",
+                "key2": 2,
+                "key3": Date()
+            ]
+        )
+        let error = CoreStoreError(internalError)
+        XCTAssertEqual((error as NSError).domain, CoreStoreErrorDomain)
+        XCTAssertEqual((error as NSError).code, CoreStoreErrorCode.internalError.rawValue)
+        
+        let userInfo: NSDictionary = [
+            "NSError": internalError
+        ]
+        let objcError = error.bridgeToObjectiveC
+        XCTAssertEqual(error, objcError.bridgeToSwift)
+        XCTAssertEqual(objcError.domain, CoreStoreErrorDomain)
+        XCTAssertEqual(objcError.code, CoreStoreErrorCode.internalError.rawValue)
+        XCTAssertEqual(objcError.userInfo as NSDictionary, userInfo)
+        
+        let objcError2 = objcError.bridgeToSwift.bridgeToObjectiveC
+        XCTAssertEqual(error, objcError2.bridgeToSwift)
+        XCTAssertEqual(objcError2.domain, CoreStoreErrorDomain)
+        XCTAssertEqual(objcError2.code, CoreStoreErrorCode.internalError.rawValue)
+        XCTAssertEqual(objcError2.userInfo as NSDictionary, userInfo)
+    }
+}

CoreStoreTests/FromTests.swift

@@ -0,0 +1,429 @@
+//
+//  FromTests.swift
+//  CoreStore
+//
+//  Copyright © 2016 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import XCTest
+
+@testable
+import CoreStore
+
+
+//MARK: - FromTests
+
+final class FromTests: BaseTestCase {
+    
+    @objc
+    dynamic func test_ThatFromClauses_ConfigureCorrectly() {
+        
+        do {
+            
+            let from = From()
+            XCTAssert(from.entityClass === NSManagedObject.self)
+            XCTAssertNil(from.configurations)
+        }
+        do {
+            
+            let from = From<TestEntity1>()
+            XCTAssert(from.entityClass === TestEntity1.self)
+            XCTAssertNil(from.configurations)
+        }
+        do {
+            
+            let from = From<TestEntity1>("Config1")
+            XCTAssert(from.entityClass === TestEntity1.self)
+            XCTAssertEqual(from.configurations?.count, 1)
+            XCTAssertEqual(from.configurations?[0], "Config1")
+        }
+        do {
+            
+            let from = From<TestEntity1>(nil, "Config1")
+            XCTAssert(from.entityClass === TestEntity1.self)
+            XCTAssertEqual(from.configurations?.count, 2)
+            XCTAssertEqual(from.configurations?[0], nil)
+            XCTAssertEqual(from.configurations?[1], "Config1")
+        }
+    }
+    
+    @objc
+    dynamic func test_ThatFromClauses_ApplyToFetchRequestsCorrectlyForDefaultConfigurations() {
+        
+        self.prepareStack { (dataStack) in
+            
+            do {
+                
+                let from = From<TestEntity1>()
+                
+                let request = CoreStoreFetchRequest()
+                let storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
+                XCTAssertTrue(storesFound)
+                XCTAssertNotNil(request.entity)
+                XCTAssertNotNil(request.safeAffectedStores)
+                
+                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
+                
+                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                XCTAssertEqual(affectedConfigurations, ["PF_DEFAULT_CONFIGURATION_NAME"])
+            }
+            do {
+                
+                let from = From<TestEntity1>("Config1")
+                
+                let request = CoreStoreFetchRequest()
+                let storesFound = self.expectLogger([.logWarning]) {
+                    
+                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                }
+                XCTAssertFalse(storesFound)
+                XCTAssertNotNil(request.entity)
+                XCTAssertNotNil(request.safeAffectedStores)
+                
+                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
+                
+                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                XCTAssertTrue(affectedConfigurations.isEmpty)
+            }
+        }
+    }
+    
+    @objc
+    dynamic func test_ThatFromClauses_ApplyToFetchRequestsCorrectlyForSingleConfigurations() {
+        
+        self.prepareStack(configurations: ["Config1"]) { (dataStack) in
+            
+            do {
+                
+                let from = From<TestEntity1>()
+                
+                let request = CoreStoreFetchRequest()
+                let storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
+                XCTAssertTrue(storesFound)
+                XCTAssertNotNil(request.entity)
+                XCTAssertNotNil(request.safeAffectedStores)
+                
+                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
+                
+                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                XCTAssertEqual(affectedConfigurations, ["Config1"])
+            }
+            do {
+                
+                let from = From<TestEntity1>("Config1")
+                
+                let request = CoreStoreFetchRequest()
+                let storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
+                XCTAssertTrue(storesFound)
+                XCTAssertNotNil(request.entity)
+                XCTAssertNotNil(request.safeAffectedStores)
+                
+                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
+                
+                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                XCTAssertEqual(affectedConfigurations, ["Config1"])
+            }
+            do {
+                
+                let from = From<TestEntity1>("Config2")
+                
+                let request = CoreStoreFetchRequest()
+                let storesFound = self.expectLogger([.logWarning]) {
+                    
+                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                }
+                XCTAssertFalse(storesFound)
+                XCTAssertNotNil(request.entity)
+                XCTAssertNotNil(request.safeAffectedStores)
+                
+                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
+                
+                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                XCTAssertTrue(affectedConfigurations.isEmpty)
+            }
+            do {
+                
+                let from = From<TestEntity2>()
+                
+                let request = CoreStoreFetchRequest()
+                let storesFound = self.expectLogger([.logWarning]) {
+                    
+                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                }
+                XCTAssertFalse(storesFound)
+                XCTAssertNotNil(request.entity)
+                XCTAssertNotNil(request.safeAffectedStores)
+                
+                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
+                
+                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                XCTAssertTrue(affectedConfigurations.isEmpty)
+            }
+            do {
+                
+                let from = From<TestEntity2>("Config1")
+                
+                let request = CoreStoreFetchRequest()
+                let storesFound = self.expectLogger([.logWarning]) {
+                    
+                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                }
+                XCTAssertFalse(storesFound)
+                XCTAssertNotNil(request.entity)
+                XCTAssertNotNil(request.safeAffectedStores)
+                
+                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
+                
+                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                XCTAssertTrue(affectedConfigurations.isEmpty)
+            }
+            do {
+                
+                let from = From<TestEntity2>("Config2")
+                
+                let request = CoreStoreFetchRequest()
+                let storesFound = self.expectLogger([.logWarning]) {
+                    
+                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                }
+                XCTAssertFalse(storesFound)
+                XCTAssertNotNil(request.entity)
+                XCTAssertNotNil(request.safeAffectedStores)
+                
+                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
+                
+                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                XCTAssertTrue(affectedConfigurations.isEmpty)
+            }
+        }
+    }
+    
+    @objc
+    dynamic func test_ThatFromClauses_ApplyToFetchRequestsCorrectlyForDefaultAndCustomConfigurations() {
+        
+        self.prepareStack(configurations: [nil, "Config1"]) { (dataStack) in
+            
+            do {
+                
+                let from = From<TestEntity1>()
+                
+                let request = CoreStoreFetchRequest()
+                let storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
+                XCTAssertTrue(storesFound)
+                XCTAssertNotNil(request.entity)
+                XCTAssertNotNil(request.safeAffectedStores)
+                
+                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
+                
+                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                XCTAssertEqual(Set(affectedConfigurations), ["PF_DEFAULT_CONFIGURATION_NAME", "Config1"] as Set)
+            }
+            do {
+                
+                let from = From<TestEntity1>("Config1")
+                
+                let request = CoreStoreFetchRequest()
+                let storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
+                XCTAssertTrue(storesFound)
+                XCTAssertNotNil(request.entity)
+                XCTAssertNotNil(request.safeAffectedStores)
+                
+                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
+                
+                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                XCTAssertEqual(affectedConfigurations, ["Config1"])
+            }
+            do {
+                
+                let from = From<TestEntity1>("Config2")
+                
+                let request = CoreStoreFetchRequest()
+                let storesFound = self.expectLogger([.logWarning]) {
+                    
+                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                }
+                XCTAssertFalse(storesFound)
+                XCTAssertNotNil(request.entity)
+                XCTAssertNotNil(request.safeAffectedStores)
+                
+                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
+                
+                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                XCTAssertTrue(affectedConfigurations.isEmpty)
+            }
+            do {
+                
+                let from = From<TestEntity2>()
+                
+                let request = CoreStoreFetchRequest()
+                let storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
+                XCTAssertTrue(storesFound)
+                XCTAssertNotNil(request.entity)
+                XCTAssertNotNil(request.safeAffectedStores)
+                
+                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
+                
+                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                XCTAssertEqual(affectedConfigurations, ["PF_DEFAULT_CONFIGURATION_NAME"])
+            }
+            do {
+                
+                let from = From<TestEntity2>("Config1")
+                
+                let request = CoreStoreFetchRequest()
+                let storesFound = self.expectLogger([.logWarning]) {
+                    
+                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                }
+                XCTAssertFalse(storesFound)
+                XCTAssertNotNil(request.entity)
+                XCTAssertNotNil(request.safeAffectedStores)
+                
+                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
+                
+                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                XCTAssertTrue(affectedConfigurations.isEmpty)
+            }
+            do {
+                
+                let from = From<TestEntity2>("Config2")
+                
+                let request = CoreStoreFetchRequest()
+                let storesFound = self.expectLogger([.logWarning]) {
+                    
+                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                }
+                XCTAssertFalse(storesFound)
+                XCTAssertNotNil(request.entity)
+                XCTAssertNotNil(request.safeAffectedStores)
+                
+                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
+                
+                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                XCTAssertTrue(affectedConfigurations.isEmpty)
+            }
+        }
+    }
+    
+    @objc
+    dynamic func test_ThatFromClauses_ApplyToFetchRequestsCorrectlyForMultipleConfigurations() {
+        
+        self.prepareStack(configurations: ["Config1", "Config2"]) { (dataStack) in
+            
+            do {
+                
+                let from = From<TestEntity1>()
+                
+                let request = CoreStoreFetchRequest()
+                let storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
+                XCTAssertTrue(storesFound)
+                XCTAssertNotNil(request.entity)
+                XCTAssertNotNil(request.safeAffectedStores)
+                
+                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
+                
+                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                XCTAssertEqual(affectedConfigurations, ["Config1"])
+            }
+            do {
+                
+                let from = From<TestEntity1>("Config1")
+                
+                let request = CoreStoreFetchRequest()
+                let storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
+                XCTAssertTrue(storesFound)
+                XCTAssertNotNil(request.entity)
+                XCTAssertNotNil(request.safeAffectedStores)
+                
+                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
+                
+                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                XCTAssertEqual(affectedConfigurations, ["Config1"])
+            }
+            do {
+                
+                let from = From<TestEntity1>("Config2")
+                
+                let request = CoreStoreFetchRequest()
+                let storesFound = self.expectLogger([.logWarning]) {
+                    
+                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                }
+                XCTAssertFalse(storesFound)
+                XCTAssertNotNil(request.entity)
+                XCTAssertNotNil(request.safeAffectedStores)
+                
+                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
+                
+                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                XCTAssertTrue(affectedConfigurations.isEmpty)
+            }
+            do {
+                
+                let from = From<TestEntity2>()
+                
+                let request = CoreStoreFetchRequest()
+                let storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
+                XCTAssertTrue(storesFound)
+                XCTAssertNotNil(request.entity)
+                XCTAssertNotNil(request.safeAffectedStores)
+                
+                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
+                
+                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                XCTAssertEqual(affectedConfigurations, ["Config2"])
+            }
+            do {
+                
+                let from = From<TestEntity2>("Config1")
+                
+                let request = CoreStoreFetchRequest()
+                let storesFound = self.expectLogger([.logWarning]) {
+                    
+                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                }
+                XCTAssertFalse(storesFound)
+                XCTAssertNotNil(request.entity)
+                XCTAssertNotNil(request.safeAffectedStores)
+                
+                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
+                
+                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                XCTAssertTrue(affectedConfigurations.isEmpty)
+            }
+            do {
+                
+                let from = From<TestEntity2>("Config2")
+                
+                let request = CoreStoreFetchRequest()
+                let storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
+                XCTAssertTrue(storesFound)
+                XCTAssertNotNil(request.entity)
+                XCTAssertNotNil(request.safeAffectedStores)
+                
+                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
+                
+                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                XCTAssertEqual(affectedConfigurations, ["Config2"])
+            }
+        }
+    }
+}

CoreStoreTests/GroupByTests.swift

@@ -0,0 +1,81 @@
+//
+//  GroupByTests.swift
+//  CoreStore
+//
+//  Copyright © 2016 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import XCTest
+
+@testable
+import CoreStore
+
+
+//MARK: - GroupByTests
+
+final class GroupByTests: BaseTestCase {
+    
+    @objc
+    dynamic func test_ThatGroupByClauses_ConfigureCorrectly() {
+        
+        do {
+            
+            let groupBy = GroupBy()
+            XCTAssertEqual(groupBy, GroupBy([] as [String]))
+            XCTAssertNotEqual(groupBy, GroupBy("key"))
+            XCTAssertTrue(groupBy.keyPaths.isEmpty)
+        }
+        do {
+            
+            let groupBy = GroupBy("key1")
+            XCTAssertEqual(groupBy, GroupBy("key1"))
+            XCTAssertEqual(groupBy, GroupBy(["key1"]))
+            XCTAssertNotEqual(groupBy, GroupBy("key2"))
+            XCTAssertEqual(groupBy.keyPaths, ["key1"])
+        }
+        do {
+            
+            let groupBy = GroupBy("key1", "key2")
+            XCTAssertEqual(groupBy, GroupBy("key1", "key2"))
+            XCTAssertEqual(groupBy, GroupBy(["key1", "key2"]))
+            XCTAssertNotEqual(groupBy, GroupBy("key2", "key1"))
+            XCTAssertEqual(groupBy.keyPaths, ["key1", "key2"])
+        }
+    }
+    
+    @objc
+    dynamic func test_ThatGroupByClauses_ApplyToFetchRequestsCorrectly() {
+        
+        self.prepareStack { (dataStack) in
+            
+            let groupBy = GroupBy(#keyPath(TestEntity1.testString))
+            
+            let request = CoreStoreFetchRequest()
+            _ = From<TestEntity1>().applyToFetchRequest(request, context: dataStack.mainContext)
+            groupBy.applyToFetchRequest(request)
+            
+            XCTAssertNotNil(request.propertiesToGroupBy)
+            
+            let attributes = (request.propertiesToGroupBy ?? []) as! [NSAttributeDescription]
+            XCTAssertEqual(attributes.map { $0.name }, groupBy.keyPaths)
+        }
+    }
+}

CoreStoreTests/IntoTests.swift

@@ -0,0 +1,204 @@
+//
+//  IntoTests.swift
+//  CoreStore
+//
+//  Copyright © 2016 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import XCTest
+
+@testable
+import CoreStore
+
+
+//MARK: - IntoTests
+
+final class IntoTests: XCTestCase {
+    
+    @objc
+    dynamic func test_ThatIntoClauseConstants_AreCorrect() {
+        
+        XCTAssertEqual(Into<NSManagedObject>.defaultConfigurationName, "PF_DEFAULT_CONFIGURATION_NAME")
+    }
+    
+    @objc
+    dynamic func test_ThatIntoClauses_ConfigureCorrectly() {
+        
+        do {
+            
+            let into = Into()
+            XCTAssert(into.entityClass === NSManagedObject.self)
+            XCTAssertNil(into.configuration)
+            XCTAssertTrue(into.inferStoreIfPossible)
+        }
+        do {
+            
+            let into = Into<TestEntity1>()
+            XCTAssert(into.entityClass === TestEntity1.self)
+            XCTAssertNil(into.configuration)
+            XCTAssertTrue(into.inferStoreIfPossible)
+        }
+        do {
+            
+            let into = Into<TestEntity1>()
+            XCTAssert(into.entityClass === TestEntity1.self)
+            XCTAssertNil(into.configuration)
+            XCTAssertTrue(into.inferStoreIfPossible)
+        }
+        do {
+            
+            let into = Into(TestEntity1.self as AnyClass)
+            XCTAssert(into.entityClass === TestEntity1.self)
+            XCTAssertNil(into.configuration)
+            XCTAssertTrue(into.inferStoreIfPossible)
+        }
+        do {
+            
+            let into = Into<TestEntity1>("Config1")
+            XCTAssert(into.entityClass === TestEntity1.self)
+            XCTAssertEqual(into.configuration, "Config1")
+            XCTAssertFalse(into.inferStoreIfPossible)
+        }
+        do {
+            
+            let into = Into(TestEntity1.self, "Config1")
+            XCTAssert(into.entityClass === TestEntity1.self)
+            XCTAssertEqual(into.configuration, "Config1")
+            XCTAssertFalse(into.inferStoreIfPossible)
+        }
+        do {
+            
+            let into = Into(TestEntity1.self as AnyClass, "Config1")
+            XCTAssert(into.entityClass === TestEntity1.self)
+            XCTAssertEqual(into.configuration, "Config1")
+            XCTAssertFalse(into.inferStoreIfPossible)
+        }
+    }
+    
+    @objc
+    dynamic func test_ThatIntoClauses_AreEquatable() {
+        
+        do {
+            
+            let into = Into()
+            XCTAssertEqual(into, Into())
+            XCTAssertEqual(into, Into<NSManagedObject>())
+            XCTAssertEqual(into, Into(NSManagedObject.self as AnyClass))
+            XCTAssertFalse(into == Into<TestEntity1>())
+            XCTAssertNotEqual(into, Into<NSManagedObject>("Config1"))
+        }
+        do {
+            
+            let into = Into<TestEntity1>()
+            XCTAssertEqual(into, Into<TestEntity1>())
+            XCTAssertEqual(into, Into(TestEntity1.self as AnyClass))
+            XCTAssertFalse(into == Into<TestEntity2>())
+            XCTAssertNotEqual(into, Into<TestEntity1>("Config1"))
+        }
+        do {
+            
+            let into = Into<TestEntity1>()
+            XCTAssertEqual(into, Into<TestEntity1>())
+            XCTAssertEqual(into, Into(TestEntity1.self as AnyClass))
+            XCTAssertFalse(into == Into<TestEntity2>())
+            XCTAssertNotEqual(into, Into<TestEntity1>("Config1"))
+        }
+        do {
+            
+            let into = Into(TestEntity1.self as AnyClass)
+            XCTAssert(into == Into<TestEntity1>())
+            XCTAssertEqual(into, Into(TestEntity1.self))
+            XCTAssertFalse(into == Into<TestEntity2>())
+            XCTAssertFalse(into == Into<TestEntity1>("Config1"))
+        }
+        do {
+            
+            let into = Into<TestEntity1>("Config1")
+            XCTAssertEqual(into, Into(TestEntity1.self, "Config1"))
+            XCTAssertEqual(into, Into(TestEntity1.self as AnyClass, "Config1"))
+            XCTAssertFalse(into == Into<TestEntity2>("Config1"))
+            XCTAssertNotEqual(into, Into<TestEntity1>("Config2"))
+        }
+        do {
+            
+            let into = Into(TestEntity1.self, "Config1")
+            XCTAssertEqual(into, Into(TestEntity1.self, "Config1"))
+            XCTAssertEqual(into, Into<TestEntity1>("Config1"))
+            XCTAssertFalse(into == Into<TestEntity2>("Config1"))
+            XCTAssertNotEqual(into, Into<TestEntity1>("Config2"))
+        }
+        do {
+            
+            let into = Into(TestEntity1.self as AnyClass, "Config1")
+            XCTAssert(into == Into<TestEntity1>("Config1"))
+            XCTAssertEqual(into, Into(TestEntity1.self, "Config1"))
+            XCTAssertFalse(into == Into<TestEntity2>("Config1"))
+            XCTAssertFalse(into == Into<TestEntity1>("Config2"))
+        }
+    }
+    
+    @objc
+    dynamic func test_ThatIntoClauses_BridgeCorrectly() {
+        
+        do {
+            
+            let into = Into()
+            let objcInto = into.bridgeToObjectiveC
+            XCTAssertEqual(into, objcInto.bridgeToSwift)
+        }
+        do {
+            
+            let into = Into<TestEntity1>()
+            let objcInto = into.bridgeToObjectiveC
+            XCTAssertTrue(into == objcInto.bridgeToSwift)
+        }
+        do {
+            
+            let into = Into(TestEntity1.self as AnyClass)
+            let objcInto = into.bridgeToObjectiveC
+            XCTAssertEqual(into, objcInto.bridgeToSwift)
+        }
+        do {
+            
+            let into = Into(TestEntity1.self as AnyClass)
+            let objcInto = into.bridgeToObjectiveC
+            XCTAssertEqual(into, objcInto.bridgeToSwift)
+        }
+        do {
+            
+            let into = Into<TestEntity1>("Config1")
+            let objcInto = into.bridgeToObjectiveC
+            XCTAssertTrue(into == objcInto.bridgeToSwift)
+        }
+        do {
+            
+            let into = Into(TestEntity1.self, "Config1")
+            let objcInto = into.bridgeToObjectiveC
+            XCTAssertTrue(into == objcInto.bridgeToSwift)
+        }
+        do {
+            
+            let into = Into(TestEntity1.self as AnyClass, "Config1")
+            let objcInto = into.bridgeToObjectiveC
+            XCTAssertTrue(into == objcInto.bridgeToSwift)
+        }
+    }
+}

CoreStoreTests/ListObserverTests.swift

@@ -0,0 +1,682 @@
+//
+//  ListObserverTests.swift
+//  CoreStore
+//
+//  Copyright © 2016 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import XCTest
+
+@testable
+import CoreStore
+
+
+#if os(iOS) || os(watchOS) || os(tvOS)
+
+// MARK: - ListObserverTests
+
+class ListObserverTests: BaseTestDataTestCase {
+    
+    @objc
+    dynamic func test_ThatListObservers_CanReceiveInsertNotifications() {
+        
+        self.prepareStack { (stack) in
+            
+            let observer = TestListObserver()
+            let monitor = stack.monitorSectionedList(
+                From<TestEntity1>(),
+                SectionBy(#keyPath(TestEntity1.testBoolean)),
+                OrderBy(.ascending(#keyPath(TestEntity1.testBoolean)), .ascending(#keyPath(TestEntity1.testEntityID)))
+            )
+            monitor.addObserver(observer)
+            
+            XCTAssertFalse(monitor.hasSections())
+            XCTAssertFalse(monitor.hasObjects())
+            XCTAssertTrue(monitor.objectsInAllSections().isEmpty)
+            
+            var events = 0
+            
+            let willChangeExpectation = self.expectation(
+                forNotification: "listMonitorWillChange:",
+                object: observer,
+                handler: { (note) -> Bool in
+                    
+                    XCTAssertEqual(events, 0)
+                    XCTAssertEqual((note.userInfo as NSDictionary?) ?? [:], NSDictionary())
+                    defer {
+                        
+                        events += 1
+                    }
+                    return events == 0
+                }
+            )
+            let didInsertSectionExpectation = self.expectation(
+                forNotification: "listMonitor:didInsertSection:toSectionIndex:",
+                object: observer,
+                handler: { (note) -> Bool in
+                    
+                    XCTAssertEqual(events, 1)
+                    XCTAssertEqual(
+                        ((note.userInfo as NSDictionary?) ?? [:]),
+                        [
+                            "sectionInfo": monitor.sectionInfoAtIndex(0),
+                            "sectionIndex": 0
+                        ] as NSDictionary
+                    )
+                    defer {
+                        
+                        events += 1
+                    }
+                    return events == 1
+                }
+            )
+            let didInsertObjectExpectation = self.expectation(
+                forNotification: "listMonitor:didInsertObject:toIndexPath:",
+                object: observer,
+                handler: { (note) -> Bool in
+                    
+                    XCTAssertEqual(events, 2)
+                    
+                    let userInfo = note.userInfo
+                    XCTAssertNotNil(userInfo)
+                    XCTAssertEqual(
+                        Set(userInfo?.keys.map({ $0 as! String }) ?? []),
+                        ["indexPath", "object"]
+                    )
+                    
+                    let indexPath = userInfo?["indexPath"] as? NSIndexPath
+                    XCTAssertEqual(indexPath?.section, 0)
+                    XCTAssertEqual(indexPath?.row, 0)
+                    
+                    let object = userInfo?["object"] as? TestEntity1
+                    XCTAssertEqual(object?.testBoolean, NSNumber(value: true))
+                    XCTAssertEqual(object?.testNumber, NSNumber(value: 1))
+                    XCTAssertEqual(object?.testDecimal, NSDecimalNumber(string: "1"))
+                    XCTAssertEqual(object?.testString, "nil:TestEntity1:1")
+                    XCTAssertEqual(object?.testData, ("nil:TestEntity1:1" as NSString).data(using: String.Encoding.utf8.rawValue)!)
+                    XCTAssertEqual(object?.testDate, self.dateFormatter.date(from: "2000-01-01T00:00:00Z")!)
+                    defer {
+                        
+                        events += 1
+                    }
+                    return events == 2
+                }
+            )
+            let didChangeExpectation = self.expectation(
+                forNotification: "listMonitorDidChange:",
+                object: observer,
+                handler: { (note) -> Bool in
+                    
+                    XCTAssertEqual((note.userInfo as NSDictionary?) ?? [:], NSDictionary())
+                    defer {
+                        
+                        events += 1
+                    }
+                    return events == 3
+                }
+            )
+            let saveExpectation = self.expectation(description: "save")
+            stack.beginAsynchronous { (transaction) in
+                
+                let object = transaction.create(Into<TestEntity1>())
+                object.testBoolean = NSNumber(value: true)
+                object.testNumber = NSNumber(value: 1)
+                object.testDecimal = NSDecimalNumber(string: "1")
+                object.testString = "nil:TestEntity1:1"
+                object.testData = ("nil:TestEntity1:1" as NSString).data(using: String.Encoding.utf8.rawValue)!
+                object.testDate = self.dateFormatter.date(from: "2000-01-01T00:00:00Z")!
+                
+                transaction.commit { (result) in
+                    
+                    switch result {
+                        
+                    case .success(let hasChanges):
+                        XCTAssertTrue(hasChanges)
+                        saveExpectation.fulfill()
+                        
+                    case .failure:
+                        XCTFail()
+                    }
+                }
+            }
+            self.waitAndCheckExpectations()
+        }
+    }
+    
+    @objc
+    dynamic func test_ThatListObservers_CanReceiveUpdateNotifications() {
+        
+        self.prepareStack { (stack) in
+            
+            self.prepareTestDataForStack(stack)
+            
+            let observer = TestListObserver()
+            let monitor = stack.monitorSectionedList(
+                From<TestEntity1>(),
+                SectionBy(#keyPath(TestEntity1.testBoolean)),
+                OrderBy(.ascending(#keyPath(TestEntity1.testBoolean)), .ascending(#keyPath(TestEntity1.testEntityID)))
+            )
+            monitor.addObserver(observer)
+            
+            XCTAssertTrue(monitor.hasSections())
+            XCTAssertEqual(monitor.numberOfSections(), 2)
+            XCTAssertTrue(monitor.hasObjects())
+            XCTAssertTrue(monitor.hasObjectsInSection(0))
+            XCTAssertEqual(monitor.numberOfObjectsInSection(0), 2)
+            XCTAssertEqual(monitor.numberOfObjectsInSection(1), 3)
+            
+            var events = 0
+            
+            let willChangeExpectation = self.expectation(
+                forNotification: "listMonitorWillChange:",
+                object: observer,
+                handler: { (note) -> Bool in
+                    
+                    XCTAssertEqual(events, 0)
+                    XCTAssertEqual((note.userInfo as NSDictionary?) ?? [:], NSDictionary())
+                    defer {
+                        
+                        events += 1
+                    }
+                    return events == 0
+                }
+            )
+            for _ in 1 ... 2 {
+                
+                let didUpdateObjectExpectation = self.expectation(
+                    forNotification: "listMonitor:didUpdateObject:atIndexPath:",
+                    object: observer,
+                    handler: { (note) -> Bool in
+                        
+                        XCTAssert(events == 1 || events == 2)
+                        
+                        let userInfo = note.userInfo
+                        XCTAssertNotNil(userInfo)
+                        XCTAssertEqual(
+                            Set(userInfo?.keys.map({ $0 as! String }) ?? []),
+                            ["indexPath", "object"]
+                        )
+                        
+                        let indexPath = userInfo?["indexPath"] as? NSIndexPath
+                        let object = userInfo?["object"] as? TestEntity1
+                        
+                        switch object?.testEntityID {
+                            
+                        case NSNumber(value: 101)?:
+                            XCTAssertEqual(indexPath?.section, 1)
+                            XCTAssertEqual(indexPath?.row, 0)
+                            
+                            XCTAssertEqual(object?.testBoolean, NSNumber(value: true))
+                            XCTAssertEqual(object?.testNumber, NSNumber(value: 11))
+                            XCTAssertEqual(object?.testDecimal, NSDecimalNumber(string: "11"))
+                            XCTAssertEqual(object?.testString, "nil:TestEntity1:11")
+                            XCTAssertEqual(object?.testData, ("nil:TestEntity1:11" as NSString).data(using: String.Encoding.utf8.rawValue)!)
+                            XCTAssertEqual(object?.testDate, self.dateFormatter.date(from: "2000-01-11T00:00:00Z")!)
+                            
+                        case NSNumber(value: 102)?:
+                            XCTAssertEqual(indexPath?.section, 0)
+                            XCTAssertEqual(indexPath?.row, 0)
+                            
+                            XCTAssertEqual(object?.testBoolean, NSNumber(value: false))
+                            XCTAssertEqual(object?.testNumber, NSNumber(value: 22))
+                            XCTAssertEqual(object?.testDecimal, NSDecimalNumber(string: "22"))
+                            XCTAssertEqual(object?.testString, "nil:TestEntity1:22")
+                            XCTAssertEqual(object?.testData, ("nil:TestEntity1:22" as NSString).data(using: String.Encoding.utf8.rawValue)!)
+                            XCTAssertEqual(object?.testDate, self.dateFormatter.date(from: "2000-01-22T00:00:00Z")!)
+                            
+                        default:
+                            XCTFail()
+                        }
+                        defer {
+                            
+                            events += 1
+                        }
+                        return events == 1 || events == 2
+                    }
+                )
+            }
+            let didChangeExpectation = self.expectation(
+                forNotification: "listMonitorDidChange:",
+                object: observer,
+                handler: { (note) -> Bool in
+                    
+                    XCTAssertEqual(events, 3)
+                    XCTAssertEqual((note.userInfo as NSDictionary?) ?? [:], NSDictionary())
+                    defer {
+                        
+                        events += 1
+                    }
+                    return events == 3
+                }
+            )
+            let saveExpectation = self.expectation(description: "save")
+            stack.beginAsynchronous { (transaction) in
+                
+                if let object = transaction.fetchOne(
+                    From<TestEntity1>(),
+                    Where(#keyPath(TestEntity1.testEntityID), isEqualTo: 101)) {
+                    
+                    object.testNumber = NSNumber(value: 11)
+                    object.testDecimal = NSDecimalNumber(string: "11")
+                    object.testString = "nil:TestEntity1:11"
+                    object.testData = ("nil:TestEntity1:11" as NSString).data(using: String.Encoding.utf8.rawValue)!
+                    object.testDate = self.dateFormatter.date(from: "2000-01-11T00:00:00Z")!
+                }
+                else {
+                    
+                    XCTFail()
+                }
+                if let object = transaction.fetchOne(
+                    From<TestEntity1>(),
+                    Where(#keyPath(TestEntity1.testEntityID), isEqualTo: 102)) {
+                    
+                    object.testNumber = NSNumber(value: 22)
+                    object.testDecimal = NSDecimalNumber(string: "22")
+                    object.testString = "nil:TestEntity1:22"
+                    object.testData = ("nil:TestEntity1:22" as NSString).data(using: String.Encoding.utf8.rawValue)!
+                    object.testDate = self.dateFormatter.date(from: "2000-01-22T00:00:00Z")!
+                }
+                else {
+                    
+                    XCTFail()
+                }
+                transaction.commit { (result) in
+                    
+                    switch result {
+                        
+                    case .success(let hasChanges):
+                        XCTAssertTrue(hasChanges)
+                        saveExpectation.fulfill()
+                        
+                    case .failure:
+                        XCTFail()
+                    }
+                }
+            }
+            self.waitAndCheckExpectations()
+        }
+    }
+    
+    @objc
+    dynamic func test_ThatListObservers_CanReceiveMoveNotifications() {
+        
+        self.prepareStack { (stack) in
+            
+            self.prepareTestDataForStack(stack)
+            
+            let observer = TestListObserver()
+            let monitor = stack.monitorSectionedList(
+                From<TestEntity1>(),
+                SectionBy(#keyPath(TestEntity1.testBoolean)),
+                OrderBy(.ascending(#keyPath(TestEntity1.testBoolean)), .ascending(#keyPath(TestEntity1.testEntityID)))
+            )
+            monitor.addObserver(observer)
+            
+            var events = 0
+            
+            let willChangeExpectation = self.expectation(
+                forNotification: "listMonitorWillChange:",
+                object: observer,
+                handler: { (note) -> Bool in
+                    
+                    XCTAssertEqual(events, 0)
+                    XCTAssertEqual((note.userInfo as NSDictionary?) ?? [:], NSDictionary())
+                    defer {
+                        
+                        events += 1
+                    }
+                    return events == 0
+                }
+            )
+            let didMoveObjectExpectation = self.expectation(
+                forNotification: "listMonitor:didMoveObject:fromIndexPath:toIndexPath:",
+                object: observer,
+                handler: { (note) -> Bool in
+                    
+                    XCTAssertEqual(events, 1)
+                    
+                    let userInfo = note.userInfo
+                    XCTAssertNotNil(userInfo)
+                    XCTAssertEqual(
+                        Set(userInfo?.keys.map({ $0 as! String }) ?? []),
+                        ["fromIndexPath", "toIndexPath", "object"]
+                    )
+                    
+                    let fromIndexPath = userInfo?["fromIndexPath"] as? NSIndexPath
+                    XCTAssertEqual(fromIndexPath?.section, 0)
+                    XCTAssertEqual(fromIndexPath?.row, 0)
+                    
+                    let toIndexPath = userInfo?["toIndexPath"] as? NSIndexPath
+                    XCTAssertEqual(toIndexPath?.section, 1)
+                    XCTAssertEqual(toIndexPath?.row, 1)
+                    
+                    let object = userInfo?["object"] as? TestEntity1
+                    XCTAssertEqual(object?.testEntityID, NSNumber(value: 102))
+                    XCTAssertEqual(object?.testBoolean, NSNumber(value: true))
+                    
+                    defer {
+                        
+                        events += 1
+                    }
+                    return events == 1
+                }
+            )
+            let didChangeExpectation = self.expectation(
+                forNotification: "listMonitorDidChange:",
+                object: observer,
+                handler: { (note) -> Bool in
+                    
+                    XCTAssertEqual(events, 2)
+                    XCTAssertEqual((note.userInfo as NSDictionary?) ?? [:], NSDictionary())
+                    defer {
+                        
+                        events += 1
+                    }
+                    return events == 2
+                }
+            )
+            let saveExpectation = self.expectation(description: "save")
+            stack.beginAsynchronous { (transaction) in
+                
+                if let object = transaction.fetchOne(
+                    From<TestEntity1>(),
+                    Where(#keyPath(TestEntity1.testEntityID), isEqualTo: 102)) {
+                    
+                    object.testBoolean = NSNumber(value: true)
+                }
+                else {
+                    
+                    XCTFail()
+                }
+                transaction.commit { (result) in
+                    
+                    switch result {
+                        
+                    case .success(let hasChanges):
+                        XCTAssertTrue(hasChanges)
+                        saveExpectation.fulfill()
+                        
+                    case .failure:
+                        XCTFail()
+                    }
+                }
+            }
+            self.waitAndCheckExpectations()
+        }
+    }
+    
+    @objc
+    dynamic func test_ThatListObservers_CanReceiveDeleteNotifications() {
+        
+        self.prepareStack { (stack) in
+            
+            self.prepareTestDataForStack(stack)
+            
+            let observer = TestListObserver()
+            let monitor = stack.monitorSectionedList(
+                From<TestEntity1>(),
+                SectionBy(#keyPath(TestEntity1.testBoolean)),
+                OrderBy(.ascending(#keyPath(TestEntity1.testBoolean)), .ascending(#keyPath(TestEntity1.testEntityID)))
+            )
+            monitor.addObserver(observer)
+            
+            var events = 0
+            
+            let willChangeExpectation = self.expectation(
+                forNotification: "listMonitorWillChange:",
+                object: observer,
+                handler: { (note) -> Bool in
+                    
+                    XCTAssertEqual(events, 0)
+                    XCTAssertEqual((note.userInfo as NSDictionary?) ?? [:], NSDictionary())
+                    defer {
+                        
+                        events += 1
+                    }
+                    return events == 0
+                }
+            )
+            for _ in 1 ... 2 {
+                
+                let didUpdateObjectExpectation = self.expectation(
+                    forNotification: "listMonitor:didDeleteObject:fromIndexPath:",
+                    object: observer,
+                    handler: { (note) -> Bool in
+                        
+                        XCTAssert(events == 1 || events == 2)
+                        
+                        let userInfo = note.userInfo
+                        XCTAssertNotNil(userInfo)
+                        XCTAssertEqual(
+                            Set(userInfo?.keys.map({ $0 as! String }) ?? []),
+                            ["indexPath", "object"]
+                        )
+                        
+                        let indexPath = userInfo?["indexPath"] as? NSIndexPath
+                        
+                        XCTAssertEqual(indexPath?.section, 0)
+                        XCTAssert(indexPath?.row == 0 || indexPath?.row == 1)
+                        
+                        let object = userInfo?["object"] as? TestEntity1
+                        XCTAssertEqual(object?.isDeleted, true)
+                        
+                        defer {
+                            
+                            events += 1
+                        }
+                        return events == 1 || events == 2
+                    }
+                )
+            }
+            let didDeleteSectionExpectation = self.expectation(
+                forNotification: "listMonitor:didDeleteSection:fromSectionIndex:",
+                object: observer,
+                handler: { (note) -> Bool in
+                    
+                    XCTAssertEqual(events, 3)
+                    
+                    let userInfo = note.userInfo
+                    XCTAssertNotNil(userInfo)
+                    XCTAssertEqual(
+                        Set(userInfo?.keys.map({ $0 as! String }) ?? []),
+                        ["sectionInfo", "sectionIndex"]
+                    )
+                    
+                    let sectionInfo = userInfo?["sectionInfo"] as? NSFetchedResultsSectionInfo
+                    XCTAssertNotNil(sectionInfo)
+                    XCTAssertEqual(sectionInfo?.name, "0")
+                    
+                    let sectionIndex = userInfo?["sectionIndex"]
+                    XCTAssertEqual(sectionIndex as? NSNumber, NSNumber(value: 0))
+                    
+                    defer {
+                        
+                        events += 1
+                    }
+                    return events == 3
+                }
+            )
+            let didChangeExpectation = self.expectation(
+                forNotification: "listMonitorDidChange:",
+                object: observer,
+                handler: { (note) -> Bool in
+                    
+                    XCTAssertEqual(events, 4)
+                    XCTAssertEqual((note.userInfo as NSDictionary?) ?? [:], NSDictionary())
+                    defer {
+                        
+                        events += 1
+                    }
+                    return events == 4
+                }
+            )
+            let saveExpectation = self.expectation(description: "save")
+            stack.beginAsynchronous { (transaction) in
+                
+                transaction.deleteAll(
+                    From<TestEntity1>(),
+                    Where(#keyPath(TestEntity1.testBoolean), isEqualTo: false)
+                )
+                transaction.commit { (result) in
+                    
+                    switch result {
+                        
+                    case .success(let hasChanges):
+                        XCTAssertTrue(hasChanges)
+                        saveExpectation.fulfill()
+                        
+                    case .failure:
+                        XCTFail()
+                    }
+                }
+            }
+            self.waitAndCheckExpectations()
+        }
+    }
+}
+
+
+// MARK: TestListObserver
+
+class TestListObserver: ListSectionObserver {
+    
+    // MARK: ListObserver
+    
+    typealias ListEntityType = TestEntity1
+    
+    func listMonitorWillChange(_ monitor: ListMonitor<TestEntity1>) {
+        
+        NotificationCenter.default.post(
+            name: Notification.Name(rawValue: "listMonitorWillChange:"),
+            object: self,
+            userInfo: [:]
+        )
+    }
+    
+    func listMonitorDidChange(_ monitor: ListMonitor<TestEntity1>) {
+        
+        NotificationCenter.default.post(
+            name: Notification.Name(rawValue: "listMonitorDidChange:"),
+            object: self,
+            userInfo: [:]
+        )
+    }
+    
+    func listMonitorWillRefetch(_ monitor: ListMonitor<TestEntity1>) {
+        
+        NotificationCenter.default.post(
+            name: Notification.Name(rawValue: "listMonitorWillRefetch:"),
+            object: self,
+            userInfo: [:]
+        )
+    }
+    
+    func listMonitorDidRefetch(_ monitor: ListMonitor<TestEntity1>) {
+        
+        NotificationCenter.default.post(
+            name: Notification.Name(rawValue: "listMonitorDidRefetch:"),
+            object: self,
+            userInfo: [:]
+        )
+    }
+    
+    
+    // MARK: ListObjectObserver
+    
+    func listMonitor(_ monitor: ListMonitor<TestEntity1>, didInsertObject object: TestEntity1, toIndexPath indexPath: IndexPath) {
+        
+        NotificationCenter.default.post(
+            name: Notification.Name(rawValue: "listMonitor:didInsertObject:toIndexPath:"),
+            object: self,
+            userInfo: [
+                "object": object,
+                "indexPath": indexPath
+            ]
+        )
+    }
+    
+    func listMonitor(_ monitor: ListMonitor<TestEntity1>, didDeleteObject object: TestEntity1, fromIndexPath indexPath: IndexPath) {
+        
+        NotificationCenter.default.post(
+            name: Notification.Name(rawValue: "listMonitor:didDeleteObject:fromIndexPath:"),
+            object: self,
+            userInfo: [
+                "object": object,
+                "indexPath": indexPath
+            ]
+        )
+    }
+    
+    func listMonitor(_ monitor: ListMonitor<TestEntity1>, didUpdateObject object: TestEntity1, atIndexPath indexPath: IndexPath) {
+        
+        NotificationCenter.default.post(
+            name: Notification.Name(rawValue: "listMonitor:didUpdateObject:atIndexPath:"),
+            object: self,
+            userInfo: [
+                "object": object,
+                "indexPath": indexPath
+            ]
+        )
+    }
+    
+    
+    func listMonitor(_ monitor: ListMonitor<TestEntity1>, didMoveObject object: TestEntity1, fromIndexPath: IndexPath, toIndexPath: IndexPath) {
+        
+        NotificationCenter.default.post(
+            name: Notification.Name(rawValue: "listMonitor:didMoveObject:fromIndexPath:toIndexPath:"),
+            object: self,
+            userInfo: [
+                "object": object,
+                "fromIndexPath": fromIndexPath,
+                "toIndexPath": toIndexPath
+            ]
+        )
+    }
+    
+    
+    // MARK: ListSectionObserver
+    
+    func listMonitor(_ monitor: ListMonitor<TestEntity1>, didInsertSection sectionInfo: NSFetchedResultsSectionInfo, toSectionIndex sectionIndex: Int) {
+        
+        NotificationCenter.default.post(
+            name: Notification.Name(rawValue: "listMonitor:didInsertSection:toSectionIndex:"),
+            object: self,
+            userInfo: [
+                "sectionInfo": sectionInfo,
+                "sectionIndex": sectionIndex
+            ]
+        )
+    }
+    
+    func listMonitor(_ monitor: ListMonitor<TestEntity1>, didDeleteSection sectionInfo: NSFetchedResultsSectionInfo, fromSectionIndex sectionIndex: Int) {
+        
+        NotificationCenter.default.post(
+            name: Notification.Name(rawValue: "listMonitor:didDeleteSection:fromSectionIndex:"),
+            object: self,
+            userInfo: [
+                "sectionInfo": sectionInfo,
+                "sectionIndex": sectionIndex
+            ]
+        )
+    }
+}
+
+#endif

CoreStoreTests/MigrationChainTests.swift

@@ -0,0 +1,147 @@
+//
+//  MigrationChainTests.swift
+//  CoreStore
+//
+//  Copyright © 2016 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import XCTest
+
+@testable
+import CoreStore
+
+
+// MARK: - MigrationChainTests
+
+final class MigrationChainTests: XCTestCase {
+    
+    @objc
+    dynamic func test_ThatNilMigrationChains_HaveNoVersions() {
+        
+        let chain: MigrationChain = nil
+        XCTAssertTrue(chain.valid)
+        XCTAssertTrue(chain.empty)
+        
+        XCTAssertFalse(chain.contains("version1"))
+        XCTAssertNil(chain.nextVersionFrom("version1"))
+    }
+    
+    @objc
+    dynamic func test_ThatStringMigrationChains_HaveOneVersion() {
+        
+        let chain: MigrationChain = "version1"
+        XCTAssertTrue(chain.valid)
+        XCTAssertTrue(chain.empty)
+        
+        XCTAssertTrue(chain.contains("version1"))
+        XCTAssertFalse(chain.contains("version2"))
+        
+        XCTAssertNil(chain.nextVersionFrom("version1"))
+        XCTAssertNil(chain.nextVersionFrom("version2"))
+    }
+    
+    @objc
+    dynamic func test_ThatArrayMigrationChains_HaveLinearVersions() {
+        
+        let chain: MigrationChain = ["version1", "version2", "version3", "version4"]
+        XCTAssertTrue(chain.valid)
+        XCTAssertFalse(chain.empty)
+        
+        XCTAssertTrue(chain.contains("version1"))
+        XCTAssertTrue(chain.contains("version2"))
+        XCTAssertTrue(chain.contains("version3"))
+        XCTAssertTrue(chain.contains("version4"))
+        XCTAssertFalse(chain.contains("version5"))
+        
+        XCTAssertEqual(chain.nextVersionFrom("version1"), "version2")
+        XCTAssertEqual(chain.nextVersionFrom("version2"), "version3")
+        XCTAssertEqual(chain.nextVersionFrom("version3"), "version4")
+        XCTAssertNil(chain.nextVersionFrom("version4"))
+        XCTAssertNil(chain.nextVersionFrom("version5"))
+    }
+    
+    @objc
+    dynamic func test_ThatDictionaryMigrationChains_HaveTreeVersions() {
+        
+        let chain: MigrationChain = [
+            "version1": "version4",
+            "version2": "version3",
+            "version3": "version4"
+        ]
+        XCTAssertTrue(chain.valid)
+        XCTAssertFalse(chain.empty)
+        
+        XCTAssertTrue(chain.contains("version1"))
+        XCTAssertTrue(chain.contains("version2"))
+        XCTAssertTrue(chain.contains("version3"))
+        XCTAssertTrue(chain.contains("version4"))
+        XCTAssertFalse(chain.contains("version5"))
+        
+        XCTAssertEqual(chain.nextVersionFrom("version1"), "version4")
+        XCTAssertEqual(chain.nextVersionFrom("version2"), "version3")
+        XCTAssertEqual(chain.nextVersionFrom("version3"), "version4")
+        XCTAssertNil(chain.nextVersionFrom("version4"))
+        XCTAssertNil(chain.nextVersionFrom("version5"))
+        
+// The cases below will trigger assertion failures internally
+
+//        let linearLoopChain: MigrationChain = ["version1", "version2", "version1", "version3", "version4"]
+//        XCTAssertFalse(linearLoopChain.valid, "linearLoopChain.valid")
+//
+//        let treeAmbiguousChain: MigrationChain = [
+//            "version1": "version4",
+//            "version2": "version3",
+//            "version1": "version2",
+//            "version3": "version4"
+//        ]
+//        XCTAssertFalse(treeAmbiguousChain.valid, "treeAmbiguousChain.valid")
+    }
+    
+    @objc
+    dynamic func test_ThatMigrationChains_AreEquatable() {
+        
+        do {
+            
+            let chain1: MigrationChain = nil
+            let chain2: MigrationChain = []
+            let chain3: MigrationChain = [:]
+            XCTAssertEqual(chain1, chain2)
+            XCTAssertEqual(chain2, chain3)
+            XCTAssertEqual(chain3, chain1)
+        }
+        do {
+            
+            let chain1: MigrationChain = "version1"
+            let chain2: MigrationChain = ["version1"]
+            XCTAssertEqual(chain1, chain2)
+        }
+        do {
+            
+            let chain1: MigrationChain = ["version1", "version2", "version3", "version4"]
+            let chain2: MigrationChain = [
+                "version1": "version2",
+                "version2": "version3",
+                "version3": "version4"
+            ]
+            XCTAssertEqual(chain1, chain2)
+        }
+    }
+}

CoreStoreTests/Model.xcdatamodeld/Model.xcdatamodel/contents

@@ -1,15 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="9057" systemVersion="15B42" minimumToolsVersion="Xcode 4.3">
+<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="10174" systemVersion="15F34" minimumToolsVersion="Xcode 4.3">
     <entity name="TestEntity1AAA" representedClassName="CoreStoreTests.TestEntity1" syncable="YES">
+        <attribute name="testBoolean" optional="YES" attributeType="Boolean" syncable="YES"/>
+        <attribute name="testData" optional="YES" attributeType="Binary" syncable="YES"/>
         <attribute name="testDate" optional="YES" attributeType="Date" syncable="YES"/>
-        <attribute name="testEntityID" attributeType="Integer 64" syncable="YES"/>
-        <attribute name="testNumber" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
+        <attribute name="testDecimal" optional="YES" attributeType="Decimal" syncable="YES"/>
+        <attribute name="testEntityID" optional="YES" attributeType="Integer 64" syncable="YES"/>
+        <attribute name="testNil" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="testNumber" optional="YES" attributeType="Integer 32" syncable="YES"/>
         <attribute name="testString" optional="YES" attributeType="String" syncable="YES"/>
     </entity>
     <entity name="TestEntity2" representedClassName="CoreStoreTests.TestEntity2" syncable="YES">
+        <attribute name="testBoolean" optional="YES" attributeType="Boolean" syncable="YES"/>
+        <attribute name="testData" optional="YES" attributeType="Binary" syncable="YES"/>
         <attribute name="testDate" optional="YES" attributeType="Date" syncable="YES"/>
-        <attribute name="testEntityID" attributeType="Integer 64" syncable="YES"/>
-        <attribute name="testNumber" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
+        <attribute name="testDecimal" optional="YES" attributeType="Decimal" syncable="YES"/>
+        <attribute name="testEntityID" optional="YES" attributeType="Integer 64" syncable="YES"/>
+        <attribute name="testNil" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="testNumber" optional="YES" attributeType="Integer 32" syncable="YES"/>
         <attribute name="testString" optional="YES" attributeType="String" syncable="YES"/>
     </entity>
     <configuration name="Config1">
@@ -19,7 +27,7 @@
         <memberEntity name="TestEntity2"/>
     </configuration>
     <elements>
-        <element name="TestEntity1AAA" positionX="-63" positionY="-18" width="128" height="105"/>
-        <element name="TestEntity2" positionX="-63" positionY="9" width="128" height="105"/>
+        <element name="TestEntity1AAA" positionX="-63" positionY="-18" width="128" height="165"/>
+        <element name="TestEntity2" positionX="-63" positionY="9" width="128" height="165"/>
     </elements>
 </model>

CoreStoreTests/ObjectObserverTests.swift

@@ -0,0 +1,246 @@
+//
+//  ObjectObserverTests.swift
+//  CoreStore
+//
+//  Copyright © 2016 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import XCTest
+
+@testable
+import CoreStore
+
+
+#if os(iOS) || os(watchOS) || os(tvOS)
+
+// MARK: - ObjectObserverTests
+
+class ObjectObserverTests: BaseTestDataTestCase {
+    
+    @objc
+    dynamic func test_ThatObjectObservers_CanReceiveUpdateNotifications() {
+        
+        self.prepareStack { (stack) in
+            
+            self.prepareTestDataForStack(stack)
+            
+            guard let object = stack.fetchOne(
+                From<TestEntity1>(),
+                Where(#keyPath(TestEntity1.testEntityID), isEqualTo: 101)) else {
+                    
+                    XCTFail()
+                    return
+            }
+            let observer = TestObjectObserver()
+            let monitor = stack.monitorObject(object)
+            monitor.addObserver(observer)
+            
+            XCTAssertEqual(monitor.object, object)
+            XCTAssertFalse(monitor.isObjectDeleted)
+            
+            var events = 0
+            
+            let willUpdateExpectation = self.expectation(
+                forNotification: "objectMonitor:willUpdateObject:",
+                object: observer,
+                handler: { (note) -> Bool in
+                    
+                    XCTAssertEqual(events, 0)
+                    XCTAssertEqual(
+                        ((note.userInfo as NSDictionary?) ?? [:]),
+                        ["object": object] as NSDictionary
+                    )
+                    defer {
+                        
+                        events += 1
+                    }
+                    return events == 0
+                }
+            )
+            let didUpdateExpectation = self.expectation(
+                forNotification: "objectMonitor:didUpdateObject:changedPersistentKeys:",
+                object: observer,
+                handler: { (note) -> Bool in
+                    
+                    XCTAssertEqual(events, 1)
+                    XCTAssertEqual(
+                        ((note.userInfo as NSDictionary?) ?? [:]),
+                        [
+                            "object": object,
+                            "changedPersistentKeys": Set(
+                                [
+                                    #keyPath(TestEntity1.testNumber),
+                                    #keyPath(TestEntity1.testString)
+                                ]
+                            )
+                        ] as NSDictionary
+                    )
+                    let object = note.userInfo?["object"] as? TestEntity1
+                    XCTAssertEqual(object?.testNumber, NSNumber(value: 10))
+                    XCTAssertEqual(object?.testString, "nil:TestEntity1:10")
+                    
+                    defer {
+                        
+                        events += 1
+                    }
+                    return events == 1
+                }
+            )
+            let saveExpectation = self.expectation(description: "save")
+            stack.beginAsynchronous { (transaction) in
+                
+                guard let object = transaction.edit(object) else {
+                    
+                    XCTFail()
+                    return
+                }
+                object.testNumber = NSNumber(value: 10)
+                object.testString = "nil:TestEntity1:10"
+                
+                transaction.commit { (result) in
+                    
+                    switch result {
+                        
+                    case .success(let hasChanges):
+                        XCTAssertTrue(hasChanges)
+                        saveExpectation.fulfill()
+                        
+                    case .failure:
+                        XCTFail()
+                    }
+                }
+            }
+            self.waitAndCheckExpectations()
+        }
+    }
+    
+    @objc
+    dynamic func test_ThatObjectObservers_CanReceiveDeleteNotifications() {
+        
+        self.prepareStack { (stack) in
+            
+            self.prepareTestDataForStack(stack)
+            
+            guard let object = stack.fetchOne(
+                From<TestEntity1>(),
+                Where(#keyPath(TestEntity1.testEntityID), isEqualTo: 101)) else {
+                    
+                    XCTFail()
+                    return
+            }
+            let observer = TestObjectObserver()
+            let monitor = stack.monitorObject(object)
+            monitor.addObserver(observer)
+            
+            XCTAssertEqual(monitor.object, object)
+            XCTAssertFalse(monitor.isObjectDeleted)
+            
+            var events = 0
+            
+            let didDeleteExpectation = self.expectation(
+                forNotification: "objectMonitor:didDeleteObject:",
+                object: observer,
+                handler: { (note) -> Bool in
+                    
+                    XCTAssertEqual(events, 0)
+                    XCTAssertEqual(
+                        ((note.userInfo as NSDictionary?) ?? [:]),
+                        ["object": object] as NSDictionary
+                    )
+                    defer {
+                        
+                        events += 1
+                    }
+                    return events == 0
+                }
+            )
+            let saveExpectation = self.expectation(description: "save")
+            stack.beginAsynchronous { (transaction) in
+                
+                guard let object = transaction.edit(object) else {
+                    
+                    XCTFail()
+                    return
+                }
+                transaction.delete(object)
+                
+                transaction.commit { (result) in
+                    
+                    switch result {
+                        
+                    case .success(let hasChanges):
+                        XCTAssertTrue(hasChanges)
+                        XCTAssertTrue(monitor.isObjectDeleted)
+                        saveExpectation.fulfill()
+                        
+                    case .failure:
+                        XCTFail()
+                    }
+                }
+            }
+            self.waitAndCheckExpectations()
+        }
+    }
+}
+
+
+// MARK: TestObjectObserver
+
+class TestObjectObserver: ObjectObserver {
+    
+    typealias ObjectEntityType = TestEntity1
+    
+    func objectMonitor(_ monitor: ObjectMonitor<TestEntity1>, willUpdateObject object: TestEntity1) {
+        
+        NotificationCenter.default.post(
+            name: Notification.Name(rawValue: "objectMonitor:willUpdateObject:"),
+            object: self,
+            userInfo: [
+                "object": object
+            ]
+        )
+    }
+    
+    func objectMonitor(_ monitor: ObjectMonitor<TestEntity1>, didUpdateObject object: TestEntity1, changedPersistentKeys: Set<KeyPath>) {
+        
+        NotificationCenter.default.post(
+            name: NSNotification.Name(rawValue: "objectMonitor:didUpdateObject:changedPersistentKeys:"),
+            object: self,
+            userInfo: [
+                "object": object,
+                "changedPersistentKeys": changedPersistentKeys
+            ]
+        )
+    }
+    
+    func objectMonitor(_ monitor: ObjectMonitor<TestEntity1>, didDeleteObject object: TestEntity1) {
+        
+        NotificationCenter.default.post(
+            name: Notification.Name(rawValue: "objectMonitor:didDeleteObject:"),
+            object: self,
+            userInfo: [
+                "object": object
+            ]
+        )
+    }
+}
+
+#endif

CoreStoreTests/OrderByTests.swift

@@ -0,0 +1,187 @@
+//
+//  OrderByTests.swift
+//  CoreStore
+//
+//  Copyright © 2016 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import XCTest
+
+@testable
+import CoreStore
+
+
+//MARK: - OrderByTests
+
+final class OrderByTests: XCTestCase {
+    
+    @objc
+    dynamic func test_ThatOrderByClauses_ConfigureCorrectly() {
+        
+        do {
+            
+            let orderBy = OrderBy()
+            XCTAssertEqual(orderBy, OrderBy([NSSortDescriptor]()))
+            XCTAssertNotEqual(orderBy, OrderBy(NSSortDescriptor(key: "key", ascending: false)))
+            XCTAssertTrue(orderBy.sortDescriptors.isEmpty)
+        }
+        do {
+            
+            let sortDescriptor = NSSortDescriptor(key: "key1", ascending: true)
+            let orderBy = OrderBy(sortDescriptor)
+            XCTAssertEqual(orderBy, OrderBy(sortDescriptor))
+            XCTAssertEqual(orderBy, OrderBy(.ascending("key1")))
+            XCTAssertNotEqual(orderBy, OrderBy(.ascending("key2")))
+            XCTAssertNotEqual(orderBy, OrderBy(.descending("key1")))
+            XCTAssertNotEqual(orderBy, OrderBy(NSSortDescriptor(key: "key1", ascending: false)))
+            XCTAssertEqual(orderBy, OrderBy([sortDescriptor]))
+            XCTAssertEqual(orderBy.sortDescriptors, [sortDescriptor])
+        }
+        do {
+            
+            let sortDescriptors = [
+                NSSortDescriptor(key: "key1", ascending: true),
+                NSSortDescriptor(key: "key2", ascending: false)
+            ]
+            let orderBy = OrderBy(sortDescriptors)
+            XCTAssertEqual(orderBy, OrderBy(sortDescriptors))
+            XCTAssertEqual(orderBy, OrderBy(.ascending("key1"), .descending("key2")))
+            XCTAssertNotEqual(
+                orderBy,
+                OrderBy(
+                    [
+                        NSSortDescriptor(key: "key1", ascending: false),
+                        NSSortDescriptor(key: "key2", ascending: false)
+                    ]
+                )
+            )
+            XCTAssertNotEqual(orderBy, OrderBy(.ascending("key1"), .ascending("key2")))
+            XCTAssertNotEqual(orderBy, OrderBy(.ascending("key1"), .descending("key3")))
+            XCTAssertEqual(orderBy.sortDescriptors, sortDescriptors)
+        }
+        do {
+            
+            let orderBy = OrderBy(.ascending("key1"))
+            let sortDescriptor = NSSortDescriptor(key: "key1", ascending: true)
+            XCTAssertEqual(orderBy, OrderBy(sortDescriptor))
+            XCTAssertEqual(orderBy, OrderBy(.ascending("key1")))
+            XCTAssertNotEqual(orderBy, OrderBy(.descending("key1")))
+            XCTAssertNotEqual(orderBy, OrderBy(.ascending("key2")))
+            XCTAssertEqual(orderBy, OrderBy([sortDescriptor]))
+            XCTAssertEqual(orderBy.sortDescriptors, [sortDescriptor])
+        }
+        do {
+            
+            let orderBy = OrderBy(.ascending("key1"), .descending("key2"))
+            let sortDescriptors = [
+                NSSortDescriptor(key: "key1", ascending: true),
+                NSSortDescriptor(key: "key2", ascending: false)
+            ]
+            XCTAssertEqual(orderBy, OrderBy(sortDescriptors))
+            XCTAssertEqual(orderBy, OrderBy(.ascending("key1"), .descending("key2")))
+            XCTAssertNotEqual(
+                orderBy,
+                OrderBy(
+                    [
+                        NSSortDescriptor(key: "key1", ascending: false),
+                        NSSortDescriptor(key: "key2", ascending: false)
+                    ]
+                )
+            )
+            XCTAssertNotEqual(orderBy, OrderBy(.ascending("key1"), .ascending("key2")))
+            XCTAssertNotEqual(orderBy, OrderBy(.ascending("key1"), .descending("key3")))
+            XCTAssertEqual(orderBy.sortDescriptors, sortDescriptors)
+        }
+        do {
+            
+            let sortKeys: [SortKey] = [.ascending("key1"), .descending("key2")]
+            let orderBy = OrderBy(sortKeys)
+            let sortDescriptors = [
+                NSSortDescriptor(key: "key1", ascending: true),
+                NSSortDescriptor(key: "key2", ascending: false)
+            ]
+            XCTAssertEqual(orderBy, OrderBy(sortDescriptors))
+            XCTAssertEqual(orderBy, OrderBy(.ascending("key1"), .descending("key2")))
+            XCTAssertNotEqual(
+                orderBy,
+                OrderBy(
+                    [
+                        NSSortDescriptor(key: "key1", ascending: false),
+                        NSSortDescriptor(key: "key2", ascending: false)
+                    ]
+                )
+            )
+            XCTAssertNotEqual(orderBy, OrderBy(.ascending("key1"), .ascending("key2")))
+            XCTAssertNotEqual(orderBy, OrderBy(.ascending("key1"), .descending("key3")))
+            XCTAssertEqual(orderBy.sortDescriptors, sortDescriptors)
+        }
+    }
+    
+    @objc
+    dynamic func test_ThatOrderByClauseOperations_ComputeCorrectly() {
+        
+        let orderBy1 = OrderBy(.ascending("key1"))
+        let orderBy2 = OrderBy(.descending("key2"))
+        let orderBy3 = OrderBy(.ascending("key3"))
+        
+        do {
+            
+            let plusOrderBy = orderBy1 + orderBy2 + orderBy3
+            XCTAssertEqual(plusOrderBy, OrderBy(.ascending("key1"), .descending("key2"), .ascending("key3")))
+            XCTAssertEqual(plusOrderBy, OrderBy(.ascending("key1")) + OrderBy(.descending("key2"), .ascending("key3")))
+            XCTAssertNotEqual(plusOrderBy, orderBy1 + orderBy3 + orderBy2)
+            XCTAssertNotEqual(plusOrderBy, orderBy2 + orderBy1 + orderBy3)
+            XCTAssertNotEqual(plusOrderBy, orderBy2 + orderBy3 + orderBy1)
+            XCTAssertNotEqual(plusOrderBy, orderBy3 + orderBy1 + orderBy2)
+            XCTAssertNotEqual(plusOrderBy, orderBy3 + orderBy2 + orderBy1)
+            XCTAssertEqual(plusOrderBy.sortDescriptors, orderBy1.sortDescriptors + orderBy2.sortDescriptors + orderBy3.sortDescriptors)
+        }
+        do {
+            
+            var plusOrderBy = orderBy1
+            plusOrderBy += orderBy2
+            XCTAssertEqual(plusOrderBy, OrderBy(.ascending("key1"), .descending("key2")))
+            XCTAssertEqual(plusOrderBy, OrderBy(.ascending("key1")) + OrderBy(.descending("key2")))
+            XCTAssertNotEqual(plusOrderBy, orderBy2 + orderBy1)
+            XCTAssertEqual(plusOrderBy.sortDescriptors, orderBy1.sortDescriptors + orderBy2.sortDescriptors)
+            
+            plusOrderBy += orderBy3
+            XCTAssertEqual(plusOrderBy, OrderBy(.ascending("key1"), .descending("key2"), .ascending("key3")))
+            XCTAssertEqual(plusOrderBy, OrderBy(.ascending("key1"), .descending("key2")) + OrderBy(.ascending("key3")))
+            XCTAssertNotEqual(plusOrderBy, orderBy1 + orderBy3 + orderBy2)
+            XCTAssertNotEqual(plusOrderBy, orderBy2 + orderBy1 + orderBy3)
+            XCTAssertNotEqual(plusOrderBy, orderBy2 + orderBy3 + orderBy1)
+            XCTAssertNotEqual(plusOrderBy, orderBy3 + orderBy1 + orderBy2)
+            XCTAssertNotEqual(plusOrderBy, orderBy3 + orderBy2 + orderBy1)
+            XCTAssertEqual(plusOrderBy.sortDescriptors, orderBy1.sortDescriptors + orderBy2.sortDescriptors + orderBy3.sortDescriptors)
+        }
+    }
+    
+    @objc
+    dynamic func test_ThatOrderByClauses_ApplyToFetchRequestsCorrectly() {
+        
+        let orderBy = OrderBy(.ascending("key"))
+        let request = CoreStoreFetchRequest()
+        orderBy.applyToFetchRequest(request)
+        XCTAssertNotNil(request.sortDescriptors)
+        XCTAssertEqual(request.sortDescriptors ?? [], orderBy.sortDescriptors)
+    }
+}

CoreStoreTests/SectionByTests.swift

@@ -0,0 +1,57 @@
+//
+//  SectionByTests.swift
+//  CoreStore
+//
+//  Copyright © 2016 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import XCTest
+
+@testable
+import CoreStore
+
+
+#if os(iOS) || os(watchOS) || os(tvOS)
+
+//MARK: - SectionByTests
+
+final class SectionByTests: XCTestCase {
+    
+    @objc
+    dynamic func test_ThatSectionByClauses_ConfigureCorrectly() {
+        
+        do {
+            
+            let sectionBy = SectionBy("key")
+            XCTAssertEqual(sectionBy.sectionKeyPath, "key")
+            XCTAssertEqual(sectionBy.sectionIndexTransformer("key"), "key")
+        }
+        do {
+            
+            let sectionBy = SectionBy("key") { $0.flatMap { "\($0):suffix" } }
+            XCTAssertEqual(sectionBy.sectionKeyPath, "key")
+            XCTAssertEqual(sectionBy.sectionIndexTransformer("key"), "key:suffix")
+            XCTAssertNil(sectionBy.sectionIndexTransformer(nil))
+        }
+    }
+}
+
+#endif

CoreStoreTests/SelectTests.swift

@@ -0,0 +1,420 @@
+//
+//  SelectTests.swift
+//  CoreStore
+//
+//  Copyright © 2016 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import XCTest
+
+@testable
+import CoreStore
+
+
+//MARK: - SelectTests
+
+final class SelectTests: XCTestCase {
+    
+    @objc
+    dynamic func test_ThatAttributeSelectTerms_ConfigureCorrectly() {
+        
+        do {
+            
+            let term: SelectTerm = "attribute"
+            XCTAssertEqual(term, SelectTerm.attribute("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.attribute("attribute2"))
+            XCTAssertNotEqual(term, SelectTerm.average("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.count("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.maximum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.minimum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.sum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.objectID())
+            switch term {
+                
+            case ._attribute(let key):
+                XCTAssertEqual(key, "attribute")
+                
+            default:
+                XCTFail()
+            }
+        }
+        do {
+            
+            let term = SelectTerm.attribute("attribute")
+            XCTAssertNotEqual(term, SelectTerm.attribute("attribute2"))
+            XCTAssertNotEqual(term, SelectTerm.average("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.count("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.maximum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.minimum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.sum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.objectID())
+            switch term {
+                
+            case ._attribute(let key):
+                XCTAssertEqual(key, "attribute")
+                
+            default:
+                XCTFail()
+            }
+        }
+    }
+    
+    @objc
+    dynamic func test_ThatAverageSelectTerms_ConfigureCorrectly() {
+        
+        do {
+            
+            let term = SelectTerm.average("attribute")
+            XCTAssertEqual(term, SelectTerm.average("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.average("attribute", as: "alias"))
+            XCTAssertNotEqual(term, SelectTerm.average("attribute2"))
+            XCTAssertNotEqual(term, SelectTerm.attribute("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.count("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.maximum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.minimum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.sum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.objectID())
+            switch term {
+                
+            case ._aggregate(let function, let keyPath, let alias, let nativeType):
+                XCTAssertEqual(function, "average:")
+                XCTAssertEqual(keyPath, "attribute")
+                XCTAssertEqual(alias, "average(attribute)")
+                XCTAssertTrue(nativeType == .decimalAttributeType)
+                
+            default:
+                XCTFail()
+            }
+        }
+        do {
+            
+            let term = SelectTerm.average("attribute", as: "alias")
+            XCTAssertEqual(term, SelectTerm.average("attribute", as: "alias"))
+            XCTAssertNotEqual(term, SelectTerm.average("attribute", as: "alias2"))
+            XCTAssertNotEqual(term, SelectTerm.average("attribute2"))
+            XCTAssertNotEqual(term, SelectTerm.attribute("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.count("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.maximum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.minimum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.sum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.objectID())
+            switch term {
+                
+            case ._aggregate(let function, let keyPath, let alias, let nativeType):
+                XCTAssertEqual(function, "average:")
+                XCTAssertEqual(keyPath, "attribute")
+                XCTAssertEqual(alias, "alias")
+                XCTAssertTrue(nativeType == .decimalAttributeType)
+                
+            default:
+                XCTFail()
+            }
+        }
+    }
+    
+    @objc
+    dynamic func test_ThatCountSelectTerms_ConfigureCorrectly() {
+        
+        do {
+            
+            let term = SelectTerm.count("attribute")
+            XCTAssertEqual(term, SelectTerm.count("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.count("attribute", as: "alias"))
+            XCTAssertNotEqual(term, SelectTerm.count("attribute2"))
+            XCTAssertNotEqual(term, SelectTerm.attribute("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.average("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.maximum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.minimum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.sum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.objectID())
+            switch term {
+                
+            case ._aggregate(let function, let keyPath, let alias, let nativeType):
+                XCTAssertEqual(function, "count:")
+                XCTAssertEqual(keyPath, "attribute")
+                XCTAssertEqual(alias, "count(attribute)")
+                XCTAssertTrue(nativeType == .integer64AttributeType)
+                
+            default:
+                XCTFail()
+            }
+        }
+        do {
+            
+            let term = SelectTerm.count("attribute", as: "alias")
+            XCTAssertEqual(term, SelectTerm.count("attribute", as: "alias"))
+            XCTAssertNotEqual(term, SelectTerm.count("attribute", as: "alias2"))
+            XCTAssertNotEqual(term, SelectTerm.count("attribute2"))
+            XCTAssertNotEqual(term, SelectTerm.attribute("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.average("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.maximum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.minimum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.sum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.objectID())
+            switch term {
+                
+            case ._aggregate(let function, let keyPath, let alias, let nativeType):
+                XCTAssertEqual(function, "count:")
+                XCTAssertEqual(keyPath, "attribute")
+                XCTAssertEqual(alias, "alias")
+                XCTAssertTrue(nativeType == .integer64AttributeType)
+                
+            default:
+                XCTFail()
+            }
+        }
+    }
+    
+    @objc
+    dynamic func test_ThatMaximumSelectTerms_ConfigureCorrectly() {
+        
+        do {
+            
+            let term = SelectTerm.maximum("attribute")
+            XCTAssertEqual(term, SelectTerm.maximum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.maximum("attribute", as: "alias"))
+            XCTAssertNotEqual(term, SelectTerm.maximum("attribute2"))
+            XCTAssertNotEqual(term, SelectTerm.attribute("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.average("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.count("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.minimum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.sum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.objectID())
+            switch term {
+                
+            case ._aggregate(let function, let keyPath, let alias, let nativeType):
+                XCTAssertEqual(function, "max:")
+                XCTAssertEqual(keyPath, "attribute")
+                XCTAssertEqual(alias, "max(attribute)")
+                XCTAssertTrue(nativeType == .undefinedAttributeType)
+                
+            default:
+                XCTFail()
+            }
+        }
+        do {
+            
+            let term = SelectTerm.maximum("attribute", as: "alias")
+            XCTAssertEqual(term, SelectTerm.maximum("attribute", as: "alias"))
+            XCTAssertNotEqual(term, SelectTerm.maximum("attribute", as: "alias2"))
+            XCTAssertNotEqual(term, SelectTerm.maximum("attribute2"))
+            XCTAssertNotEqual(term, SelectTerm.attribute("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.average("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.count("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.minimum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.sum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.objectID())
+            switch term {
+                
+            case ._aggregate(let function, let keyPath, let alias, let nativeType):
+                XCTAssertEqual(function, "max:")
+                XCTAssertEqual(keyPath, "attribute")
+                XCTAssertEqual(alias, "alias")
+                XCTAssertTrue(nativeType == .undefinedAttributeType)
+                
+            default:
+                XCTFail()
+            }
+        }
+    }
+    
+    @objc
+    dynamic func test_ThatMinimumSelectTerms_ConfigureCorrectly() {
+        
+        do {
+            
+            let term = SelectTerm.minimum("attribute")
+            XCTAssertEqual(term, SelectTerm.minimum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.minimum("attribute", as: "alias"))
+            XCTAssertNotEqual(term, SelectTerm.minimum("attribute2"))
+            XCTAssertNotEqual(term, SelectTerm.attribute("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.average("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.count("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.maximum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.sum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.objectID())
+            switch term {
+                
+            case ._aggregate(let function, let keyPath, let alias, let nativeType):
+                XCTAssertEqual(function, "min:")
+                XCTAssertEqual(keyPath, "attribute")
+                XCTAssertEqual(alias, "min(attribute)")
+                XCTAssertTrue(nativeType == .undefinedAttributeType)
+                
+            default:
+                XCTFail()
+            }
+        }
+        do {
+            
+            let term = SelectTerm.minimum("attribute", as: "alias")
+            XCTAssertEqual(term, SelectTerm.minimum("attribute", as: "alias"))
+            XCTAssertNotEqual(term, SelectTerm.minimum("attribute", as: "alias2"))
+            XCTAssertNotEqual(term, SelectTerm.minimum("attribute2"))
+            XCTAssertNotEqual(term, SelectTerm.attribute("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.average("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.count("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.maximum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.sum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.objectID())
+            switch term {
+                
+            case ._aggregate(let function, let keyPath, let alias, let nativeType):
+                XCTAssertEqual(function, "min:")
+                XCTAssertEqual(keyPath, "attribute")
+                XCTAssertEqual(alias, "alias")
+                XCTAssertTrue(nativeType == .undefinedAttributeType)
+                
+            default:
+                XCTFail()
+            }
+        }
+    }
+    
+    @objc
+    dynamic func test_ThatSumSelectTerms_ConfigureCorrectly() {
+        
+        do {
+            
+            let term = SelectTerm.sum("attribute")
+            XCTAssertEqual(term, SelectTerm.sum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.sum("attribute", as: "alias"))
+            XCTAssertNotEqual(term, SelectTerm.sum("attribute2"))
+            XCTAssertNotEqual(term, SelectTerm.attribute("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.average("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.count("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.maximum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.minimum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.objectID())
+            switch term {
+                
+            case ._aggregate(let function, let keyPath, let alias, let nativeType):
+                XCTAssertEqual(function, "sum:")
+                XCTAssertEqual(keyPath, "attribute")
+                XCTAssertEqual(alias, "sum(attribute)")
+                XCTAssertTrue(nativeType == .decimalAttributeType)
+                
+            default:
+                XCTFail()
+            }
+        }
+        do {
+            
+            let term = SelectTerm.sum("attribute", as: "alias")
+            XCTAssertEqual(term, SelectTerm.sum("attribute", as: "alias"))
+            XCTAssertNotEqual(term, SelectTerm.sum("attribute", as: "alias2"))
+            XCTAssertNotEqual(term, SelectTerm.sum("attribute2"))
+            XCTAssertNotEqual(term, SelectTerm.attribute("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.average("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.count("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.maximum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.minimum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.objectID())
+            switch term {
+                
+            case ._aggregate(let function, let keyPath, let alias, let nativeType):
+                XCTAssertEqual(function, "sum:")
+                XCTAssertEqual(keyPath, "attribute")
+                XCTAssertEqual(alias, "alias")
+                XCTAssertTrue(nativeType == .decimalAttributeType)
+                
+            default:
+                XCTFail()
+            }
+        }
+    }
+    
+    @objc
+    dynamic func test_ThatObjectIDSelectTerms_ConfigureCorrectly() {
+        
+        do {
+            
+            let term = SelectTerm.objectID()
+            XCTAssertEqual(term, SelectTerm.objectID())
+            XCTAssertNotEqual(term, SelectTerm.objectID(as: "alias"))
+            XCTAssertNotEqual(term, SelectTerm.attribute("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.average("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.count("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.maximum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.minimum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.sum("attribute"))
+            switch term {
+                
+            case ._identity(let alias, let nativeType):
+                XCTAssertEqual(alias, "objectID")
+                XCTAssertTrue(nativeType == .objectIDAttributeType)
+                
+            default:
+                XCTFail()
+            }
+        }
+        do {
+            
+            let term = SelectTerm.objectID(as: "alias")
+            XCTAssertEqual(term, SelectTerm.objectID(as: "alias"))
+            XCTAssertNotEqual(term, SelectTerm.objectID(as: "alias2"))
+            XCTAssertNotEqual(term, SelectTerm.objectID())
+            XCTAssertNotEqual(term, SelectTerm.attribute("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.average("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.count("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.maximum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.minimum("attribute"))
+            XCTAssertNotEqual(term, SelectTerm.sum("attribute"))
+            switch term {
+                
+            case ._identity(let alias, let nativeType):
+                XCTAssertEqual(alias, "alias")
+                XCTAssertTrue(nativeType == .objectIDAttributeType)
+                
+            default:
+                XCTFail()
+            }
+        }
+    }
+    
+    @objc
+    dynamic func test_ThatSelectClauses_ConfigureCorrectly() {
+        
+        let term1 = SelectTerm.attribute("attribute1")
+        let term2 = SelectTerm.attribute("attribute2")
+        let term3 = SelectTerm.attribute("attribute3")
+        do {
+            
+            let select = Select<Int>(term1, term2, term3)
+            XCTAssertEqual(select.selectTerms, [term1, term2, term3])
+            XCTAssertNotEqual(select.selectTerms, [term1, term3, term2])
+            XCTAssertNotEqual(select.selectTerms, [term2, term1, term3])
+            XCTAssertNotEqual(select.selectTerms, [term2, term3, term1])
+            XCTAssertNotEqual(select.selectTerms, [term3, term1, term2])
+            XCTAssertNotEqual(select.selectTerms, [term3, term2, term1])
+        }
+        do {
+            
+            let select = Select<Int>([term1, term2, term3])
+            XCTAssertEqual(select.selectTerms, [term1, term2, term3])
+            XCTAssertNotEqual(select.selectTerms, [term1, term3, term2])
+            XCTAssertNotEqual(select.selectTerms, [term2, term1, term3])
+            XCTAssertNotEqual(select.selectTerms, [term2, term3, term1])
+            XCTAssertNotEqual(select.selectTerms, [term3, term1, term2])
+            XCTAssertNotEqual(select.selectTerms, [term3, term2, term1])
+        }
+    }
+}

CoreStoreTests/SetupTests.swift

@@ -0,0 +1,369 @@
+//
+//  SetupTests.swift
+//  CoreStore
+//
+//  Copyright © 2016 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+@testable
+import CoreStore
+
+
+// MARK: - SetupTests
+
+class SetupTests: BaseTestDataTestCase {
+    
+    @objc
+    dynamic func test_ThatDataStacks_ConfigureCorrectly() {
+        
+        do {
+            
+            let model = NSManagedObjectModel.mergedModel(from: [Bundle(for: type(of: self))])!
+            
+            let stack = DataStack(model: model, migrationChain: nil)
+            XCTAssertEqual(stack.coordinator.managedObjectModel, model)
+            XCTAssertEqual(stack.rootSavingContext.persistentStoreCoordinator, stack.coordinator)
+            XCTAssertNil(stack.rootSavingContext.parent)
+            XCTAssertFalse(stack.rootSavingContext.isDataStackContext)
+            XCTAssertFalse(stack.rootSavingContext.isTransactionContext)
+            XCTAssertEqual(stack.mainContext.parent, stack.rootSavingContext)
+            XCTAssertTrue(stack.mainContext.isDataStackContext)
+            XCTAssertFalse(stack.mainContext.isTransactionContext)
+            XCTAssertEqual(stack.model, model)
+            XCTAssertTrue(stack.migrationChain.valid)
+            XCTAssertTrue(stack.migrationChain.empty)
+            XCTAssertTrue(stack.migrationChain.rootVersions.isEmpty)
+            XCTAssertTrue(stack.migrationChain.leafVersions.isEmpty)
+            
+            CoreStore.defaultStack = stack
+            XCTAssertEqual(CoreStore.defaultStack, stack)
+        }
+        do {
+            
+            let migrationChain: MigrationChain = ["version1", "version2", "version3"]
+            
+            let stack = self.expectLogger([.logWarning]) {
+                
+                DataStack(
+                    modelName: "Model",
+                    bundle: Bundle(for: type(of: self)),
+                    migrationChain: migrationChain
+                )
+            }
+            XCTAssertEqual(stack.modelVersion, "Model")
+            XCTAssertEqual(stack.migrationChain, migrationChain)
+            
+            CoreStore.defaultStack = stack
+            XCTAssertEqual(CoreStore.defaultStack, stack)
+        }
+    }
+    
+    @objc
+    dynamic func test_ThatInMemoryStores_SetupCorrectly() {
+        
+        let stack = DataStack(
+            modelName: "Model",
+            bundle: Bundle(for: type(of: self))
+        )
+        do {
+            
+            let inMemoryStore = InMemoryStore()
+            do {
+                
+                try stack.addStorageAndWait(inMemoryStore)
+            }
+            catch let error as NSError {
+                
+                XCTFail(error.description)
+            }
+            let persistentStore = stack.persistentStoreForStorage(inMemoryStore)
+            XCTAssertNotNil(persistentStore)
+        }
+        do {
+            
+            let inMemoryStore = InMemoryStore(
+                configuration: "Config1"
+            )
+            do {
+                
+                try stack.addStorageAndWait(inMemoryStore)
+            }
+            catch let error as NSError {
+                
+                XCTFail(error.description)
+            }
+            let persistentStore = stack.persistentStoreForStorage(inMemoryStore)
+            XCTAssertNotNil(persistentStore)
+        }
+        do {
+            
+            let inMemoryStore = InMemoryStore(
+                configuration: "Config2"
+            )
+            do {
+                
+                try stack.addStorageAndWait(inMemoryStore)
+            }
+            catch let error as NSError {
+                
+                XCTFail(error.description)
+            }
+            let persistentStore = stack.persistentStoreForStorage(inMemoryStore)
+            XCTAssertNotNil(persistentStore)
+        }
+    }
+    
+    @objc
+    dynamic func test_ThatSQLiteStores_SetupCorrectly() {
+        
+        let stack = DataStack(
+            modelName: "Model",
+            bundle: Bundle(for: type(of: self))
+        )
+        do {
+            
+            let sqliteStore = SQLiteStore()
+            do {
+                
+                try stack.addStorageAndWait(sqliteStore)
+            }
+            catch let error as NSError {
+                
+                XCTFail(error.description)
+            }
+            let persistentStore = stack.persistentStoreForStorage(sqliteStore)
+            XCTAssertNotNil(persistentStore)
+            XCTAssert(sqliteStore.matchesPersistentStore(persistentStore!))
+        }
+        do {
+            
+            let sqliteStore = SQLiteStore(
+                fileName: "ConfigStore1.sqlite",
+                configuration: "Config1",
+                localStorageOptions: .recreateStoreOnModelMismatch
+            )
+            do {
+                
+                try stack.addStorageAndWait(sqliteStore)
+            }
+            catch let error as NSError {
+                
+                XCTFail(error.description)
+            }
+            let persistentStore = stack.persistentStoreForStorage(sqliteStore)
+            XCTAssertNotNil(persistentStore)
+            XCTAssert(sqliteStore.matchesPersistentStore(persistentStore!))
+        }
+        do {
+            
+            let sqliteStore = SQLiteStore(
+                fileName: "ConfigStore2.sqlite",
+                configuration: "Config2",
+                localStorageOptions: .recreateStoreOnModelMismatch
+            )
+            do {
+                
+                try stack.addStorageAndWait(sqliteStore)
+            }
+            catch let error as NSError {
+                
+                XCTFail(error.description)
+            }
+            let persistentStore = stack.persistentStoreForStorage(sqliteStore)
+            XCTAssertNotNil(persistentStore)
+            XCTAssert(sqliteStore.matchesPersistentStore(persistentStore!))
+        }
+    }
+    
+    @objc
+    dynamic func test_ThatSQLiteStores_DeleteFilesCorrectly() {
+        
+        let fileManager = FileManager.default
+        let sqliteStore = SQLiteStore()
+        func createStore() throws -> [String: Any] {
+            
+            do {
+                
+                let stack = DataStack(
+                    modelName: "Model",
+                    bundle: Bundle(for: type(of: self))
+                )
+                try! stack.addStorageAndWait(sqliteStore)
+                self.prepareTestDataForStack(stack)
+            }
+            XCTAssertTrue(fileManager.fileExists(atPath: sqliteStore.fileURL.path))
+            XCTAssertTrue(fileManager.fileExists(atPath: sqliteStore.fileURL.path.appending("-wal")))
+            XCTAssertTrue(fileManager.fileExists(atPath: sqliteStore.fileURL.path.appending("-shm")))
+            
+            return try NSPersistentStoreCoordinator.metadataForPersistentStore(
+                ofType: type(of: sqliteStore).storeType,
+                at: sqliteStore.fileURL,
+                options: sqliteStore.storeOptions
+            )
+        }
+        do {
+            
+            let metadata = try createStore()
+            let stack = DataStack(
+                modelName: "Model",
+                bundle: Bundle(for: type(of: self))
+            )
+            try sqliteStore.eraseStorageAndWait(metadata: metadata, soureModelHint: stack.model[metadata])
+            XCTAssertFalse(fileManager.fileExists(atPath: sqliteStore.fileURL.path))
+            XCTAssertFalse(fileManager.fileExists(atPath: sqliteStore.fileURL.path.appending("-wal")))
+            XCTAssertFalse(fileManager.fileExists(atPath: sqliteStore.fileURL.path.appending("-shm")))
+        }
+        catch {
+            
+            XCTFail()
+        }
+        do {
+            
+            let metadata = try createStore()
+            try sqliteStore.eraseStorageAndWait(metadata: metadata, soureModelHint: nil)
+            XCTAssertFalse(fileManager.fileExists(atPath: sqliteStore.fileURL.path))
+            XCTAssertFalse(fileManager.fileExists(atPath: sqliteStore.fileURL.path.appending("-wal")))
+            XCTAssertFalse(fileManager.fileExists(atPath: sqliteStore.fileURL.path.appending("-shm")))
+        }
+        catch {
+            
+            XCTFail()
+        }
+    }
+    
+    @objc
+    dynamic func test_ThatLegacySQLiteStores_SetupCorrectly() {
+        
+        let stack = DataStack(
+            modelName: "Model",
+            bundle: Bundle(for: type(of: self))
+        )
+        do {
+            
+            let sqliteStore = LegacySQLiteStore()
+            do {
+                
+                try stack.addStorageAndWait(sqliteStore)
+            }
+            catch let error as NSError {
+                
+                XCTFail(error.description)
+            }
+            let persistentStore = stack.persistentStoreForStorage(sqliteStore)
+            XCTAssertNotNil(persistentStore)
+            XCTAssert(sqliteStore.matchesPersistentStore(persistentStore!))
+        }
+        do {
+            
+            let sqliteStore = LegacySQLiteStore(
+                fileName: "ConfigStore1.sqlite",
+                configuration: "Config1",
+                localStorageOptions: .recreateStoreOnModelMismatch
+            )
+            do {
+                
+                try stack.addStorageAndWait(sqliteStore)
+            }
+            catch let error as NSError {
+                
+                XCTFail(error.description)
+            }
+            let persistentStore = stack.persistentStoreForStorage(sqliteStore)
+            XCTAssertNotNil(persistentStore)
+            XCTAssert(sqliteStore.matchesPersistentStore(persistentStore!))
+        }
+        do {
+            
+            let sqliteStore = LegacySQLiteStore(
+                fileName: "ConfigStore2.sqlite",
+                configuration: "Config2",
+                localStorageOptions: .recreateStoreOnModelMismatch
+            )
+            do {
+                
+                try stack.addStorageAndWait(sqliteStore)
+            }
+            catch let error as NSError {
+                
+                XCTFail(error.description)
+            }
+            let persistentStore = stack.persistentStoreForStorage(sqliteStore)
+            XCTAssertNotNil(persistentStore)
+            XCTAssert(sqliteStore.matchesPersistentStore(persistentStore!))
+        }
+    }
+    
+    @objc
+    dynamic func test_ThatLegacySQLiteStores_DeleteFilesCorrectly() {
+        
+        let fileManager = FileManager.default
+        let sqliteStore = LegacySQLiteStore()
+        func createStore() throws -> [String: Any] {
+            
+            do {
+                
+                let stack = DataStack(
+                    modelName: "Model",
+                    bundle: Bundle(for: type(of: self))
+                )
+                try! stack.addStorageAndWait(sqliteStore)
+                self.prepareTestDataForStack(stack)
+            }
+            XCTAssertTrue(fileManager.fileExists(atPath: sqliteStore.fileURL.path))
+            XCTAssertTrue(fileManager.fileExists(atPath: sqliteStore.fileURL.path.appending("-wal")))
+            XCTAssertTrue(fileManager.fileExists(atPath: sqliteStore.fileURL.path.appending("-shm")))
+            
+            return try NSPersistentStoreCoordinator.metadataForPersistentStore(
+                ofType: type(of: sqliteStore).storeType,
+                at: sqliteStore.fileURL,
+                options: sqliteStore.storeOptions
+            )
+        }
+        do {
+            
+            let metadata = try createStore()
+            let stack = DataStack(
+                modelName: "Model",
+                bundle: Bundle(for: type(of: self))
+            )
+            try sqliteStore.eraseStorageAndWait(metadata: metadata, soureModelHint: stack.model[metadata])
+            XCTAssertFalse(fileManager.fileExists(atPath: sqliteStore.fileURL.path))
+            XCTAssertFalse(fileManager.fileExists(atPath: sqliteStore.fileURL.path.appending("-wal")))
+            XCTAssertFalse(fileManager.fileExists(atPath: sqliteStore.fileURL.path.appending("-shm")))
+        }
+        catch {
+            
+            XCTFail()
+        }
+        do {
+            
+            let metadata = try createStore()
+            try sqliteStore.eraseStorageAndWait(metadata: metadata, soureModelHint: nil)
+            XCTAssertFalse(fileManager.fileExists(atPath: sqliteStore.fileURL.path))
+            XCTAssertFalse(fileManager.fileExists(atPath: sqliteStore.fileURL.path.appending("-wal")))
+            XCTAssertFalse(fileManager.fileExists(atPath: sqliteStore.fileURL.path.appending("-shm")))
+        }
+        catch {
+            
+            XCTFail()
+        }
+    }
+}

CoreStoreTests/StorageInterfaceTests.swift

@@ -0,0 +1,216 @@
+//
+//  StorageInterfaceTests.swift
+//  CoreStore
+//
+//  Copyright © 2016 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import XCTest
+
+@testable
+import CoreStore
+
+
+//MARK: - StorageInterfaceTests
+
+final class StorageInterfaceTests: XCTestCase {
+    
+    @objc
+    dynamic func test_ThatDefaultInMemoryStores_ConfigureCorrectly() {
+        
+        let store = InMemoryStore()
+        XCTAssertEqual(type(of: store).storeType, NSInMemoryStoreType)
+        XCTAssertNil(store.configuration)
+        XCTAssertNil(store.storeOptions)
+    }
+    
+    @objc
+    dynamic func test_ThatCustomInMemoryStores_ConfigureCorrectly() {
+        
+        let store = InMemoryStore(configuration: "config1")
+        XCTAssertEqual(type(of: store).storeType, NSInMemoryStoreType)
+        XCTAssertEqual(store.configuration, "config1")
+        XCTAssertNil(store.storeOptions)
+    }
+    
+    @objc
+    dynamic func test_ThatSQLiteStoreDefaultDirectories_AreCorrect() {
+        
+        #if os(tvOS)
+            let systemDirectorySearchPath = FileManager.SearchPathDirectory.cachesDirectory
+        #else
+            let systemDirectorySearchPath = FileManager.SearchPathDirectory.applicationSupportDirectory
+        #endif
+        
+        let defaultSystemDirectory = FileManager.default
+            .urls(for: systemDirectorySearchPath, in: .userDomainMask).first!
+        
+        let defaultRootDirectory = defaultSystemDirectory.appendingPathComponent(
+            Bundle.main.bundleIdentifier ?? "com.CoreStore.DataStack",
+            isDirectory: true
+        )
+        let applicationName = (Bundle.main.object(forInfoDictionaryKey: "CFBundleName") as? String) ?? "CoreData"
+        
+        let defaultFileURL = defaultRootDirectory
+            .appendingPathComponent(applicationName, isDirectory: false)
+            .appendingPathExtension("sqlite")
+        
+        XCTAssertEqual(SQLiteStore.defaultRootDirectory, defaultRootDirectory)
+        XCTAssertEqual(SQLiteStore.defaultFileURL, defaultFileURL)
+    }
+    
+    @objc
+    dynamic func test_ThatDefaultSQLiteStores_ConfigureCorrectly() {
+        
+        let store = SQLiteStore()
+        XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType)
+        XCTAssertNil(store.configuration)
+        XCTAssertEqual(store.storeOptions as NSDictionary?, [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary)
+        
+        XCTAssertEqual(store.fileURL, SQLiteStore.defaultFileURL)
+        XCTAssertEqual(store.mappingModelBundles, Bundle.allBundles)
+        XCTAssertEqual(store.localStorageOptions, .none)
+    }
+    
+    @objc
+    dynamic func test_ThatFileURLSQLiteStores_ConfigureCorrectly() {
+        
+        let fileURL = NSURL(fileURLWithPath: NSTemporaryDirectory())
+            .appendingPathComponent(NSUUID().uuidString, isDirectory: false)!
+            .appendingPathExtension("db")
+        let bundles = [Bundle(for: type(of: self))]
+        
+        let store = SQLiteStore(
+            fileURL: fileURL,
+            configuration: "config1",
+            mappingModelBundles: bundles,
+            localStorageOptions: .recreateStoreOnModelMismatch
+        )
+        XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType)
+        XCTAssertEqual(store.configuration, "config1")
+        XCTAssertEqual(store.storeOptions as NSDictionary?, [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary)
+        
+        XCTAssertEqual(store.fileURL, fileURL)
+        XCTAssertEqual(store.mappingModelBundles, bundles)
+        XCTAssertEqual(store.localStorageOptions, [.recreateStoreOnModelMismatch])
+    }
+    
+    @objc
+    dynamic func test_ThatFileNameSQLiteStores_ConfigureCorrectly() {
+        
+        let fileName = UUID().uuidString + ".db"
+        let bundles = [Bundle(for: type(of: self))]
+        
+        let store = SQLiteStore(
+            fileName: fileName,
+            configuration: "config1",
+            mappingModelBundles: bundles,
+            localStorageOptions: .recreateStoreOnModelMismatch
+        )
+        XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType)
+        XCTAssertEqual(store.configuration, "config1")
+        XCTAssertEqual(store.storeOptions as NSDictionary?, [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary)
+        
+        XCTAssertEqual(store.fileURL.deletingLastPathComponent(), SQLiteStore.defaultRootDirectory)
+        XCTAssertEqual(store.fileURL.lastPathComponent, fileName)
+        XCTAssertEqual(store.mappingModelBundles, bundles)
+        XCTAssertEqual(store.localStorageOptions, [.recreateStoreOnModelMismatch])
+    }
+    
+    @objc
+    dynamic func test_ThatLegacySQLiteStoreDefaultDirectories_AreCorrect() {
+        
+        #if os(tvOS)
+            let systemDirectorySearchPath = FileManager.SearchPathDirectory.cachesDirectory
+        #else
+            let systemDirectorySearchPath = FileManager.SearchPathDirectory.applicationSupportDirectory
+        #endif
+        
+        let legacyDefaultRootDirectory = FileManager.default.urls(
+            for: systemDirectorySearchPath,
+            in: .userDomainMask).first!
+        
+        let legacyDefaultFileURL = legacyDefaultRootDirectory
+            .appendingPathComponent(DataStack.applicationName, isDirectory: false)
+            .appendingPathExtension("sqlite")
+        
+        XCTAssertEqual(LegacySQLiteStore.defaultRootDirectory, legacyDefaultRootDirectory)
+        XCTAssertEqual(LegacySQLiteStore.defaultFileURL, legacyDefaultFileURL)
+    }
+    
+    @objc
+    dynamic func test_ThatDefaultLegacySQLiteStores_ConfigureCorrectly() {
+        
+        let store = LegacySQLiteStore()
+        XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType)
+        XCTAssertNil(store.configuration)
+        XCTAssertEqual(store.storeOptions as NSDictionary?, [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary)
+        
+        XCTAssertEqual(store.fileURL, LegacySQLiteStore.defaultFileURL)
+        XCTAssertEqual(store.mappingModelBundles, Bundle.allBundles)
+        XCTAssertEqual(store.localStorageOptions, .none)
+    }
+    
+    @objc
+    dynamic func test_ThatFileURLLegacySQLiteStores_ConfigureCorrectly() {
+        
+        let fileURL = NSURL(fileURLWithPath: NSTemporaryDirectory())
+            .appendingPathComponent(NSUUID().uuidString, isDirectory: false)!
+            .appendingPathExtension("db")
+        let bundles = [Bundle(for: type(of: self))]
+        
+        let store = LegacySQLiteStore(
+            fileURL: fileURL,
+            configuration: "config1",
+            mappingModelBundles: bundles,
+            localStorageOptions: .recreateStoreOnModelMismatch
+        )
+        XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType)
+        XCTAssertEqual(store.configuration, "config1")
+        XCTAssertEqual(store.storeOptions as NSDictionary?, [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary)
+        
+        XCTAssertEqual(store.fileURL, fileURL)
+        XCTAssertEqual(store.mappingModelBundles, bundles)
+        XCTAssertEqual(store.localStorageOptions, [.recreateStoreOnModelMismatch])
+    }
+    
+    @objc
+    dynamic func test_ThatFileNameLegacySQLiteStores_ConfigureCorrectly() {
+        
+        let fileName = UUID().uuidString + ".db"
+        let bundles = [Bundle(for: type(of: self))]
+        
+        let store = LegacySQLiteStore(
+            fileName: fileName,
+            configuration: "config1",
+            mappingModelBundles: bundles,
+            localStorageOptions: .recreateStoreOnModelMismatch
+        )
+        XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType)
+        XCTAssertEqual(store.configuration, "config1")
+        XCTAssertEqual(store.storeOptions as NSDictionary?, [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary)
+        
+        XCTAssertEqual(store.fileURL.deletingLastPathComponent(), LegacySQLiteStore.defaultRootDirectory)
+        XCTAssertEqual(store.fileURL.lastPathComponent, fileName)
+        XCTAssertEqual(store.mappingModelBundles, bundles)
+        XCTAssertEqual(store.localStorageOptions, [.recreateStoreOnModelMismatch])
+    }
+}

CoreStoreTests/TestEntities/TestEntity1.swift

@@ -31,5 +31,9 @@ class TestEntity1: NSManagedObject {
     @NSManaged var testEntityID: NSNumber?
     @NSManaged var testString: String?
     @NSManaged var testNumber: NSNumber?
-    @NSManaged var testDate: NSDate?
+    @NSManaged var testDate: Date?
+    @NSManaged var testBoolean: NSNumber?
+    @NSManaged var testDecimal: NSDecimalNumber?
+    @NSManaged var testData: Data?
+    @NSManaged var testNil: String?
 }

CoreStoreTests/TestEntities/TestEntity2.swift

@@ -31,7 +31,9 @@ class TestEntity2: NSManagedObject {
     @NSManaged var testEntityID: NSNumber?
     @NSManaged var testString: String?
     @NSManaged var testNumber: NSNumber?
-    @NSManaged var testDate: NSDate?
-    
-    var testProperty: NSNumber?
+    @NSManaged var testDate: Date?
+    @NSManaged var testBoolean: NSNumber?
+    @NSManaged var testDecimal: NSDecimalNumber?
+    @NSManaged var testData: Data?
+    @NSManaged var testNil: String?
 }

CoreStoreTests/TweakTests.swift

@@ -0,0 +1,53 @@
+//
+//  TweakTests.swift
+//  CoreStore
+//
+//  Copyright © 2016 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import XCTest
+
+@testable
+import CoreStore
+
+
+//MARK: - TweakTests
+
+final class TweakTests: XCTestCase {
+    
+    @objc
+    dynamic func test_ThatTweakClauses_ApplyToFetchRequestsCorrectly() {
+        
+        let predicate = NSPredicate(format: "%K == %@", "key", "value")
+        let tweak = Tweak {
+            
+            $0.fetchOffset = 100
+            $0.fetchLimit = 200
+            $0.predicate = predicate
+        }
+        let request = CoreStoreFetchRequest()
+        tweak.applyToFetchRequest(request)
+        XCTAssertEqual(request.fetchOffset, 100)
+        XCTAssertEqual(request.fetchLimit, 200)
+        XCTAssertNotNil(request.predicate)
+        XCTAssertEqual(request.predicate, predicate)
+    }
+}

CoreStoreTests/WhereTests.swift

@@ -0,0 +1,355 @@
+//
+//  WhereTests.swift
+//  CoreStore
+//
+//  Copyright © 2016 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import XCTest
+
+@testable
+import CoreStore
+
+
+//MARK: - WhereTests
+
+final class WhereTests: XCTestCase {
+    
+    @objc
+    dynamic func test_ThatWhereClauses_ConfigureCorrectly() {
+        
+        do {
+            
+            let whereClause = Where()
+            XCTAssertEqual(whereClause, Where(true))
+            XCTAssertNotEqual(whereClause, Where(false))
+            XCTAssertEqual(whereClause.predicate, NSPredicate(value: true))
+        }
+        do {
+            
+            let whereClause = Where(true)
+            XCTAssertEqual(whereClause, Where())
+            XCTAssertNotEqual(whereClause, Where(false))
+            XCTAssertEqual(whereClause.predicate, NSPredicate(value: true))
+        }
+        do {
+            
+            let predicate = NSPredicate(format: "%K == %@", "key", "value")
+            let whereClause = Where(predicate)
+            XCTAssertEqual(whereClause, Where(predicate))
+            XCTAssertEqual(whereClause.predicate, predicate)
+        }
+        do {
+            
+            let whereClause = Where("%K == %@", "key", "value")
+            let predicate = NSPredicate(format: "%K == %@", "key", "value")
+            XCTAssertEqual(whereClause, Where(predicate))
+            XCTAssertEqual(whereClause.predicate, predicate)
+        }
+        do {
+            
+            let whereClause = Where("%K == %@", argumentArray: ["key", "value"])
+            let predicate = NSPredicate(format: "%K == %@", "key", "value")
+            XCTAssertEqual(whereClause, Where(predicate))
+            XCTAssertEqual(whereClause.predicate, predicate)
+        }
+        do {
+            
+            let whereClause = Where("key", isEqualTo: "value")
+            let predicate = NSPredicate(format: "%K == %@", "key", "value")
+            XCTAssertEqual(whereClause, Where(predicate))
+            XCTAssertEqual(whereClause.predicate, predicate)
+        }
+        do {
+            
+            let whereClause = Where("key", isMemberOf: ["value1", "value2", "value3"])
+            let predicate = NSPredicate(format: "%K IN %@", "key", ["value1", "value2", "value3"])
+            XCTAssertEqual(whereClause, Where(predicate))
+            XCTAssertEqual(whereClause.predicate, predicate)
+        }
+    }
+    
+    @objc
+    dynamic func test_ThatWhereClauses_BridgeArgumentsCorrectly() {
+        
+        do {
+            
+            let value: Int = 100
+            let whereClause1 = Where("%K == %d", "key", value)
+            let whereClause2 = Where("%K == %d", "key", value as AnyObject)
+            let whereClause3 = Where("%K == %d", "key", NSNumber(value: value))
+            let whereClause4 = Where("%K == %@", "key", value)
+            let whereClause5 = Where("%K == %@", "key", value as AnyObject)
+            let whereClause6 = Where("%K == %@", "key", NSNumber(value: value))
+            XCTAssertEqual(whereClause1, whereClause2)
+            XCTAssertEqual(whereClause1, whereClause3)
+            XCTAssertEqual(whereClause1, whereClause4)
+            XCTAssertEqual(whereClause1, whereClause5)
+            XCTAssertEqual(whereClause1, whereClause6)
+            XCTAssertEqual(whereClause2, whereClause3)
+            XCTAssertEqual(whereClause2, whereClause4)
+            XCTAssertEqual(whereClause2, whereClause5)
+            XCTAssertEqual(whereClause2, whereClause6)
+            XCTAssertEqual(whereClause3, whereClause4)
+            XCTAssertEqual(whereClause3, whereClause5)
+            XCTAssertEqual(whereClause3, whereClause6)
+            XCTAssertEqual(whereClause4, whereClause5)
+            XCTAssertEqual(whereClause4, whereClause6)
+            XCTAssertEqual(whereClause5, whereClause6)
+        }
+        do {
+            
+            let value = NSNumber(value: 100)
+            let whereClause1 = Where("%K == %d", "key", value)
+            let whereClause2 = Where("%K == %d", "key", value as AnyObject)
+            let whereClause3 = Where("%K == %d", "key", value.intValue)
+            let whereClause4 = Where("%K == %@", "key", value)
+            let whereClause5 = Where("%K == %@", "key", value as AnyObject)
+            let whereClause6 = Where("%K == %@", "key", value.intValue)
+            XCTAssertEqual(whereClause1, whereClause2)
+            XCTAssertEqual(whereClause1, whereClause3)
+            XCTAssertEqual(whereClause1, whereClause4)
+            XCTAssertEqual(whereClause1, whereClause5)
+            XCTAssertEqual(whereClause1, whereClause6)
+            XCTAssertEqual(whereClause2, whereClause3)
+            XCTAssertEqual(whereClause2, whereClause4)
+            XCTAssertEqual(whereClause2, whereClause5)
+            XCTAssertEqual(whereClause2, whereClause6)
+            XCTAssertEqual(whereClause3, whereClause4)
+            XCTAssertEqual(whereClause3, whereClause5)
+            XCTAssertEqual(whereClause3, whereClause6)
+            XCTAssertEqual(whereClause4, whereClause5)
+            XCTAssertEqual(whereClause4, whereClause6)
+            XCTAssertEqual(whereClause5, whereClause6)
+        }
+        do {
+            
+            let value: Int64 = Int64.max
+            let whereClause1 = Where("%K == %d", "key", value)
+            let whereClause2 = Where("%K == %d", "key", value as AnyObject)
+            let whereClause3 = Where("%K == %d", "key", NSNumber(value: value))
+            let whereClause4 = Where("%K == %@", "key", value)
+            let whereClause5 = Where("%K == %@", "key", value as AnyObject)
+            let whereClause6 = Where("%K == %@", "key", NSNumber(value: value))
+            XCTAssertEqual(whereClause1, whereClause2)
+            XCTAssertEqual(whereClause1, whereClause3)
+            XCTAssertEqual(whereClause1, whereClause4)
+            XCTAssertEqual(whereClause1, whereClause5)
+            XCTAssertEqual(whereClause1, whereClause6)
+            XCTAssertEqual(whereClause2, whereClause3)
+            XCTAssertEqual(whereClause2, whereClause4)
+            XCTAssertEqual(whereClause2, whereClause5)
+            XCTAssertEqual(whereClause2, whereClause6)
+            XCTAssertEqual(whereClause3, whereClause4)
+            XCTAssertEqual(whereClause3, whereClause5)
+            XCTAssertEqual(whereClause3, whereClause6)
+            XCTAssertEqual(whereClause4, whereClause5)
+            XCTAssertEqual(whereClause4, whereClause6)
+            XCTAssertEqual(whereClause5, whereClause6)
+        }
+        do {
+            
+            let value = NSNumber(value: Int64.max)
+            let whereClause1 = Where("%K == %d", "key", value)
+            let whereClause2 = Where("%K == %d", "key", value as AnyObject)
+            let whereClause3 = Where("%K == %d", "key", value.int64Value)
+            let whereClause4 = Where("%K == %@", "key", value)
+            let whereClause5 = Where("%K == %@", "key", value as AnyObject)
+            let whereClause6 = Where("%K == %@", "key", value.int64Value)
+            XCTAssertEqual(whereClause1, whereClause2)
+            XCTAssertEqual(whereClause1, whereClause3)
+            XCTAssertEqual(whereClause1, whereClause4)
+            XCTAssertEqual(whereClause1, whereClause5)
+            XCTAssertEqual(whereClause1, whereClause6)
+            XCTAssertEqual(whereClause2, whereClause3)
+            XCTAssertEqual(whereClause2, whereClause4)
+            XCTAssertEqual(whereClause2, whereClause5)
+            XCTAssertEqual(whereClause2, whereClause6)
+            XCTAssertEqual(whereClause3, whereClause4)
+            XCTAssertEqual(whereClause3, whereClause5)
+            XCTAssertEqual(whereClause3, whereClause6)
+            XCTAssertEqual(whereClause4, whereClause5)
+            XCTAssertEqual(whereClause4, whereClause6)
+            XCTAssertEqual(whereClause5, whereClause6)
+        }
+        do {
+            
+            let value: String = "value"
+            let whereClause1 = Where("%K == %s", "key", value)
+            let whereClause2 = Where("%K == %s", "key", value as AnyObject)
+            let whereClause3 = Where("%K == %s", "key", NSString(string: value))
+            let whereClause4 = Where("%K == %@", "key", value)
+            let whereClause5 = Where("%K == %@", "key", value as AnyObject)
+            let whereClause6 = Where("%K == %@", "key", NSString(string: value))
+            XCTAssertEqual(whereClause1, whereClause2)
+            XCTAssertEqual(whereClause1, whereClause3)
+            XCTAssertEqual(whereClause1, whereClause4)
+            XCTAssertEqual(whereClause1, whereClause5)
+            XCTAssertEqual(whereClause1, whereClause6)
+            XCTAssertEqual(whereClause2, whereClause3)
+            XCTAssertEqual(whereClause2, whereClause4)
+            XCTAssertEqual(whereClause2, whereClause5)
+            XCTAssertEqual(whereClause2, whereClause6)
+            XCTAssertEqual(whereClause3, whereClause4)
+            XCTAssertEqual(whereClause3, whereClause5)
+            XCTAssertEqual(whereClause3, whereClause6)
+            XCTAssertEqual(whereClause4, whereClause5)
+            XCTAssertEqual(whereClause4, whereClause6)
+            XCTAssertEqual(whereClause5, whereClause6)
+        }
+        do {
+            
+            let value = NSString(string: "value")
+            let whereClause1 = Where("%K == %s", "key", value)
+            let whereClause2 = Where("%K == %s", "key", value as String)
+            let whereClause3 = Where("%K == %s", "key", value as String as AnyObject)
+            let whereClause4 = Where("%K == %@", "key", value)
+            let whereClause5 = Where("%K == %@", "key", value as String)
+            let whereClause6 = Where("%K == %@", "key", value as String as AnyObject)
+            XCTAssertEqual(whereClause1, whereClause2)
+            XCTAssertEqual(whereClause1, whereClause3)
+            XCTAssertEqual(whereClause1, whereClause4)
+            XCTAssertEqual(whereClause1, whereClause5)
+            XCTAssertEqual(whereClause1, whereClause6)
+            XCTAssertEqual(whereClause2, whereClause3)
+            XCTAssertEqual(whereClause2, whereClause4)
+            XCTAssertEqual(whereClause2, whereClause5)
+            XCTAssertEqual(whereClause2, whereClause6)
+            XCTAssertEqual(whereClause3, whereClause4)
+            XCTAssertEqual(whereClause3, whereClause5)
+            XCTAssertEqual(whereClause3, whereClause6)
+            XCTAssertEqual(whereClause4, whereClause5)
+            XCTAssertEqual(whereClause4, whereClause6)
+            XCTAssertEqual(whereClause5, whereClause6)
+        }
+        do {
+            
+            let value: [Int] = [100, 200]
+            let whereClause1 = Where("%K == %@", "key", value)
+            let whereClause2 = Where("%K == %@", "key", value as AnyObject)
+            let whereClause3 = Where("%K == %@", "key", value as [AnyObject])
+            let whereClause4 = Where("%K == %@", "key", value as NSArray)
+            let whereClause5 = Where("%K == %@", "key", NSArray(array: value))
+            let whereClause6 = Where("%K == %@", "key", value as AnyObject as! NSArray)
+            XCTAssertEqual(whereClause1, whereClause2)
+            XCTAssertEqual(whereClause1, whereClause3)
+            XCTAssertEqual(whereClause1, whereClause4)
+            XCTAssertEqual(whereClause1, whereClause5)
+            XCTAssertEqual(whereClause1, whereClause6)
+            XCTAssertEqual(whereClause2, whereClause3)
+            XCTAssertEqual(whereClause2, whereClause4)
+            XCTAssertEqual(whereClause2, whereClause5)
+            XCTAssertEqual(whereClause2, whereClause6)
+            XCTAssertEqual(whereClause3, whereClause4)
+            XCTAssertEqual(whereClause3, whereClause5)
+            XCTAssertEqual(whereClause3, whereClause6)
+            XCTAssertEqual(whereClause4, whereClause5)
+            XCTAssertEqual(whereClause4, whereClause6)
+            XCTAssertEqual(whereClause5, whereClause6)
+        }
+        do {
+            
+            let value: [Int64] = [Int64.min, 100, Int64.max]
+            let whereClause1 = Where("%K == %@", "key", value)
+            let whereClause2 = Where("%K == %@", "key", value as AnyObject)
+            let whereClause3 = Where("%K == %@", "key", value as [AnyObject])
+            let whereClause4 = Where("%K == %@", "key", value as NSArray)
+            let whereClause5 = Where("%K == %@", "key", NSArray(array: value))
+            let whereClause6 = Where("%K == %@", "key", value as AnyObject as! NSArray)
+            XCTAssertEqual(whereClause1, whereClause2)
+            XCTAssertEqual(whereClause1, whereClause3)
+            XCTAssertEqual(whereClause1, whereClause4)
+            XCTAssertEqual(whereClause1, whereClause5)
+            XCTAssertEqual(whereClause1, whereClause6)
+            XCTAssertEqual(whereClause2, whereClause3)
+            XCTAssertEqual(whereClause2, whereClause4)
+            XCTAssertEqual(whereClause2, whereClause5)
+            XCTAssertEqual(whereClause2, whereClause6)
+            XCTAssertEqual(whereClause3, whereClause4)
+            XCTAssertEqual(whereClause3, whereClause5)
+            XCTAssertEqual(whereClause3, whereClause6)
+            XCTAssertEqual(whereClause4, whereClause5)
+            XCTAssertEqual(whereClause4, whereClause6)
+            XCTAssertEqual(whereClause5, whereClause6)
+        }
+    }
+    
+    @objc
+    dynamic func test_ThatWhereClauseOperations_ComputeCorrectly() {
+        
+        let whereClause1 = Where("key1", isEqualTo: "value1")
+        let whereClause2 = Where("key2", isEqualTo: "value2")
+        let whereClause3 = Where("key3", isEqualTo: "value3")
+        
+        do {
+            
+            let notWhere = !whereClause1
+            let notPredicate = NSCompoundPredicate(
+                type: .not,
+                subpredicates: [whereClause1.predicate]
+            )
+            XCTAssertEqual(notWhere.predicate, notPredicate)
+            XCTAssertEqual(notWhere, !whereClause1)
+        }
+        do {
+            
+            let andWhere = whereClause1 && whereClause2 && whereClause3
+            let andPredicate = NSCompoundPredicate(
+                type: .and,
+                subpredicates: [
+                    NSCompoundPredicate(
+                        type: .and,
+                        subpredicates: [whereClause1.predicate, whereClause2.predicate]
+                    ),
+                    whereClause3.predicate
+                ]
+            )
+            XCTAssertEqual(andWhere.predicate, andPredicate)
+            XCTAssertEqual(andWhere, whereClause1 && whereClause2 && whereClause3)
+        }
+        do {
+            
+            let orWhere = whereClause1 || whereClause2 || whereClause3
+            let orPredicate = NSCompoundPredicate(
+                type: .or,
+                subpredicates: [
+                    NSCompoundPredicate(
+                        type: .or,
+                        subpredicates: [whereClause1.predicate, whereClause2.predicate]
+                    ),
+                    whereClause3.predicate
+                ]
+            )
+            XCTAssertEqual(orWhere.predicate, orPredicate)
+            XCTAssertEqual(orWhere, whereClause1 || whereClause2 || whereClause3)
+        }
+    }
+    
+    @objc
+    dynamic func test_ThatWhereClauses_ApplyToFetchRequestsCorrectly() {
+        
+        let whereClause = Where("key", isEqualTo: "value")
+        let request = CoreStoreFetchRequest()
+        whereClause.applyToFetchRequest(request)
+        XCTAssertNotNil(request.predicate)
+        XCTAssertEqual(request.predicate, whereClause.predicate)
+    }
+}

Package.swift

@@ -25,6 +25,21 @@
 
 import PackageDescription
 
+let targets: [Target]
+#if os(iOS)
+targets = [Target(name: "CoreStore iOS")]
+#elseif os(OSX)
+targets = [Target(name: "CoreStore OSX")]
+#elseif os(watchOS)
+targets = [Target(name: "CoreStore watchOS")]
+#elseif os(tvOS)
+targets = [Target(name: "CoreStore tvOS")]
+#else
+targets = []
+#endif
+
 let package = Package(
-    name: "CoreStore"
+    name: "CoreStore",
+    targets: targets,
+    exclude: ["Carthage", "CoreStoreDemo", "Sources/libA/images"]
 )

Sources/Convenience/NSFetchedResultsController+Convenience.swift

@@ -0,0 +1,222 @@
+//
+//  NSManagedObject+Convenience.swift
+//  CoreStore
+//
+//  Copyright © 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 os(iOS) || os(watchOS) || os(tvOS)
+
+// MARK: - DataStack
+
+public extension DataStack {
+    
+    /**
+     Utility for creating an `NSFetchedResultsController` from the `DataStack`. This is useful when an `NSFetchedResultsController` is preferred over the overhead of `ListMonitor`s abstraction.
+     - Note: It is the caller's responsibility to call `performFetch()` on the created `NSFetchedResultsController`.
+     
+     - 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.
+     - returns: an `NSFetchedResultsController` that observes the `DataStack`
+     */
+    @nonobjc
+    public func createFetchedResultsController<T: NSManagedObject>(_ from: From<T>, _ sectionBy: SectionBy, _ fetchClauses: FetchClause...) -> NSFetchedResultsController<T> {
+        
+        return createFRC(
+            fromContext: self.mainContext,
+            from: from,
+            sectionBy: sectionBy,
+            fetchClauses: fetchClauses
+        )
+    }
+    
+    /**
+     Utility for creating an `NSFetchedResultsController` from a `DataStack`. This is useful when an `NSFetchedResultsController` is preferred over the overhead of `ListMonitor`s abstraction.
+     - Note: It is the caller's responsibility to call `performFetch()` on the created `NSFetchedResultsController`.
+     
+     - 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.
+     - returns: an `NSFetchedResultsController` that observes the `DataStack`
+     */
+    @nonobjc
+    public func createFetchedResultsController<T: NSManagedObject>(_ from: From<T>, _ sectionBy: SectionBy, _ fetchClauses: [FetchClause]) -> NSFetchedResultsController<T> {
+        
+        return createFRC(
+            fromContext: self.mainContext,
+            from: from,
+            sectionBy: sectionBy,
+            fetchClauses: fetchClauses
+        )
+    }
+    
+    /**
+     Utility for creating an `NSFetchedResultsController` from the `DataStack`. This is useful when an `NSFetchedResultsController` is preferred over the overhead of `ListMonitor`s abstraction.
+     - Note: It is the caller's responsibility to call `performFetch()` on the created `NSFetchedResultsController`.
+     
+     - 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: an `NSFetchedResultsController` that observes the `DataStack`
+     */
+    @nonobjc
+    public func createFetchedResultsController<T: NSManagedObject>(_ from: From<T>, _ fetchClauses: FetchClause...) -> NSFetchedResultsController<T> {
+        
+        return createFRC(
+            fromContext: self.mainContext,
+            from: from,
+            sectionBy: nil,
+            fetchClauses: fetchClauses
+        )
+    }
+    
+    /**
+     Utility for creating an `NSFetchedResultsController` from the `DataStack`. This is useful when an `NSFetchedResultsController` is preferred over the overhead of `ListMonitor`s abstraction.
+     - Note: It is the caller's responsibility to call `performFetch()` on the created `NSFetchedResultsController`.
+     
+     - 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: an `NSFetchedResultsController` that observes the `DataStack`
+     */
+    @nonobjc
+    public func createFetchedResultsController<T: NSManagedObject>(forDataStack dataStack: DataStack, _ from: From<T>, _ fetchClauses: [FetchClause]) -> NSFetchedResultsController<T> {
+        
+        return createFRC(
+            fromContext: self.mainContext,
+            from: from,
+            sectionBy: nil,
+            fetchClauses: fetchClauses
+        )
+    }
+}
+
+
+// MARK: - UnsafeDataTransaction
+
+public extension UnsafeDataTransaction {
+    
+    /**
+     Utility for creating an `NSFetchedResultsController` from the `UnsafeDataTransaction`. This is useful when an `NSFetchedResultsController` is preferred over the overhead of `ListMonitor`s abstraction.
+     - Note: It is the caller's responsibility to call `performFetch()` on the created `NSFetchedResultsController`.
+     
+     - 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.
+     - returns: an `NSFetchedResultsController` that observes the `UnsafeDataTransaction`
+     */
+    @nonobjc
+    public func createFetchedResultsController<T: NSManagedObject>(_ from: From<T>, _ sectionBy: SectionBy, _ fetchClauses: FetchClause...) -> NSFetchedResultsController<T> {
+        
+        return createFRC(
+            fromContext: self.context,
+            from: from,
+            sectionBy: sectionBy,
+            fetchClauses: fetchClauses
+        )
+    }
+    
+    /**
+     Utility for creating an `NSFetchedResultsController` from the `UnsafeDataTransaction`. This is useful when an `NSFetchedResultsController` is preferred over the overhead of `ListMonitor`s abstraction.
+     - Note: It is the caller's responsibility to call `performFetch()` on the created `NSFetchedResultsController`.
+     
+     - 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.
+     - returns: an `NSFetchedResultsController` that observes the `UnsafeDataTransaction`
+     */
+    @nonobjc
+    public func createFetchedResultsController<T: NSManagedObject>(_ from: From<T>, _ sectionBy: SectionBy, _ fetchClauses: [FetchClause]) -> NSFetchedResultsController<T> {
+        
+        return createFRC(
+            fromContext: self.context,
+            from: from,
+            sectionBy: sectionBy,
+            fetchClauses: fetchClauses
+        )
+    }
+    
+    /**
+     Utility for creating an `NSFetchedResultsController` from the `UnsafeDataTransaction`. This is useful when an `NSFetchedResultsController` is preferred over the overhead of `ListMonitor`s abstraction.
+     - Note: It is the caller's responsibility to call `performFetch()` on the created `NSFetchedResultsController`.
+     
+     - 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: an `NSFetchedResultsController` that observes the `UnsafeDataTransaction`
+     */
+    @nonobjc
+    public func createFetchedResultsController<T: NSManagedObject>(_ from: From<T>, _ fetchClauses: FetchClause...) -> NSFetchedResultsController<T> {
+        
+        return createFRC(
+            fromContext: self.context,
+            from: from,
+            sectionBy: nil,
+            fetchClauses: fetchClauses
+        )
+    }
+    
+    /**
+     Utility for creating an `NSFetchedResultsController` from the `UnsafeDataTransaction`. This is useful when an `NSFetchedResultsController` is preferred over the overhead of `ListMonitor`s abstraction.
+     - Note: It is the caller's responsibility to call `performFetch()` on the created `NSFetchedResultsController`.
+     
+     - 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: an `NSFetchedResultsController` that observes the `UnsafeDataTransaction`
+     */
+    @nonobjc
+    public func createFetchedResultsController<T: NSManagedObject>(_ from: From<T>, _ fetchClauses: [FetchClause]) -> NSFetchedResultsController<T> {
+        
+        return createFRC(
+            fromContext: self.context,
+            from: from,
+            sectionBy: nil,
+            fetchClauses: fetchClauses
+        )
+    }
+}
+
+
+
+// MARK: - Private
+
+fileprivate func createFRC<T: NSManagedObject>(fromContext context: NSManagedObjectContext, from: From<T>? = nil, sectionBy: SectionBy? = nil, fetchClauses: [FetchClause]) -> NSFetchedResultsController<T> {
+    
+    let controller = CoreStoreFetchedResultsController(
+        context: context,
+        fetchRequest: CoreStoreFetchRequest().dynamicCast(),
+        from: from,
+        sectionBy: sectionBy,
+        applyFetchClauses: { (fetchRequest) in
+            
+            fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest as! NSFetchRequest<NSFetchRequestResult>) }
+            
+            CoreStore.assert(
+                fetchRequest.sortDescriptors?.isEmpty == false,
+                "An \(cs_typeName(NSFetchedResultsController<NSManagedObject>.self)) requires a sort information. Specify from a \(cs_typeName(OrderBy.self)) clause or any custom \(cs_typeName(FetchClause.self)) that provides a sort descriptor."
+            )
+        }
+    )
+    return controller.dynamicCast()
+}
+    
+#endif

Sources/Convenience/NSManagedObject+Convenience.swift

@@ -0,0 +1,170 @@
+//
+//  NSManagedObject+Convenience.swift
+//  CoreStore
+//
+//  Copyright © 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: - NSManagedObject
+
+public extension NSManagedObject {
+    
+    /**
+     Exposes a `FetchableSource` that can fetch sibling objects of this `NSManagedObject` instance. This may be the `DataStack`, a `BaseDataTransaction`, the `NSManagedObjectContext` itself, or `nil` if the obejct's parent is already deallocated.
+     - Warning: Future implementations may change the instance returned by this method depending on the timing or condition that `fetchSource()` was called. Do not make assumptions that the instance will be a specific instance. If the `NSManagedObjectContext` instance is desired, use the `FetchableSource.internalContext()` method to get the correct instance. Also, do not assume that the `fetchSource()` and `querySource()` return the same instance all the time.
+     - returns: a `FetchableSource` that can fetch sibling objects of this `NSManagedObject` instance. This may be the `DataStack`, a `BaseDataTransaction`, the `NSManagedObjectContext` itself, or `nil` if the object's parent is already deallocated.
+     */
+    @nonobjc
+    public func fetchSource() -> FetchableSource? {
+        
+        guard let context = self.managedObjectContext else {
+            
+            return nil
+        }
+        if context.isTransactionContext {
+            
+            return context.parentTransaction
+        }
+        if context.isDataStackContext {
+            
+            return context.parentStack
+        }
+        return context
+    }
+    
+    /**
+     Exposes a `QueryableSource` that can query attributes and aggregate values. This may be the `DataStack`, a `BaseDataTransaction`, the `NSManagedObjectContext` itself, or `nil` if the obejct's parent is already deallocated.
+     - Warning: Future implementations may change the instance returned by this method depending on the timing or condition that `querySource()` was called. Do not make assumptions that the instance will be a specific instance. If the `NSManagedObjectContext` instance is desired, use the `QueryableSource.internalContext()` method to get the correct instance. Also, do not assume that the `fetchSource()` and `querySource()` return the same instance all the time.
+     - returns: a `QueryableSource` that can query attributes and aggregate values. This may be the `DataStack`, a `BaseDataTransaction`, the `NSManagedObjectContext` itself, or `nil` if the object's parent is already deallocated.
+     */
+    @nonobjc
+    public func querySource() -> QueryableSource? {
+        
+        guard let context = self.managedObjectContext else {
+            
+            return nil
+        }
+        if context.isTransactionContext {
+            
+            return context.parentTransaction
+        }
+        if context.isDataStackContext {
+            
+            return context.parentStack
+        }
+        return context
+    }
+    
+    /**
+     Provides a convenience wrapper for accessing `primitiveValueForKey(...)` with proper calls to `willAccessValueForKey(...)` and `didAccessValueForKey(...)`. This is useful when implementing accessor methods for transient attributes.
+     
+     - parameter KVCKey: the KVC key
+     - returns: the primitive value for the KVC key
+     */
+    @nonobjc
+    public func accessValueForKVCKey(_ KVCKey: KeyPath) -> Any? {
+        
+        self.willAccessValue(forKey: KVCKey)
+        defer {
+            
+            self.didAccessValue(forKey: KVCKey)
+        }
+        return self.primitiveValue(forKey: KVCKey)
+    }
+    
+    /**
+     Provides a convenience wrapper for accessing `primitiveValueForKey(...)` with proper calls to `willAccessValueForKey(...)` and `didAccessValueForKey(...)`. This is useful when implementing accessor methods for transient attributes.
+     
+     - parameter KVCKey: the KVC key
+     - parameter didAccessPrimitiveValue: the closure to access the value. This is called between `willAccessValueForKey(...)` and `didAccessValueForKey(...)`
+     - returns: the primitive value for the KVC key
+     */
+    @discardableResult
+    @nonobjc
+    public func accessValueForKVCKey<T>(_ KVCKey: KeyPath, _ didAccessPrimitiveValue: (Any?) throws -> T) rethrows -> T {
+        
+        self.willAccessValue(forKey: KVCKey)
+        defer {
+            
+            self.didAccessValue(forKey: KVCKey)
+        }
+        return try didAccessPrimitiveValue(self.primitiveValue(forKey: KVCKey))
+    }
+    
+    /**
+     Provides a convenience wrapper for setting `setPrimitiveValue(...)` with proper calls to `willChangeValueForKey(...)` and `didChangeValueForKey(...)`. This is useful when implementing mutator methods for transient attributes.
+     
+     - parameter value: the value to set the KVC key with
+     - parameter KVCKey: the KVC key
+     */
+    @nonobjc
+    public func setValue(_ value: Any?, forKVCKey KVCKey: KeyPath) {
+        
+        self.willChangeValue(forKey: KVCKey)
+        defer {
+            
+            self.didChangeValue(forKey: KVCKey)
+        }
+        self.setPrimitiveValue(value, forKey: KVCKey)
+    }
+    
+    /**
+     Provides a convenience wrapper for setting `setPrimitiveValue(...)` with proper calls to `willChangeValueForKey(...)` and `didChangeValueForKey(...)`. This is useful when implementing mutator methods for transient attributes.
+     
+     - parameter value: the value to set the KVC key with
+     - parameter KVCKey: the KVC key
+     - parameter didSetPrimitiveValue: the closure called between `willChangeValueForKey(...)` and `didChangeValueForKey(...)`
+     */
+    @discardableResult
+    @nonobjc
+    public func setValue<T>(_ value: Any?, forKVCKey KVCKey: KeyPath, _ didSetPrimitiveValue: (Any?) throws -> T) rethrows -> T {
+        
+        self.willChangeValue(forKey: KVCKey)
+        defer {
+            
+            self.didChangeValue(forKey: KVCKey)
+        }
+        self.setPrimitiveValue(value, forKey: KVCKey)
+        return try didSetPrimitiveValue(value)
+    }
+    
+    /**
+     Re-faults the object to use the latest values from the persistent store
+     */
+    @nonobjc
+    public func refreshAsFault() {
+        
+        self.managedObjectContext?.refresh(self, mergeChanges: false)
+    }
+    
+    /**
+     Re-faults the object to use the latest values from the persistent store and merges previously pending changes back
+     */
+    @nonobjc
+    public func refreshAndMerge() {
+        
+        self.managedObjectContext?.refresh(self, mergeChanges: true)
+    }
+}

Sources/Convenience/Progress+Convenience.swift

@@ -1,5 +1,5 @@
 //
-//  NSProgress+Convenience.swift
+//  Progress+Convenience.swift
 //  CoreStore
 //
 //  Copyright © 2015 John Rommel Estropia
@@ -24,20 +24,19 @@
 //
 
 import Foundation
-#if USE_FRAMEWORKS
-    import GCDKit
-#endif
 
 
-// MARK: - NSProgress
+// MARK: - Progress
 
-public extension NSProgress {
+public extension Progress {
     
     /**
-     Sets a closure that the `NSProgress` calls whenever its `fractionCompleted` changes. You can use this instead of setting up KVO.
+     Sets a closure that the `Progress` calls whenever its `fractionCompleted` changes. You can use this instead of setting up KVO.
+     
      - parameter closure: the closure to execute on progress change
      */
-    public func setProgressHandler(closure: ((progress: NSProgress) -> Void)?) {
+    @nonobjc
+    public func setProgressHandler(_ closure: ((_ progress: Progress) -> Void)?) {
         
         self.progressObserver.progressHandler = closure
     }
@@ -50,18 +49,19 @@ public extension NSProgress {
         static var progressObserver: Void?
     }
     
+    @nonobjc
     private var progressObserver: ProgressObserver {
         
         get {
             
-            let object: ProgressObserver? = getAssociatedObjectForKey(&PropertyKeys.progressObserver, inObject: self)
+            let object: ProgressObserver? = cs_getAssociatedObjectForKey(&PropertyKeys.progressObserver, inObject: self)
             if let observer = object {
                 
                 return observer
             }
             
             let observer = ProgressObserver(self)
-            setAssociatedRetainedObject(
+            cs_setAssociatedRetainedObject(
                 observer,
                 forKey: &PropertyKeys.progressObserver,
                 inObject: self
@@ -73,10 +73,14 @@ public extension NSProgress {
 }
 
 
-@objc private final class ProgressObserver: NSObject {
+// MARK: - ProgressObserver
+
+@objc
+private final class ProgressObserver: NSObject {
     
-    private unowned let progress: NSProgress
-    private var progressHandler: ((progress: NSProgress) -> Void)? {
+    private unowned let progress: Progress
+    
+    fileprivate var progressHandler: ((_ progress: Progress) -> Void)? {
         
         didSet {
             
@@ -90,19 +94,19 @@ public extension NSProgress {
                 
                 self.progress.addObserver(
                     self,
-                    forKeyPath: "fractionCompleted",
-                    options: [.Initial, .New],
+                    forKeyPath: #keyPath(Progress.fractionCompleted),
+                    options: [.initial, .new],
                     context: nil
                 )
             }
             else {
                 
-                self.progress.removeObserver(self, forKeyPath: "fractionCompleted")
+                self.progress.removeObserver(self, forKeyPath: #keyPath(Progress.fractionCompleted))
             }
         }
     }
     
-    private init(_ progress: NSProgress) {
+    fileprivate init(_ progress: Progress) {
         
         self.progress = progress
         super.init()
@@ -113,20 +117,22 @@ public extension NSProgress {
         if let _ = self.progressHandler {
             
             self.progressHandler = nil
-            self.progress.removeObserver(self, forKeyPath: "fractionCompleted")
+            self.progress.removeObserver(self, forKeyPath: #keyPath(Progress.fractionCompleted))
         }
     }
     
-    override func observeValueForKeyPath(keyPath: String?, ofObject object: AnyObject?, change: [String : AnyObject]?, context: UnsafeMutablePointer<Void>) {
+    override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
         
-        guard let progress = object as? NSProgress where progress == self.progress && keyPath == "fractionCompleted" else {
-            
-            return
+        guard let progress = object as? Progress,
+            progress == self.progress,
+            keyPath == #keyPath(Progress.fractionCompleted) else {
+                
+                return
         }
         
-        GCDQueue.Main.async { [weak self] () -> Void in
+        DispatchQueue.main.async { [weak self] () -> Void in
             
-            self?.progressHandler?(progress: progress)
+            self?.progressHandler?(progress)
         }
     }
 }

Sources/CoreStore.h

@@ -28,3 +28,5 @@
 
 FOUNDATION_EXPORT double CoreStoreVersionNumber;
 FOUNDATION_EXPORT const unsigned char CoreStoreVersionString[];
+
+#import "CoreStoreBridge.h"

Sources/CoreStore.swift

@@ -24,9 +24,6 @@
 //
 
 import CoreData
-#if USE_FRAMEWORKS
-    import GCDKit
-#endif
 
 
 // MARK: - CoreStore
@@ -38,17 +35,17 @@ public enum CoreStore {
     
     /**
      The default `DataStack` instance to be used. If `defaultStack` is not set before the first time accessed, a default-configured `DataStack` will be created.
-     
-     Changing the `defaultStack` is thread safe, but it is recommended to setup `DataStacks` on a common queue (e.g. the main queue).
+     - SeeAlso: `DataStack`
+     - Note: Changing the `defaultStack` is thread safe, but it is recommended to setup `DataStacks` on a common queue (e.g. the main queue).
      */
     public static var defaultStack: DataStack {
         
         get {
         
-            self.defaultStackBarrierQueue.barrierSync {
-        
+            self.defaultStackBarrierQueue.sync(flags: .barrier) {
+                
                 if self.defaultStackInstance == nil {
-        
+                    
                     self.defaultStackInstance = DataStack()
                 }
             }
@@ -56,7 +53,7 @@ public enum CoreStore {
         }
         set {
             
-            self.defaultStackBarrierQueue.barrierAsync {
+            self.defaultStackBarrierQueue.async(flags: .barrier) {
                 
                 self.defaultStackInstance = newValue
             }
@@ -66,7 +63,7 @@ public enum CoreStore {
     
     // MARK: Private
     
-    private static let defaultStackBarrierQueue = GCDQueue.createConcurrent("com.coreStore.defaultStackBarrierQueue")
+    private static let defaultStackBarrierQueue = DispatchQueue.concurrent("com.coreStore.defaultStackBarrierQueue")
     
     private static var defaultStackInstance: DataStack?
 }

Sources/CoreStoreError.swift

@@ -0,0 +1,241 @@
+//
+//  CoreStoreError.swift
+//  CoreStore
+//
+//  Copyright © 2014 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import Foundation
+import CoreData
+
+
+// MARK: - CoreStoreError
+
+/**
+ All errors thrown from CoreStore are expressed in `CoreStoreError` enum values.
+ */
+public enum CoreStoreError: Error, CustomNSError, Hashable {
+    
+    /**
+     A failure occured because of an unknown error.
+     */
+    case unknown
+    
+    /**
+     The `NSPersistentStore` could not be initialized because another store existed at the specified `NSURL`.
+     */
+    case differentStorageExistsAtURL(existingPersistentStoreURL: URL)
+    
+    /**
+     An `NSMappingModel` could not be found for a specific source and destination model versions.
+     */
+    case mappingModelNotFound(localStoreURL: URL, targetModel: NSManagedObjectModel, targetModelVersion: String)
+    
+    /**
+     Progressive migrations are disabled for a store, but an `NSMappingModel` could not be found for a specific source and destination model versions.
+     */
+    case progressiveMigrationRequired(localStoreURL: URL)
+    
+    /**
+     An internal SDK call failed with the specified `NSError`.
+     */
+    case internalError(NSError: NSError)
+    
+    
+    // MARK: CustomNSError
+    
+    public static var errorDomain: String {
+        
+        return CoreStoreErrorDomain
+    }
+    
+    public var errorCode: Int {
+    
+        switch self {
+            
+        case .unknown:
+            return CoreStoreErrorCode.unknownError.rawValue
+            
+        case .differentStorageExistsAtURL:
+            return CoreStoreErrorCode.differentStorageExistsAtURL.rawValue
+            
+        case .mappingModelNotFound:
+            return CoreStoreErrorCode.mappingModelNotFound.rawValue
+            
+        case .progressiveMigrationRequired:
+            return CoreStoreErrorCode.progressiveMigrationRequired.rawValue
+            
+        case .internalError:
+            return CoreStoreErrorCode.internalError.rawValue
+        }
+    }
+    
+    public var errorUserInfo: [String : Any] {
+        
+        switch self {
+            
+        case .unknown:
+            return [:]
+            
+        case .differentStorageExistsAtURL(let existingPersistentStoreURL):
+            return [
+                "existingPersistentStoreURL": existingPersistentStoreURL
+            ]
+            
+        case .mappingModelNotFound(let localStoreURL, let targetModel, let targetModelVersion):
+            return [
+                "localStoreURL": localStoreURL,
+                "targetModel": targetModel,
+                "targetModelVersion": targetModelVersion
+            ]
+            
+        case .progressiveMigrationRequired(let localStoreURL):
+            return [
+                "localStoreURL": localStoreURL
+            ]
+            
+        case .internalError(let NSError):
+            return [
+                "NSError": NSError
+            ]
+        }
+    }
+    
+    
+    // MARK: Equatable
+    
+    public static func == (lhs: CoreStoreError, rhs: CoreStoreError) -> Bool {
+        
+        switch (lhs, rhs) {
+            
+        case (.unknown, .unknown):
+            return true
+            
+        case (.differentStorageExistsAtURL(let url1), .differentStorageExistsAtURL(let url2)):
+            return url1 == url2
+            
+        case (.mappingModelNotFound(let url1, let model1, let version1), .mappingModelNotFound(let url2, let model2, let version2)):
+            return url1 == url2 && model1 == model2 && version1 == version2
+            
+        case (.progressiveMigrationRequired(let url1), .progressiveMigrationRequired(let url2)):
+            return url1 == url2
+            
+        case (.internalError(let NSError1), .internalError(let NSError2)):
+            return NSError1 == NSError2
+            
+        default:
+            return false
+        }
+    }
+    
+    
+    // MARK: Hashable
+    
+    public var hashValue: Int {
+        
+        let code = self._code
+        switch self {
+            
+        case .unknown:
+            return code.hashValue
+            
+        case .differentStorageExistsAtURL(let existingPersistentStoreURL):
+            return code.hashValue ^ existingPersistentStoreURL.hashValue
+            
+        case .mappingModelNotFound(let localStoreURL, let targetModel, let targetModelVersion):
+            return code.hashValue ^ localStoreURL.hashValue ^ targetModel.hashValue ^ targetModelVersion.hashValue
+            
+        case .progressiveMigrationRequired(let localStoreURL):
+            return code.hashValue ^ localStoreURL.hashValue
+            
+        case .internalError(let NSError):
+            return code.hashValue ^ NSError.hashValue
+        }
+    }
+    
+    
+    // MARK: Internal
+    
+    internal init(_ error: Error?) {
+        
+        self = error.flatMap { $0.bridgeToSwift } ?? .unknown
+    }
+}
+
+
+// MARK: - CoreStoreErrorDomain
+
+/**
+ The `NSError` error domain string for `CSError`.
+ */
+@nonobjc
+public let CoreStoreErrorDomain = "com.corestore.error"
+
+
+// MARK: - CoreStoreErrorCode
+
+/**
+ The `NSError` error codes for `CoreStoreErrorDomain`.
+ */
+public enum CoreStoreErrorCode: Int {
+    
+    /**
+     A failure occured because of an unknown error.
+     */
+    case unknownError
+    
+    /**
+     The `NSPersistentStore` could note be initialized because another store existed at the specified `NSURL`.
+     */
+    case differentStorageExistsAtURL
+    
+    /**
+     An `NSMappingModel` could not be found for a specific source and destination model versions.
+     */
+    case mappingModelNotFound
+    
+    /**
+     Progressive migrations are disabled for a store, but an `NSMappingModel` could not be found for a specific source and destination model versions.
+     */
+    case progressiveMigrationRequired
+    
+    /**
+     An internal SDK call failed with the specified "NSError" userInfo key.
+     */
+    case internalError
+}
+
+
+// MARK: - NSError
+
+public extension NSError {
+    
+    // MARK: Internal
+    
+    internal var isCoreDataMigrationError: Bool {
+        
+        let code = self.code
+        return (code == NSPersistentStoreIncompatibleVersionHashError
+            || code == NSMigrationMissingSourceModelError
+            || code == NSMigrationError)
+            && self.domain == NSCocoaErrorDomain
+    }
+}

Sources/Fetching and Querying/BaseDataTransaction+Querying.swift

@@ -29,7 +29,46 @@ import CoreData
 
 // MARK: - DataTransaction
 
-public extension BaseDataTransaction {
+extension BaseDataTransaction: FetchableSource, QueryableSource {
+    
+    /**
+     Deletes all `NSManagedObject`s that satisfy the specified `DeleteClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter deleteClauses: a series of `DeleteClause` instances for the delete request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: the number of `NSManagedObject`s deleted
+     */
+    @discardableResult
+    public func deleteAll<T: NSManagedObject>(_ from: From<T>, _ deleteClauses: DeleteClause...) -> Int? {
+        
+        CoreStore.assert(
+            self.isRunningInAllowedQueue(),
+            "Attempted to delete from a \(cs_typeName(self)) outside its designated queue."
+        )
+        
+        return self.context.deleteAll(from, deleteClauses)
+    }
+    
+    /**
+     Deletes all `NSManagedObject`s that satisfy the specified `DeleteClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter deleteClauses: a series of `DeleteClause` instances for the delete request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: the number of `NSManagedObject`s deleted
+     */
+    @discardableResult
+    public func deleteAll<T: NSManagedObject>(_ from: From<T>, _ deleteClauses: [DeleteClause]) -> Int? {
+        
+        CoreStore.assert(
+            self.isRunningInAllowedQueue(),
+            "Attempted to delete from a \(cs_typeName(self)) outside its designated queue."
+        )
+        
+        return self.context.deleteAll(from, deleteClauses)
+    }
+    
+    
+    // MARK: FetchableSource
     
     /**
      Fetches the `NSManagedObject` instance in the transaction's context from a reference created from a transaction or from a different managed object context.
@@ -37,17 +76,9 @@ public extension BaseDataTransaction {
      - parameter object: a reference to the object created/fetched outside the transaction
      - returns: the `NSManagedObject` instance if the object exists in the transaction, or `nil` if not found.
      */
-    @warn_unused_result
-    public func fetchExisting<T: NSManagedObject>(object: T) -> T? {
+    public func fetchExisting<T: NSManagedObject>(_ object: T) -> T? {
         
-        do {
-            
-            return (try self.context.existingObjectWithID(object.objectID) as! T)
-        }
-        catch _ {
-            
-            return nil
-        }
+        return self.context.fetchExisting(object)
     }
     
     /**
@@ -56,17 +87,9 @@ public extension BaseDataTransaction {
      - parameter objectID: the `NSManagedObjectID` for the object
      - returns: the `NSManagedObject` instance if the object exists in the transaction, or `nil` if not found.
      */
-    @warn_unused_result
-    public func fetchExisting<T: NSManagedObject>(objectID: NSManagedObjectID) -> T? {
+    public func fetchExisting<T: NSManagedObject>(_ objectID: NSManagedObjectID) -> T? {
         
-        do {
-            
-            return (try self.context.existingObjectWithID(objectID) as! T)
-        }
-        catch _ {
-            
-            return nil
-        }
+        return self.context.fetchExisting(objectID)
     }
     
     /**
@@ -75,10 +98,9 @@ public extension BaseDataTransaction {
      - parameter objects: an array of `NSManagedObject`s created/fetched outside the transaction
      - returns: the `NSManagedObject` array for objects that exists in the transaction
      */
-    @warn_unused_result
-    public func fetchExisting<T: NSManagedObject, S: SequenceType where S.Generator.Element == T>(objects: S) -> [T] {
+    public func fetchExisting<T: NSManagedObject, S: Sequence>(_ objects: S) -> [T] where S.Iterator.Element == T {
         
-        return objects.flatMap { (try? self.context.existingObjectWithID($0.objectID)) as? T }
+        return self.context.fetchExisting(objects)
     }
     
     /**
@@ -87,10 +109,9 @@ public extension BaseDataTransaction {
      - parameter objectIDs: the `NSManagedObjectID` array for the objects
      - returns: the `NSManagedObject` array for objects that exists in the transaction
      */
-    @warn_unused_result
-    public func fetchExisting<T: NSManagedObject, S: SequenceType where S.Generator.Element == NSManagedObjectID>(objectIDs: S) -> [T] {
+    public func fetchExisting<T: NSManagedObject, S: Sequence>(_ objectIDs: S) -> [T] where S.Iterator.Element == NSManagedObjectID {
         
-        return objectIDs.flatMap { (try? self.context.existingObjectWithID($0)) as? T }
+        return self.context.fetchExisting(objectIDs)
     }
     
     /**
@@ -100,14 +121,12 @@ public extension BaseDataTransaction {
      - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
      - returns: the first `NSManagedObject` instance that satisfies the specified `FetchClause`s
      */
-    @warn_unused_result
-    public func fetchOne<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> T? {
+    public func fetchOne<T: NSManagedObject>(_ from: From<T>, _ fetchClauses: FetchClause...) -> T? {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
-            "Attempted to fetch from a \(typeName(self)) outside its designated queue."
+            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
         )
-        
         return self.context.fetchOne(from, fetchClauses)
     }
     
@@ -118,14 +137,12 @@ public extension BaseDataTransaction {
      - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
      - returns: the first `NSManagedObject` instance that satisfies the specified `FetchClause`s
      */
-    @warn_unused_result
-    public func fetchOne<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> T? {
+    public func fetchOne<T: NSManagedObject>(_ from: From<T>, _ fetchClauses: [FetchClause]) -> T? {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
-            "Attempted to fetch from a \(typeName(self)) outside its designated queue."
+            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
         )
-        
         return self.context.fetchOne(from, fetchClauses)
     }
     
@@ -136,14 +153,12 @@ public extension BaseDataTransaction {
      - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
      - returns: all `NSManagedObject` instances that satisfy the specified `FetchClause`s
      */
-    @warn_unused_result
-    public func fetchAll<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> [T]? {
+    public func fetchAll<T: NSManagedObject>(_ from: From<T>, _ fetchClauses: FetchClause...) -> [T]? {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
-            "Attempted to fetch from a \(typeName(self)) outside its designated queue."
+            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
         )
-        
         return self.context.fetchAll(from, fetchClauses)
     }
     
@@ -154,14 +169,12 @@ public extension BaseDataTransaction {
      - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
      - returns: all `NSManagedObject` instances that satisfy the specified `FetchClause`s
      */
-    @warn_unused_result
-    public func fetchAll<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> [T]? {
+    public func fetchAll<T: NSManagedObject>(_ from: From<T>, _ fetchClauses: [FetchClause]) -> [T]? {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
-            "Attempted to fetch from a \(typeName(self)) outside its designated queue."
+            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
         )
-        
         return self.context.fetchAll(from, fetchClauses)
     }
     
@@ -172,14 +185,12 @@ public extension BaseDataTransaction {
      - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
      - returns: the number `NSManagedObject`s that satisfy the specified `FetchClause`s
      */
-    @warn_unused_result
-    public func fetchCount<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> Int? {
+    public func fetchCount<T: NSManagedObject>(_ from: From<T>, _ fetchClauses: FetchClause...) -> Int? {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
-            "Attempted to fetch from a \(typeName(self)) outside its designated queue."
+            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
         )
-        
         return self.context.fetchCount(from, fetchClauses)
     }
     
@@ -190,14 +201,12 @@ public extension BaseDataTransaction {
      - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
      - returns: the number `NSManagedObject`s that satisfy the specified `FetchClause`s
      */
-    @warn_unused_result
-    public func fetchCount<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> Int? {
+    public func fetchCount<T: NSManagedObject>(_ from: From<T>, _ fetchClauses: [FetchClause]) -> Int? {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
-            "Attempted to fetch from a \(typeName(self)) outside its designated queue."
+            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
         )
-        
         return self.context.fetchCount(from, fetchClauses)
     }
     
@@ -208,14 +217,12 @@ public extension BaseDataTransaction {
      - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
      - returns: the `NSManagedObjectID` for the first `NSManagedObject` that satisfies the specified `FetchClause`s
      */
-    @warn_unused_result
-    public func fetchObjectID<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> NSManagedObjectID? {
+    public func fetchObjectID<T: NSManagedObject>(_ from: From<T>, _ fetchClauses: FetchClause...) -> NSManagedObjectID? {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
-            "Attempted to fetch from a \(typeName(self)) outside its designated queue."
+            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
         )
-        
         return self.context.fetchObjectID(from, fetchClauses)
     }
     
@@ -226,14 +233,12 @@ public extension BaseDataTransaction {
      - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
      - returns: the `NSManagedObjectID` for the first `NSManagedObject` that satisfies the specified `FetchClause`s
      */
-    @warn_unused_result
-    public func fetchObjectID<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> NSManagedObjectID? {
+    public func fetchObjectID<T: NSManagedObject>(_ from: From<T>, _ fetchClauses: [FetchClause]) -> NSManagedObjectID? {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
-            "Attempted to fetch from a \(typeName(self)) outside its designated queue."
+            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
         )
-        
         return self.context.fetchObjectID(from, fetchClauses)
     }
     
@@ -244,14 +249,12 @@ public extension BaseDataTransaction {
      - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
      - returns: the `NSManagedObjectID` for all `NSManagedObject`s that satisfy the specified `FetchClause`s
      */
-    @warn_unused_result
-    public func fetchObjectIDs<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> [NSManagedObjectID]? {
+    public func fetchObjectIDs<T: NSManagedObject>(_ from: From<T>, _ fetchClauses: FetchClause...) -> [NSManagedObjectID]? {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
-            "Attempted to fetch from a \(typeName(self)) outside its designated queue."
+            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
         )
-        
         return self.context.fetchObjectIDs(from, fetchClauses)
     }
     
@@ -262,50 +265,17 @@ public extension BaseDataTransaction {
      - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
      - returns: the `NSManagedObjectID` for all `NSManagedObject`s that satisfy the specified `FetchClause`s
      */
-    @warn_unused_result
-    public func fetchObjectIDs<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> [NSManagedObjectID]? {
+    public func fetchObjectIDs<T: NSManagedObject>(_ from: From<T>, _ fetchClauses: [FetchClause]) -> [NSManagedObjectID]? {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
-            "Attempted to fetch from a \(typeName(self)) outside its designated queue."
+            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
         )
-        
         return self.context.fetchObjectIDs(from, fetchClauses)
     }
     
-    /**
-     Deletes all `NSManagedObject`s that satisfy the specified `DeleteClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-     
-     - parameter from: a `From` clause indicating the entity type
-     - parameter deleteClauses: a series of `DeleteClause` instances for the delete request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-     - returns: the number of `NSManagedObject`s deleted
-     */
-    public func deleteAll<T: NSManagedObject>(from: From<T>, _ deleteClauses: DeleteClause...) -> Int? {
-        
-        CoreStore.assert(
-            self.isRunningInAllowedQueue(),
-            "Attempted to delete from a \(typeName(self)) outside its designated queue."
-        )
-        
-        return self.context.deleteAll(from, deleteClauses)
-    }
     
-    /**
-     Deletes all `NSManagedObject`s that satisfy the specified `DeleteClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-     
-     - parameter from: a `From` clause indicating the entity type
-     - parameter deleteClauses: a series of `DeleteClause` instances for the delete request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-     - returns: the number of `NSManagedObject`s deleted
-     */
-    public func deleteAll<T: NSManagedObject>(from: From<T>, _ deleteClauses: [DeleteClause]) -> Int? {
-        
-        CoreStore.assert(
-            self.isRunningInAllowedQueue(),
-            "Attempted to delete from a \(typeName(self)) outside its designated queue."
-        )
-        
-        return self.context.deleteAll(from, deleteClauses)
-    }
+    // MARK: QueryableSource
     
     /**
      Queries aggregate values as specified by the `QueryClause`s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
@@ -317,14 +287,12 @@ public extension BaseDataTransaction {
      - parameter queryClauses: a series of `QueryClause` instances for the query request. Accepts `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
      - returns: the result of the the query. The type of the return value is specified by the generic type of the `Select<U>` parameter.
      */
-    @warn_unused_result
-    public func queryValue<T: NSManagedObject, U: SelectValueResultType>(from: From<T>, _ selectClause: Select<U>, _ queryClauses: QueryClause...) -> U? {
+    public func queryValue<T: NSManagedObject, U: SelectValueResultType>(_ from: From<T>, _ selectClause: Select<U>, _ queryClauses: QueryClause...) -> U? {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
-            "Attempted to query from a \(typeName(self)) outside its designated queue."
+            "Attempted to query from a \(cs_typeName(self)) outside its designated queue."
         )
-        
         return self.context.queryValue(from, selectClause, queryClauses)
     }
     
@@ -338,14 +306,12 @@ public extension BaseDataTransaction {
      - parameter queryClauses: a series of `QueryClause` instances for the query request. Accepts `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
      - returns: the result of the the query. The type of the return value is specified by the generic type of the `Select<U>` parameter.
      */
-    @warn_unused_result
-    public func queryValue<T: NSManagedObject, U: SelectValueResultType>(from: From<T>, _ selectClause: Select<U>, _ queryClauses: [QueryClause]) -> U? {
+    public func queryValue<T: NSManagedObject, U: SelectValueResultType>(_ from: From<T>, _ selectClause: Select<U>, _ queryClauses: [QueryClause]) -> U? {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
-            "Attempted to query from a \(typeName(self)) outside its designated queue."
+            "Attempted to query from a \(cs_typeName(self)) outside its designated queue."
         )
-        
         return self.context.queryValue(from, selectClause, queryClauses)
     }
     
@@ -359,14 +325,12 @@ public extension BaseDataTransaction {
      - parameter queryClauses: a series of `QueryClause` instances for the query request. Accepts `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
      - returns: the result of the the query. The type of the return value is specified by the generic type of the `Select<U>` parameter.
      */
-    @warn_unused_result
-    public func queryAttributes<T: NSManagedObject>(from: From<T>, _ selectClause: Select<NSDictionary>, _ queryClauses: QueryClause...) -> [[NSString: AnyObject]]? {
+    public func queryAttributes<T: NSManagedObject>(_ from: From<T>, _ selectClause: Select<NSDictionary>, _ queryClauses: QueryClause...) -> [[String: Any]]? {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
-            "Attempted to query from a \(typeName(self)) outside its designated queue."
+            "Attempted to query from a \(cs_typeName(self)) outside its designated queue."
         )
-        
         return self.context.queryAttributes(from, selectClause, queryClauses)
     }
     
@@ -380,14 +344,23 @@ public extension BaseDataTransaction {
      - parameter queryClauses: a series of `QueryClause` instances for the query request. Accepts `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
      - returns: the result of the the query. The type of the return value is specified by the generic type of the `Select<U>` parameter.
      */
-    @warn_unused_result
-    public func queryAttributes<T: NSManagedObject>(from: From<T>, _ selectClause: Select<NSDictionary>, _ queryClauses: [QueryClause]) -> [[NSString: AnyObject]]? {
+    public func queryAttributes<T: NSManagedObject>(_ from: From<T>, _ selectClause: Select<NSDictionary>, _ queryClauses: [QueryClause]) -> [[String: Any]]? {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
-            "Attempted to query from a \(typeName(self)) outside its designated queue."
+            "Attempted to query from a \(cs_typeName(self)) outside its designated queue."
         )
-        
         return self.context.queryAttributes(from, selectClause, queryClauses)
     }
+    
+    
+    // MARK: FetchableSource, QueryableSource
+    
+    /**
+     The internal `NSManagedObjectContext` managed by this instance. Using this context directly should typically be avoided, and is provided by CoreStore only for extremely specialized cases.
+     */
+    public func internalContext() -> NSManagedObjectContext {
+        
+        return self.context
+    }
 }