Merge pull request #210 from ivasic/master

Fixes unboxing with keypaths that contain keys identical to the first one
JohnSundell · Jan 17, 2018 · 5b825e2 · 5b825e2
2 parents 0f43982 + 2cb4de8
commit 5b825e2
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/Sources/Unboxer.swift b/Sources/Unboxer.swift
@@ -224,14 +224,13 @@ private extension Unboxer {
             case .keyPath(let keyPath):
                 var node: UnboxPathNode = self.dictionary
                 let components = keyPath.components(separatedBy: ".")
-                let lastKey = components.last
 
-                for key in components {
+                for (index, key) in components.enumerated() {
                     guard let nextValue = node.unboxPathValue(forKey: key) else {
                         throw UnboxPathError.missingKey(key)
                     }
 
-                    if key == lastKey {
+                    if index == components.index(before: components.endIndex) {
                         return try transform(nextValue).orThrow(UnboxPathError.invalidValue(nextValue, key))
                     }
 

diff --git a/Tests/UnboxTests/UnboxTests.swift b/Tests/UnboxTests/UnboxTests.swift
@@ -1744,6 +1744,31 @@ class UnboxTests: XCTestCase {
             XCTFail("\(error)")
         }
     }
+
+    func testKeypathsWithSameKeys() {
+        struct Model: Unboxable {
+            let value: String
+
+            init(unboxer: Unboxer) throws {
+                self.value = try unboxer.unbox(keyPath: "key.nested.key")
+            }
+        }
+
+        let dictionary: UnboxableDictionary = [
+            "key": [
+                "nested": [
+                    "key": "value"
+                ]
+            ]
+        ]
+
+        do {
+            let model: Model = try unbox(dictionary: dictionary)
+            XCTAssertEqual(model.value, "value")
+        } catch {
+            XCTFail("\(error)")
+        }
+    }
 }
 
 private func UnboxTestDictionaryWithAllRequiredKeysWithValidValues(nested: Bool) -> UnboxableDictionary {