added two early exists to safeValue(forField:in:), one if the string …

…is empty and one where it's a single key (instead of a keypath
Noobish1 · Nov 7, 2016 · c8c9c3b · c8c9c3b
1 parent bd919d3
commit c8c9c3b
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/KeyedMapper/Objects/KeyedMapper.swift b/KeyedMapper/Objects/KeyedMapper.swift
@@ -49,6 +49,14 @@ public struct KeyedMapper<Object: Mappable> {
     }
 
     internal func safeValue(forField field: Object.Key, in dictionary: NSDictionary) -> Any? {
+        guard !field.stringValue.isEmpty else {
+            return dictionary
+        }
+
+        guard field.stringValue.contains(".") else {
+            return dictionary[field.stringValue]
+        }
+
         var object: Any? = dictionary
         var keys = field.stringValue.characters.split(separator: ".").map(String.init)