[Swift] tweak conditions

336bb87b53 (commitcomment-12318006)
This commit is contained in:
Atsushi Nagase
2015-07-23 21:50:01 +09:00
parent f98974190e
commit 5dcdadb751
2 changed files with 15 additions and 9 deletions

View File

@@ -30,7 +30,6 @@ class AlamofireRequestBuilder<T>: RequestBuilder<T> {
let encoding = isBody ? Alamofire.ParameterEncoding.JSON : Alamofire.ParameterEncoding.URL
let xMethod = Alamofire.Method(rawValue: method)
var request: Request? = nil
let fileKeys = parameters == nil ? [] : map(filter(parameters!) { $1.isKindOfClass(NSURL) }) { $0.0 }
if fileKeys.count > 0 {
@@ -38,12 +37,19 @@ class AlamofireRequestBuilder<T>: RequestBuilder<T> {
xMethod!, URLString, headers: nil,
multipartFormData: { mpForm in
for (k, v) in self.parameters! {
if v.isKindOfClass(NSURL) {
mpForm.appendBodyPart(fileURL: v as! NSURL, name: k)
} else if let str = v as? NSString {
mpForm.appendBodyPart(data: str.dataUsingEncoding(NSUTF8StringEncoding)!, name: k)
} else if let num = v as? NSNumber {
mpForm.appendBodyPart(data: num.stringValue.dataUsingEncoding(NSUTF8StringEncoding)!, name: k)
switch v {
case let fileURL as NSURL:
mpForm.appendBodyPart(fileURL: fileURL, name: k)
break
case let string as NSString:
mpForm.appendBodyPart(data: string.dataUsingEncoding(NSUTF8StringEncoding)!, name: k)
break
case let number as NSNumber:
mpForm.appendBodyPart(data: number.stringValue.dataUsingEncoding(NSUTF8StringEncoding)!, name: k)
break
default:
fatalError("Unprocessable value \(v) with key \(k)")
break
}
}
},
@@ -100,7 +106,7 @@ class AlamofireRequestBuilder<T>: RequestBuilder<T> {
completion(response: response, erorr: nil)
return
}
completion(response: nil, erorr: NSError(domain: "localhost", code: 500, userInfo: ["reason": "unreacheable code"]))
}
}

View File

@@ -1,2 +1,2 @@
github "Alamofire/Alamofire" >= 1.2
github "Alamofire/Alamofire" >= 1.3
github "mxcl/PromiseKit" >=1.5.3