Merge pull request #209 from ishkawa/swiftpm

Support Swift Package Manager

Author: ikesyo

.gitmodules

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

.travis.yml

@@ -7,21 +7,19 @@ matrix:
     - os: osx
       language: objective-c
       osx_image: xcode8
-      env: JOB=Xcode8
-
-install:
-  - carthage bootstrap --use-submodules --no-build
-  - pod repo update --silent
-
-script:
-  - if [[ "$JOB" == "Xcode7.3" ]]; then pod lib lint; fi
-  - set -o pipefail
-  - xcodebuild build-for-testing test-without-building -workspace APIKit.xcworkspace -scheme APIKit -configuration Release ENABLE_TESTABILITY=YES | xcpretty -c
-  - xcodebuild build-for-testing test-without-building -workspace APIKit.xcworkspace -scheme APIKit -configuration Release -sdk iphonesimulator -destination "name=iPhone 6s" ENABLE_TESTABILITY=YES | xcpretty -c
-  - xcodebuild build-for-testing test-without-building -workspace APIKit.xcworkspace -scheme APIKit -configuration Release -sdk appletvsimulator -destination "name=Apple TV 1080p" ENABLE_TESTABILITY=YES | xcpretty -c
-
-after_success:
-  - bash <(curl -s https://codecov.io/bash)
+      script:
+        - set -o pipefail
+        - xcodebuild build-for-testing test-without-building -workspace APIKit.xcworkspace -scheme APIKit -configuration Release ENABLE_TESTABILITY=YES | xcpretty -c
+        - xcodebuild build-for-testing test-without-building -workspace APIKit.xcworkspace -scheme APIKit -configuration Release -sdk iphonesimulator -destination "name=iPhone 6s" ENABLE_TESTABILITY=YES | xcpretty -c
+        - xcodebuild build-for-testing test-without-building -workspace APIKit.xcworkspace -scheme APIKit -configuration Release -sdk appletvsimulator -destination "name=Apple TV 1080p" ENABLE_TESTABILITY=YES | xcpretty -c
+      after_success:
+        - bash <(curl -s https://codecov.io/bash)
+    - os: osx
+      language: generic
+      osx_image: xcode8
+      script:
+        - swift build
+        - swift test
 
 notifications:
   email: false

APIKit.xcodeproj/project.pbxproj

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

APIKit.xcworkspace/contents.xcworkspacedata

@@ -4,7 +4,7 @@ DYLIB_COMPATIBILITY_VERSION = 1
 DYLIB_CURRENT_VERSION = 1
 DYLIB_INSTALL_NAME_BASE = @rpath
 FRAMEWORK_VERSION = A
-INFOPLIST_FILE = Sources/Info.plist
+INFOPLIST_FILE = Sources/APIKit/Info.plist
 PRODUCT_BUNDLE_IDENTIFIER = org.ishkawa.$(PRODUCT_NAME:rfc1034identifier)
 PRODUCT_NAME = $(PROJECT_NAME)
 SKIP_INSTALL = YES

Cartfile.private

@@ -3,6 +3,7 @@ import PackageDescription
 let package = Package(
     name: "APIKit",
     dependencies: [
-        .Package(url: "https://github.com/antitypical/Result.git", majorVersion: 1),
-    ]
+        .Package(url: "https://github.com/antitypical/Result.git", majorVersion: 3),
+    ],
+    exclude: ["Sources/APIKit/BodyParameters/AbstractInputStream.m"]
 )

Cartfile.resolved

@@ -6,6 +6,14 @@ import Foundation
     import CoreServices
 #endif
 
+#if SWIFT_PACKAGE
+    class AbstractInputStream: InputStream {
+        init() {
+            super.init(data: Data())
+        }
+    }
+#endif
+
 /// `FormURLEncodedBodyParameters` serializes array of `Part` for HTTP body and states its content type is multipart/form-data.
 public struct MultipartFormDataBodyParameters: BodyParameters {
     /// `EntityType` represents wheather the entity is expressed as `Data` or `InputStream`.

Carthage/Checkouts/OHHTTPStubs

@@ -70,6 +70,9 @@ class MultipartFormDataParametersTests: XCTestCase {
     }
 
     // MARK: Values
+
+    // Skip test cases that uses files until SwiftPM supports resources.
+    #if !SWIFT_PACKAGE
     func testFileValue() {
         let fileURL = Bundle(for: type(of: self)).url(forResource: "test", withExtension: "json")!
         let part = try! MultipartFormDataBodyParameters.Part(fileURL: fileURL, name: "test")
@@ -100,6 +103,7 @@ class MultipartFormDataParametersTests: XCTestCase {
             XCTFail()
         }
     }
+    #endif
 
     func testStringValue() {
         let part = try! MultipartFormDataBodyParameters.Part(value: "abcdef", name: "foo")

Configurations/APIKit.xcconfig

@@ -1,6 +1,5 @@
 import Foundation
 import XCTest
-import OHHTTPStubs
 import APIKit
 
 class URLSessionAdapterSubclassTests: XCTestCase {
@@ -25,24 +24,16 @@ class URLSessionAdapterSubclassTests: XCTestCase {
         super.setUp()
 
         let configuration = URLSessionConfiguration.default
+        configuration.protocolClasses = [HTTPStub.self]
+
         adapter = SessionAdapter(configuration: configuration)
         session = Session(adapter: adapter)
     }
 
-    override func tearDown() {
-        OHHTTPStubs.removeAllStubs()
-        super.tearDown()
-    }
-
     func testDelegateMethodCall() {
-        let data = try! JSONSerialization.data(withJSONObject: [:], options: [])
-        
-        OHHTTPStubs.stubRequests(passingTest: { request in
-            return true
-        }, withStubResponse: { request in
-            return OHHTTPStubsResponse(data: data, statusCode: 200, headers: nil)
-        })
-        
+        let data = "{}".data(using: .utf8)!
+        HTTPStub.stubResult = .success(data)
+
         let expectation = self.expectation(description: "wait for response")
         let request = TestRequest()
 

Package.swift

@@ -1,38 +1,29 @@
 import Foundation
 import APIKit
 import XCTest
-import OHHTTPStubs
 
 class URLSessionAdapterTests: XCTestCase {
     var session: Session!
 
     override func setUp() {
         super.setUp()
-
+        
         let configuration = URLSessionConfiguration.default
+        configuration.protocolClasses = [HTTPStub.self]
+        
         let adapter = URLSessionAdapter(configuration: configuration)
         session = Session(adapter: adapter)
     }
 
-    override func tearDown() {
-        OHHTTPStubs.removeAllStubs()
-        super.tearDown()
-    }
-
     // MARK: - integration tests
     func testSuccess() {
         let dictionary = ["key": "value"]
         let data = try! JSONSerialization.data(withJSONObject: dictionary, options: [])
-        
-        OHHTTPStubs.stubRequests(passingTest: { request in
-            return true
-        }, withStubResponse: { request in
-            return OHHTTPStubsResponse(data: data, statusCode: 200, headers: nil)
-        })
+        HTTPStub.stubResult = .success(data)
 
         let expectation = self.expectation(description: "wait for response")
         let request = TestRequest()
-        
+
         session.send(request) { response in
             switch response {
             case .success(let dictionary):
@@ -50,12 +41,7 @@ class URLSessionAdapterTests: XCTestCase {
 
     func testConnectionError() {
         let error = NSError(domain: NSURLErrorDomain, code: NSURLErrorTimedOut, userInfo: nil)
-        
-        OHHTTPStubs.stubRequests(passingTest: { request in
-            return true
-        }, withStubResponse: { request in
-            return OHHTTPStubsResponse(error: error)
-        })
+        HTTPStub.stubResult = .failure(error)
 
         let expectation = self.expectation(description: "wait for response")
         let request = TestRequest()
@@ -82,14 +68,9 @@ class URLSessionAdapterTests: XCTestCase {
     }
 
     func testCancel() {
-        let data = try! JSONSerialization.data(withJSONObject: [:], options: [])
-        
-        OHHTTPStubs.stubRequests(passingTest: { request in
-            return true
-        }, withStubResponse: { request in
-            return OHHTTPStubsResponse(data: data, statusCode: 200, headers: nil).responseTime(1.0)
-        })
-        
+        let data = "{}".data(using: .utf8)!
+        HTTPStub.stubResult = .success(data)
+
         let expectation = self.expectation(description: "wait for response")
         let request = TestRequest()
 

Sources/APIKit.h Sources/APIKit/APIKit.h

@@ -1,7 +1,6 @@
 import Foundation
 import APIKit
 import XCTest
-import OHHTTPStubs
 
 class SessionCallbackQueueTests: XCTestCase {
     var adapter: TestSessionAdapter!

Sources/BodyParameters/AbstractInputStream.m Sources/APIKit/BodyParameters/AbstractInputStream.m

@@ -1,7 +1,6 @@
 import Foundation
 import APIKit
 import XCTest
-import OHHTTPStubs
 import Result
 
 class SessionTests: XCTestCase {

Sources/BodyParameters/BodyParameters.swift Sources/APIKit/BodyParameters/BodyParameters.swift

@@ -0,0 +1,51 @@
+import Foundation
+import Dispatch
+import Result
+
+class HTTPStub: URLProtocol {
+    static var stubResult: Result<Data, NSError> = .success(Data())
+
+    private var isCancelled = false
+
+    // MARK: URLProtocol -
+    
+    override class func canInit(with: URLRequest) -> Bool {
+        return true
+    }
+
+    override class func canonicalRequest(for request: URLRequest) -> URLRequest {
+        return request
+    }
+
+    override func startLoading() {
+        let response = HTTPURLResponse(
+            url: request.url!,
+            statusCode: 200,
+            httpVersion: "1.1",
+            headerFields: nil)
+
+        let queue = DispatchQueue.global(qos: .default)
+
+        queue.asyncAfter(deadline: .now() + 0.01) {
+            guard !self.isCancelled else {
+                return
+            }
+            
+            self.client?.urlProtocol(self, didReceive: response!, cacheStoragePolicy: .notAllowed)
+
+            switch HTTPStub.stubResult {
+            case .success(let data):
+                self.client?.urlProtocol(self, didLoad: data)
+
+            case .failure(let error):
+                self.client?.urlProtocol(self, didFailWithError: error)
+            }
+            
+            self.client?.urlProtocolDidFinishLoading(self)
+        }
+    }
+
+    override func stopLoading() {
+        isCancelled = true
+    }
+}