|
@@ -38,10 +38,8 @@ extension Request {
|
|
|
return (nil, nil)
|
|
return (nil, nil)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if encoding == nil {
|
|
|
|
|
- if let encodingName = response?.textEncodingName {
|
|
|
|
|
- encoding = CFStringConvertEncodingToNSStringEncoding(CFStringConvertIANACharSetNameToEncoding(encodingName))
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ if let encodingName = response?.textEncodingName where encoding == nil {
|
|
|
|
|
+ encoding = CFStringConvertEncodingToNSStringEncoding(CFStringConvertIANACharSetNameToEncoding(encodingName))
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
let string = NSString(data: data!, encoding: encoding ?? NSISOLatin1StringEncoding)
|
|
let string = NSString(data: data!, encoding: encoding ?? NSISOLatin1StringEncoding)
|
|
@@ -59,9 +57,9 @@ extension Request {
|
|
|
:returns: The request.
|
|
:returns: The request.
|
|
|
*/
|
|
*/
|
|
|
public func responseString(encoding: NSStringEncoding? = nil, completionHandler: (NSURLRequest, NSHTTPURLResponse?, String?, NSError?) -> Void) -> Self {
|
|
public func responseString(encoding: NSStringEncoding? = nil, completionHandler: (NSURLRequest, NSHTTPURLResponse?, String?, NSError?) -> Void) -> Self {
|
|
|
- return response(serializer: Request.stringResponseSerializer(encoding: encoding), completionHandler: { request, response, string, error in
|
|
|
|
|
|
|
+ return response(serializer: Request.stringResponseSerializer(encoding: encoding)) { request, response, string, error in
|
|
|
completionHandler(request, response, string as? String, error)
|
|
completionHandler(request, response, string as? String, error)
|
|
|
- })
|
|
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -97,9 +95,9 @@ extension Request {
|
|
|
:returns: The request.
|
|
:returns: The request.
|
|
|
*/
|
|
*/
|
|
|
public func responseJSON(options: NSJSONReadingOptions = .AllowFragments, completionHandler: (NSURLRequest, NSHTTPURLResponse?, AnyObject?, NSError?) -> Void) -> Self {
|
|
public func responseJSON(options: NSJSONReadingOptions = .AllowFragments, completionHandler: (NSURLRequest, NSHTTPURLResponse?, AnyObject?, NSError?) -> Void) -> Self {
|
|
|
- return response(serializer: Request.JSONResponseSerializer(options: options), completionHandler: { request, response, JSON, error in
|
|
|
|
|
|
|
+ return response(serializer: Request.JSONResponseSerializer(options: options)) { request, response, JSON, error in
|
|
|
completionHandler(request, response, JSON, error)
|
|
completionHandler(request, response, JSON, error)
|
|
|
- })
|
|
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -135,8 +133,8 @@ extension Request {
|
|
|
:returns: The request.
|
|
:returns: The request.
|
|
|
*/
|
|
*/
|
|
|
public func responsePropertyList(options: NSPropertyListReadOptions = 0, completionHandler: (NSURLRequest, NSHTTPURLResponse?, AnyObject?, NSError?) -> Void) -> Self {
|
|
public func responsePropertyList(options: NSPropertyListReadOptions = 0, completionHandler: (NSURLRequest, NSHTTPURLResponse?, AnyObject?, NSError?) -> Void) -> Self {
|
|
|
- return response(serializer: Request.propertyListResponseSerializer(options: options), completionHandler: { request, response, plist, error in
|
|
|
|
|
|
|
+ return response(serializer: Request.propertyListResponseSerializer(options: options)) { request, response, plist, error in
|
|
|
completionHandler(request, response, plist, error)
|
|
completionHandler(request, response, plist, error)
|
|
|
- })
|
|
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|