♻️ ✨ Move Combine nibbles into Fuse

Author: connor-ricks

.swiftpm/xcode/xcshareddata/xcschemes/swift-nibbles-Package.xcscheme

@@ -118,6 +118,20 @@
                ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "Fuse"
+               BuildableName = "Fuse"
+               BlueprintName = "Fuse"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
@@ -182,6 +196,16 @@
                ReferencedContainer = "container:">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "FuseTests"
+               BuildableName = "FuseTests"
+               BlueprintName = "FuseTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction

Package.swift

@@ -11,23 +11,23 @@ let package = Package(
         .watchOS(.v9),
     ],
     products: [
-        .library(name: "BuffableAsyncPublishers", targets: ["BuffableAsyncPublishers"]),
         .library(name: "Cache", targets: ["Cache"]),
         .library(name: "Extensions", targets: ["Extensions"]),
+        .library(name: "Fuse", targets: ["Fuse"]),
         .library(name: "HTTPNetworking", targets: ["HTTPNetworking"]),
         .library(name: "Identified", targets: ["Identified"]),
         .plugin(name: "Create TCA Feature", targets: ["Create TCA Feature"])
     ],
     targets: [
-        .target(name: "BuffableAsyncPublishers"),
-        .testTarget(name: "BuffableAsyncPublishersTests", dependencies: ["BuffableAsyncPublishers"]),
-            
         .target(name: "Cache"),
         .testTarget(name: "CacheTests", dependencies: ["Cache"]),
 
         .target(name: "Extensions"),
         .testTarget(name: "ExtensionsTests", dependencies: ["Extensions"]),
 
+        .target(name: "Fuse"),
+        .testTarget(name: "FuseTests", dependencies: ["Fuse"]),
+        
         .target(name: "HTTPNetworking"),
         .testTarget(name: "HTTPNetworkingTests", dependencies: ["HTTPNetworking"]),
 

Sources/Extensions/Publisher+Sinks.swift renamed to Sources/Fuse/Extensions/Publisher+Sinks.swift

@@ -23,41 +23,6 @@
 import Foundation
 import Combine
 
-// MARK: - DisposableBag
-
-/// A thread safe bag of `AnyCancellables`
-public class DisposableBag {
-    
-    // MARK: Properties
-    
-    private let lock = NSLock()
-    private var cancellables = Set<AnyCancellable>()
-    
-    public var count: Int {
-        return cancellables.count
-    }
-
-    // MARK: Methods
-    
-    public func store(_ anyCancellable: AnyCancellable) {
-        lock.lock()
-        cancellables.insert(anyCancellable)
-        lock.unlock()
-    }
-
-    public func dispose(_ anyCancellable: AnyCancellable) {
-        lock.lock()
-        cancellables.remove(anyCancellable)
-        lock.unlock()
-    }
-    
-    public func empty() {
-        lock.lock()
-        cancellables.removeAll()
-        lock.unlock()
-    }
-}
-
 // MARK: - Standard Sinks
 
 extension Publisher {

Sources/Fuse/Models/DisposableBag.swift

@@ -0,0 +1,54 @@
+//
+// MIT License
+//
+// Copyright (c) 2023 Connor Ricks
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+import Combine
+import Foundation
+
+/// A thread safe bag of `AnyCancellables`
+public class DisposableBag {
+    
+    // MARK: Properties
+    
+    private let lock = NSLock()
+    private(set) var cancellables = Set<AnyCancellable>()
+
+    // MARK: Methods
+    
+    public func store(_ anyCancellable: AnyCancellable) {
+        lock.lock()
+        cancellables.insert(anyCancellable)
+        lock.unlock()
+    }
+
+    public func dispose(_ anyCancellable: AnyCancellable) {
+        lock.lock()
+        cancellables.remove(anyCancellable)
+        lock.unlock()
+    }
+    
+    public func empty() {
+        lock.lock()
+        cancellables.removeAll()
+        lock.unlock()
+    }
+}

Sources/BuffableAsyncPublishers/AsyncPublisher.swift renamed to Sources/Fuse/Publishers/BuffableAsyncPublisher.swift

@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-@testable import Extensions
+@testable import Fuse
 import XCTest
 import Combine
 
@@ -38,7 +38,7 @@ class PublisherSinksTests: XCTestCase {
 
     var cancellable: AnyCancellable?
 
-    // MARK: Publisher Tests
+    // MARK: Sink Tests
 
     func test_synchronousSink_doesComplete_whenValuesFinishedPublishing() {
         /// Setup expectations
@@ -133,7 +133,7 @@ class PublisherSinksTests: XCTestCase {
     func test_disposableSynchronousBagSink_doesCleanup_whenValuesFinishedPublishing() {
         /// Prepare test
         let bag = DisposableBag()
-        XCTAssertEqual(bag.count, 0)
+        XCTAssertEqual(bag.cancellables.count, 0)
 
         /// Setup expectations
         let valueExpectation = createReceiveValueExpectation(count: 3)
@@ -157,7 +157,7 @@ class PublisherSinksTests: XCTestCase {
     func test_disposableAsynchronousBagSink_doesCleanup_whenValuesFinishedPublishing() {
         /// Prepare test
         let bag = DisposableBag()
-        XCTAssertEqual(bag.count, 0)
+        XCTAssertEqual(bag.cancellables.count, 0)
 
         /// Setup expectations
         let valueExpectation = createReceiveValueExpectation(count: 1)
@@ -187,7 +187,7 @@ class PublisherSinksTests: XCTestCase {
     func test_disposableBagSink_doesCleanup_whenCancellableIsCancelled() {
         /// Prepare test
         let bag = DisposableBag()
-        XCTAssertEqual(bag.count, 0)
+        XCTAssertEqual(bag.cancellables.count, 0)
 
         /// Setup expectations
         let valueExpectation = createReceiveValueExpectation(count: 1)
@@ -217,7 +217,7 @@ class PublisherSinksTests: XCTestCase {
     func test_disposableBagSink_doesCleanup_whenErrorIsPublished() {
         /// Prepare test
         let bag = DisposableBag()
-        XCTAssertEqual(bag.count, 0)
+        XCTAssertEqual(bag.cancellables.count, 0)
 
         /// Setup expectations
         let valueExpectation = createReceiveValueExpectation(count: 1)
@@ -249,7 +249,7 @@ class PublisherSinksTests: XCTestCase {
     func test_disposableBag_whenEmptied_doesCancelAllPublishers() {
         /// Prepare test
         let bag = DisposableBag()
-        XCTAssertEqual(bag.count, 0)
+        XCTAssertEqual(bag.cancellables.count, 0)
 
         /// Setup expectations
         let completionExpectation = expectation(description: "Expected publisher to complete.")
@@ -266,7 +266,7 @@ class PublisherSinksTests: XCTestCase {
         }, bag: bag)
 
         bag.empty()
-        XCTAssertEqual(bag.count, 0)
+        XCTAssertEqual(bag.cancellables.count, 0)
 
         wait(for: [
             completionExpectation,
@@ -281,7 +281,7 @@ private extension PublisherSinksTests {
     func createEmptyBagExpectation(from bag: DisposableBag) -> XCTestExpectation {
         return expectation(for: NSPredicate { any, _ in
             guard let bag = any as? DisposableBag else { return false}
-            return bag.count == 0
+            return bag.cancellables.count == 0
         }, evaluatedWith: bag, handler: .none)
     }
 

Sources/BuffableAsyncPublishers/AsyncThrowingPublisher.swift renamed to Sources/Fuse/Publishers/BuffableAsyncThrowingPublisher.swift

@@ -16,8 +16,8 @@
       "parallelizable" : true,
       "target" : {
         "containerPath" : "container:",
-        "identifier" : "BuffableAsyncPublishersTests",
-        "name" : "BuffableAsyncPublishersTests"
+        "identifier" : "FuseTests",
+        "name" : "FuseTests"
       }
     }
   ],

Tests/ExtensionsTests/PublisherSinksTests.swift renamed to Tests/FuseTests/Extensions/PublisherSinksTests.swift

@@ -0,0 +1,79 @@
+// MIT License
+//
+// Copyright (c) 2023 Connor Ricks
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+@testable import Fuse
+import XCTest
+import Combine
+
+class DisposableBagTests: XCTestCase {
+    
+    // MARK: MockCancellable
+    struct MockCancellable: Cancellable {
+        let id: Int
+        func cancel() {}
+    }
+    
+    // MARK: Tests
+    
+    func test_disposableBag_whenStoringAndDisposingCancellable_doesUpdateCancellableSet() {
+        let bag = DisposableBag()
+        let cancellableOne = AnyCancellable(MockCancellable(id: 1))
+        let cancellableTwo = AnyCancellable(MockCancellable(id: 2))
+        
+        bag.store(cancellableOne)
+        XCTAssertTrue(bag.cancellables == [cancellableOne])
+        
+        bag.store(cancellableTwo)
+        XCTAssertTrue(bag.cancellables == [cancellableOne, cancellableTwo])
+        
+        bag.dispose(cancellableTwo)
+        XCTAssertTrue(bag.cancellables == [cancellableOne])
+        
+        bag.dispose(cancellableOne)
+        XCTAssertTrue(bag.cancellables == [])
+    }
+    
+    func test_disposableBag_whenEmptying_doesRemoveAllCancellables() {
+        let bag = DisposableBag()
+        let cancellableOne = AnyCancellable(MockCancellable(id: 1))
+        let cancellableTwo = AnyCancellable(MockCancellable(id: 2))
+        
+        bag.store(cancellableOne)
+        bag.store(cancellableTwo)
+        
+        bag.empty()
+        XCTAssertTrue(bag.cancellables == [])
+    }
+    
+    func test_disposableBag_whenDisposingCancellableNotInBag_doesNotAlterBag() {
+        let bag = DisposableBag()
+        let cancellableOne = AnyCancellable(MockCancellable(id: 1))
+        let cancellableTwo = AnyCancellable(MockCancellable(id: 2))
+        let cancellableThree = AnyCancellable(MockCancellable(id: 3))
+        
+        bag.store(cancellableOne)
+        bag.store(cancellableTwo)
+        
+        bag.dispose(cancellableThree)
+        XCTAssertTrue(bag.cancellables == [cancellableOne, cancellableTwo])
+    }
+}

Tests/BuffableAsyncPublishersTests/BuffableAsyncPublishers.xctestplan renamed to Tests/FuseTests/Fuse.xctestplan

@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-@testable import BuffableAsyncPublishers
+@testable import Fuse
 import Combine
 import XCTest