100 percent test coverage

README.md

@@ -2,7 +2,7 @@
 
 [![Carthage](https://img.shields.io/badge/Carthage-compatible-brightgreen.svg?style=flat)](https://github.com/Carthage/Carthage)
 
-Token is a unidirectional data flow framework for Swift!
+Token is a unidirectional data flow framework for Swift
 
 - [Installation](#installation)
 - [License](#license)

Token.xcodeproj/xcshareddata/xcschemes/Token.xcscheme

@@ -26,7 +26,18 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      codeCoverageEnabled = "YES"
+      onlyGenerateCoverageForSpecifiedTargets = "YES"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <CodeCoverageTargets>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "F039926E1FB3BB1700A76CB7"
+            BuildableName = "Token.framework"
+            BlueprintName = "Token"
+            ReferencedContainer = "container:Token.xcodeproj">
+         </BuildableReference>
+      </CodeCoverageTargets>
       <Testables>
          <TestableReference
             skipped = "NO">

Token.xcodeproj/xcshareddata/xcschemes/TokenMobile.xcscheme

@@ -26,7 +26,18 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      codeCoverageEnabled = "YES"
+      onlyGenerateCoverageForSpecifiedTargets = "YES"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <CodeCoverageTargets>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "F039928D1FB3BB4700A76CB7"
+            BuildableName = "Token.framework"
+            BlueprintName = "TokenMobile"
+            ReferencedContainer = "container:Token.xcodeproj">
+         </BuildableReference>
+      </CodeCoverageTargets>
       <Testables>
          <TestableReference
             skipped = "NO">

Token.xcodeproj/xcshareddata/xcschemes/TokenTV.xcscheme

@@ -26,7 +26,18 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      codeCoverageEnabled = "YES"
+      onlyGenerateCoverageForSpecifiedTargets = "YES"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <CodeCoverageTargets>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "F01EA0FA2101CA0F0040FA96"
+            BuildableName = "Token.framework"
+            BlueprintName = "TokenTV"
+            ReferencedContainer = "container:Token.xcodeproj">
+         </BuildableReference>
+      </CodeCoverageTargets>
       <Testables>
          <TestableReference
             skipped = "NO">

Token/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.4</string>
+	<string>1.4.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>

TokenMobile/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.4</string>
+	<string>1.4.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

TokenShared/ActionCreator.swift

@@ -9,5 +9,7 @@
 import Foundation
 
 public protocol ActionCreator {
+
     func create(store: Store, state: State?, result: @escaping (_ action: Action?) -> Void) -> Void
+
 }

TokenShared/Array+Cacheable.swift

@@ -13,7 +13,6 @@ public extension Array where Element: Cacheable {
     // MARK: - Getters
 
     public func uuids() -> [String] { return map { $0.uuid } }
-//    public func items<T: Element>() -> [T] where T: Cacheable { return compactMap { $0 as? T } }
     public func items(for uuids: [String]) -> [Element] { return filter { uuids.contains($0.uuid) } }
 
     public func contains(_ cacheable: Element) -> Bool { return uuids().contains(cacheable.uuid)  }
@@ -26,29 +25,27 @@ public extension Array where Element: Cacheable {
         })
     }
 
-//    public func item(for UUID: String) -> Element? {
-//        return reduce(nil, { (result, cacheable) -> Element? in
-//            if let result = result { return result }
-//            if cacheable.uuid != UUID { return nil }
-//            return cacheable
-//        })
-//    }
-
     // MARK: - Maps
 
     public func merging(_ cacheable: Element) -> [Element] {
-        var found: Bool = false
+//        var found: Bool = false
+//
+//        let result: [Element] = map {
+//            if $0 == cacheable {
+//                found = true
+//                return cacheable
+//            } else {
+//                return $0
+//            }
+//        }
+//
+//        if !found { return result.appending(cacheable) } else { return result }
 
-        let result: [Element] = map {
-            if $0 == cacheable {
-                found = true
-                return cacheable
-            } else {
-                return $0
-            }
+        let result: [Element] = filter { (element) -> Bool in
+            return element != cacheable
         }
 
-        if !found { return result.appending(cacheable) } else { return result }
+        return result.appending(cacheable)
     }
 
     public func merging(cacheables: [Element]) -> [Element] {

TokenShared/ArrayReducer.swift

@@ -9,5 +9,7 @@
 import Foundation
 
 public protocol ArrayReducer {
+
     func reduce(action: Action, state: [State]) -> [State]
+
 }

TokenShared/Middleware.swift

@@ -11,5 +11,7 @@ import Foundation
 public typealias MiddlewareResult = (store: Store, action: Action, state: State?)
 
 public protocol Middleware {
-    func execute(store: Store, action: Action, state: State?) -> MiddlewareResult?
+
+    func execute(store: Store, action: Action, state: State?) -> MiddlewareResult
+
 }

TokenShared/Reducer.swift

@@ -9,5 +9,7 @@
 import Foundation
 
 public protocol Reducer {
+
     func reduce(action: Action, state: State?) -> State?
+
 }

TokenShared/Subscriber.swift

@@ -9,12 +9,19 @@
 import Foundation
 
 public protocol Subscriber: class {
+
     func onChange(newState: State?, action: Action) -> Void
+
 }
 
 public extension Subscriber {
 
-    public func subscribe() { token.subscribe(subscriber: self) }
-    public func unsubscribe() { token.unsubscribe(subscriber: self) }
+    public var token: Token { return Token.shared }
+
+    public func dispatch(_ action: Action, token: Token = Token.shared) { token.dispatch(action: action) }
+    public func dispatch(_ actionCreator: ActionCreator, token: Token = Token.shared) { token.dispatch(actionCreator: actionCreator) }
+
+    public func subscribe(token: Token = Token.shared) { token.subscribe(subscriber: self) }
+    public func unsubscribe(token: Token = Token.shared) { token.unsubscribe(subscriber: self) }
 
 }

TokenShared/Token.swift

@@ -8,11 +8,6 @@
 
 import Foundation
 
-public var token: Token { return Token.shared }
-
-public func dispatch(_ action: Action) { Token.shared.dispatch(action: action) }
-public func dispatch(_ actionCreator: ActionCreator) { Token.shared.dispatch(actionCreator: actionCreator) }
-
 public class Token: Store {
 
     public static let shared = Token()
@@ -36,12 +31,10 @@ public class Token: Store {
     public func dispatch(action: Action) {
         if self.middleware.count > 0 {
             let initial: MiddlewareResult = (self, action, self.state)
-            if let result = self.middleware.reduce(initial, { (result, middleware) -> MiddlewareResult? in
-                guard let result = result else { return nil }
+            let result = self.middleware.reduce(initial, { (result, middleware) -> MiddlewareResult in
                 return middleware.execute(store: result.store, action: result.action, state: result.state)
-            }) {
-                self.state = self.reducer?.reduce(action: result.action, state: result.state)
-            }
+            })
+            self.state = self.reducer?.reduce(action: result.action, state: result.state)
         } else {
             self.state = self.reducer?.reduce(action: action, state: self.state)
         }

TokenTV/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.4</string>
+	<string>1.4.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

TokenTestsShared/ArrayAppendingTests.swift

@@ -11,4 +11,44 @@ import XCTest
 
 class ArrayAppendingTests: XCTestCase {
 
+    func testCanAppendSingleElement() {
+        let array = [1, 2, 3]
+
+        XCTAssertEqual(array.count, 3)
+
+        let newArray = array.appending(4)
+
+        XCTAssertEqual(newArray.count, 4)
+    }
+
+    func testCanAppendMultipleElements() {
+        let array = [1, 2, 3]
+
+        XCTAssertEqual(array.count, 3)
+
+        let newArray = array.appending([4, 5])
+
+        XCTAssertEqual(newArray.count, 5)
+    }
+
+    func testCanAppendSingleElementUsingPlus() {
+        let array = [1, 2, 3]
+
+        XCTAssertEqual(array.count, 3)
+
+        let newArray = array + 4
+
+        XCTAssertEqual(newArray.count, 4)
+    }
+
+    func testCanAppendMultipleElementsUsingPlus() {
+        let array = [1, 2, 3]
+
+        XCTAssertEqual(array.count, 3)
+
+        let newArray = array + [4, 5]
+
+        XCTAssertEqual(newArray.count, 5)
+    }
+
 }

TokenTestsShared/ArrayCacheableTests.swift

@@ -11,4 +11,51 @@ import XCTest
 
 class ArrayCacheableTests: XCTestCase {
 
+    func testItems() {
+        let array: [TestWidget] = [TestWidget(uuid: "123")]
+        let items = array.items(for: ["123"])
+
+        XCTAssertEqual(items.count, 1)
+    }
+
+    func testRemovingElement() {
+        let widget = TestWidget(uuid: "123")
+        var array: [TestWidget] = [widget]
+
+        XCTAssertEqual(array.count, 1)
+
+        array.remove(widget)
+
+        XCTAssertEqual(array.count, 0)
+    }
+
+    func testRemovingElements() {
+        let widget1 = TestWidget(uuid: "123")
+        let widget2 = TestWidget(uuid: "234")
+        var array: [TestWidget] = [widget1, widget2]
+
+        XCTAssertEqual(array.count, 2)
+
+        array.remove([widget1, widget2])
+
+        XCTAssertEqual(array.count, 0)
+    }
+
+    func testMerging() {
+        let widget1 = TestWidget(uuid: "123")
+        let widget2 = TestWidget(uuid: "234")
+        let widget3 = TestWidget(uuid: "345")
+        var array: [TestWidget] = [widget1, widget2]
+
+        XCTAssertEqual(array.count, 2)
+
+        array = array.merging(widget2)
+
+        XCTAssertEqual(array.count, 2)
+
+        array = array.merging(widget3)
+
+        XCTAssertEqual(array.count, 3)
+    }
+
 }