Merge pull request JohnSundell#94 from clayellis/master

Unboxing string array to integer array. Fix #87
hhunaid · Jul 26, 2016 · f9c5a63 · f9c5a63
2 parents c2ab085 + 7edfe75
commit f9c5a63
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 0 deletions.
diff --git a/Sources/Unbox.swift b/Sources/Unbox.swift
@@ -482,6 +482,23 @@ public class Unboxer {
 
     /// Unbox a required Array containing values of a raw type
     public func unbox<T: UnboxableRawType>(key: String, isKeyPath: Bool = true) -> [T] {
+        if let rawValueArray = UnboxValueResolver<[T]>(self).resolveOptionalValueForKey(key, isKeyPath: isKeyPath) {
+            return rawValueArray
+        }
+
+        let transformedStringArray = UnboxValueResolver<[String]>(self).resolveOptionalValueForKey(key, isKeyPath: isKeyPath, transform: { stringArray -> [T]? in
+            var transformedStringArray = [T]()
+            for string in stringArray {
+                guard let transformedUnboxedString = T.transformUnboxedString(string) else { return nil }
+                transformedStringArray.append(transformedUnboxedString)
+            }
+            return transformedStringArray
+        })
+
+        if let transformedStringArray = transformedStringArray {
+            return transformedStringArray
+        }
+
         return UnboxValueResolver<[T]>(self).resolveRequiredValueForKey(key, isKeyPath: isKeyPath, fallbackValue: [])
     }
 

diff --git a/Tests/UnboxTests.swift b/Tests/UnboxTests.swift
@@ -1358,6 +1358,44 @@ class UnboxTests: XCTestCase {
         }
     }
 
+    func testUnboxingArrayOfStringsTransformedToInt() {
+        let dictionary: UnboxableDictionary = ["intArray": ["123", "456", "789"]]
+
+        struct ModelA: Unboxable {
+            let intArray: [Int]
+            init(unboxer: Unboxer) {
+                self.intArray = unboxer.unbox("intArray")
+            }
+        }
+
+        do {
+            let modelA: ModelA = try Unbox(dictionary)
+            XCTAssertEqual(modelA.intArray[0], 123)
+            XCTAssertEqual(modelA.intArray[1], 456)
+            XCTAssertEqual(modelA.intArray[2], 789)
+        } catch {
+            XCTFail()
+        }
+    }
+
+    func testUnboxingArrayOfBadStringsTransformedToInt() {
+        let dictionary: UnboxableDictionary = ["intArray": ["123", "abc", "789"]]
+
+        struct ModelA: Unboxable {
+            let intArray: [Int]
+            init(unboxer: Unboxer) {
+                self.intArray = unboxer.unbox("intArray")
+            }
+        }
+
+        do {
+            try Unbox(dictionary) as ModelA
+            XCTFail()
+        } catch {
+            // Test Passed
+        }
+    }
+
 }
 
 private func UnboxTestDictionaryWithAllRequiredKeysWithValidValues(nested: Bool) -> UnboxableDictionary {