Remove Forever (#13)

* Remove Forever and use Combine’s Sink

* Update CI GitHub Action

* Replace old GitHub CI Action with newer version

* Rename GitHub Action and update Swift version

* Add build status SVG to README.md

Author: atdrendel

.github/workflows/ci.yml

@@ -1,15 +1,19 @@
-name: ci
-on: push
+name: Build
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
 jobs:
-  test:
-    runs-on: macOS-10.14
+  build:
+    name: Build and Test
+    runs-on: macos-latest
+
     steps:
-      - uses: actions/checkout@v1
-      - name: Switch Xcode to 11.1
-        run: xcversion select 11.1
-      - name: Generate Xcode project file
-        run: swift package generate-xcodeproj
-      - name: Build
-        run: xcodebuild -scheme SQLite-Package -destination 'platform=iOS Simulator,name=iPhone 11 Pro,OS=13.1'
-      - name: Test
-        run: xcodebuild -scheme SQLite-Package -destination 'platform=iOS Simulator,name=iPhone 11 Pro,OS=13.1' test | xcpretty
+    - uses: actions/checkout@v2
+    - name: Build
+      run: swift build -v
+    - name: Run tests
+      run: swift test -v

Package.resolved

@@ -1,4 +1,4 @@
-// swift-tools-version:5.1
+// swift-tools-version:5.2
 import PackageDescription
 
 let package = Package(
@@ -12,8 +12,7 @@ let package = Package(
             targets: ["SQLite"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/shareup/atomic.git", .upToNextMajor(from: "1.0.0")),
-        .package(url: "https://github.com/shareup/forever.git", .upToNextMajor(from: "0.0.0")),
+        .package(name: "Atomic", url: "https://github.com/shareup/atomic.git", from: "1.0.0"),
     ],
     targets: [
         .target(
@@ -25,7 +24,6 @@ let package = Package(
             name: "SQLiteTests",
             dependencies: [
                 "SQLite",
-                "Forever",
             ]
         ),
     ]

Package.swift

@@ -1,7 +1,8 @@
 # SQLite.Database
 
-[![Swift](https://img.shields.io/badge/swift-5.1-green.svg?longCache=true&style=flat)](https://developer.apple.com/swift/)
+[![Swift](https://img.shields.io/badge/swift-5.2-green.svg?longCache=true&style=flat)](https://developer.apple.com/swift/)
 [![License](https://img.shields.io/badge/license-MIT-green.svg?longCache=true&style=flat)](/LICENSE)
+![Build](https://github.com/shareup/sqlite/workflows/Build/badge.svg)
 
 ## Introduction
 

README.md

@@ -277,8 +277,7 @@ extension SQLite.Database {
     }
 
     func notify(observers: Array<SQLite.Observer>) {
-        _queue.async { [weak self] in
-            guard let self = self else { return }
+        _queue.async {
             observers.forEach { (observer) in
                 defer { observer.statement.reset() }
                 guard let (_, output) = try? observer.statement.evaluate() else { return }

Sources/SQLite/SQLite+Database.swift

@@ -39,7 +39,7 @@ private extension SQLite {
     final class Subscription: Combine.Subscription {
         private let _subscriber: AnySubscriber<Array<SQLiteRow>, Swift.Error>
 
-        private var _demand: Subscribers.Demand?
+        private var _demand: Subscribers.Demand = .none
 
         @Atomic(nil) private var _token: AnyObject?
 
@@ -48,12 +48,12 @@ private extension SQLite {
         }
 
         func request(_ demand: Subscribers.Demand) {
-            _demand = demand
+            _demand += demand
         }
 
         func cancel() {
             _token = nil
-            _demand = nil
+            _demand = .none
         }
 
         func observe(_ sql: SQL, arguments: SQLiteArguments, queue: DispatchQueue, on database: Database) throws {
@@ -68,9 +68,9 @@ private extension SQLite {
 
         func receive(_ rows: Array<SQLiteRow>) {
             guard _token != nil else { return }
-            guard let demand = _demand else { return }
-            guard demand > 0 else { return }
-            _demand = _subscriber.receive(rows)
+            guard _demand > 0 else { return }
+            _demand -= rows.count
+            _demand += _subscriber.receive(rows)
         }
     }
 }

Sources/SQLite/SQLite+Publisher.swift

@@ -1,6 +1,5 @@
 import XCTest
 import Combine
-import Forever
 @testable import SQLite
 
 class SQLitePublisherTests: XCTestCase {
@@ -47,10 +46,10 @@ class SQLitePublisherTests: XCTestCase {
 
     func testCancellingForeverCancelsSubscriptions() {
         let publisher: AnyPublisher<Array<Person>, Error> = database.publisher(Person.getAll)
-        let forever = self.forever(for: publisher, expecting: [[_person1, _person2]])
+        let sink = self.sink(for: publisher, expecting: [[_person1, _person2]])
 
         self.do({
-            forever.cancel()
+            sink.cancel()
             try! self.database.write(Person.deleteWithID, arguments: ["id": .text(self._person1.id)])
         }, after: 0.05, thenWait: 0.1)
     }
@@ -64,10 +63,10 @@ class SQLitePublisherTests: XCTestCase {
         ]
 
         let publisher: AnyPublisher<Array<SQLiteRow>, Error> = database.publisher(Person.getAll)
-        let forever = self.forever(for: publisher, expecting: expected, expectation: expectation)
+        let sink = self.sink(for: publisher, expecting: expected, expectation: expectation)
         try! database.write(Person.deleteWithID, arguments: ["id": .text(_person1.id)])
         waitForExpectations(timeout: 0.5)
-        forever.cancel()
+        sink.cancel()
     }
 
     func testDelete() {
@@ -79,10 +78,10 @@ class SQLitePublisherTests: XCTestCase {
         ]
 
         let publisher: AnyPublisher<Array<Person>, Error> = database.publisher(Person.getAll)
-        let forever = self.forever(for: publisher, expecting: expected, expectation: expectation)
+        let sink = self.sink(for: publisher, expecting: expected, expectation: expectation)
         try! database.write(Person.deleteWithID, arguments: ["id": .text(_person1.id)])
         waitForExpectations(timeout: 0.5)
-        forever.cancel()
+        sink.cancel()
     }
 
     func testDeleteFirstWhere() {
@@ -92,10 +91,10 @@ class SQLitePublisherTests: XCTestCase {
                 .filter({ $0.count == 1 })
                 .eraseToAnyPublisher()
 
-        let forever = self.forever(for: publisher, shouldFinish: true, expecting: [[_person2]], expectation: expectation)
+        let sink = self.sink(for: publisher, shouldFinish: true, expecting: [[_person2]], expectation: expectation)
         try! database.write(Person.deleteWithID, arguments: ["id": .text(_person1.id)])
         waitForExpectations(timeout: 0.5)
-        forever.cancel()
+        sink.cancel()
     }
 
     func testDeleteMappedToName() {
@@ -111,10 +110,10 @@ class SQLitePublisherTests: XCTestCase {
                 .map { $0.map { $0.name } }
                 .eraseToAnyPublisher()
 
-        let forever = self.forever(for: publisher, expecting: expected, expectation: expectation)
+        let sink = self.sink(for: publisher, expecting: expected, expectation: expectation)
         try! database.write(Person.deleteWithID, arguments: ["id": .text(_person1.id)])
         waitForExpectations(timeout: 0.5)
-        forever.cancel()
+        sink.cancel()
     }
 
     func testInsert() {
@@ -134,11 +133,11 @@ class SQLitePublisherTests: XCTestCase {
 
         let publisher: AnyPublisher<Array<PetOwner>, Error> = database.publisher(PetOwner.self, PetOwner.getAll)
 
-        let forever = self.forever(for: publisher, expecting: expected, expectation: expectation)
+        let sink = self.sink(for: publisher, expecting: expected, expectation: expectation)
         try! database.write(Person.insert, arguments: person3.asArguments)
         try! database.write(Pet.insert, arguments: pet3.asArguments)
         waitForExpectations(timeout: 0.5)
-        forever.cancel()
+        sink.cancel()
     }
 
     static var allTests = [
@@ -197,12 +196,12 @@ private extension SQLitePublisherTests {
         }
     }
 
-    func forever<T: Equatable, E: Error>(
+    func sink<T: Equatable, E: Error>(
         for publisher: AnyPublisher<Array<T>, E>,
         shouldFinish: Bool = false,
         expecting expected: Array<Array<T>>,
         expectation: XCTestExpectation? = nil)
-        -> Subscribers.Forever<AnyPublisher<Array<T>, E>> {
+        -> AnyCancellable {
             let receiveCompletion: (Subscribers.Completion<E>) -> Void = { completion in
                 guard shouldFinish, case .finished = completion else {
                     XCTFail("Should not receive completion: \(String(describing: completion))")
@@ -219,6 +218,6 @@ private extension SQLitePublisherTests {
                 }
             }
 
-            return publisher.forever(receiveCompletion: receiveCompletion, receiveValue: receiveValue)
+            return publisher.sink(receiveCompletion: receiveCompletion, receiveValue: receiveValue)
     }
 }