separate CoreStoreFetchRequest file

.gitignore

@@ -6,3 +6,4 @@ Carthage/Build
 CoreStore.xcworkspace/xcuserdata
 .DS_Store
 DerivedData
+*.orig

CoreStore.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name = "CoreStore"
-    s.version = "1.6.1"
+    s.version = "1.6.2"
     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"

CoreStore.xcodeproj/project.pbxproj

@@ -87,6 +87,11 @@
 		B51BE06A1B47FC4B0069F532 /* NSManagedObjectModel+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51BE0691B47FC4B0069F532 /* NSManagedObjectModel+Setup.swift */; };
 		B5202CFA1C04688100DED140 /* NSFetchedResultsController+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5202CF91C04688100DED140 /* NSFetchedResultsController+Convenience.swift */; };
 		B5202CFD1C046E8400DED140 /* NSFetchedResultsController+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5202CF91C04688100DED140 /* NSFetchedResultsController+Convenience.swift */; };
+		B52661401CADD585007B85D9 /* CoreStoreFetchRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B526613F1CADD585007B85D9 /* CoreStoreFetchRequest.swift */; };
+		B52661411CADD585007B85D9 /* CoreStoreFetchRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B526613F1CADD585007B85D9 /* CoreStoreFetchRequest.swift */; };
+		B52661421CADD585007B85D9 /* CoreStoreFetchRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B526613F1CADD585007B85D9 /* CoreStoreFetchRequest.swift */; };
+		B52661431CADD585007B85D9 /* CoreStoreFetchRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B526613F1CADD585007B85D9 /* CoreStoreFetchRequest.swift */; };
+		B52661441CADD585007B85D9 /* CoreStoreFetchRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B526613F1CADD585007B85D9 /* CoreStoreFetchRequest.swift */; };
 		B52DD17E1BE1F8CD00949AFE /* CoreStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B52DD1741BE1F8CC00949AFE /* CoreStore.framework */; };
 		B52DD1911BE1F8EB00949AFE /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5548CD51BD65AE00077652A /* Foundation.framework */; };
 		B52DD1921BE1F8F000949AFE /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5548CD71BD65AE50077652A /* CoreData.framework */; };
@@ -283,7 +288,6 @@
 		B5D9E32F1CA2C317007A9D52 /* CoreStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 2F03A53519C5C6DA005002A5 /* CoreStore.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B5D9E3431CA2C6C4007A9D52 /* GCDBlock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D9E3371CA2C6BF007A9D52 /* GCDBlock.swift */; };
 		B5D9E3441CA2C6C4007A9D52 /* GCDGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D9E3381CA2C6BF007A9D52 /* GCDGroup.swift */; };
-		B5D9E3451CA2C6C4007A9D52 /* GCDKit.h in Headers */ = {isa = PBXBuildFile; fileRef = B5D9E3391CA2C6BF007A9D52 /* GCDKit.h */; };
 		B5D9E3461CA2C6C4007A9D52 /* GCDQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D9E33A1CA2C6BF007A9D52 /* GCDQueue.swift */; };
 		B5D9E3471CA2C6C4007A9D52 /* GCDSemaphore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D9E33B1CA2C6BF007A9D52 /* GCDSemaphore.swift */; };
 		B5D9E3481CA2C6C4007A9D52 /* GCDTimer.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D9E33C1CA2C6BF007A9D52 /* GCDTimer.swift */; };
