add String pattern to DateTransform

nartex · Dec 22, 2015 · b5b76eb · b5b76eb
1 parent 8b81aae
commit b5b76eb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/ObjectMapper/Transforms/DateTransform.swift b/ObjectMapper/Transforms/DateTransform.swift
@@ -38,6 +38,11 @@ public class DateTransform: TransformType {
 		if let timeInt = value as? Double {
 			return NSDate(timeIntervalSince1970: NSTimeInterval(timeInt))
 		}
+
+		if let timeStr = value as? String {
+			return NSDate(timeIntervalSince1970: NSTimeInterval(atof(timeStr)))
+		}
+
 		return nil
 	}
 

diff --git a/ObjectMapperTests/CustomTransformTests.swift b/ObjectMapperTests/CustomTransformTests.swift
@@ -54,6 +54,14 @@ class CustomTransformTests: XCTestCase {
 		XCTAssertNotNil(parsedTransforms)
 		XCTAssertEqual(parsedTransforms?.date, transforms.date)
 		XCTAssertEqual(parsedTransforms?.dateOpt, transforms.dateOpt)
+
+		let JSONDateString: [String: AnyObject] = ["date": "946684800", "dateOpt": "946684912"]
+		let parsedTransformsDateString = mapper.map(JSONDateString)
+
+		XCTAssertNotNil(parsedTransformsDateString)
+		XCTAssertEqual(parsedTransforms?.date, parsedTransformsDateString?.date)
+		XCTAssertEqual(parsedTransforms?.dateOpt, parsedTransformsDateString?.dateOpt)
+
 	}
 
 	func testISO8601DateTransform() {