Merge branch 'master' into prototype/Swift_3_2

CoreStore.podspec

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

CoreStoreDemo/CoreStoreDemo/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.0.2</string>
+	<string>4.0.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Sources/CustomSchemaMappingProvider.swift

@@ -352,7 +352,7 @@ public class CustomSchemaMappingProvider: Hashable, SchemaMappingProvider {
         )
         func expression(forSource sourceEntity: NSEntityDescription) -> NSExpression {
             
-            return NSExpression(format: "FETCH(FUNCTION($\(NSMigrationManagerKey), \"fetchRequestForSourceEntityNamed:predicateString:\" , \"\(sourceEntity.name!)\", \"\(NSPredicate(value: true))\"), $\(NSMigrationManagerKey).\(#keyPath(NSMigrationManager.sourceContext)), \(false))")
+            return NSExpression(format: "FETCH(FUNCTION($\(NSMigrationManagerKey), \"fetchRequestForSourceEntityNamed:predicateString:\" , \"\(sourceEntity.name!)\", \"\(NSPredicate(value: true))\"), FUNCTION($\(NSMigrationManagerKey), \"\(#selector(getter: NSMigrationManager.sourceContext))\"), \(false))")
         }
         
         let sourceEntitiesByName = sourceModel.entitiesByName
@@ -427,22 +427,25 @@ public class CustomSchemaMappingProvider: Hashable, SchemaMappingProvider {
                     let destinationAttribute = destination.attribute
                     let propertyMapping = NSPropertyMapping()
                     propertyMapping.name = destinationAttribute.name
-                    propertyMapping.valueExpression = NSExpression(format: "$\(NSMigrationSourceObjectKey).\(sourceAttribute.name)")
+                    propertyMapping.valueExpression = NSExpression(format: "FUNCTION($\(NSMigrationSourceObjectKey), \"\(#selector(NSManagedObject.value(forKey:)))\", \"\(sourceAttribute.name)\")")
                     attributeMappings.append(propertyMapping)
                 }
                 return attributeMappings
             }
