Use CDKMapStrategy instead of CDKNoMapping value

Author: mac-cain13

CoreDataKit/Importing/NSPropertyDescription+Importing.swift

@@ -10,40 +10,57 @@ import CoreData
 
 extension NSPropertyDescription
 {
+    var mapStrategy: MapStrategy {
+        let fallbackStrategy = MapStrategy.Mapping
+
+        if let mappingStrategyString = userInfo?[MappingUserInfoKey] as? String {
+            if let strategy = MapStrategy(rawValue: mappingStrategyString) {
+                return strategy
+            } else {
+                CoreDataKit.sharedLogger(.ERROR, "Unsupported \(MappingUserInfoKey) given for \(entity.name).\(name), falling back to \(fallbackStrategy.rawValue) strategy")
+                return fallbackStrategy
+            }
+        }
+
+        return fallbackStrategy
+    }
+
     /**
     Keys that could contain data for this property as defined by the model
 
     :returns: Array of keys to look for when mapping data into this property
     */
     var mappings: [String] {
-        var _mappings = [String]()
+        switch mapStrategy {
+        case .NoMapping:
+            return [String]()
 
-        // Fetch the unnumbered mapping
-        if let unnumberedMapping = userInfo?[MappingUserInfoKey] as? String {
-            if SuppressMappingUserInfoValue == unnumberedMapping {
-                return [String]()
-            } else {
+        case .Mapping:
+            var _mappings = [String]()
+
+            // Fetch the unnumbered mapping
+            if let unnumberedMapping = userInfo?[MappingUserInfoKey] as? String {
                 _mappings.append(unnumberedMapping)
             }
-        }
 
-        // Fetch the numbered mappings
-        for i in 0...MaxNumberedMappings+1 {
-            if let numberedMapping = userInfo?[MappingUserInfoKey + ".\(i)"] as? String {
-                _mappings.append(numberedMapping)
+            // Fetch the numbered mappings
+            for i in 0...MaxNumberedMappings+1 {
+                if let numberedMapping = userInfo?[MappingUserInfoKey + ".\(i)"] as? String {
+                    _mappings.append(numberedMapping)
 
-                if i == MaxNumberedMappings+1 {
-                    CoreDataKit.sharedLogger(.WARN, "Only mappings up to \(MappingUserInfoKey).\(MaxNumberedMappings) mappings are supported, you defined more for \(entity.name).\(name)")
+                    if i == MaxNumberedMappings+1 {
+                        CoreDataKit.sharedLogger(.WARN, "Only mappings up to \(MappingUserInfoKey).\(MaxNumberedMappings) mappings are supported all others are ignored, you defined more for \(entity.name).\(name)")
+                    }
                 }
             }
-        }
 
-        // Fallback to the name of the property as a mapping if no mappings are defined
-        if 0 == _mappings.count {
-            _mappings.append(name)
+            // Fallback to the name of the property as a mapping if no mappings are defined
+            if 0 == _mappings.count {
+                _mappings.append(name)
+            }
+            
+            return _mappings
         }
-
-        return _mappings
     }
 
     /**

CoreDataKit/Importing/NSRelationshipDescription+Importing.swift

@@ -12,10 +12,17 @@ extension NSRelationshipDescription {
 
     /// Type of the relation as defined in the model
     var relationType: RelationType {
+        let fallbackRelationType = RelationType.RelatedById
+
         if let relationTypeString = userInfo?[RelationTypeUserInfoKey] as? String {
-            return RelationType.fromString(relationTypeString)
+            if let relationType = RelationType(rawValue: relationTypeString) {
+                return relationType
+            } else {
+                CoreDataKit.sharedLogger(.ERROR, "Unsupported \(RelationTypeUserInfoKey) given for \(entity.name).\(name), falling back to \(fallbackRelationType.rawValue) relation type")
+                return fallbackRelationType
+            }
         }
 
-        return RelationType.RelatedById
+        return fallbackRelationType
     }
 }

CoreDataKit/Importing/Types+Importing.swift

@@ -18,11 +18,20 @@ let IdentifierUserInfoKey = "CDKId"
 /// Key used on property to define mapping in CoreData user info
 let MappingUserInfoKey = "CDKMap"
 
-/// Value used with MappingUserInfoKey to disable all mapping behaviour
-let SuppressMappingUserInfoValue = "CDKNoMapping"
-
 /// Maximum of numbered MappingUserInfoKeys on an property
-let MaxNumberedMappings = 10
+let MaxNumberedMappings = 9
+
+/// Key used on property to define mapping strategy in CoreData user info
+let MapStrategyUserInfoKey = "CDKMapStrategy"
+
+/// Type of mapping to use
+enum MapStrategy: String {
+    /// Stategy to use default mapping behaviour with the available MappingUserInfoKey and fallbacks
+    case Mapping = "CDKStandardMapping"
+
+    /// Strategy to disable all mapping behaviour
+    case NoMapping = "CDKNoMapping"
+}
 
 // MARK: Relations
 
@@ -36,10 +45,6 @@ enum RelationType: String {
 
     /// Relation that doesn't use a ID of some sort
     case Embedding = "CDKEmbedding"
-
-    static func fromString(string: String) -> RelationType {
-        return RelationType(rawValue: string) ?? .RelatedById
-    }
 }
 
 // MARK: - Importable value