Updated for latest Combine beta API

Author: tcldr

Sources/Common/Utilities/SinkQueue.swift

@@ -34,7 +34,6 @@ class SinkQueue<Sink: Subscriber> {
     private var demandRequested = Subscribers.Demand.none
     private var demandProcessed = Subscribers.Demand.none
     private var demandForwarded = Subscribers.Demand.none
-    private var demandQueued: Subscribers.Demand { .max(buffer.count) }
 
     private var completion: Subscribers.Completion<Sink.Failure>?
     private var isActive: Bool { sink != nil && completion == nil }
@@ -78,13 +77,13 @@ class SinkQueue<Sink: Subscriber> {
             demandProcessed += 1
             demandRequested += sink.receive(next)
         }
-        if let completion = completion, demandQueued < 1 {
+        if let completion = completion, buffer.count < 1 {
             expediteCompletion(completion)
             return .none
         }
-        let spareDemand = max(.none, demandRequested - demandProcessed - demandQueued - demandForwarded)
-        demandForwarded += spareDemand
-        return spareDemand
+        let forwardableDemand = (demandRequested - demandForwarded)
+        demandForwarded += forwardableDemand
+        return forwardableDemand
     }
 
     func assertPreCompletion() {

Sources/Entwine/Deprecations.swift

@@ -0,0 +1,9 @@
+//
+//  File.swift
+//  
+//
+//  Created by Tristan Celder on 01/07/2019.
+//
+
+@available(*, deprecated, renamed: "CancellableBag")
+public typealias CancellationBag = CancellableBag

Sources/Entwine/Utilities/CancellationBag.swift renamed to Sources/Entwine/Utilities/CancellableBag.swift

@@ -25,7 +25,7 @@
 import Combine
 
 /// A container for cancellables that will be cancelled when the bag is deallocated or cancelled itself
-public final class CancellationBag: Cancellable {
+public final class CancellableBag: Cancellable {
 
     public init() {}
 
@@ -47,7 +47,7 @@ public final class CancellationBag: Cancellable {
 
 public extension Cancellable {
     /// Adds this cancellable to the passed `CancellationBag`
-    func cancelled(by cancellationBag: CancellationBag) {
+    func cancelled(by cancellationBag: CancellableBag) {
         cancellationBag.add(self)
     }
 }

Sources/EntwineTest/TestableSubscriber/DemandLedger.swift

@@ -147,10 +147,10 @@ extension DemandLedger.Transaction: CustomDebugStringConvertible {
 
 extension Subscribers.Demand {
     func prettyDescription() -> String {
-        guard case .max(let amount) = self else {
+        guard let max = max else {
             return ".unlimited"
         }
-        return ".max(\(amount))"
+        return ".max(\(max))"
     }
 }
 

Sources/EntwineTest/TestableSubscriber/TestableSubscriber.swift

@@ -93,10 +93,8 @@ public final class TestableSubscriber<Input, Failure: Error> {
     func debitDemand(_ demand: Subscribers.Demand) {
 
         let authorized = (demandBalance > .none)
-        
-        demandBalance -= demand
+        demandBalance -= authorized ? demand : .none
         demands.append((scheduler.now, demandBalance, .debit(authorized: authorized)))
-        
         if !authorized {
             signalNegativeBalance()
         }

Tests/EntwineTestTests/TestableSubscriberTests.swift

@@ -188,10 +188,10 @@ final class TestableSubscriberTests: XCTestCase {
 
 
         let expectedDemandLedger: DemandLedger<VirtualTime> = [
-            (200, .max( 2), .credit(amount: .max(2))),
-            (200, .max( 1), .debit(authorized: true)),
-            (200, .none,    .debit(authorized: true)),
-            (200, .max(-1), .debit(authorized: false)),
+            (200, .max(2), .credit(amount: .max(2))),
+            (200, .max(1), .debit(authorized: true)),
+            (200, .none,   .debit(authorized: true)),
+            (200, .none,   .debit(authorized: false)),
         ]
 
         XCTAssertEqual(expectedDemandLedger, testableSubscriber.demands)

Tests/EntwineTests/CancellationBagTests.swift renamed to Tests/EntwineTests/CancellableBagTests.swift

@@ -28,15 +28,15 @@ import Combine
 @testable import Entwine
 @testable import EntwineTest
 
-final class CancellationBagTests: XCTestCase {
+final class CancellableBagTests: XCTestCase {
 
     func testBagCancelsContainedCancellablesOnDeallocation() {
 
         let scheduler = TestScheduler()
         let subject = PassthroughSubject<Int, Never>()
         let subscriber = scheduler.createTestableSubscriber(Int.self, Never.self)
 
-        var sut: CancellationBag! = CancellationBag()
+        var sut: CancellableBag! = CancellableBag()
 
         subscriber.cancelled(by: sut)
 
@@ -61,7 +61,7 @@ final class CancellationBagTests: XCTestCase {
         let subject = PassthroughSubject<Int, Never>()
         let subscriber = scheduler.createTestableSubscriber(Int.self, Never.self)
 
-        let sut = CancellationBag()
+        let sut = CancellableBag()
 
         subscriber.cancelled(by: sut)
 

Tests/EntwineTests/MaterializeTests.swift

@@ -74,7 +74,7 @@ final class MaterializeTests: XCTestCase {
 
     func testMaterializesJust1() {
 
-        let results1 = scheduler.start { Publishers.Just<Int>(1).materialize() }
+        let results1 = scheduler.start { Just<Int>(1).materialize() }
 
         let expected1: TestSequence<Signal<Int, Never>, Never> = [
             (200, .subscription),