-            let entityMappingName = entityMapping.name!
             entityMapping.relationshipMappings = autoreleasepool { () -> [NSPropertyMapping] in
                 
+                let sourceRelationships = sourceEntity.cs_resolvedRelationshipRenamingIdentities()
                 let destinationRelationships = destinationEntity.cs_resolvedRelationshipRenamingIdentities()
                 var relationshipMappings: [NSPropertyMapping] = []
-                for (_, destination) in destinationRelationships {
+                for (renamingIdentifier, destination) in destinationRelationships {
                     
+                    let sourceRelationship = sourceRelationships[renamingIdentifier]!.relationship
                     let destinationRelationship = destination.relationship
+                    let sourceRelationshipName = sourceRelationship.name
+
                     let propertyMapping = NSPropertyMapping()
                     propertyMapping.name = destinationRelationship.name
-                    propertyMapping.valueExpression = NSExpression(format: "FUNCTION($\(NSMigrationManagerKey), \"\(#selector(NSMigrationManager.destinationInstances(forEntityMappingName:sourceInstances:)))\" , \"\(entityMappingName)\", $\(NSMigrationSourceObjectKey))[0]")
+                    propertyMapping.valueExpression = NSExpression(format: "FUNCTION($\(NSMigrationManagerKey), \"destinationInstancesForSourceRelationshipNamed:sourceInstances:\", \"\(sourceRelationshipName)\", FUNCTION($\(NSMigrationSourceObjectKey), \"\(#selector(NSManagedObject.value(forKey:)))\", \"\(sourceRelationshipName)\"))")
                     relationshipMappings.append(propertyMapping)
                 }
                 return relationshipMappings
@@ -483,17 +486,24 @@ public class CustomSchemaMappingProvider: Hashable, SchemaMappingProvider {
                 }
                 userInfo[CustomEntityMigrationPolicy.UserInfoKey.sourceAttributesByDestinationKey] = sourceAttributesByDestinationKey
             }
-            let entityMappingName = entityMapping.name!
             entityMapping.relationshipMappings = autoreleasepool { () -> [NSPropertyMapping] in
                 
+                let sourceRelationships = sourceEntity.cs_resolvedRelationshipRenamingIdentities()
                 let destinationRelationships = destinationEntity.cs_resolvedRelationshipRenamingIdentities()
-                var relationshipMappings: [NSPropertyMapping] = []
+                let transformedRenamingIdentifiers = Set(destinationRelationships.keys)
-                for (_, destination) in destinationRelationships {
+                    .intersection(sourceRelationships.keys)
+
+                var relationshipMappings: [NSPropertyMapping] = []
+                for renamingIdentifier in transformedRenamingIdentifiers {
+
+                    let sourceRelationship = sourceRelationships[renamingIdentifier]!.relationship
+                    let destinationRelationship = destinationRelationships[renamingIdentifier]!.relationship
+                    let sourceRelationshipName = sourceRelationship.name
+                    let destinationRelationshipName = destinationRelationship.name
 
-                    let destinationRelationship = destination.relationship
                     let propertyMapping = NSPropertyMapping()
-                    propertyMapping.name = destinationRelationship.name
+                    propertyMapping.name = destinationRelationshipName
-                    propertyMapping.valueExpression = NSExpression(format: "FUNCTION($\(NSMigrationManagerKey), \"\(#selector(NSMigrationManager.destinationInstances(forEntityMappingName:sourceInstances:)))\" , \"\(entityMappingName)\", $\(NSMigrationSourceObjectKey))[0]")
+                    propertyMapping.valueExpression = NSExpression(format: "FUNCTION($\(NSMigrationManagerKey), \"destinationInstancesForSourceRelationshipNamed:sourceInstances:\", \"\(sourceRelationshipName)\", FUNCTION($\(NSMigrationSourceObjectKey), \"\(#selector(NSManagedObject.value(forKey:)))\", \"\(sourceRelationshipName)\"))")
                     relationshipMappings.append(propertyMapping)
                 }
                 return relationshipMappings
@@ -545,11 +555,7 @@ public class CustomSchemaMappingProvider: Hashable, SchemaMappingProvider {
             )
             if let dInstance = destinationObject?.rawObject {
                 
-                manager.associate(
+                manager.associate(sourceInstance: sInstance, withDestinationInstance: dInstance, for: mapping)
-                    sourceInstance: sInstance,
-                    withDestinationInstance: dInstance,
-                    for: mapping
-                )
             }
         }
         
@@ -670,77 +676,76 @@ public class CustomSchemaMappingProvider: Hashable, SchemaMappingProvider {
                 allMappedSourceKeys[sourceEntity] = destinationEntity
                 allMappedDestinationKeys[destinationEntity] = sourceEntity
             }
+        }
+        for renamingIdentifier in transformedRenamingIdentifiers {
             
-            for renamingIdentifier in transformedRenamingIdentifiers {
+            let sourceEntity = sourceRenamingIdentifiers[renamingIdentifier]!.entity
+            let destinationEntity = destinationRenamingIdentifiers[renamingIdentifier]!.entity
+            let sourceEntityName = sourceEntity.name!
+            let destinationEntityName = destinationEntity.name!
+            switch (allMappedSourceKeys[sourceEntityName], allMappedDestinationKeys[destinationEntityName]) {
                 
-                let sourceEntity = sourceRenamingIdentifiers[renamingIdentifier]!.entity
+            case (nil, nil):
-                let destinationEntity = destinationRenamingIdentifiers[renamingIdentifier]!.entity
+                if sourceEntity.versionHash == destinationEntity.versionHash {
-                let sourceEntityName = sourceEntity.name!
-                let destinationEntityName = destinationEntity.name!
-                switch (allMappedSourceKeys[sourceEntityName], allMappedDestinationKeys[destinationEntityName]) {
                     
-                case (nil, nil):
+                    copyMappings.insert(
-                    if sourceEntity.versionHash == destinationEntity.versionHash {
+                        .copyEntity(
-                        
+                            sourceEntity: sourceEntityName,
-                        copyMappings.insert(
+                            destinationEntity: destinationEntityName
-                            .copyEntity(
-                                sourceEntity: sourceEntityName,
-                                destinationEntity: destinationEntityName
-                            )
                         )
-                    }
+                    )
-                    else {
+                }
+                else {
                     
-                        transformMappings.insert(
+                    transformMappings.insert(
-                            .transformEntity(
+                        .transformEntity(
-                                sourceEntity: sourceEntityName,
+                            sourceEntity: sourceEntityName,
-                                destinationEntity: destinationEntityName,
+                            destinationEntity: destinationEntityName,
-                                transformer: CustomMapping.inferredTransformation
+                            transformer: CustomMapping.inferredTransformation
-                            )
                         )
-                    }
+                    )
-                    allMappedSourceKeys[sourceEntityName] = destinationEntityName
-                    allMappedDestinationKeys[destinationEntityName] = sourceEntityName
-                    
-                case (""?, nil):
-                    insertMappings.insert(.insertEntity(destinationEntity: destinationEntityName))
-                    allMappedDestinationKeys[destinationEntityName] = ""
-                    
-                case (nil, ""?):
-                    deleteMappings.insert(.deleteEntity(sourceEntity: sourceEntityName))
-                    allMappedSourceKeys[sourceEntityName] = ""
-                    
-                default:
-                    continue
                 }
+                allMappedSourceKeys[sourceEntityName] = destinationEntityName
+                allMappedDestinationKeys[destinationEntityName] = sourceEntityName
+                
+            case (""?, nil):
+                insertMappings.insert(.insertEntity(destinationEntity: destinationEntityName))
+                allMappedDestinationKeys[destinationEntityName] = ""
+                
+            case (nil, ""?):
+                deleteMappings.insert(.deleteEntity(sourceEntity: sourceEntityName))
+                allMappedSourceKeys[sourceEntityName] = ""
+                
+            default:
+                continue
             }
-            for renamingIdentifier in removedRenamingIdentifiers {
+        }
+        for renamingIdentifier in removedRenamingIdentifiers {
             
-                let sourceEntity = sourceRenamingIdentifiers[renamingIdentifier]!.entity
+            let sourceEntity = sourceRenamingIdentifiers[renamingIdentifier]!.entity
-                let sourceEntityName = sourceEntity.name!
+            let sourceEntityName = sourceEntity.name!
-                switch allMappedSourceKeys[sourceEntityName] {
+            switch allMappedSourceKeys[sourceEntityName] {
                 
-                case nil:
+            case nil:
-                    deleteMappings.insert(.deleteEntity(sourceEntity: sourceEntityName))
+                deleteMappings.insert(.deleteEntity(sourceEntity: sourceEntityName))
-                    allMappedSourceKeys[sourceEntityName] = ""
+                allMappedSourceKeys[sourceEntityName] = ""
                 
-                default:
+            default:
-                    continue
+                continue
-                }
             }
-            for renamingIdentifier in addedRenamingIdentifiers {
+        }
+        for renamingIdentifier in addedRenamingIdentifiers {
             
-                let destinationEntity = destinationRenamingIdentifiers[renamingIdentifier]!.entity
+            let destinationEntity = destinationRenamingIdentifiers[renamingIdentifier]!.entity
-                let destinationEntityName = destinationEntity.name!
+            let destinationEntityName = destinationEntity.name!
-                switch allMappedDestinationKeys[destinationEntityName] {
+            switch allMappedDestinationKeys[destinationEntityName] {
                 
-                case nil:
+            case nil:
-                    insertMappings.insert(.insertEntity(destinationEntity: destinationEntityName))
+                insertMappings.insert(.insertEntity(destinationEntity: destinationEntityName))
-                    allMappedDestinationKeys[destinationEntityName] = ""
+                allMappedDestinationKeys[destinationEntityName] = ""
                 
-                default:
+            default:
-                    continue
+                continue
-                }
             }
         }
         return (deleteMappings, insertMappings, copyMappings, transformMappings)

Sources/Info.plist

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