Shorten Observable static functions where possible

Author: nanoxd

Action.swift

@@ -67,7 +67,7 @@ public extension Action {
 
     /// Always enabled.
     public convenience init(workFactory: WorkFactory) {
-        self.init(enabledIf: Observable.just(true), workFactory: workFactory)
+        self.init(enabledIf: .just(true), workFactory: workFactory)
     }
 }
 

Demo/Demo/ViewController.swift

@@ -33,7 +33,7 @@ class ViewController: UIViewController {
 				ok.rx_action = CocoaAction {
 					print("Alert's OK button was pressed")
 					observer.onCompleted()
-					return Observable.empty()
+					return .empty()
 				}
 				alertController.addAction(ok)
 				self!.presentViewController(alertController, animated: true, completion: nil)

Demo/DemoTests/ActionTests.swift

@@ -121,7 +121,7 @@ class ActionTests: QuickSpec {
             var receivedInput: String?
             let subject = Action<String, Void>(workFactory: { (input) in
                 receivedInput = input
-                return Observable.just()
+                return .just()
             })
 
             subject.execute(testInput)
@@ -215,7 +215,7 @@ class ActionTests: QuickSpec {
             var invocations = 0
             let subject = Action<Void, Void>(workFactory: { _ in
                 invocations++
-                return Observable.empty()
+                return .empty()
             })
 
             subject.execute()
@@ -254,17 +254,17 @@ class ActionTests: QuickSpec {
 
         describe("disabled") {
             it("sends false on enabled observable") {
-                let subject = Action<Void, Void>(enabledIf: Observable.just(false), workFactory: { _ in
-                    return Observable.empty()
+                let subject = Action<Void, Void>(enabledIf: .just(false), workFactory: { _ in
+                    return .empty()
                 })
 
                 let enabled = try! subject.enabled.toBlocking().first()
                 expect(enabled) == false
             }
 
             it("errors observable sends error as next event when execute() is called") {
-                let subject = Action<Void, Void>(enabledIf: Observable.just(false), workFactory: { _ in
-                    return Observable.empty()
+                let subject = Action<Void, Void>(enabledIf: .just(false), workFactory: { _ in
+                    return .empty()
                 })
 
                 var receivedError: ActionError?
@@ -282,8 +282,8 @@ class ActionTests: QuickSpec {
             }
 
             it("errors observable sends correct error types when execute() is called") {
-                let subject = Action<Void, Void>(enabledIf: Observable.just(false), workFactory: { _ in
-                    return Observable.empty()
+                let subject = Action<Void, Void>(enabledIf: .just(false), workFactory: { _ in
+                    return .empty()
                 })
 
                 var receivedError: ActionError?
@@ -311,9 +311,9 @@ class ActionTests: QuickSpec {
             it("doesn't invoke the work factory") {
                 var invoked = false
 
-                let subject = Action<Void, Void>(enabledIf: Observable.just(false), workFactory: { _ in
+                let subject = Action<Void, Void>(enabledIf: .just(false), workFactory: { _ in
                     invoked = true
-                    return Observable.empty()
+                    return .empty()
                 })
 
                 subject.execute()
@@ -330,7 +330,7 @@ extension String: ErrorType { }
 let TestError = "Test Error"
 
 func errorObservable() -> Observable<Void> {
-    return Observable.create({ (observer) -> Disposable in
+    return .create({ (observer) -> Disposable in
         observer.onError(TestError)
         return NopDisposable.instance
     })
@@ -344,7 +344,7 @@ func errorSubject() -> Action<Void, Void> {
 
 func emptySubject() -> Action<Void, Void> {
     return Action(workFactory: { input in
-        return Observable.empty()
+        return .empty()
     })
 }
 

Demo/DemoTests/BarButtonTests.swift

@@ -45,7 +45,7 @@ class BarButtonTests: QuickSpec {
 		it("disables the button if the Action is disabled") {
 			let subject = UIBarButtonItem(barButtonSystemItem: .Save, target: nil, action: nil)
 
-			subject.rx_action = emptyAction(Observable.just(false))
+			subject.rx_action = emptyAction(.just(false))
 
 			expect(subject.enabled) == false
 		}
@@ -54,9 +54,9 @@ class BarButtonTests: QuickSpec {
 			let subject = UIBarButtonItem(barButtonSystemItem: .Save, target: nil, action: nil)
 
 			var executed = false
-			subject.rx_action = CocoaAction(enabledIf: Observable.just(false), workFactory: { _ in
+			subject.rx_action = CocoaAction(enabledIf: .just(false), workFactory: { _ in
 				executed = true
-				return Observable.empty()
+				return .empty()
 			})
 
 			subject.target?.performSelector(subject.action, withObject: subject)
@@ -70,7 +70,7 @@ class BarButtonTests: QuickSpec {
 			var executed = false
 			let action = CocoaAction(workFactory: { _ in
 				executed = true
-				return Observable.empty()
+				return .empty()
 			})
 			subject.rx_action = action
 

Demo/DemoTests/ButtonTests.swift

@@ -45,7 +45,7 @@ class ButtonTests: QuickSpec {
         it("disables the button if the Action is disabled") {
             let subject = UIButton(type: .System)
 
-            subject.rx_action = emptyAction(Observable.just(false))
+            subject.rx_action = emptyAction(.just(false))
 
             expect(subject.enabled) == false
         }
@@ -54,9 +54,9 @@ class ButtonTests: QuickSpec {
             let subject = UIButton(type: .System)
 
             var executed = false
-            subject.rx_action = CocoaAction(enabledIf: Observable.just(false), workFactory: { _ in
+            subject.rx_action = CocoaAction(enabledIf: .just(false), workFactory: { _ in
                 executed = true
-                return Observable.empty()
+                return .empty()
             })
 
             subject.sendActionsForControlEvents(.TouchUpInside)
@@ -70,7 +70,7 @@ class ButtonTests: QuickSpec {
             var executed = false
             let action = CocoaAction(workFactory: { _ in
                 executed = true
-                return Observable.empty()
+                return .empty()
             })
             subject.rx_action = action
 
@@ -109,8 +109,8 @@ class ButtonTests: QuickSpec {
     }
 }
 
-func emptyAction(enabledIf: Observable<Bool> = Observable.just(true)) -> CocoaAction {
+func emptyAction(enabledIf: Observable<Bool> = .just(true)) -> CocoaAction {
     return CocoaAction(enabledIf: enabledIf, workFactory: { _ in
-        return Observable.empty()
+        return .empty()
     })
 }