- Added a missing case

- improved code format
- added a test for nested array objects

ObjectMapper/Core/Map.swift

@@ -118,12 +118,10 @@ private func valueFor(keyPathComponents: ArraySlice<String>, dictionary: [String
 		} else if let dict = object as? [String : AnyObject] where keyPathComponents.count > 1 {
 			let tail = keyPathComponents.dropFirst()
 			return valueFor(tail, dictionary: dict)
-		}
-		else if let dict = object as? [AnyObject] where keyPathComponents.count > 1 {
+		} else if let array = object as? [AnyObject] where keyPathComponents.count > 1 {
 			let tail = keyPathComponents.dropFirst()
-			return valueFor(tail, dictionary: dict)
-		}
-		else {
+			return valueFor(tail, dictionary: array)
+		} else {
 			return object
 		}
 	}
@@ -139,22 +137,24 @@ private func valueFor(keyPathComponents: ArraySlice<String>, dictionary: [AnyObj
 		return nil
 	}
 
-	//Try to convert keypath to Int as index)
+	//Try to convert keypath to Int as index
 	if let keyPath = keyPathComponents.first,
-		let index = Int(keyPath) {
+		let index = Int(keyPath) where index >= 0 && index < dictionary.count {
 
-		if index >= 0 && index < dictionary.count {
-			let object = dictionary[index]
-
-			if object is NSNull {
-				return nil
-			} else if let dict = object as? [AnyObject] where keyPathComponents.count > 1 {
-				let tail = keyPathComponents.dropFirst()
-				return valueFor(tail, dictionary: dict)
-			} else {
-				return object
-			}
+		let object = dictionary[index]
+
+		if object is NSNull {
+			return nil
+		} else if let array = object as? [AnyObject] where keyPathComponents.count > 1 {
+			let tail = keyPathComponents.dropFirst()
+			return valueFor(tail, dictionary: array)
+		} else if let dict = object as? [String : AnyObject] where keyPathComponents.count > 1 {
+			let tail = keyPathComponents.dropFirst()
+			return valueFor(tail, dictionary: dict)
+		} else {
+			return object
 		}
 	}
+
 	return nil
 }

ObjectMapperTests/NestedArrayTests.swift

@@ -57,19 +57,49 @@ class NestedArrayTests: XCTestCase {
 		XCTAssertEqual(value.value_0, valueFromParsedJSON.value_0)
 		XCTAssertEqual(value.value_1, valueFromParsedJSON.value_1)
 	}
+
+	func testNestedObjectArray() {
+		let value = 456
+		let JSON: [String: AnyObject] = [ "nested": [ ["value": 123], ["value": value] ] ]
+
+		let mapper = Mapper<NestedArray>()
+
+		let mappedObject: NestedArray! = mapper.map(JSON)
+		XCTAssertNotNil(mappedObject)
+
+		XCTAssertEqual(mappedObject.nestedObject!.value, value)
+		XCTAssertEqual(mappedObject.nestedObjectValue, value)
+	}
 }
 
 class NestedArray: Mappable {
 
 	var value_0: Int?
 	var value_1: Int?
 
+	var nestedObject: NestedObject?
+
+	var nestedObjectValue: Int?
+
 	required init?(_ map: Map){
 
 	}
 
 	func mapping(map: Map) {
 		value_0	<- map["nested.0.value"]
 		value_1	<- map["nested.1.value"]
+
+		nestedObject <- map["nested.1"]
+		nestedObjectValue <- map["nested.1.value"]
+	}
+}
+
+class NestedObject: Mappable {
+	var value: Int?
+
+	required init?(_ map: Map){}
+
+	func mapping(map: Map) {
+		value	<- map["value"]
 	}
 }