Merge pull request #194 from ishkawa/si-swift3

Swift 3 support

.gitmodules

@@ -3,4 +3,4 @@
 	url = https://github.com/antitypical/Result.git
 [submodule "Carthage/Checkouts/OHHTTPStubs"]
 	path = Carthage/Checkouts/OHHTTPStubs
-	url = https://github.com/ikesyo/OHHTTPStubs.git
+	url = https://github.com/AliSoftware/OHHTTPStubs.git

.travis.yml

@@ -5,10 +5,6 @@ env:
 
 matrix:
   include:
-    - os: osx
-      language: objective-c
-      osx_image: xcode7.3
-      env: JOB=Xcode7.3
     - os: osx
       language: objective-c
       osx_image: xcode8
@@ -21,9 +17,9 @@ install:
 script:
   - if [[ "$JOB" == "Xcode7.3" ]]; then pod lib lint; fi
   - set -o pipefail
-  - xcodebuild test -workspace APIKit.xcworkspace -scheme APIKit | xcpretty -c
-  - xcodebuild test -workspace APIKit.xcworkspace -scheme APIKit -sdk iphonesimulator -destination "name=iPhone 6s" | xcpretty -c
-  - xcodebuild test -workspace APIKit.xcworkspace -scheme APIKit -sdk appletvsimulator -destination "name=Apple TV 1080p" | xcpretty -c
+  - xcodebuild build-for-testing test-without-building -workspace APIKit.xcworkspace -scheme APIKit | xcpretty -c
+  - xcodebuild build-for-testing test-without-building -workspace APIKit.xcworkspace -scheme APIKit -sdk iphonesimulator -destination "name=iPhone 6s" | xcpretty -c
+  - xcodebuild build-for-testing test-without-building -workspace APIKit.xcworkspace -scheme APIKit -sdk appletvsimulator -destination "name=Apple TV 1080p" | xcpretty -c
   - carthage build --no-skip-current
 
 after_success:

Cartfile

@@ -1 +1 @@
-github "antitypical/Result" ~> 2.1.2
+github "antitypical/Result" ~> 3.0

Cartfile.private

@@ -1 +1 @@
-github "ikesyo/OHHTTPStubs" "swift2.3"
+github "AliSoftware/OHHTTPStubs" "5.2.1-swift3"

Cartfile.resolved

@@ -1,2 +1,2 @@
-github "ikesyo/OHHTTPStubs" "b9abbd044ebeecbedf8db10721ed24e4bfe07f29"
-github "antitypical/Result" "2.1.2"
+github "AliSoftware/OHHTTPStubs" "5.2.1-swift3"
+github "antitypical/Result" "3.0.0"

Demo.playground/Contents.swift

@@ -1,56 +1,56 @@
-import XCPlayground
+import PlaygroundSupport
 import UIKit
 import APIKit
 
-XCPlaygroundPage.currentPage.needsIndefiniteExecution = true
+PlaygroundPage.current.needsIndefiniteExecution = true
 
 //: Step 1: Define request protocol
