diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj index 04de4da..a077ee0 100644 --- a/CoreStore.xcodeproj/project.pbxproj +++ b/CoreStore.xcodeproj/project.pbxproj @@ -145,6 +145,14 @@ B546F9541C95529D00D5AC55 /* LocalStorageOptions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B546F9521C95529D00D5AC55 /* LocalStorageOptions.swift */; }; B546F9551C95529D00D5AC55 /* LocalStorageOptions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B546F9521C95529D00D5AC55 /* LocalStorageOptions.swift */; }; B546F9561C95529D00D5AC55 /* LocalStorageOptions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B546F9521C95529D00D5AC55 /* LocalStorageOptions.swift */; }; + B546F9581C99B17400D5AC55 /* CSCoreStore+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B546F9571C99B17400D5AC55 /* CSCoreStore+Setup.swift */; }; + B546F9591C99B17400D5AC55 /* CSCoreStore+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B546F9571C99B17400D5AC55 /* CSCoreStore+Setup.swift */; }; + B546F95A1C99B17400D5AC55 /* CSCoreStore+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B546F9571C99B17400D5AC55 /* CSCoreStore+Setup.swift */; }; + B546F95B1C99B17400D5AC55 /* CSCoreStore+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B546F9571C99B17400D5AC55 /* CSCoreStore+Setup.swift */; }; + B546F95D1C9A12B800D5AC55 /* CSSQliteStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B546F95C1C9A12B800D5AC55 /* CSSQliteStore.swift */; }; + B546F95E1C9A12B800D5AC55 /* CSSQliteStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B546F95C1C9A12B800D5AC55 /* CSSQliteStore.swift */; }; + B546F95F1C9A12B800D5AC55 /* CSSQliteStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B546F95C1C9A12B800D5AC55 /* CSSQliteStore.swift */; }; + B546F9601C9A12B800D5AC55 /* CSSQliteStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B546F95C1C9A12B800D5AC55 /* CSSQliteStore.swift */; }; B54A6A551BA15F2A007870FD /* FetchedResultsControllerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54A6A541BA15F2A007870FD /* FetchedResultsControllerDelegate.swift */; }; B5598BCC1BE2093D0092EFCE /* Model.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B5D372821A39CD6900F583D9 /* Model.xcdatamodeld */; }; B56007111B3F6BD500A9A8F9 /* Into.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56007101B3F6BD500A9A8F9 /* Into.swift */; }; @@ -360,6 +368,8 @@ 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; }; B546F9521C95529D00D5AC55 /* LocalStorageOptions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LocalStorageOptions.swift; sourceTree = ""; }; + B546F9571C99B17400D5AC55 /* CSCoreStore+Setup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CSCoreStore+Setup.swift"; sourceTree = ""; }; + B546F95C1C9A12B800D5AC55 /* CSSQliteStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSSQliteStore.swift; sourceTree = ""; }; B54A6A541BA15F2A007870FD /* FetchedResultsControllerDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FetchedResultsControllerDelegate.swift; sourceTree = ""; }; B5548CD51BD65AE00077652A /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; B5548CD71BD65AE50077652A /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/System/Library/Frameworks/CoreData.framework; sourceTree = DEVELOPER_DIR; }; @@ -622,6 +632,24 @@ path = iCloud; sourceTree = ""; }; + B546F9611C9A13F400D5AC55 /* Setup */ = { + isa = PBXGroup; + children = ( + B546F9571C99B17400D5AC55 /* CSCoreStore+Setup.swift */, + B5DBE2D11C991B3E00B5CEFA /* CSDataStack.swift */, + B546F9621C9A140E00D5AC55 /* StorageInterfaces */, + ); + name = Setup; + sourceTree = ""; + }; + B546F9621C9A140E00D5AC55 /* StorageInterfaces */ = { + isa = PBXGroup; + children = ( + B546F95C1C9A12B800D5AC55 /* CSSQliteStore.swift */, + ); + name = StorageInterfaces; + sourceTree = ""; + }; B56964D11B22FF700075EE4A /* Migrating */ = { isa = PBXGroup; children = ( @@ -637,9 +665,9 @@ B5DBE2CB1C99148100B5CEFA /* ObjectiveC */ = { isa = PBXGroup; children = ( - B5DBE2CC1C9914A900B5CEFA /* CSCoreStore.swift */, - B5DBE2D11C991B3E00B5CEFA /* CSDataStack.swift */, B5AEFAB41C9962AE00AD137F /* CoreStoreBridge.swift */, + B5DBE2CC1C9914A900B5CEFA /* CSCoreStore.swift */, + B546F9611C9A13F400D5AC55 /* Setup */, ); path = ObjectiveC; sourceTree = ""; @@ -1077,6 +1105,7 @@ B56007161B4018AB00A9A8F9 /* MigrationChain.swift in Sources */, B5E84F0E1AFF847B0064E85B /* Tweak.swift in Sources */, B5E84F121AFF847B0064E85B /* OrderBy.swift in Sources */, + B546F9581C99B17400D5AC55 /* CSCoreStore+Setup.swift in Sources */, B5E84F361AFF85470064E85B /* NSManagedObjectContext+Setup.swift in Sources */, B5FAD6AE1B518DCB00714891 /* CoreStore+Migration.swift in Sources */, B5E84EE71AFF84610064E85B /* CoreStore+Logging.swift in Sources */, @@ -1127,6 +1156,7 @@ B5E84EE61AFF84610064E85B /* DefaultLogger.swift in Sources */, B5E84EF41AFF846E0064E85B /* AsynchronousDataTransaction.swift in Sources */, B5DBE2CD1C9914A900B5CEFA /* CSCoreStore.swift in Sources */, + B546F95D1C9A12B800D5AC55 /* CSSQliteStore.swift in Sources */, B5E84F151AFF847B0064E85B /* CoreStore+Querying.swift in Sources */, B5E84F241AFF84860064E85B /* ListObserver.swift in Sources */, B5E84F2E1AFF849C0064E85B /* AssociatedObjects.swift in Sources */, @@ -1167,6 +1197,7 @@ B5D3F6461C887C0A00C7492A /* LegacySQLiteStore.swift in Sources */, 82BA18B31C4BBD3900A0916E /* ImportableUniqueObject.swift in Sources */, 82BA18A11C4BBD1D00A0916E /* CoreStore.swift in Sources */, + B546F9591C99B17400D5AC55 /* CSCoreStore+Setup.swift in Sources */, 82BA18CF1C4BBD7100A0916E /* Functions.swift in Sources */, 82BA18A31C4BBD2200A0916E /* DataStack.swift in Sources */, 82BA18C81C4BBD5900A0916E /* MigrationChain.swift in Sources */, @@ -1217,6 +1248,7 @@ 82BA18B91C4BBD4A00A0916E /* From.swift in Sources */, 82BA18BE1C4BBD4A00A0916E /* Tweak.swift in Sources */, B5DBE2CE1C9914A900B5CEFA /* CSCoreStore.swift in Sources */, + B546F95E1C9A12B800D5AC55 /* CSSQliteStore.swift in Sources */, 82BA18CC1C4BBD6400A0916E /* NSProgress+Convenience.swift in Sources */, 82BA18C01C4BBD5300A0916E /* DataStack+Observing.swift in Sources */, 82BA18A61C4BBD2900A0916E /* DefaultLogger.swift in Sources */, @@ -1244,10 +1276,12 @@ B5DBE2D01C9914A900B5CEFA /* CSCoreStore.swift in Sources */, B52DD1BE1BE1F94300949AFE /* NSProgress+Convenience.swift in Sources */, B52DD1951BE1F92500949AFE /* CoreStoreError.swift in Sources */, + B546F9601C9A12B800D5AC55 /* CSSQliteStore.swift in Sources */, B52DD1C21BE1F94600949AFE /* MigrationManager.swift in Sources */, B5FEC1911C9166E700532541 /* NSPersistentStore+Setup.swift in Sources */, B52DD1AB1BE1F93900949AFE /* From.swift in Sources */, B52DD1BF1BE1F94600949AFE /* AssociatedObjects.swift in Sources */, + B546F95B1C99B17400D5AC55 /* CSCoreStore+Setup.swift in Sources */, B52DD1A11BE1F92C00949AFE /* DataStack+Transaction.swift in Sources */, B5D3F6481C887C0A00C7492A /* LegacySQLiteStore.swift in Sources */, B52DD19E1BE1F92C00949AFE /* AsynchronousDataTransaction.swift in Sources */, @@ -1336,6 +1370,7 @@ B5D3F6471C887C0A00C7492A /* LegacySQLiteStore.swift in Sources */, B563217F1BD65216006C9394 /* CoreStore.swift in Sources */, B56321911BD65216006C9394 /* BaseDataTransaction+Importing.swift in Sources */, + B546F95A1C99B17400D5AC55 /* CSCoreStore+Setup.swift in Sources */, B56321941BD65216006C9394 /* CoreStore+Querying.swift in Sources */, B56321811BD65216006C9394 /* DataStack.swift in Sources */, B56321A81BD65219006C9394 /* NSManagedObject+Convenience.swift in Sources */, @@ -1386,6 +1421,7 @@ B56321861BD65216006C9394 /* CoreStoreLogger.swift in Sources */, B56321841BD65216006C9394 /* DefaultLogger.swift in Sources */, B5DBE2CF1C9914A900B5CEFA /* CSCoreStore.swift in Sources */, + B546F95F1C9A12B800D5AC55 /* CSSQliteStore.swift in Sources */, B56321A41BD65216006C9394 /* CoreStore+Migration.swift in Sources */, B56321A01BD65216006C9394 /* ObjectObserver.swift in Sources */, B56321951BD65216006C9394 /* ClauseTypes.swift in Sources */, diff --git a/Sources/ObjectiveC/CSCoreStore+Setup.swift b/Sources/ObjectiveC/CSCoreStore+Setup.swift new file mode 100644 index 0000000..e4517b4 --- /dev/null +++ b/Sources/ObjectiveC/CSCoreStore+Setup.swift @@ -0,0 +1,98 @@ +// +// CSCoreStore+Setup.swift +// CoreStore +// +// Created by John Rommel Estropia on 2016/03/17. +// Copyright © 2016 John Rommel Estropia. All rights reserved. +// + +import Foundation + +public extension CSCoreStore { + + /** + Returns the `defaultStack`'s model version. The version string is the same as the name of the version-specific .xcdatamodeld file. + */ + @objc + public class var modelVersion: String { + + return CoreStore.defaultStack.modelVersion + } + + /** + Returns the entity name-to-class type mapping from the `defaultStack`'s model. + */ + @objc + public static var entityTypesByName: [String: NSManagedObject.Type] { + + return CoreStore.defaultStack.entityTypesByName + } + + /** + Returns the `NSEntityDescription` for the specified `NSManagedObject` subclass from `defaultStack`'s model. + */ + @objc + public static func entityDescriptionForType(type: NSManagedObject.Type) -> NSEntityDescription? { + + return CoreStore.defaultStack.entityDescriptionForType(type) + } + + /** + Creates an `CSSQLiteStore` with default parameters and adds it to the `defaultStack`. This method blocks until completion. + ``` + try CSCoreStore.addStorageAndWait() + ``` + + - returns: the local SQLite storage added to the `defaultStack` + */ + @objc + public static func addStorageAndWait() throws -> CSSQLiteStore { + + return try CoreStore.defaultStack.addStorageAndWait(SQLiteStore).objc + } + + /** + Adds a `StorageInterface` to the `defaultStack` and blocks until completion. + ``` + try CoreStore.addStorageAndWait(InMemoryStore(configuration: "Config1")) + ``` + + - parameter storage: the `StorageInterface` + - returns: the `StorageInterface` added to the `defaultStack` + */ +// @objc +// public static func addStorageAndWait(storage: StorageInterface) throws -> StorageInterface { +// +// return try self.defaultStack.swift.addStorageAndWait(storage) +// } + + /** + Creates a `LocalStorageface` of the specified store type with default values and adds it to the `defaultStack`. This method blocks until completion. + ``` + try CoreStore.addStorageAndWait(SQLiteStore) + ``` + + - parameter storeType: the `LocalStorageface` type + - returns: the local storage added to the `defaultStack` + */ +// @objc +// public static func addStorageAndWait(storageType: T.Type) throws -> T { +// +// return try self.defaultStack.swift.addStorageAndWait(storageType.init()) +// } + + /** + Adds a `LocalStorage` to the `defaultStack` and blocks until completion. + ``` + try CoreStore.addStorageAndWait(SQLiteStore(configuration: "Config1")) + ``` + + - parameter storage: the local storage + - returns: the local storage added to the `defaultStack`. Note that this may not always be the same instance as the parameter argument if a previous `LocalStorage` was already added at the same URL and with the same configuration. + */ +// @objc +// public static func addStorageAndWait(storage: T) throws -> T { +// +// return try self.defaultStack.swift.addStorageAndWait(storage) +// } +} \ No newline at end of file diff --git a/Sources/ObjectiveC/CSSQliteStore.swift b/Sources/ObjectiveC/CSSQliteStore.swift new file mode 100644 index 0000000..8d1c840 --- /dev/null +++ b/Sources/ObjectiveC/CSSQliteStore.swift @@ -0,0 +1,75 @@ +// +// CSSQLiteStore.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: - SQLiteStore + +extension SQLiteStore: CoreStoreBridgeable { + + // MARK: CoreStoreBridgeable + + public typealias NativeType = CSSQLiteStore +} + + +// MARK: - CSSQLiteStore + +/** + The `CSSQLiteStore` serves as the Objective-C bridging type for `SQLiteStore`. + */ +@objc +public final class CSSQLiteStore: NSObject, CoreStoreBridge { + + + + // MARK: NSObject + + public override var hash: Int { + + return ObjectIdentifier(self.swift).hashValue + } + + public override func isEqual(object: AnyObject?) -> Bool { + + guard let object = object as? CSSQLiteStore else { + + return false + } + return self.swift === object.swift + } + + + // MARK: CoreStoreBridge + + public let swift: SQLiteStore + + public required init(_ swiftObject: SQLiteStore) { + + self.swift = swiftObject + } +}