@@ -379,6 +383,7 @@
 		B519E4571C4CD2CA00E7B469 /* GCDKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GCDKit.framework; path = "../../Library/Developer/Xcode/DerivedData/Build/Products/Debug-iphoneos/GCDKit.framework"; sourceTree = "<group>"; };
 		B51BE0691B47FC4B0069F532 /* NSManagedObjectModel+Setup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSManagedObjectModel+Setup.swift"; sourceTree = "<group>"; };
 		B5202CF91C04688100DED140 /* NSFetchedResultsController+Convenience.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSFetchedResultsController+Convenience.swift"; sourceTree = "<group>"; };
+		B526613F1CADD585007B85D9 /* CoreStoreFetchRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoreStoreFetchRequest.swift; sourceTree = "<group>"; };
 		B52DD1741BE1F8CC00949AFE /* CoreStore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CoreStore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B52DD17D1BE1F8CC00949AFE /* CoreStoreTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CoreStoreTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		B54A6A541BA15F2A007870FD /* FetchedResultsControllerDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FetchedResultsControllerDelegate.swift; sourceTree = "<group>"; };
@@ -407,7 +412,6 @@
 		B5D9E3341CA2C317007A9D52 /* CoreStore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CoreStore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B5D9E3371CA2C6BF007A9D52 /* GCDBlock.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = GCDBlock.swift; path = Carthage/Checkouts/GCDKit/Sources/GCDBlock.swift; sourceTree = "<group>"; };
 		B5D9E3381CA2C6BF007A9D52 /* GCDGroup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = GCDGroup.swift; path = Carthage/Checkouts/GCDKit/Sources/GCDGroup.swift; sourceTree = "<group>"; };
-		B5D9E3391CA2C6BF007A9D52 /* GCDKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GCDKit.h; path = Carthage/Checkouts/GCDKit/Sources/GCDKit.h; sourceTree = "<group>"; };
 		B5D9E33A1CA2C6BF007A9D52 /* GCDQueue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = GCDQueue.swift; path = Carthage/Checkouts/GCDKit/Sources/GCDQueue.swift; sourceTree = "<group>"; };
 		B5D9E33B1CA2C6BF007A9D52 /* GCDSemaphore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = GCDSemaphore.swift; path = Carthage/Checkouts/GCDKit/Sources/GCDSemaphore.swift; sourceTree = "<group>"; };
 		B5D9E33C1CA2C6BF007A9D52 /* GCDTimer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = GCDTimer.swift; path = Carthage/Checkouts/GCDKit/Sources/GCDTimer.swift; sourceTree = "<group>"; };
@@ -647,7 +651,6 @@
 			children = (
 				B5D9E3371CA2C6BF007A9D52 /* GCDBlock.swift */,
 				B5D9E3381CA2C6BF007A9D52 /* GCDGroup.swift */,
-				B5D9E3391CA2C6BF007A9D52 /* GCDKit.h */,
 				B5D9E33A1CA2C6BF007A9D52 /* GCDQueue.swift */,
 				B5D9E33B1CA2C6BF007A9D52 /* GCDSemaphore.swift */,
 				B5D9E33C1CA2C6BF007A9D52 /* GCDTimer.swift */,
@@ -769,6 +772,7 @@
 				B5E84F2B1AFF849C0064E85B /* NotificationObserver.swift */,
 				B59D5C211B5BA34B00453479 /* NSFileManager+Setup.swift */,
 				B5C976E61C6E3A5900B1AF90 /* CoreStoreFetchedResultsController.swift */,
+				B526613F1CADD585007B85D9 /* CoreStoreFetchRequest.swift */,
 				B5E84F2C1AFF849C0064E85B /* NSManagedObjectContext+CoreStore.swift */,
 				B5E84F351AFF85470064E85B /* NSManagedObjectContext+Querying.swift */,
 				B5E84F321AFF85470064E85B /* NSManagedObjectContext+Setup.swift */,
@@ -819,7 +823,6 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				B5D9E3451CA2C6C4007A9D52 /* GCDKit.h in Headers */,
 				B5D9E32F1CA2C317007A9D52 /* CoreStore.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1114,6 +1117,7 @@
 				B56007111B3F6BD500A9A8F9 /* Into.swift in Sources */,
 				B5E84F111AFF847B0064E85B /* Select.swift in Sources */,
 				B50392F91C478FF3009900CA /* NSManagedObject+Transaction.swift in Sources */,
+				B52661401CADD585007B85D9 /* CoreStoreFetchRequest.swift in Sources */,
 				B5202CFA1C04688100DED140 /* NSFetchedResultsController+Convenience.swift in Sources */,
 				B5E84EE11AFF84500064E85B /* PersistentStoreResult.swift in Sources */,
 				B5E84F251AFF84860064E85B /* ObjectObserver.swift in Sources */,
@@ -1192,6 +1196,7 @@
 				82BA18DD1C4BBE1400A0916E /* NSFetchedResultsController+Convenience.swift in Sources */,
 				82BA18B41C4BBD3900A0916E /* BaseDataTransaction+Importing.swift in Sources */,
 				82BA18CA1C4BBD5900A0916E /* MigrationResult.swift in Sources */,
