WIP: prototype for ManagedObjectProtocol

Sources/Setup/StorageInterfaces/ICloudStore.swift

@@ -65,7 +65,7 @@ public final class ICloudStore: CloudStorage {
      - parameter mappingModelBundles: a list of `NSBundle`s from which to search mapping models for migration.
      - parameter cloudStorageOptions: When the `ICloudStore` is passed to the `DataStack`'s `addStorage()` methods, tells the `DataStack` how to setup the persistent store. Defaults to `.None`.
      */
-    public required init?(ubiquitousContentName: String, ubiquitousContentTransactionLogsSubdirectory: String, ubiquitousContainerID: String? = nil, ubiquitousPeerToken: String? = nil, configuration: String? = nil, cloudStorageOptions: CloudStorageOptions = nil) {
+    public required init?(ubiquitousContentName: String, ubiquitousContentTransactionLogsSubdirectory: String, ubiquitousContainerID: String? = nil, ubiquitousPeerToken: String? = nil, configuration: ModelConfiguration = nil, cloudStorageOptions: CloudStorageOptions = nil) {
         
         CoreStore.assert(
             !ubiquitousContentName.isEmpty,
@@ -258,7 +258,7 @@ public final class ICloudStore: CloudStorage {
     /**
      The configuration name in the model file
      */
-    public let configuration: String?
+    public let configuration: ModelConfiguration
     
     /**
      The options dictionary for the `NSPersistentStore`. For `SQLiteStore`s, this is always set to

Sources/Setup/StorageInterfaces/InMemoryStore.swift

@@ -37,7 +37,7 @@ public final class InMemoryStore: StorageInterface, DefaultInitializableStore {
      Initializes an `InMemoryStore` for the specified configuration
      - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil`, the "Default" configuration.
      */
-    public init(configuration: String?) {
+    public init(configuration: ModelConfiguration) {
     
         self.configuration = configuration
     }
@@ -64,7 +64,7 @@ public final class InMemoryStore: StorageInterface, DefaultInitializableStore {
     /**
      The configuration name in the model file
      */
-    public let configuration: String?
+    public let configuration: ModelConfiguration
     
     /**
      The options dictionary for the `NSPersistentStore`. For `InMemoryStore`s, this is always set to `nil`.

Sources/Setup/StorageInterfaces/LegacySQLiteStore.swift

@@ -44,7 +44,7 @@ public final class LegacySQLiteStore: LocalStorage, DefaultInitializableStore {
      - parameter mappingModelBundles: a list of `NSBundle`s from which to search mapping models for migration.
      - parameter localStorageOptions: When the `SQLiteStore` is passed to the `DataStack`'s `addStorage()` methods, tells the `DataStack` how to setup the persistent store. Defaults to `.None`.
      */
-    public init(fileURL: URL, configuration: String? = nil, mappingModelBundles: [Bundle] = Bundle.allBundles, localStorageOptions: LocalStorageOptions = nil) {
+    public init(fileURL: URL, configuration: ModelConfiguration = nil, mappingModelBundles: [Bundle] = Bundle.allBundles, localStorageOptions: LocalStorageOptions = nil) {
         
         self.fileURL = fileURL
         self.configuration = configuration
@@ -61,7 +61,7 @@ public final class LegacySQLiteStore: LocalStorage, DefaultInitializableStore {
      - parameter mappingModelBundles: a list of `NSBundle`s from which to search mapping models for migration.
      - parameter localStorageOptions: When the `SQLiteStore` is passed to the `DataStack`'s `addStorage()` methods, tells the `DataStack` how to setup the persistent store. Defaults to `.None`.
      */
-    public init(fileName: String, configuration: String? = nil, mappingModelBundles: [Bundle] = Bundle.allBundles, localStorageOptions: LocalStorageOptions = nil) {
+    public init(fileName: String, configuration: ModelConfiguration = nil, mappingModelBundles: [Bundle] = Bundle.allBundles, localStorageOptions: LocalStorageOptions = nil) {
         
         self.fileURL = LegacySQLiteStore.defaultRootDirectory.appendingPathComponent(
             fileName,
@@ -118,7 +118,7 @@ public final class LegacySQLiteStore: LocalStorage, DefaultInitializableStore {
     /**
      The configuration name in the model file
      */
-    public let configuration: String?
+    public let configuration: ModelConfiguration
     
     /**
      The options dictionary for the `NSPersistentStore`. For `SQLiteStore`s, this is always set to

Sources/Setup/StorageInterfaces/SQLiteStore.swift

@@ -43,7 +43,7 @@ public final class SQLiteStore: LocalStorage, DefaultInitializableStore {
      - parameter mappingModelBundles: a list of `NSBundle`s from which to search mapping models (*.xcmappingmodel) for migration.
      - parameter localStorageOptions: When the `SQLiteStore` is passed to the `DataStack`'s `addStorage()` methods, tells the `DataStack` how to setup the persistent store. Defaults to `.None`.
      */
-    public init(fileURL: URL, configuration: String? = nil, mappingModelBundles: [Bundle] = Bundle.allBundles, localStorageOptions: LocalStorageOptions = nil) {
+    public init(fileURL: URL, configuration: ModelConfiguration = nil, mappingModelBundles: [Bundle] = Bundle.allBundles, localStorageOptions: LocalStorageOptions = nil) {
         
         self.fileURL = fileURL
         self.configuration = configuration
@@ -60,7 +60,7 @@ public final class SQLiteStore: LocalStorage, DefaultInitializableStore {
      - parameter mappingModelBundles: a list of `NSBundle`s from which to search mapping models (*.xcmappingmodel) for migration
      - parameter localStorageOptions: When the `SQLiteStore` is passed to the `DataStack`'s `addStorage()` methods, tells the `DataStack` how to setup the persistent store. Defaults to `.None`.
      */
-    public init(fileName: String, configuration: String? = nil, mappingModelBundles: [Bundle] = Bundle.allBundles, localStorageOptions: LocalStorageOptions = nil) {
+    public init(fileName: String, configuration: ModelConfiguration = nil, mappingModelBundles: [Bundle] = Bundle.allBundles, localStorageOptions: LocalStorageOptions = nil) {
         
         self.fileURL = SQLiteStore.defaultRootDirectory
             .appendingPathComponent(fileName, isDirectory: false)
@@ -96,7 +96,7 @@ public final class SQLiteStore: LocalStorage, DefaultInitializableStore {
     /**
      The configuration name in the model file
      */
-    public let configuration: String?
+    public let configuration: ModelConfiguration
     
     /**
      The options dictionary for the `NSPersistentStore`. For `SQLiteStore`s, this is always set to 

Sources/Setup/StorageInterfaces/StorageInterface.swift

@@ -41,7 +41,7 @@ public protocol StorageInterface: class {
     /**
      The configuration name in the model file
      */
-    var configuration: String? { get }
+    var configuration: ModelConfiguration { get }
     
     /**
      The options dictionary for the `NSPersistentStore`
@@ -166,7 +166,7 @@ internal extension LocalStorage {
     internal func matchesPersistentStore(_ persistentStore: NSPersistentStore) -> Bool {
         
         return persistentStore.type == type(of: self).storeType
-            && persistentStore.configurationName == (self.configuration ?? Into.defaultConfigurationName)
+            && persistentStore.configurationName == (self.configuration ?? DataStack.defaultConfigurationName)
             && persistentStore.url == self.fileURL
     }
 }
@@ -250,7 +250,7 @@ internal extension CloudStorage {
     internal func matchesPersistentStore(_ persistentStore: NSPersistentStore) -> Bool {
         
         guard persistentStore.type == type(of: self).storeType
-            && persistentStore.configurationName == (self.configuration ?? Into.defaultConfigurationName) else {
+            && persistentStore.configurationName == (self.configuration ?? DataStack.defaultConfigurationName) else {
                 
                 return false
         }