Cleanup

ffried · ffried · commit acd893779183 · 2017-11-06T08:48:32.000+01:00
diff --git a/FFCoreData/FFCoreData Tests/FFCoreDataTests.swift b/FFCoreData/FFCoreData Tests/FFCoreDataTests.swift
@@ -19,6 +19,7 @@
 //
 
 import XCTest
+import CoreData
 import FFCoreData
 
 class FFCoreDataTests: XCTestCase {
diff --git a/FFCoreData/FFCoreData.xcodeproj/project.pbxproj b/FFCoreData/FFCoreData.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 48;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -25,7 +25,7 @@
 		071408771E8001C1004318C9 /* FFCoreData.h in Headers */ = {isa = PBXBuildFile; fileRef = 07876A1B19D41E7000F21E7D /* FFCoreData.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		073F000C1F99F45700E2708A /* CoreDataDecodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 073F000B1F99F45700E2708A /* CoreDataDecodable.swift */; };
 		0788305D1E824C2A00A0F103 /* NSManagedObject+FindAndOrCreate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07A64BF21B2C53480008EFF2 /* NSManagedObject+FindAndOrCreate.swift */; };
-		07F2F4651FB03E5C0064559C /* FFFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07F2F4661FB03E5C0064559C /* FFFoundation.framework */; };
+		07F2F4981FB049700064559C /* FFFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07F2F4991FB049700064559C /* FFFoundation.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -55,7 +55,7 @@
 		07A64BF21B2C53480008EFF2 /* NSManagedObject+FindAndOrCreate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSManagedObject+FindAndOrCreate.swift"; sourceTree = "<group>"; };
 		07AA24371B28037E00FA689B /* CoreDataManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoreDataManager.swift; sourceTree = "<group>"; };
 		07AA24391B2A0F0900FA689B /* FetchedResulsControllerDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FetchedResulsControllerDelegate.swift; sourceTree = "<group>"; };
-		07F2F4661FB03E5C0064559C /* FFFoundation.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = FFFoundation.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		07F2F4991FB049700064559C /* FFFoundation.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = FFFoundation.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		07F82FDC1DAA7ADA00DBCBAA /* FFCoreDataTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FFCoreDataTests.swift; sourceTree = "<group>"; };
 		07F82FDD1DAA7ADA00DBCBAA /* TestEntity+CoreDataProperties.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "TestEntity+CoreDataProperties.swift"; sourceTree = "<group>"; };
 		07F82FDE1DAA7ADA00DBCBAA /* TestEntity.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestEntity.swift; sourceTree = "<group>"; };
@@ -67,7 +67,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				07F2F4651FB03E5C0064559C /* FFFoundation.framework in Frameworks */,
+				07F2F4981FB049700064559C /* FFFoundation.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -181,7 +181,7 @@
 		07F2F4641FB03E5C0064559C /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				07F2F4661FB03E5C0064559C /* FFFoundation.framework */,
+				07F2F4991FB049700064559C /* FFFoundation.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -269,7 +269,7 @@
 				};
 			};
 			buildConfigurationList = 07876A1019D41E7000F21E7D /* Build configuration list for PBXProject "FFCoreData" */;
-			compatibilityVersion = "Xcode 3.2";
+			compatibilityVersion = "Xcode 8.0";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
diff --git a/FFCoreData/FFCoreData/CoreDataManager.swift b/FFCoreData/FFCoreData/CoreDataManager.swift
@@ -139,28 +139,26 @@ public struct CoreDataStack {
     }
     private static let manager = CoreDataManager(configuration: configuration)
     
-    public static let mainContext = CoreDataStack.manager.managedObjectContext
+    public static let mainContext = manager.managedObjectContext
     
