more autoclosures == backwards compatibility

lixin1988 · Feb 16, 2015 · 4df4d02 · 4df4d02
1 parent 76de1d4
commit 4df4d02
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/Endpoint.swift b/Endpoint.swift
@@ -11,8 +11,8 @@ import Alamofire
 
 /// Used for stubbing responses.
 public enum EndpointSampleResponse {
-    case Success(@autoclosure () -> (Int, NSData))
-    case Error(@autoclosure () -> (Int?, NSError?, NSData?))
+    case Success(@autoclosure () -> Int, @autoclosure () -> NSData)
+    case Error(@autoclosure () -> Int?, @autoclosure () -> NSError?, @autoclosure () -> NSData?)
 }
 
 

diff --git a/Moya.swift b/Moya.swift
@@ -133,12 +133,10 @@ public class MoyaProvider<T: MoyaTarget> {
                 var optError : NSError?
 
                 switch endpoint.sampleResponse {
-                case .Success(let successClosure):
-                    (statusCode, data) = successClosure()
-                    completion(data: data, statusCode: statusCode, response:nil, error: nil)
-                case .Error(let failureClosure):
-                    (optStatusCode, optError, optData) = failureClosure()
-                    completion(data: optData, statusCode: optStatusCode, response:nil, error: optError)
+                case .Success(let statusCodeClosure, let dataClosure):
+                    completion(data: dataClosure(), statusCode: statusCodeClosure(), response:nil, error: nil)
+                case .Error(let statusCodeClosure, let errorClosure, let dataClosure):
+                    completion(data: dataClosure(), statusCode: statusCodeClosure(), response:nil, error: errorClosure())
                 }
             }