Merge branch 'develop/0.4' into feature/no-singleton-API-instance

Author: ishkawa

APIKit/APIKit.swift

@@ -80,6 +80,10 @@ public class API {
         return internalDefaultURLSession
     }
 
+    public class var acceptableStatusCodes: [Int] {
+        return [Int](200..<300)
+    }
+
     // build NSURLRequest
     public class func URLRequest(method: Method, _ path: String, _ parameters: [String: AnyObject] = [:]) -> NSURLRequest? {
         if let components = NSURLComponents(URL: baseURL(), resolvingAgainstBaseURL: true) {
@@ -135,10 +139,15 @@ public class API {
                 }
 
                 let statusCode = (URLResponse as? NSHTTPURLResponse)?.statusCode ?? 0
-                if !contains(200..<300, statusCode) {
-                    let userInfo = [NSLocalizedDescriptionKey: "received status code that represents error"]
-                    let error = NSError(domain: APIKitErrorDomain, code: statusCode, userInfo: userInfo)
-                    dispatch_async(mainQueue, { handler(.Failure(Box(error))) })
+                if !contains(self.acceptableStatusCodes, statusCode) {
+                    let error: NSError = {
+                        switch self.responseBodyParser().parseData(data) {
+                        case .Success(let box): return self.responseErrorFromObject(box.unbox)
+                        case .Failure(let box): return box.unbox
+                        }
+                    }()
+
+                    dispatch_async(mainQueue) { handler(failure(error)) }
                     return
                 }
 
@@ -150,8 +159,8 @@ public class API {
                         let error = NSError(domain: APIKitErrorDomain, code: 0, userInfo: userInfo)
                         return failure(error)
                     }
-                    
                 }
+
                 dispatch_async(mainQueue, { handler(mappedResponse) })
             }
 
@@ -166,6 +175,12 @@ public class API {
             return nil
         }
     }
+    
+    public class func responseErrorFromObject(object: AnyObject) -> NSError {
+        let userInfo = [NSLocalizedDescriptionKey: "received status code that represents error"]
+        let error = NSError(domain: APIKitErrorDomain, code: 0, userInfo: userInfo)
+        return error
+    }
 }
 
 public class URLSessionDelegate: NSObject, NSURLSessionDelegate, NSURLSessionDataDelegate {

APIKitTests/APITests.swift

@@ -17,6 +17,10 @@ class APITests: XCTestCase {
         override class func responseBodyParser() -> ResponseBodyParser {
             return .JSON(readingOptions: nil)
         }
+
+        override class func responseErrorFromObject(object: AnyObject) -> NSError {
+            return NSError(domain: "MockAPIErrorDomain", code: 10000, userInfo: nil)
+        }
 
         class Endpoint {
             class Get: Request {
@@ -103,7 +107,8 @@ class APITests: XCTestCase {
         OHHTTPStubs.stubRequestsPassingTest({ request in
             return true
         }, withStubResponse: { request in
-            return OHHTTPStubsResponse(data: NSData(), statusCode: 400, headers: nil)
+            let data = NSJSONSerialization.dataWithJSONObject([:], options: nil, error: nil)!
+            return OHHTTPStubsResponse(data: data, statusCode: 400, headers: nil)
         })
 
         let expectation = expectationWithDescription("wait for response")
@@ -116,8 +121,8 @@ class APITests: XCTestCase {
 
             case .Failure(let box):
                 let error = box.unbox
-                assertEqual(error.domain, APIKitErrorDomain)
-                assertEqual(error.code, 400)
+                assertEqual(error.domain, "MockAPIErrorDomain")
+                assertEqual(error.code, 10000)
             }
 
             expectation.fulfill()