PMK 5.0.0

Author: mxcl

.gitignore

@@ -1,5 +1,5 @@
 *.xcodeproj/**/xcuserdata/
 *.xcscmblueprint
 /Carthage
-/Cartfile.resolved
 /.build
+.DS_Store

Cartfile

@@ -1 +1 @@
-github "mxcl/PromiseKit" ~> 4.0
+github "mxcl/PromiseKit" ~> 5.0

Sources/SKPayment+Promise.swift

@@ -1,16 +1,16 @@
-import StoreKit
-#if !COCOAPODS
+#if !PMKCocoaPods
 import PromiseKit
 #endif
+import StoreKit
 
 extension SKPayment {
     public func promise() -> Promise<SKPaymentTransaction> {
         return PaymentObserver(payment: self).promise
     }
 }
 
-fileprivate class PaymentObserver: NSObject, SKPaymentTransactionObserver {
-    let (promise, fulfill, reject) = Promise<SKPaymentTransaction>.pending()
+private class PaymentObserver: NSObject, SKPaymentTransactionObserver {
+    let (promise, seal) = Promise<SKPaymentTransaction>.pending()
     let payment: SKPayment
     var retainCycle: PaymentObserver?
 
@@ -29,13 +29,13 @@ fileprivate class PaymentObserver: NSObject, SKPaymentTransactionObserver {
         switch transaction.transactionState {
         case .purchased:
             queue.finishTransaction(transaction)
-            fulfill(transaction)
+            seal.fulfill(transaction)
             queue.remove(self)
             retainCycle = nil
         case .failed:
-            let error = transaction.error ?? NSError.cancelledError()
+            let error = transaction.error ?? PMKError.cancelled
             queue.finishTransaction(transaction)
-            reject(error)
+            seal.reject(error)
             queue.remove(self)
             retainCycle = nil
         default:

Sources/SKProductsRequest+Promise.swift

@@ -1,5 +1,5 @@
 import StoreKit
-#if !COCOAPODS
+#if !PMKCocoaPods
 import PromiseKit
 #endif
 
@@ -19,7 +19,7 @@ extension SKProductsRequest {
 
      - Returns: A promise that fulfills if the request succeeds.
     */
-    public func promise() -> Promise<SKProductsResponse> {
+    public func start(_: PMKNamespacer) -> Promise<SKProductsResponse> {
         let proxy = SKDelegate()
         delegate = proxy
         proxy.retainCycle = proxy
@@ -30,23 +30,23 @@ extension SKProductsRequest {
 
 
 fileprivate class SKDelegate: NSObject, SKProductsRequestDelegate {
-    let (promise, fulfill, reject) = Promise<SKProductsResponse>.pending()
+    let (promise, seal) = Promise<SKProductsResponse>.pending()
     var retainCycle: SKDelegate?
 
     @objc fileprivate func request(_ request: SKRequest, didFailWithError error: Error) {
-        reject(error)
+        seal.reject(error)
         retainCycle = nil
     }
 
     @objc fileprivate func productsRequest(_ request: SKProductsRequest, didReceive response: SKProductsResponse) {
-        fulfill(response)
+        seal.fulfill(response)
         retainCycle = nil
     }
-
-#if swift(>=3.2)
-#else
-    @objc override class func initialize() {
-        NSError.registerCancelledErrorDomain(SKErrorDomain, code: SKError.Code.paymentCancelled.rawValue)
-    }
-#endif
 }
+
+// perhaps one day Apple will actually make their errors into Errors…
+//extension SKError: CancellableError {
+//    public var isCancelled: Bool {
+//        return true
+//    }
+//}

Sources/SKReceiptRefreshRequest+Promise.swift

@@ -1,16 +1,16 @@
-import StoreKit
-#if !COCOAPODS
+#if !PMKCocoaPods
 import PromiseKit
 #endif
+import StoreKit
 
 extension SKReceiptRefreshRequest {
     public func promise() -> Promise<SKReceiptRefreshRequest> {
         return ReceiptRefreshObserver(request: self).promise
     }
 }
 
-fileprivate class ReceiptRefreshObserver: NSObject, SKRequestDelegate {
-    let (promise, fulfill, reject) = Promise<SKReceiptRefreshRequest>.pending()
+private class ReceiptRefreshObserver: NSObject, SKRequestDelegate {
+    let (promise, seal) = Promise<SKReceiptRefreshRequest>.pending()
     let request: SKReceiptRefreshRequest
     var retainCycle: ReceiptRefreshObserver?
 
@@ -23,13 +23,13 @@ fileprivate class ReceiptRefreshObserver: NSObject, SKRequestDelegate {
     }
 
 
-    func requestDidFinish(_ request: SKRequest) {
-        fulfill(self.request)
+    func requestDidFinish(_: SKRequest) {
+        seal.fulfill(request)
         retainCycle = nil
     }
 
-    func request(_ request: SKRequest, didFailWithError error: Error) {
-        reject(error)
+    func request(_: SKRequest, didFailWithError error: Error) {
+        seal.reject(error)
         retainCycle = nil
     }
 }

Tests/TestStoreKit.swift

@@ -7,37 +7,16 @@ class SKProductsRequestTests: XCTestCase {
     func test() {
         class MockProductsRequest: SKProductsRequest {
             override func start() {
-                after(interval: 0.1).then {
+                after(seconds: 0.1).done {
                     self.delegate?.productsRequest(self, didReceive: SKProductsResponse())
                 }
             }
         }
 
         let ex = expectation(description: "")
-        MockProductsRequest().promise().then { _ in
+        MockProductsRequest().start(.promise).done { _ in
             ex.fulfill()
         }
         waitForExpectations(timeout: 1, handler: nil)
     }
-
-#if swift(>=3.2)
-#else
-    func testCancellation() {
-        class MockProductsRequest: SKProductsRequest {
-            override func start() {
-                after(interval: 0.1).then { _ -> Void in
-                    let err = NSError(domain: SKErrorDomain, code: SKError.Code.paymentCancelled.rawValue, userInfo: nil)
-                    self.delegate?.request?(self, didFailWithError: err)
-                }
-            }
-        }
-
-        let ex = expectation(description: "")
-        MockProductsRequest().promise().catch(policy: .allErrors) { err in
-            XCTAssert((err as NSError).isCancelled)
-            ex.fulfill()
-        }
-        waitForExpectations(timeout: 1, handler: nil)
-    }
-#endif
 }