-    public static func save(context: NSManagedObjectContext, rollback: Bool = true, completion: @escaping (Bool) -> Void = {_ in}) {
-        context.performAndWait {
-            CoreDataStack.manager.save(context: context, rollback: rollback, completion: completion)
-        }
+    public static func save(context: NSManagedObjectContext, rollback: Bool = true, completion: @escaping (Bool) -> () = { _ in }) {
+        context.sync { manager.save(context: context, rollback: rollback, completion: completion) }
     }
 
-    public static func saveMainContext(rollback: Bool = true, completion: @escaping (Bool) -> Void = {_ in}) {
-        CoreDataStack.save(context: CoreDataStack.mainContext, rollback: rollback, completion: completion)
+    public static func saveMainContext(rollback: Bool = true, completion: @escaping (Bool) -> () = { _ in }) {
+        save(context: mainContext, rollback: rollback, completion: completion)
     }
     
     public static func createTemporaryMainContext() -> NSManagedObjectContext {
-        return CoreDataStack.manager.createTemporaryMainContext()
+        return manager.createTemporaryMainContext()
     }
     
     public static func createTemporaryBackgroundContext() -> NSManagedObjectContext {
-        return CoreDataStack.manager.createTemporaryBackgroundContext()
+        return manager.createTemporaryBackgroundContext()
     }
 
     public static func clearDataStore() throws {
-        try CoreDataStack.manager.clearDataStore()
+        try manager.clearDataStore()
     }
 }
 
@@ -215,15 +213,15 @@ extension CoreDataStack {
         }
         #endif
         
-        private static let InfoDictionaryTargetDisplayNameKey = "CFBundleDisplayName"
-        private static let InfoDictionaryTargetNameKey = String(kCFBundleNameKey)
-        private static let DefaultTargetName = "UNKNOWN_TARGET_NAME"
+        private static let infoDictionaryTargetDisplayNameKey = "CFBundleDisplayName"
+        private static let infoDictionaryTargetNameKey = String(kCFBundleNameKey)
+        private static let defaultTargetName = "UNKNOWN_TARGET_NAME"
         
         private init(bundle: Bundle, modelName: String?, sqliteName: String?, storePath: URL?, appSupportFolderName: String?, removeNamespaces: Bool) {
             func targetName(from bundle: Bundle) -> String {
-                guard let infoDict = bundle.infoDictionary else { return Configuration.DefaultTargetName }
-                let name = infoDict[Configuration.InfoDictionaryTargetDisplayNameKey] ?? infoDict[Configuration.InfoDictionaryTargetNameKey]
-                return (name as? String) ?? Configuration.DefaultTargetName
+                guard let infoDict = bundle.infoDictionary else { return Configuration.defaultTargetName }
+                let name = infoDict[Configuration.infoDictionaryTargetDisplayNameKey] ?? infoDict[Configuration.infoDictionaryTargetNameKey]
+                return (name as? String) ?? Configuration.defaultTargetName
             }
             
             self.bundle = bundle
diff --git a/FFCoreData/FFCoreData/Info.plist b/FFCoreData/FFCoreData/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.0</string>
+	<string>3.1.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Original file line number	Diff line number	Diff line change
`@@ -139,28 +139,26 @@ public struct CoreDataStack {`
`139`	`139`	`}`
`140`	`140`	`private static let manager = CoreDataManager(configuration: configuration)`
`141`	`141`
`142`		`- public static let mainContext = CoreDataStack.manager.managedObjectContext`
	`142`	`+ public static let mainContext = manager.managedObjectContext`
`143`	`143`
`144`		`- public static func save(context: NSManagedObjectContext, rollback: Bool = true, completion: @escaping (Bool) -> Void = {_ in}) {`
`145`		`- context.performAndWait {`
`146`		`- CoreDataStack.manager.save(context: context, rollback: rollback, completion: completion)`
`147`		`- }`
	`144`	`+ public static func save(context: NSManagedObjectContext, rollback: Bool = true, completion: @escaping (Bool) -> () = { _ in }) {`
	`145`	`+ context.sync { manager.save(context: context, rollback: rollback, completion: completion) }`
`148`	`146`	`}`
`149`	`147`
`150`		`- public static func saveMainContext(rollback: Bool = true, completion: @escaping (Bool) -> Void = {_ in}) {`
`151`		`- CoreDataStack.save(context: CoreDataStack.mainContext, rollback: rollback, completion: completion)`
	`148`	`+ public static func saveMainContext(rollback: Bool = true, completion: @escaping (Bool) -> () = { _ in }) {`
	`149`	`+ save(context: mainContext, rollback: rollback, completion: completion)`
`152`	`150`	`}`
`153`	`151`
`154`	`152`	`public static func createTemporaryMainContext() -> NSManagedObjectContext {`
`155`		`- return CoreDataStack.manager.createTemporaryMainContext()`
	`153`	`+ return manager.createTemporaryMainContext()`
`156`	`154`	`}`
`157`	`155`
`158`	`156`	`public static func createTemporaryBackgroundContext() -> NSManagedObjectContext {`
`159`		`- return CoreDataStack.manager.createTemporaryBackgroundContext()`
	`157`	`+ return manager.createTemporaryBackgroundContext()`
`160`	`158`	`}`
`161`	`159`
`162`	`160`	`public static func clearDataStore() throws {`
`163`		`- try CoreDataStack.manager.clearDataStore()`
	`161`	`+ try manager.clearDataStore()`
`164`	`162`	`}`
`165`	`163`	`}`
`166`	`164`
`@@ -215,15 +213,15 @@ extension CoreDataStack {`
`215`	`213`	`}`
`216`	`214`	`#endif`
`217`	`215`
`218`		`- private static let InfoDictionaryTargetDisplayNameKey = "CFBundleDisplayName"`
`219`		`- private static let InfoDictionaryTargetNameKey = String(kCFBundleNameKey)`
`220`		`- private static let DefaultTargetName = "UNKNOWN_TARGET_NAME"`
	`216`	`+ private static let infoDictionaryTargetDisplayNameKey = "CFBundleDisplayName"`
	`217`	`+ private static let infoDictionaryTargetNameKey = String(kCFBundleNameKey)`
	`218`	`+ private static let defaultTargetName = "UNKNOWN_TARGET_NAME"`
`221`	`219`
`222`	`220`	`private init(bundle: Bundle, modelName: String?, sqliteName: String?, storePath: URL?, appSupportFolderName: String?, removeNamespaces: Bool) {`
`223`	`221`	`func targetName(from bundle: Bundle) -> String {`
`224`		`- guard let infoDict = bundle.infoDictionary else { return Configuration.DefaultTargetName }`
`225`		`- let name = infoDict[Configuration.InfoDictionaryTargetDisplayNameKey] ?? infoDict[Configuration.InfoDictionaryTargetNameKey]`
`226`		`- return (name as? String) ?? Configuration.DefaultTargetName`
	`222`	`+ guard let infoDict = bundle.infoDictionary else { return Configuration.defaultTargetName }`
	`223`	`+ let name = infoDict[Configuration.infoDictionaryTargetDisplayNameKey] ?? infoDict[Configuration.infoDictionaryTargetNameKey]`
	`224`	`+ return (name as? String) ?? Configuration.defaultTargetName`
`227`	`225`	`}`
`228`	`226`
`229`	`227`	`self.bundle = bundle`