Add Bundle.wordPressData and update DataMigratorTests

Author: kean

Sources/WordPressData/Swift/Bundle+WordPressData.swift

@@ -0,0 +1,9 @@
+import Foundation
+
+extension Bundle {
+    public static var wordPressData: Bundle {
+        Bundle(for: BundleToken.self)
+    }
+}
+
+private final class BundleToken {}

Sources/WordPressData/Swift/ContextManager.swift

@@ -155,7 +155,7 @@ public class ContextManager: NSObject, CoreDataStack, CoreDataStackSwift {
 
         DDLogWarn("Migration required for persistent store.")
 
-        guard let modelFileURL = Bundle(for: ContextManager.self).url(forResource: "WordPress", withExtension: "momd") else {
+        guard let modelFileURL = Bundle.wordPressData.url(forResource: "WordPress", withExtension: "momd") else {
             fatalError("Can't find WordPress.momd")
         }
 
@@ -222,7 +222,7 @@ private extension ContextManager {
 
 private extension ContextManager {
     static func createPersistentContainer(storeURL: URL, modelName: String) -> NSPersistentContainer {
-        guard var modelFileURL = Bundle(for: ContextManager.self).url(forResource: "WordPress", withExtension: "momd") else {
+        guard var modelFileURL = Bundle.wordPressData.url(forResource: "WordPress", withExtension: "momd") else {
             fatalError("Can't find WordPress.momd")
         }
 

Sources/WordPressData/Swift/CoreDataHelper.swift

@@ -358,7 +358,7 @@ public extension CoreDataStack {
     }
 
     private func migrateDatabaseIfNecessary(at databaseLocation: URL) throws {
-        guard let modelFileURL = Bundle(for: ContextManager.self).url(forResource: "WordPress", withExtension: "momd"),
+        guard let modelFileURL = Bundle.wordPressData.url(forResource: "WordPress", withExtension: "momd"),
               let objectModel = NSManagedObjectModel(contentsOf: modelFileURL) else {
             return
         }

Sources/WordPressData/Swift/CoreDataIterativeMigrator.swift

@@ -263,7 +263,7 @@ private extension CoreDataIterativeMigrator {
     }
 
     static func model(for metadata: [String: Any]) throws -> NSManagedObjectModel? {
-        let bundle = Bundle(for: ContextManager.self)
+        let bundle = Bundle.wordPressData
         guard let sourceModel = NSManagedObjectModel.mergedModel(from: [bundle], forStoreMetadata: metadata) else {
             let description = "Failed to find source model for metadata: \(metadata)"
             throw error(with: .noSourceModelForMetadata, description: description)
@@ -287,7 +287,7 @@ private extension CoreDataIterativeMigrator {
     }
 
     static func urlForModel(name: String, in directory: String?) -> URL? {
-        let bundle = Bundle(for: ContextManager.self)
+        let bundle = Bundle.wordPressData
         var url = bundle.url(forResource: name, withExtension: "mom", subdirectory: directory)
 
         if url != nil {

Tests/KeystoneTests/Tests/CoreData/ContextManagerTests.swift

@@ -445,7 +445,7 @@ class ContextManagerTests: XCTestCase {
     }
 
     fileprivate func urlForModelName(_ name: String) -> URL? {
-        let bundle = Bundle(for: ContextManager.self)
+        let bundle = Bundle.wordPressData
         var url = bundle.url(forResource: name, withExtension: "mom")
 
         if url == nil {

Tests/KeystoneTests/Tests/Jetpack/DataMigratorTests.swift

@@ -259,7 +259,7 @@ private extension DataMigratorTests {
         static let defaultsWrapperKey = "defaults_staging_dictionary"
     }
 
-    func createContext(for model: NSManagedObjectModel = NSManagedObjectModel.mergedModel(from: [Bundle.main])!,
+    func createContext(for model: NSManagedObjectModel = NSManagedObjectModel.mergedModel(from: [Bundle.wordPressData])!,
                        type: String = NSInMemoryStoreType,
                        at location: URL? = nil) throws -> NSManagedObjectContext {
         let persistentStoreCoordinator = NSPersistentStoreCoordinator(managedObjectModel: model)
@@ -288,7 +288,7 @@ private extension DataMigratorTests {
     }
 
     func getModelNames() -> [String] {
-        guard let modelFileURL = Bundle.main.url(forResource: "WordPress", withExtension: "momd"),
+        guard let modelFileURL = Bundle.wordPressData.url(forResource: "WordPress", withExtension: "momd"),
               let versionInfo = NSDictionary(contentsOf: modelFileURL.appendingPathComponent("VersionInfo.plist")),
               let modelNames = (versionInfo["NSManagedObjectModel_VersionHashes"] as? [String: AnyObject])?.keys else {
             return []
@@ -305,13 +305,13 @@ private extension DataMigratorTests {
     }
 
     func urlForModel(name: String) -> URL? {
-        if let url = Bundle.main.url(forResource: name, withExtension: "mom") {
+        if let url = Bundle.wordPressData.url(forResource: name, withExtension: "mom") {
             return url
         }
 
-        let momdPaths = Bundle.main.paths(forResourcesOfType: "momd", inDirectory: nil)
+        let momdPaths = Bundle.wordPressData.paths(forResourcesOfType: "momd", inDirectory: nil)
         for path in momdPaths {
-            if let url = Bundle.main.url(forResource: name, withExtension: "mom", subdirectory: URL(fileURLWithPath: path).lastPathComponent) {
+            if let url = Bundle.wordPressData.url(forResource: name, withExtension: "mom", subdirectory: URL(fileURLWithPath: path).lastPathComponent) {
                 return url
             }
         }