- generic body parsing removed, if the response errored

- test adjustments

Author: Gujci

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode9.1
+osx_image: xcode9.4
 xcode_project: RESTAPI.xcodeproj
 xcode_scheme: RESTAPI
 xcode_sdk: iphonesimulator10.0

Cartfile

@@ -1 +1 @@
-github "SwiftyJSON/SwiftyJSON" "master"
+github "SwiftyJSON/SwiftyJSON"

Cartfile.resolved

@@ -1 +1 @@
-github "SwiftyJSON/SwiftyJSON" "3c83ad485a11f53244e077d9b7625fbb2deee937"
+github "SwiftyJSON/SwiftyJSON" "4.1.0"

RESTAPI.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

RESTAPI/API+JSONParseable.swift

@@ -67,11 +67,11 @@ public extension API {
     }
 
     //MARK: - Private part
-    fileprivate func parseableRequest<T: JSONParseable>(_ method: String, endpoint: String, query: [String: Queryable]? = nil,
+    private func parseableRequest<T: JSONParseable>(_ method: String, endpoint: String, query: [String: Queryable]? = nil,
                                    data: ValidRequestData? = nil,
                                    completion: @escaping (_ error: APIError?, _ object: T?) -> ()) {
         dataTask(clientURLRequest(endpoint, query: query, params: data), method: method) { err ,data in
-            if let validData = data {
+            if let validData = data, err == nil {
                 completion(err, T(withJSON: validData))
             }
             else {
@@ -80,11 +80,11 @@ public extension API {
         }
     }
 
-    fileprivate func parseableRequest<T: JSONParseable>(_ method: String, endpoint: String, query: [String: Queryable]? = nil,
+    private func parseableRequest<T: JSONParseable>(_ method: String, endpoint: String, query: [String: Queryable]? = nil,
                                   data: ValidRequestData? = nil,
                                   completion: @escaping (_ error: APIError?, _ object: [T]?) -> ()) {
         dataTask(clientURLRequest(endpoint, query: query, params: data), method: method) { err ,data in
-            if let arrayData = data?.array {
+            if let arrayData = data?.array, err == nil {
                 let JSONData = arrayData.map() {element in
                     return T(withJSON: element)
                 }

RESTAPITests/RESTAPITests.swift

@@ -13,13 +13,12 @@ import SwiftyJSON
 //MARK: - ExamplePostModel
 struct ExamplePostModel {
     var body: String
-    var id: Int
+    var id: Int?
     var title: String
     var userId: Int
 
-    init(withBody body: String, id: Int, title: String, userId: Int) {
+    init(withBody body: String, title: String, userId: Int) {
         self.body = body
-        self.id = id
         self.title = title
         self.userId = userId
     }
@@ -38,7 +37,7 @@ extension ExamplePostModel: JSONParseable {
 extension ExamplePostModel: JSONConvertible {
 
     var parameterValue: [String: Any] {
-        return ["body": body, "id": id, "title": title, "userId": userId]
+        return ["body": body, "title": title, "userId": userId]
     }
 }
 
@@ -66,16 +65,15 @@ class RESTAPITests: XCTestCase {
 
     func testPostAndPatch() {
         let expectation = self.expectation(description: "post&patch")
-        let example = ExamplePostModel(withBody: "something", id: 1, title: "Some title", userId: 9)
+        let example = ExamplePostModel(withBody: "something", title: "Some title", userId: 9)
 
         testServerApi.post("/posts", data: example){ (error, responsePost: ExamplePostModel?) in
-            XCTAssertEqual(responsePost?.id, example.id)
-            guard let responsePost = responsePost else {
+            guard let _ = responsePost?.id else {
                 XCTAssert(false)
                 return
             }
 
-            self.testServerApi.patch("/posts/\(responsePost.id)", data: ["title": "Other title"]) { (error,  responsePost: ExamplePostModel?) in
+            self.testServerApi.patch("/posts/1", data: ["title": "Other title"]) { (error,  responsePost: ExamplePostModel?) in
                 XCTAssertEqual(responsePost?.title, "Other title")
                 expectation.fulfill()
             }