Supports user provided JSONDecoder.

gunterhager · Aug 2, 2017 · e6eaedf · e6eaedf
1 parent c247d1e
commit e6eaedf
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 12 deletions.
diff --git a/ReactiveCodable/Info.plist b/ReactiveCodable/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.2</string>
+	<string>1.0.3</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

diff --git a/ReactiveCodable/ReactiveCodable.swift b/ReactiveCodable/ReactiveCodable.swift
@@ -32,14 +32,15 @@ public enum ReactiveCodableError: Error {
 extension SignalProtocol where Value == Data {
     /// Maps the given JSON object within the stream to an object of given `type`.
     ///
-    /// - parameter type: The type of the object that should be returned
-    ///
-    /// - returns: A new Signal emitting the decoded object.
-    public func mapToType<T: Decodable>(_ type: T.Type) -> Signal<T, ReactiveCodableError> {
+    /// - Parameters:
+    ///   - type: The type of the object that should be returned
+    ///   - decoder: A `JSONDecoder` to use. This allows configuring the decoder.
+    /// - Returns: A new Signal emitting the decoded object.
+    public func mapToType<T: Decodable>(_ type: T.Type, decoder: JSONDecoder = JSONDecoder()) -> Signal<T, ReactiveCodableError> {
         return signal
             .mapError { ReactiveCodableError.underlying($0) }
             .attemptMap { json -> Result<T, ReactiveCodableError> in
-                return unwrapThrowableResult { try JSONDecoder().decode(type.self, from: json) }
+                return unwrapThrowableResult { try decoder.decode(type.self, from: json) }
 
                 //                let info = [NSLocalizedFailureReasonErrorKey: "The provided `Value` could not be cast to `Data` or there is no value at the given `rootKeys`: \(String(describing: rootKeys))"]
                 //                let error = NSError(domain: ReactiveCodableErrorDomain, code: -1, userInfo: info)
@@ -55,11 +56,12 @@ extension SignalProducerProtocol where Value == Data {
 
     /// Maps the given JSON object within the stream to an object of given `type`
     ///
-    /// - parameter type: The type of the object that should be returned
-    ///
-    /// - returns: A new SignalProducer emitting the decoded object.
-    public func mapToType<T: Decodable>(_ type: T.Type) -> SignalProducer<T, ReactiveCodableError> {
-        return producer.lift { $0.mapToType(type) }
+    /// - Parameters:
+    ///   - type: The type of the object that should be returned
+    ///   - decoder: A `JSONDecoder` to use. This allows configuring the decoder.
+    /// - Returns: A new SignalProducer emitting the decoded object.
+    public func mapToType<T: Decodable>(_ type: T.Type, decoder: JSONDecoder = JSONDecoder()) -> SignalProducer<T, ReactiveCodableError> {
+        return producer.lift { $0.mapToType(type, decoder: decoder) }
     }
 
 }

diff --git a/ReactiveCodableTests/ReactiveCodableTests.swift b/ReactiveCodableTests/ReactiveCodableTests.swift
@@ -61,6 +61,19 @@ class ReactiveCodableTests: XCTestCase {
 
         XCTAssertNotNil(error, "error should not be nil")
         XCTAssertEqual(error?.nsError, sentError, "the sent error should be wrapped in an .Underlying error")
-    }    
+    }
+
+    func testOwnDecoder() {
+        var tasks: [Task]?
+        let decoder = JSONDecoder()
+        mockData.load("tasks")
+            .mapToType([Task].self, decoder: decoder)
+            .startWithResult { tasks = $0.value }
+
+        XCTAssertNotNil(tasks, "mapToType should not return nil tasks")
+        XCTAssertTrue((tasks!).count == 3, "mapJSON returned wrong number of tasks")
+    }
+
+
 
 }