accept NSData instead of AnyObject in ResponseParseable protocol

Author: DenTelezhkin

CHANGELOG.md

@@ -15,6 +15,7 @@ TRON 1.0 is a major release with a lot of new features and breaking changes. To
 * RxSwift extension on `MultipartAPIRequest` reworked to return single Observable<ModelType>
 * `EventDispatcher` class and corresponding `TRON.dispatcher`, `APIRequest.dispatcher` property are replaced by `TRON` and `APIRequest` properties - `processingQueue` and `resultDeliveryQueue`, which are used to determine on which queue should processing be performed and on which queue results should be delivered.
 * `Progress` and `ProgressClosure` typealiases have been removed
+* `ResponseParseable` protocol now accepts NSData instead of `AnyObject` in its constructor
 
 ### Added
 

Source/Core/APIRequest.swift

@@ -166,10 +166,4 @@ public class APIRequest<Model: ResponseParseable, ErrorModel: ResponseParseable>
             self.callSuccessFailureBlocks(success, failure: failure, response: $0)
         }
     }
-}
-
-extension NSData {
-    func parseToAnyObject() throws -> AnyObject {
-        return try NSJSONSerialization.JSONObjectWithData(self, options: .AllowFragments)
-    }
 }

Source/Core/APIStub.swift

@@ -45,12 +45,11 @@ public extension APIStub {
     public func buildModelFromFile(fileName: String, inBundle bundle: NSBundle = NSBundle.mainBundle()) {
         if let filePath = bundle.pathForResource(fileName as String, ofType: nil)
         {
-            guard let data = NSData(contentsOfFile: filePath),
-                let json = try? NSJSONSerialization.JSONObjectWithData(data, options: .AllowFragments) else {
+            guard let data = NSData(contentsOfFile: filePath) else {
                     print("failed building response model from file: \(filePath)")
                 return
             }
-            model = try? Model.from(json)
+            model = try? Model.from(data: data)
         }
     }
 }

Source/Core/BaseRequest.swift

@@ -136,19 +136,9 @@ public class BaseRequest<Model: ResponseParseable, ErrorModel: ResponseParseable
             guard error == nil else {
                 return .Failure(self.errorBuilder.buildErrorFromRequest(urlRequest, response: response, data: data, error: error))
             }
-            if Model.self is EmptyResponse.Type {
-                return .Success(try! Model.from(NSDictionary()))
-            }
-            let object : AnyObject
-            do {
-                object = try (data ?? NSData()).parseToAnyObject()
-            }
-            catch let jsonError as NSError {
-                return .Failure(self.errorBuilder.buildErrorFromRequest(urlRequest, response: response, data: data, error: jsonError))
-            }
             let model: Model.ModelType
             do {
-                model = try self.responseBuilder.buildResponseFromJSON(object)
+                model = try self.responseBuilder.buildResponseFromData(data ?? NSData())
             }
             catch let parsingError as NSError {
                 return .Failure(self.errorBuilder.buildErrorFromRequest(urlRequest, response: response, data: data, error: parsingError))

Source/Core/EmptyResponse.swift

@@ -30,7 +30,7 @@ public struct EmptyResponse : ResponseParseable {
 
     public init() {}
 
-    public static func from(json: AnyObject) throws -> EmptyResponse {
+    public static func from(data data: NSData) throws -> EmptyResponse {
         return EmptyResponse()
     }
 }

Source/Core/ErrorBuilder.swift

@@ -86,10 +86,10 @@ public struct APIError<T:ResponseParseable> : ErrorType {
         self.response = response
         self.data = data
         self.error = error
-        guard let object = try? data?.parseToAnyObject() else {
-            return
-        }
-        self.errorModel = object.flatMap { try? T.from($0) }
+//        guard let object = try? data?.parseToAnyObject() else {
+//            return
+//        }
+        self.errorModel = try? T.from(data: data ?? NSData())
     }
 
     /**

Source/Core/ResponseBuilder.swift

@@ -38,7 +38,7 @@ public protocol ResponseParseable {
      - returns: parsed model
      - note: Ideally, we would like to return Self here, however Swift 2 understands Self as final class or struct and therefore prohibits subclassing. Which is why we are using workaround with ModelType.
      */
-    static func from(json: AnyObject) throws -> ModelType
+    static func from(data data: NSData) throws -> ModelType
 }
 
 /**
@@ -56,8 +56,8 @@ public class ResponseBuilder<T:ResponseParseable>
 //     
 //     - returns parsed model.
 //     */
-    public func buildResponseFromJSON(json : AnyObject) throws -> T.ModelType {
-        return try T.from(json)
+    public func buildResponseFromData(data : NSData) throws -> T.ModelType {
+        return try T.from(data: data)
     }
 }
 

Source/SwiftyJSON/SwiftyJSONDecodable.swift

@@ -36,8 +36,8 @@ public protocol JSONDecodable  : ResponseParseable {
 }
 
 public extension ResponseParseable where Self.ModelType : JSONDecodable, Self == Self.ModelType {
-    public static func from(json: AnyObject) throws -> ModelType {
-        return self.init(json: JSON(json))
+    public static func from(data data: NSData) throws -> ModelType {
+        return self.init(json: JSON(data: data))
     }
 }
 

TRON.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'TRON'
-  s.version  = '1.0.0-beta.1'
+  s.version  = '1.0.0-beta.2'
   s.license  = 'MIT'
   s.summary  = 'Lightweight network abstraction layer, written on top of Alamofire'
   s.homepage = 'https://github.com/MLSDev/TRON'

Tests/ApiStubbingTestCase.swift

@@ -58,14 +58,6 @@ class ApiStubbingTestCase: XCTestCase {
         expect(request.apiStub.model?.id) == 1
     }
 
-    func testInvalidJSONIsNotAllowed() {
-        let request :APIRequest<TestUser,TronError> = tron.request(path: "f00")
-        request.stubbingEnabled = true
-        request.apiStub.buildModelFromFile("invalid.json", inBundle: NSBundle(forClass: self.dynamicType))
-        
-        expect(request.apiStub.model).to(beNil())
-    }
-    
     func testMultipartStubbingSuccessWorks() {
         let request: MultipartAPIRequest<Int,TronError> = tron.uploadMultipart(path: "f00") { formData in
         }