+				B52661421CADD585007B85D9 /* CoreStoreFetchRequest.swift in Sources */,
 				82BA18C11C4BBD5300A0916E /* CoreStore+Observing.swift in Sources */,
 				82BA18BC1C4BBD4A00A0916E /* OrderBy.swift in Sources */,
 				82BA18B01C4BBD3100A0916E /* NSManagedObject+Transaction.swift in Sources */,
@@ -1270,6 +1275,7 @@
 				B52DD1C71BE1F94600949AFE /* NSManagedObjectContext+Querying.swift in Sources */,
 				B52DD1C81BE1F94600949AFE /* NSManagedObjectContext+Setup.swift in Sources */,
 				B52DD1C31BE1F94600949AFE /* NotificationObserver.swift in Sources */,
+				B52661441CADD585007B85D9 /* CoreStoreFetchRequest.swift in Sources */,
 				B52DD1A81BE1F93200949AFE /* DataStack+Querying.swift in Sources */,
 				B52DD1BC1BE1F94000949AFE /* MigrationResult.swift in Sources */,
 				B52DD19D1BE1F92C00949AFE /* BaseDataTransaction.swift in Sources */,
@@ -1337,6 +1343,7 @@
 				B5202CFD1C046E8400DED140 /* NSFetchedResultsController+Convenience.swift in Sources */,
 				B56321AF1BD6521C006C9394 /* NSFileManager+Setup.swift in Sources */,
 				B50392FA1C47963F009900CA /* NSManagedObject+Transaction.swift in Sources */,
+				B52661431CADD585007B85D9 /* CoreStoreFetchRequest.swift in Sources */,
 				B56321971BD65216006C9394 /* Select.swift in Sources */,
 				B56321AB1BD6521C006C9394 /* FetchedResultsControllerDelegate.swift in Sources */,
 				B56321821BD65216006C9394 /* PersistentStoreResult.swift in Sources */,
@@ -1396,6 +1403,7 @@
 				B5D9E2F71CA2C317007A9D52 /* DataStack+Querying.swift in Sources */,
 				B5D9E2F81CA2C317007A9D52 /* SectionBy.swift in Sources */,
 				B5D9E2F91CA2C317007A9D52 /* NSManagedObjectContext+Transaction.swift in Sources */,
+				B52661411CADD585007B85D9 /* CoreStoreFetchRequest.swift in Sources */,
 				B5D9E2FA1CA2C317007A9D52 /* UnsafeDataTransaction+Observing.swift in Sources */,
 				B5D9E2FB1CA2C317007A9D52 /* MigrationChain.swift in Sources */,
 				B5D9E2FC1CA2C317007A9D52 /* Tweak.swift in Sources */,

CoreStore/Info.plist

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

CoreStore/Internal/CoreStoreFetchRequest.swift

@@ -0,0 +1,43 @@
+//
+//  CoreStoreFetchRequest.swift
+//  CoreStore
+//
+//  Copyright © 2016 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import Foundation
+import CoreData
+
+
+// MARK: - CoreStoreFetchRequest
+
+// Bugfix for NSFetchRequest messing up memory management for `affectedStores`
+// http://stackoverflow.com/questions/14396375/nsfetchedresultscontroller-crashes-in-ios-6-if-affectedstores-is-specified
+internal final class CoreStoreFetchRequest: NSFetchRequest {
+    
+    override var affectedStores: [NSPersistentStore]? {
+        
+        get { return self.safeAffectedStores }
+        set { self.safeAffectedStores = newValue }
+    }
+    
+    private var safeAffectedStores: [NSPersistentStore]?
+}

CoreStore/Internal/CoreStoreFetchedResultsController.swift

