Merge pull request #33 from chaserCN/master

fixed observable's disposing

Author: ashfurrow

.travis.yml

@@ -1,4 +1,4 @@
-osx_image: xcode7.1
+osx_image: xcode7.3
 language: objective-c
 podfile: Demo/Podfile
 cache: cocoapods

Action.swift

@@ -100,18 +100,18 @@ public extension Action {
         let work = self.workFactory(input)
         defer {
             // Subscribe to the work.
-            work.multicast(buffer).connect()
+            work.multicast(buffer).connect().addDisposableTo(disposeBag)
         }
 
-        buffer.subscribe(onNext: { element in
-                    self._elements.onNext(element)
+        buffer.subscribe(onNext: {[weak self] element in
+                    self?._elements.onNext(element)
                 },
-                onError: { error in
-                    self._errors.onNext(ActionError.UnderlyingError(error))
+                onError: {[weak self] error in
+                    self?._errors.onNext(ActionError.UnderlyingError(error))
                 },
                 onCompleted: nil,
-                onDisposed: {
-                    self.doLocked { self._executing.value = false }
+                onDisposed: {[weak self] in
+                    self?.doLocked { self?._executing.value = false }
                 })
             .addDisposableTo(disposeBag)
 

Demo/DemoTests/ActionTests.swift

@@ -214,7 +214,7 @@ class ActionTests: QuickSpec {
         it("only subscribes to observable returned from work factory once") {
             var invocations = 0
             let subject = Action<Void, Void>(workFactory: { _ in
-                invocations++
+                invocations += 1
                 return .empty()
             })
 

Demo/DemoTests/ButtonTests.swift

@@ -106,6 +106,27 @@ class ButtonTests: QuickSpec {
 
             expect(disposed) == true
         }
+        
+        it("cancels the observable if the button is deallocated") {
+            
+            var disposed = false
+            
+            autoreleasepool {
+                let subject = UIButton(type: .System)
+                let action = CocoaAction {
+                    return Observable.create {_ in
+                        AnonymousDisposable {
+                            disposed = true
+                        }
+                    }
+                }
+                
+                subject.rx_action = action
+                subject.rx_action?.execute()
+            }
+            
+            expect(disposed) == true
+        }
     }
 }
 

Demo/Podfile.lock

@@ -1,14 +1,14 @@
 PODS:
-  - Action (1.1.0):
-    - RxCocoa (~> 2.1.0)
-    - RxSwift (~> 2.1.0)
-  - Nimble (3.0.0)
-  - Quick (0.8.0)
-  - RxBlocking (2.1.0):
+  - Action (1.2.1):
+    - RxCocoa (~> 2.0)
     - RxSwift (~> 2.0)
-  - RxCocoa (2.1.0):
-    - RxSwift (~> 2.0)
-  - RxSwift (2.1.0)
+  - Nimble (4.0.1)
+  - Quick (0.9.2)
+  - RxBlocking (2.5.0):
+    - RxSwift (~> 2.5)
+  - RxCocoa (2.5.0):
+    - RxSwift (~> 2.5)
+  - RxSwift (2.5.0)
 
 DEPENDENCIES:
   - Action (from `../`)
@@ -23,11 +23,11 @@ EXTERNAL SOURCES:
     :path: ../
 
 SPEC CHECKSUMS:
-  Action: d313d68136ecaa8c8419fcb59d87bd26f2f80522
-  Nimble: 4c353d43735b38b545cbb4cb91504588eb5de926
-  Quick: 563d0f6ec5f72e394645adb377708639b7dd38ab
-  RxBlocking: fa297def258d85c5beae9ed507f94645260b3747
-  RxCocoa: 79b5feb8378545336e756a0a33fcf5e95050b71c
-  RxSwift: 110fb07f81c17c2c3b3254d168363057b1880d18
+  Action: b602680262545973293b0fd0aca84d1a49141608
+  Nimble: 0f3c8b8b084cda391209c3c5efbb48bedeeb920a
+  Quick: 18d057bc66451eedd5d1c8dc99ba2a5db6e60226
+  RxBlocking: 595d9ab56dde6b00beaa5aba40e95b150d2135f1
+  RxCocoa: e1b1562e57a554d0fb2aabf9d71b637f177257c7
+  RxSwift: 402b41a50e922a0368fc14cb3bc9f4427920e8ae
 
 COCOAPODS: 0.39.0