-protocol GitHubRequestType: RequestType {
+protocol GitHubRequest: Request {
 
 }
 
-extension GitHubRequestType {
-    var baseURL: NSURL {
-        return NSURL(string: "https://api.github.com")!
+extension GitHubRequest {
+    var baseURL: URL {
+        return URL(string: "https://api.github.com")!
     }
 }
 
 //: Step 2: Create model object
 struct RateLimit {
     let count: Int
-    let resetDate: NSDate
+    let resetDate: Date
 
     init?(dictionary: [String: AnyObject]) {
         guard let count = dictionary["rate"]?["limit"] as? Int else {
             return nil
         }
 
-        guard let resetDateString = dictionary["rate"]?["reset"] as? NSTimeInterval else {
+        guard let resetDateString = dictionary["rate"]?["reset"] as? TimeInterval else {
             return nil
         }
 
         self.count = count
-        self.resetDate = NSDate(timeIntervalSince1970: resetDateString)
+        self.resetDate = Date(timeIntervalSince1970: resetDateString)
     }
 }
 
 //: Step 3: Define request type conforming to created request protocol
 // https://developer.github.com/v3/rate_limit/
-struct GetRateLimitRequest: GitHubRequestType {
+struct GetRateLimitRequest: GitHubRequest {
     typealias Response = RateLimit
 
     var method: HTTPMethod {
-        return .GET
+        return .get
     }
 
     var path: String {
         return "/rate_limit"
     }
 
-    func responseFromObject(object: AnyObject, URLResponse: NSHTTPURLResponse) throws -> Response {
+    func response(from object: Any, urlResponse: HTTPURLResponse) throws -> Response {
         guard let dictionary = object as? [String: AnyObject],
               let rateLimit = RateLimit(dictionary: dictionary) else {
-            throw ResponseError.UnexpectedObject(object)
+            throw ResponseError.unexpectedObject(object)
         }
 
         return rateLimit
@@ -60,13 +60,13 @@ struct GetRateLimitRequest: GitHubRequestType {
 //: Step 4: Send request
 let request = GetRateLimitRequest()
 
-Session.sendRequest(request) { result in
+Session.send(request) { result in
     switch result {
-    case .Success(let rateLimit):
+    case .success(let rateLimit):
         print("count: \(rateLimit.count)")
         print("reset: \(rateLimit.resetDate)")
 
-    case .Failure(let error):
+    case .failure(let error):
         print("error: \(error)")
     }
 }

Sources/BodyParameters/BodyParameters.swift

@@ -0,0 +1,20 @@
+import Foundation
+
+/// `RequestBodyEntity` represents entity of HTTP body.
+public enum RequestBodyEntity {
+    /// Expresses entity as `Data`. The associated value will be set to `URLRequest.httpBody`.
+    case data(Data)
+
+    /// Expresses entity as `InputStream`. The associated value will be set to `URLRequest.httpBodyStream`.
+    case inputStream(InputStream)
+}
+
+/// `BodyParameters` provides interface to parse HTTP response body and to state `Content-Type` to accept.
+public protocol BodyParameters {
+    /// `Content-Type` to send. The value for this property will be set to `Accept` HTTP header field.
+    var contentType: String { get }
+
+    /// Builds `RequestBodyEntity`.
+    /// Throws: `ErrorType`
+    func buildEntity() throws -> RequestBodyEntity
+}

Sources/BodyParameters/Data+InputStream.swift

@@ -0,0 +1,36 @@
+import Foundation
+
+enum InputStreamError: Error {
+    case invalidDataCapacity(Int)
+    case unreadableStream(InputStream)
+}
+
+extension Data {
+    init(inputStream: InputStream, capacity: Int = Int(UInt16.max)) throws {
+        var data = Data(capacity: capacity)
+
+        let bufferSize = Swift.min(Int(UInt16.max), capacity)
+        let buffer = UnsafeMutablePointer<UInt8>.allocate(capacity: bufferSize)
+
+        var readSize: Int
+
+        repeat {
+            readSize = inputStream.read(buffer, maxLength: bufferSize)
+
+            switch readSize {
+            case let x where x > 0:
+                data.append(buffer, count: readSize)
+
+            case let x where x < 0:
+                throw InputStreamError.unreadableStream(inputStream)
+
+            default:
+                break
+            }
+        } while readSize > 0
+
+        buffer.deallocate(capacity: bufferSize)
+
+        self.init(data)
+    }
+}

Sources/BodyParametersType/FormURLEncodedBodyParameters.swift → Sources/BodyParameters/FormURLEncodedBodyParameters.swift

@@ -1,29 +1,29 @@
 import Foundation
 
 /// `FormURLEncodedBodyParameters` serializes form object for HTTP body and states its content type is form.
-public struct FormURLEncodedBodyParameters: BodyParametersType {
+public struct FormURLEncodedBodyParameters: BodyParameters {
     /// The form object to be serialized.
-    public let form: [String: AnyObject]
+    public let form: [String: Any]
 
     /// The string encoding of the serialized form.
-    public let encoding: NSStringEncoding
+    public let encoding: String.Encoding
 
     /// Returns `FormURLEncodedBodyParameters` that is initialized with form object and encoding.
-    public init(formObject: [String: AnyObject], encoding: NSStringEncoding = NSUTF8StringEncoding) {
+    public init(formObject: [String: Any], encoding: String.Encoding = .utf8) {
         self.form = formObject
         self.encoding = encoding
     }
 
-    // MARK: - BodyParametersType
+    // MARK: - BodyParameters
 
     /// `Content-Type` to send. The value for this property will be set to `Accept` HTTP header field.
     public var contentType: String {
         return "application/x-www-form-urlencoded"
     }
 
-    /// Builds `RequestBodyEntity.Data` that represents `form`.
+    /// Builds `RequestBodyEntity.data` that represents `form`.
     /// - Throws: `URLEncodedSerialization.Error` if `URLEncodedSerialization` fails to serialize form object.
     public func buildEntity() throws -> RequestBodyEntity {
-        return .Data(try URLEncodedSerialization.dataFromObject(form, encoding: encoding))
+        return .data(try URLEncodedSerialization.data(from: form, encoding: encoding))
     }
 }

Sources/BodyParametersType/JSONBodyParameters.swift → Sources/BodyParameters/JSONBodyParameters.swift

@@ -1,34 +1,34 @@
 import Foundation
 
 /// `JSONBodyParameters` serializes JSON object for HTTP body and states its content type is JSON.
-public struct JSONBodyParameters: BodyParametersType {
+public struct JSONBodyParameters: BodyParameters {
     /// The JSON object to be serialized.
-    public let JSONObject: AnyObject
+    public let JSONObject: Any
 
     /// The writing options for serialization.
-    public let writingOptions: NSJSONWritingOptions
+    public let writingOptions: JSONSerialization.WritingOptions
 
     /// Returns `JSONBodyParameters` that is initialized with JSON object and writing options.
-    public init(JSONObject: AnyObject, writingOptions: NSJSONWritingOptions = []) {
+    public init(JSONObject: Any, writingOptions: JSONSerialization.WritingOptions = []) {
         self.JSONObject = JSONObject
         self.writingOptions = writingOptions
     }
 
-    // MARK: - BodyParametersType
+    // MARK: - BodyParameters
 
     /// `Content-Type` to send. The value for this property will be set to `Accept` HTTP header field.
     public var contentType: String {
         return "application/json"
     }
 
-    /// Builds `RequestBodyEntity.Data` that represents `JSONObject`.
-    /// - Throws: `NSError` if `NSJSONSerialization` fails to serialize `JSONObject`.
+    /// Builds `RequestBodyEntity.data` that represents `JSONObject`.
+    /// - Throws: `NSError` if `JSONSerialization` fails to serialize `JSONObject`.
     public func buildEntity() throws -> RequestBodyEntity {
         // If isValidJSONObject(_:) is false, dataWithJSONObject(_:options:) throws NSException.
-        guard NSJSONSerialization.isValidJSONObject(JSONObject) else {
+        guard JSONSerialization.isValidJSONObject(JSONObject) else {
             throw NSError(domain: NSCocoaErrorDomain, code: 3840, userInfo: nil)
         }
 
-        return .Data(try NSJSONSerialization.dataWithJSONObject(JSONObject, options: writingOptions))
+        return .data(try JSONSerialization.data(withJSONObject: JSONObject, options: writingOptions))
     }
 }