kylefang/Alamofire-SwiftyJSON
1
0
Fork 0
mirror of https://github.com/SwiftyJSON/Alamofire-SwiftyJSON.git synced 2026-01-12 15:34:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30 from jregnauld/swift-2.0

Browse Source 
Fixing responseSwiftyJSON because Alamofire returns ErrorType instead of NSError
This commit is contained in:
Pinglin Tang
2015-09-18 11:19:30 +08:00
parent cf3e6388fa ce3abd70a5
commit 4e77f0b9e7
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Alamofire

Submodule Alamofire updated: 97531ad013...0fd77fec2a

3
README.md
View File

@@ -14,7 +14,8 @@ source 'https://github.com/CocoaPods/Specs.git'
platform :ios, '8.0'
use_frameworks!
pod 'Alamofire', :git => 'https://github.com/SwiftyJSON/Alamofire-SwiftyJSON.git', :branch => 'swift-2.0'
pod 'Alamofire-SwiftyJSON'
```
## Usage

4
Source/Alamofire-SwiftyJSON.swift
View File

@@ -22,7 +22,7 @@ extension Request {
:returns: The request.
*/
public func responseSwiftyJSON(completionHandler: (NSURLRequest, NSHTTPURLResponse?, SwiftyJSON.JSON, NSError?) -> Void) -> Self {
public func responseSwiftyJSON(completionHandler: (NSURLRequest, NSHTTPURLResponse?, SwiftyJSON.JSON, ErrorType?) -> Void) -> Self {
return responseSwiftyJSON(nil, options:NSJSONReadingOptions.AllowFragments, completionHandler:completionHandler)
}
@@ -35,7 +35,7 @@ extension Request {
:returns: The request.
*/
public func responseSwiftyJSON(queue: dispatch_queue_t? = nil, options: NSJSONReadingOptions = .AllowFragments, completionHandler: (NSURLRequest, NSHTTPURLResponse?, JSON, NSError?) -> Void) -> Self {
public func responseSwiftyJSON(queue: dispatch_queue_t? = nil, options: NSJSONReadingOptions = .AllowFragments, completionHandler: (NSURLRequest, NSHTTPURLResponse?, JSON, ErrorType?) -> Void) -> Self {
return response(queue: queue, responseSerializer: Request.JSONResponseSerializer(options: options), completionHandler: { (request, response, result) -> Void in
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), {

2
Tests/Alamofire_SwiftyJSONTests.swift
View File

@@ -22,7 +22,7 @@ class Alamofire_SwiftyJSONTests: XCTestCase {
expectation.fulfill()
XCTAssertNotNil(request, "request should not be nil")
XCTAssertNotNil(response, "response should not be nil")
XCTAssertNil(error, "error should be nil")
XCTAssertTrue(error == nil, "result error should be nil")
XCTAssertEqual(responseJSON["args"], SwiftyJSON.JSON(["foo": "bar"] as NSDictionary), "args should be equal")
})
waitForExpectationsWithTimeout(10) { (error) in