Merge pull request #29 from jregnauld/swift-2.0

Swift 2.0 #25

Author: Pinglin Tang

Alamofire

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name        = "Alamofire-SwiftyJSON"
-  s.version     = "1.1.0"
+  s.version     = "2.0.0-beta.1"
   s.summary     = "Alamofire extension for serialize NSData to SwiftyJSON "
   s.homepage    = "https://github.com/SwiftyJSON/Alamofire-SwiftyJSON"
   s.license     = { :type => "MIT" }
@@ -9,6 +9,6 @@ Pod::Spec.new do |s|
   s.requires_arc = true
   s.osx.deployment_target = "10.9"
   s.ios.deployment_target = "8.0"
-  s.source   = { :git => "https://github.com/SwiftyJSON/Alamofire-SwiftyJSON.git", :tag => "1.1.0"}
+  s.source   = { :git => "https://github.com/SwiftyJSON/Alamofire-SwiftyJSON.git", :tag => s.version }
   s.source_files = "Source/*.swift"
 end

Alamofire-SwiftyJSON.podspec

@@ -4,8 +4,18 @@ Easy way to use both [Alamofire](https://github.com/Alamofire/Alamofire) and [Sw
 
 ## Requirements
 
-- iOS 7.0+ / Mac OS X 10.9+
-- Xcode 6.1
+- iOS 8.0+ / Mac OS X 10.9+
+- Xcode 7.0
+
+## Install
+
+```
+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'
+```
 
 ## Usage
 

README.md

@@ -23,7 +23,7 @@ extension Request {
     :returns: The request.
     */
     public func responseSwiftyJSON(completionHandler: (NSURLRequest, NSHTTPURLResponse?, SwiftyJSON.JSON, NSError?) -> Void) -> Self {
-        return responseSwiftyJSON(queue:nil, options:NSJSONReadingOptions.AllowFragments, completionHandler:completionHandler)
+        return responseSwiftyJSON(nil, options:NSJSONReadingOptions.AllowFragments, completionHandler:completionHandler)
     }
 
     /**
@@ -37,19 +37,17 @@ extension Request {
     */
     public func responseSwiftyJSON(queue: dispatch_queue_t? = nil, options: NSJSONReadingOptions = .AllowFragments, completionHandler: (NSURLRequest, NSHTTPURLResponse?, JSON, NSError?) -> Void) -> Self {
 
-        return response(queue: queue, responseSerializer: Request.JSONResponseSerializer(options: options), completionHandler: { (request, response, object, error) -> Void in
-            
+        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), {
-                
                 var responseJSON: JSON
-                if error != nil || object == nil{
-                    responseJSON = JSON.nullJSON
+                if result.isFailure
+                {
+                    responseJSON = JSON.null
                 } else {
-                    responseJSON = SwiftyJSON.JSON(object!)
+                    responseJSON = SwiftyJSON.JSON(result.value!)
                 }
-                
                 dispatch_async(queue ?? dispatch_get_main_queue(), {
-                    completionHandler(self.request, self.response, responseJSON, error)
+                    completionHandler(self.request!, self.response, responseJSON, result.error)
                 })
             })
         })

Source/Alamofire-SwiftyJSON.swift

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>2.0.0-beta.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Source/Info.plist

@@ -17,16 +17,14 @@ class Alamofire_SwiftyJSONTests: XCTestCase {
     func testJSONResponse() {
         let URL = "http://httpbin.org/get"
         let expectation = expectationWithDescription("\(URL)")
-        
-        Alamofire.request(.GET, URL, parameters: ["foo": "bar"])
-            .responseSwiftyJSON { (request, response, responseJSON, error) in
-                expectation.fulfill()
-                XCTAssertNotNil(request, "request should not be nil")
-                XCTAssertNotNil(response, "response should not be nil")
-                XCTAssertNil(error, "error should be nil")
-                XCTAssertEqual(responseJSON["args"], SwiftyJSON.JSON(["foo": "bar"] as NSDictionary), "args should be equal")
-        }
-        
+
+        Alamofire.request(.GET, URL, parameters: ["foo": "bar"]).responseSwiftyJSON({(request, response, responseJSON, error) in
+            expectation.fulfill()
+            XCTAssertNotNil(request, "request should not be nil")
+            XCTAssertNotNil(response, "response should not be nil")
+            XCTAssertNil(error, "error should be nil")
+            XCTAssertEqual(responseJSON["args"], SwiftyJSON.JSON(["foo": "bar"] as NSDictionary), "args should be equal")
+        })
         waitForExpectationsWithTimeout(10) { (error) in
             XCTAssertNil(error, "\(error)")
         }