viewModel updates observable added

Author: sinarionn

Diff for: CHANGELOG.md

@@ -1,3 +1,7 @@
 # Change Log
 
 All notable changes to this project will be documented in this file.
+
+## [1.1.0](https://github.com/sinarionn/ReusableView/releases/tag/1.1.0)
+
+ViewModel updates observable added.

Diff for: ReusableView.podspec

@@ -1,7 +1,7 @@
 
 Pod::Spec.new do |s|
   s.name         = "ReusableView"
-  s.version      = "1.0.1"
+  s.version      = "1.1.0"
   s.summary      = "Reusable and NonReusable viewModel containers"
 
   s.homepage     = "https://github.com/sinarionn/ReusableView"

Diff for: Sources/Helpers.swift

@@ -37,12 +37,34 @@ extension Reactive where Base: ReusableViewProtocol, Base: AnyObject {
         get {
             return base.reuseBag
         }
-        set {
+        nonmutating set {
             base.reuseBag = newValue
         }
     }
 }
 
+extension ViewModelHolderProtocol {
+    internal var _viewModelDidUpdate: PublishSubject<(ViewModelProtocol, DisposeBag)> {
+        get {
+            objc_sync_enter(self)
+            defer { objc_sync_exit(self) }
+            guard let existingObserver : PublishSubject<(ViewModelProtocol, DisposeBag)> = associated(with: self, by: &AssociatedKeys.viewModelUpdateObserver) else {
+                let newObserver = PublishSubject<(ViewModelProtocol, DisposeBag)>()
+                associate(self, withValue: newObserver, by: &AssociatedKeys.viewModelUpdateObserver)
+                return newObserver
+            }
+            return existingObserver
+        }
+    }
+}
+
+extension Reactive where Base: ViewModelHolderProtocol {
+    public var viewModelDidUpdate: Observable<(Base.ViewModelProtocol, DisposeBag)> {
+        return base._viewModelDidUpdate.asObservable()
+    }
+}
+
 fileprivate struct AssociatedKeys {
     static var disposeBag = "viewModel dispose bag associated key"
+    static var viewModelUpdateObserver = "viewModel did update observer associated key"
 }

Diff for: Sources/NonReusableViewProtocol.swift

@@ -32,6 +32,7 @@ extension NonReusableViewProtocol where Self: AnyObject, Self.CompatibleType: An
             objc_sync_exit(self)
 
             onUpdate(with: newVM, disposeBag: rx.disposeBag)
+            _viewModelDidUpdate.onNext((newVM, rx.disposeBag))
         }
 
         get {

Diff for: Sources/ReusableViewProtocol.swift

@@ -55,6 +55,7 @@ extension ReusableViewProtocol {
             guard let newVM = newValue else { return }
             objc_sync_exit(self)
             onUpdate(with: newVM, disposeBag: reuseBag)
+            _viewModelDidUpdate.onNext((newVM, reuseBag))
         }
 
         get {
@@ -80,6 +81,7 @@ extension ReusableViewProtocol where Self.ViewModelProtocol : Equatable {
             guard let newVM = newValue else { return }
             objc_sync_exit(self)
             onUpdate(with: newVM, disposeBag: reuseBag)
+            _viewModelDidUpdate.onNext((newVM, reuseBag))
         }
 
         get {

Diff for: Tests/NonReusableViewTests.swift

@@ -45,6 +45,17 @@ class NonReusableViewTests: XCTestCase {
         XCTAssertTrue(object.errorReceivedViewModel == "321")
     }
 
+    func testViewModelObserver() {
+        let object = TestNonReusable()
+        let expect = expectation(description: "")
+        _ = object.rx.viewModelDidUpdate.take(1).subscribe(onNext: {
+            XCTAssert($0.0 == object.receivedViewModel)
+            XCTAssert($0.0 == "a")
+            expect.fulfill()
+        })
+        object.viewModel = "a"
+        waitForExpectations(timeout: 1, handler: nil)
+    }
 }
 
 class TestNonReusable: NonReusableViewProtocol {

Diff for: Tests/ReusableViewTests.swift

@@ -8,7 +8,6 @@
 
 import XCTest
 import RxSwift
-import RxCocoa
 
 @testable import ReusableView
 
@@ -139,6 +138,22 @@ class ReusableViewTests: XCTestCase {
         XCTAssertTrue(object.prepareForReuseCalled == 3)
     }
 
+    func testViewModelObserver() {
+        let object : TestReusable = TestDistinctiveReusable()
+        let expect = expectation(description: "")
+        _ = object.rx.viewModelDidUpdate.take(1).subscribe(onNext: {
+            XCTAssert($0.0 == object.receivedViewModel)
+            XCTAssert($0.0 == "a")
+            _ = object.rx.viewModelDidUpdate.take(1).subscribe(onNext: {
+                XCTAssert($0.0 == object.receivedViewModel)
+                XCTAssert($0.0 == "b")
+                expect.fulfill()
+            })
+            object.viewModel = "b"
+        })
+        object.viewModel = "a"
+        waitForExpectations(timeout: 1, handler: nil)
+    }
 }