Merge pull request #63 from heroesofcode/feature/improvements-v2.0.0

Improvements v2.0.0

Author: joaolfp

Example/Arena-Playground/Content.playground/Contents.swift

@@ -18,7 +18,7 @@ var getName = ""
 
 let viewModel = ViewModel()
 
-viewModel.myName.observer(viewModel) { name in
+viewModel.myName.addObserver(viewModel) { name in
     getName = name
 }
 

Example/Arena-Playground/PlaygroundDependencies/Package.swift

@@ -23,7 +23,7 @@ let package = Package(
 )
 
 package.dependencies = [
-    .package(url: "https://github.com/heroesofcode/DataLife", from: "1.5.0")
+    .package(url: "https://github.com/heroesofcode/DataLife", branch: "master")
 ]
 package.targets = [
     .target(name: "PlaygroundDependencies",
@@ -37,4 +37,4 @@ package.platforms = [
     .macOS("10.13"),
     .tvOS("12.0"),
     .watchOS("4.0")
-]
+]

README.md

@@ -52,7 +52,7 @@ final class ViewController: UIViewController {
     }
 
     private func setupState() {
-        viewModel.myName.observer(viewModel) { [weak self] name in
+        viewModel.myName.addObserver(viewModel) { [weak self] name in
             self?.nameLabel.text = name
         }
     }

Sources/DataLife/DataLife.swift

@@ -1,28 +1,42 @@
-public class DataLife<T> {
-
-    public typealias CompletionHandler = ((T) -> Void)
+import Foundation
 
+public class DataLife<T> {
+    
+    public typealias CompletionHandler = (T) -> Void
+    
     public var value: T? {
         didSet {
-            self.notifyObservers(self.observers)
+            notifyObservers()
         }
     }
-
-    private var observers: [Int: CompletionHandler] = [:]
-
+    
+    private var observers: [UUID: CompletionHandler] = [:]
+    private let queue = DispatchQueue(label: "com.myproject.datalife.queue", attributes: .concurrent)
+    
     public init() {}
-
-    public func observer(_ observer: ObserverProtocol, completion: @escaping CompletionHandler) {
-        self.observers[observer.id] = completion
+    
+    public func addObserver(_ observer: ObserverProtocol, completion: @escaping CompletionHandler) {
+        let id = UUID()
+        
+        queue.async(flags: .barrier) {
+            self.observers[id] = completion
+        }
     }
 
-    private func notifyObservers(_ observers: [Int: CompletionHandler]) {
-        if value != nil {
-            guard let value = value else { return }
-            observers.forEach({ $0.value(value) })
+    public func removeObserver(_ observer: ObserverProtocol) {
+        queue.async(flags: .barrier) {
+            self.observers.removeValue(forKey: observer.id)
         }
     }
-
+    
+    private func notifyObservers() {
+        guard let value = value else { return }
+        
+        queue.sync {
+            self.observers.forEach { $0.value(value) }
+        }
+    }
+    
     deinit {
         observers.removeAll()
     }

Sources/DataLife/DataLifeViewModel.swift

@@ -2,7 +2,7 @@ import Foundation
 
 open class DataLifeViewModel: ObserverProtocol {
     public init() {}
-
-    public var id: Int = 0
+    
+    public var id: UUID = UUID()
     public func onValueChanged(_ value: Any?) {}
 }

Sources/DataLife/ObserverProtocol.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-public protocol ObserverProtocol {
-    var id : Int { get set }
+public protocol ObserverProtocol: AnyObject {
+    var id: UUID { get set }
     func onValueChanged(_ value: Any?)
 }

Tests/DataLifeTests/DataLifeTests.swift

@@ -8,7 +8,7 @@ final class DataLifeTests: XCTestCase {
 
         let viewModel = ViewModel()
 
-        viewModel.myName.observer(viewModel) { name in
+        viewModel.myName.addObserver(viewModel) { name in
             getName = name
         }