@@ -56,7 +56,7 @@ internal final class CoreStoreFetchedResultsController<T: NSManagedObject>: NSFe
         
         if let from = from {
             
-            self.reapplyAffectedStores = {
+            self.reapplyAffectedStores = { fetchRequest, context in
                 
                 return from.applyAffectedStoresForFetchedRequest(fetchRequest, context: context)
             }
@@ -68,7 +68,7 @@ internal final class CoreStoreFetchedResultsController<T: NSManagedObject>: NSFe
                 fatalError("Attempted to create an \(typeName(NSFetchedResultsController)) without a  From clause or an NSEntityDescription.")
             }
             
-            self.reapplyAffectedStores = {
+            self.reapplyAffectedStores = { fetchRequest, context in
                 
                 return from.applyAffectedStoresForFetchedRequest(fetchRequest, context: context)
             }
@@ -84,7 +84,7 @@ internal final class CoreStoreFetchedResultsController<T: NSManagedObject>: NSFe
     
     internal func performFetchFromSpecifiedStores() throws {
         
-        if !self.reapplyAffectedStores() {
+        if !self.reapplyAffectedStores(fetchRequest: self.fetchRequest, context: self.managedObjectContext) {
             
             CoreStore.log(
                 .Warning,
@@ -94,8 +94,13 @@ internal final class CoreStoreFetchedResultsController<T: NSManagedObject>: NSFe
         try self.performFetch()
     }
     
+    deinit {
+        
+        self.delegate = nil
+    }
+    
     
     // MARK: Private
     
-    private let reapplyAffectedStores: () -> Bool
+    private let reapplyAffectedStores: (fetchRequest: NSFetchRequest, context: NSManagedObjectContext) -> Bool
 }

CoreStore/Internal/NSManagedObjectContext+Querying.swift

@@ -76,7 +76,7 @@ internal extension NSManagedObjectContext {
     
     internal func fetchOne<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> T? {
         
-        let fetchRequest = NSFetchRequest()
+        let fetchRequest = CoreStoreFetchRequest()
         from.applyToFetchRequest(fetchRequest, context: self)
         
         fetchRequest.fetchLimit = 1
@@ -119,7 +119,7 @@ internal extension NSManagedObjectContext {
     
     internal func fetchAll<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> [T]? {
         
-        let fetchRequest = NSFetchRequest()
+        let fetchRequest = CoreStoreFetchRequest()
         from.applyToFetchRequest(fetchRequest, context: self)
         
         fetchRequest.fetchLimit = 0
@@ -162,7 +162,7 @@ internal extension NSManagedObjectContext {
     
     internal func fetchCount<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> Int? {
         
-        let fetchRequest = NSFetchRequest()
+        let fetchRequest = CoreStoreFetchRequest()
         from.applyToFetchRequest(fetchRequest, context: self)
         
         for clause in fetchClauses {
@@ -195,7 +195,7 @@ internal extension NSManagedObjectContext {
     
     internal func fetchObjectID<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> NSManagedObjectID? {
         
-        let fetchRequest = NSFetchRequest()
+        let fetchRequest = CoreStoreFetchRequest()
         from.applyToFetchRequest(fetchRequest, context: self)
         
         fetchRequest.fetchLimit = 1
@@ -238,7 +238,7 @@ internal extension NSManagedObjectContext {
     
     internal func fetchObjectIDs<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> [NSManagedObjectID]? {
         
-        let fetchRequest = NSFetchRequest()
+        let fetchRequest = CoreStoreFetchRequest()
         from.applyToFetchRequest(fetchRequest, context: self)
         
         fetchRequest.fetchLimit = 0
@@ -281,7 +281,7 @@ internal extension NSManagedObjectContext {
     
     internal func deleteAll<T: NSManagedObject>(from: From<T>, _ deleteClauses: [DeleteClause]) -> Int? {
         
-        let fetchRequest = NSFetchRequest()
+        let fetchRequest = CoreStoreFetchRequest()
         from.applyToFetchRequest(fetchRequest, context: self)
         
         fetchRequest.fetchLimit = 0
@@ -334,7 +334,7 @@ internal extension NSManagedObjectContext {
     
     internal func queryValue<T: NSManagedObject, U: SelectValueResultType>(from: From<T>, _ selectClause: Select<U>, _ queryClauses: [QueryClause]) -> U? {
         
-        let fetchRequest = NSFetchRequest()
+        let fetchRequest = CoreStoreFetchRequest()
         from.applyToFetchRequest(fetchRequest, context: self)
         
         fetchRequest.fetchLimit = 0
@@ -383,7 +383,7 @@ internal extension NSManagedObjectContext {
     
     internal func queryAttributes<T: NSManagedObject>(from: From<T>, _ selectClause: Select<NSDictionary>, _ queryClauses: [QueryClause]) -> [[NSString: AnyObject]]? {
         
-        let fetchRequest = NSFetchRequest()
+        let fetchRequest = CoreStoreFetchRequest()
         from.applyToFetchRequest(fetchRequest, context: self)
         
         fetchRequest.fetchLimit = 0

CoreStore/Internal/NSManagedObjectContext+Transaction.swift

@@ -80,7 +80,7 @@ internal extension NSManagedObjectContext {
         
         var result = SaveResult(hasChanges: false)
         
-        self.performBlockAndWait { [unowned self] () -> Void in
+        self.performBlockAndWait {
             
             guard self.hasChanges else {
                 
@@ -124,7 +124,7 @@ internal extension NSManagedObjectContext {
     
     internal func saveAsynchronouslyWithCompletion(completion: ((result: SaveResult) -> Void) = { _ in }) {
         
-        self.performBlock { () -> Void in
+        self.performBlock {
             
             guard self.hasChanges else {
                 

CoreStore/Observing/ListMonitor.swift

@@ -891,6 +891,7 @@ public final class ListMonitor<T: NSManagedObject> {
                 object: self
             )
         }
+        self.fetchClauses = fetchClauses
         
         self.taskGroup.notify(.Main) { [weak self] () -> Void in
             
@@ -902,7 +903,7 @@ public final class ListMonitor<T: NSManagedObject> {
             strongSelf.fetchedResultsControllerDelegate.enabled = false
             
             let fetchRequest = strongSelf.fetchedResultsController.fetchRequest
-            for clause in fetchClauses {
+            for clause in strongSelf.fetchClauses {
                 
                 clause.applyToFetchRequest(fetchRequest)
             }
@@ -990,7 +991,7 @@ public final class ListMonitor<T: NSManagedObject> {
     
     private init(context: NSManagedObjectContext, transactionQueue: GCDQueue, from: From<T>, sectionBy: SectionBy?, fetchClauses: [FetchClause], createAsynchronously: ((ListMonitor<T>) -> Void)?) {
         
-        let fetchRequest = NSFetchRequest()
+        let fetchRequest = CoreStoreFetchRequest()
         fetchRequest.fetchLimit = 0
         fetchRequest.resultType = .ManagedObjectResultType
         fetchRequest.fetchBatchSize = 20
@@ -1019,6 +1020,7 @@ public final class ListMonitor<T: NSManagedObject> {
             self.sectionIndexTransformer = { $0 }
         }
         self.transactionQueue = transactionQueue
+        self.fetchClauses = fetchClauses
         
         fetchedResultsControllerDelegate.handler = self
         fetchedResultsControllerDelegate.fetchedResultsController = fetchedResultsController
@@ -1045,7 +1047,7 @@ public final class ListMonitor<T: NSManagedObject> {
                         
                         return
                 }
-                self.refetch(fetchClauses)
+                self.refetch(self.fetchClauses)
             }
         )
         
@@ -1068,7 +1070,7 @@ public final class ListMonitor<T: NSManagedObject> {
                     
                     if previousStores != currentStores {
                         
-                        self.refetch(fetchClauses)
+                        self.refetch(self.fetchClauses)
                     }
                 }
                 
@@ -1130,6 +1132,7 @@ public final class ListMonitor<T: NSManagedObject> {
     private var observerForDidChangePersistentStore: NotificationObserver!
     private let taskGroup = GCDGroup()
     private let transactionQueue: GCDQueue
+    private var fetchClauses: [FetchClause]
     
     private var willChangeListKey: Void?
     private var didChangeListKey: Void?

CoreStore/Observing/ObjectMonitor.swift

@@ -175,7 +175,7 @@ public final class ObjectMonitor<T: NSManagedObject> {
     
     private init(context: NSManagedObjectContext, object: T) {
         
-        let fetchRequest = NSFetchRequest()
+        let fetchRequest = CoreStoreFetchRequest()
         fetchRequest.entity = object.entity
         fetchRequest.fetchLimit = 0
         fetchRequest.resultType = .ManagedObjectResultType

CoreStore/Setting Up/DataStack.swift

@@ -399,9 +399,16 @@ public final class DataStack {
     
     deinit {
         
-        for store in self.coordinator.persistentStores {
+        let coordinator = self.coordinator
+        coordinator.performAsynchronously {
             
-            _ = try? self.coordinator.removePersistentStore(store)
+            withExtendedLifetime(coordinator) { coordinator in
+                
+                coordinator.persistentStores.forEach {
+                    
+                    _ = try? coordinator.removePersistentStore($0)
+                }
+            }
         }
     }
 }

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

@@ -99,10 +99,10 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
     func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         switch self.segmentedControl?.selectedSegmentIndex {
             
-        case .Some(Section.Fetching.rawValue):
+        case Section.Fetching.rawValue?:
             return self.fetchingItems.count
             
-        case .Some(Section.Querying.rawValue):
+        case Section.Querying.rawValue?:
             return self.queryingItems.count
             
         default:
@@ -116,10 +116,10 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
         
         switch self.segmentedControl?.selectedSegmentIndex {
             
-        case .Some(Section.Fetching.rawValue):
+        case Section.Fetching.rawValue?:
             cell.textLabel?.text = self.fetchingItems[indexPath.row].title
             
-        case .Some(Section.Querying.rawValue):
+        case Section.Querying.rawValue?:
             cell.textLabel?.text = self.queryingItems[indexPath.row].title
             
         default:
@@ -138,10 +138,10 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
         
         switch self.segmentedControl?.selectedSegmentIndex {
             
-        case .Some(Section.Fetching.rawValue):
+        case Section.Fetching.rawValue?:
             self.performSegueWithIdentifier("FetchingResultsViewController", sender: indexPath)
             
-        case .Some(Section.Querying.rawValue):
+        case Section.Querying.rawValue?:
             self.performSegueWithIdentifier("QueryingResultsViewController", sender: indexPath)
             
         default:

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

@@ -16,19 +16,19 @@ class QueryingResultsViewController: UITableViewController {
         
         switch value {
             
-        case .Some(let array as [AnyObject]):
+        case (let array as [AnyObject])?:
             self.values = array.map { (item: AnyObject) -> (title: String, detail: String) in
                 (
                     title: item.description,
-                    detail: _stdlib_getDemangledTypeName(item)
+                    detail: String(reflecting: item.dynamicType)
                 )
             }
             
-        case .Some(let item):
+        case let item?:
             self.values = [
                 (
                     title: item.description,
-                    detail: _stdlib_getDemangledTypeName(item)
+                    detail: String(reflecting: item.dynamicType)
                 )
             ]
             

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

@@ -88,7 +88,7 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
             UIBarButtonItem(
                 barButtonSystemItem: .Trash,
                 target: self,
-                action: "resetBarButtonItemTouched:"
+                action: #selector(self.resetBarButtonItemTouched(_:))
             )
         ]
         
@@ -96,13 +96,13 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
             title: Static.filter.rawValue,
             style: .Plain,
             target: self,
-            action: "filterBarButtonItemTouched:"
+            action: #selector(self.filterBarButtonItemTouched(_:))
         )
         navigationItem.rightBarButtonItems = [
             UIBarButtonItem(
                 barButtonSystemItem: .Add,
                 target: self,
-                action: "addBarButtonItemTouched:"
+                action: #selector(self.addBarButtonItemTouched(_:))
             ),
             filterBarButton
         ]
@@ -119,7 +119,7 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
         
         switch (segue.identifier, segue.destinationViewController, sender) {
             
-        case (.Some("ObjectObserverDemoViewController"), let destinationViewController as ObjectObserverDemoViewController, let palette as Palette):
+        case ("ObjectObserverDemoViewController"?, let destinationViewController as ObjectObserverDemoViewController, let palette as Palette):
             destinationViewController.palette = palette
             
         default:

CoreStoreDemo/CoreStoreDemo/Loggers Demo/CustomLoggerViewController.swift

@@ -102,20 +102,20 @@ class CustomLoggerViewController: UIViewController, CoreStoreLogger {
         
         switch self.segmentedControl?.selectedSegmentIndex {
             
-        case .Some(0):
+        case 0?:
             self.dataStack.beginAsynchronous { (transaction) -> Void in
                 
                 transaction.create(Into(Palette))
             }
             
-        case .Some(1):
+        case 1?:
             do {
                 
                 try self.dataStack.addSQLiteStoreAndWait(fileName: "emptyStore.sqlite", configuration: "invalidStore")
             }
             catch _ { }
             
-        case .Some(2):
+        case 2?:
             self.dataStack.beginAsynchronous { (transaction) -> Void in
                 
                 transaction.commit()

CoreStoreDemo/CoreStoreDemo/MIgrations Demo/MigrationsDemoViewController.swift

@@ -162,36 +162,46 @@ class MigrationsDemoViewController: UIViewController {
             fileName: "MigrationDemo.sqlite",
             completion: { [weak self] (result) -> Void in
                 
-                guard let strongSelf = self else {
+                guard let `self` = self else {
                     
                     return
                 }
                 
                 guard case .Success = result else {
                     
-                    strongSelf.setEnabled(true)
+                    self.setEnabled(true)
                     return
                 }
                 
-                strongSelf.setDataStack(dataStack, model: model, scrollToSelection: true)
+                self.setDataStack(dataStack, model: model, scrollToSelection: true)
                 
-                let count = dataStack.queryValue(From(model.entityType), Select<Int>(.Count("dna")))
+                let count = dataStack.queryValue(
+                    From(model.entityType),
+                    Select<Int>(.Count("dna"))
+                )
                 if count > 0 {
                     
-                    strongSelf.setEnabled(true)
+                    self.setEnabled(true)
                 }
                 else {
                     
-                    dataStack.beginAsynchronous { (transaction) -> Void in
+                    for i: Int64 in 0 ..< 20 {
                         
-                        for i: Int64 in 1 ..< 10000 {
+                        dataStack.beginAsynchronous { (transaction) -> Void in
                             
-                            let organism = transaction.create(Into(model.entityType)) as! OrganismProtocol
-                            organism.dna = i
-                            organism.mutate()
+                            for j: Int64 in 0 ..< 500 {
+                                
+                                let organism = transaction.create(Into(model.entityType)) as! OrganismProtocol
+                                organism.dna = (i * 500) + j + 1
+                                organism.mutate()
+                            }
+                            
+                            transaction.commit()
                         }
+                    }
+                    dataStack.beginAsynchronous { [weak self] (transaction) -> Void in
                         
-                        transaction.commit { result -> Void in
+                        transaction.commit { _ in
                             
                             self?.setEnabled(true)
                         }

CoreStoreDemo/CoreStoreDemo/Transactions Demo/TransactionsDemoViewController.swift

@@ -60,7 +60,7 @@ class TransactionsDemoViewController: UIViewController, MKMapViewDelegate, Objec
         
         super.viewDidLoad()
         
-        let longPressGesture = UILongPressGestureRecognizer(target: self, action: "longPressGestureRecognized:")
+        let longPressGesture = UILongPressGestureRecognizer(target: self, action: #selector(self.longPressGestureRecognized(_:)))
         self.mapView?.addGestureRecognizer(longPressGesture)
         
         Static.placeController.addObserver(self)
@@ -68,7 +68,7 @@ class TransactionsDemoViewController: UIViewController, MKMapViewDelegate, Objec
         self.navigationItem.rightBarButtonItem = UIBarButtonItem(
             barButtonSystemItem: .Refresh,
             target: self,
-            action: "refreshButtonTapped:"
+            action: #selector(self.refreshButtonTapped(_:))
         )
     }
     

README.md

@@ -1,12 +1,12 @@
 <p align="center">
-<img alt="CoreStore" src="https://cloud.githubusercontent.com/assets/3029684/13373932/84daee2a-ddb8-11e5-99db-fdf415620102.png" height=170 />
+<img alt="CoreStore" src="https://cloud.githubusercontent.com/assets/3029684/13373932/84daee2a-ddb8-11e5-99db-fdf415620102.png" width=614 />
 <br />
 <br />
 Unleashing the real power of Core Data with the elegance and safety of Swift
 <br />
 <br />
 <a href="https://travis-ci.org/JohnEstropia/CoreStore"><img alt="Build Status" src="https://img.shields.io/travis/JohnEstropia/CoreStore/master.svg?style=flat" /></a>
-<a href="http://cocoadocs.org/docsets/CoreStore"><img alt=Version" src="https://img.shields.io/cocoapods/v/CoreStore.svg?style=flat" /></a>
+<a href="http://cocoadocs.org/docsets/CoreStore"><img alt="Version" src="https://img.shields.io/cocoapods/v/CoreStore.svg?style=flat" /></a>
 <a href="http://cocoadocs.org/docsets/CoreStore"><img alt="Platform" src="https://img.shields.io/cocoapods/p/CoreStore.svg?style=flat" /></a>
 <a href="https://raw.githubusercontent.com/JohnEstropia/CoreStore/master/LICENSE"><img alt="License" src="https://img.shields.io/cocoapods/l/CoreStore.svg?style=flat" /></a>
 <a href="https://github.com/Carthage/Carthage"><img alt="Carthage compatible" src="https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat" /></a>