Improves `drive` documentation.

This commit is contained in:
Krunoslav Zaher 2016-06-15 23:05:21 +02:00
parent 95900ef394
commit 8797a05a0e
3 changed files with 19 additions and 8 deletions

View File

@ -11,9 +11,13 @@ import Foundation
import RxSwift
#endif
private let driverErrorMessage = "`drive*` family of methods can be only called from `MainThread`.\n" +
"This is required to ensure that the last replayed `Driver` element is delivered on `MainThread`.\n"
extension DriverConvertibleType {
/**
Creates new subscription and sends elements to observer.
This method can be only called from `MainThread`.
In this form it's equivalent to `subscribe` method, but it communicates intent better.
@ -22,18 +26,20 @@ extension DriverConvertibleType {
*/
@warn_unused_result(message="http://git.io/rxs.ud")
public func drive<O: ObserverType where O.E == E>(observer: O) -> Disposable {
MainScheduler.ensureExecutingOnScheduler()
MainScheduler.ensureExecutingOnScheduler(driverErrorMessage)
return self.asObservable().subscribe(observer)
}
/**
Creates new subscription and sends elements to variable.
This method can be only called from `MainThread`.
- parameter variable: Target variable for sequence elements.
- returns: Disposable object that can be used to unsubscribe the observer from the variable.
*/
@warn_unused_result(message="http://git.io/rxs.ud")
public func drive(variable: Variable<E>) -> Disposable {
MainScheduler.ensureExecutingOnScheduler(driverErrorMessage)
return drive(onNext: { e in
variable.value = e
})
@ -41,13 +47,14 @@ extension DriverConvertibleType {
/**
Subscribes to observable sequence using custom binder function.
This method can be only called from `MainThread`.
- parameter with: Function used to bind elements from `self`.
- returns: Object representing subscription.
*/
@warn_unused_result(message="http://git.io/rxs.ud")
public func drive<R>(transformation: Observable<E> -> R) -> R {
MainScheduler.ensureExecutingOnScheduler()
MainScheduler.ensureExecutingOnScheduler(driverErrorMessage)
return transformation(self.asObservable())
}
@ -59,18 +66,21 @@ extension DriverConvertibleType {
return with(self)(curriedArgument)
}
This method can be only called from `MainThread`.
- parameter with: Function used to bind elements from `self`.
- parameter curriedArgument: Final argument passed to `binder` to finish binding process.
- returns: Object representing subscription.
*/
@warn_unused_result(message="http://git.io/rxs.ud")
public func drive<R1, R2>(with: Observable<E> -> R1 -> R2, curriedArgument: R1) -> R2 {
MainScheduler.ensureExecutingOnScheduler()
MainScheduler.ensureExecutingOnScheduler(driverErrorMessage)
return with(self.asObservable())(curriedArgument)
}
/**
Subscribes an element handler, a completion handler and disposed handler to an observable sequence.
This method can be only called from `MainThread`.
Error callback is not exposed because `Driver` can't error out.
@ -83,19 +93,20 @@ extension DriverConvertibleType {
*/
@warn_unused_result(message="http://git.io/rxs.ud")
public func drive(onNext onNext: ((E) -> Void)? = nil, onCompleted: (() -> Void)? = nil, onDisposed: (() -> Void)? = nil) -> Disposable {
MainScheduler.ensureExecutingOnScheduler()
MainScheduler.ensureExecutingOnScheduler(driverErrorMessage)
return self.asObservable().subscribe(onNext: onNext, onCompleted: onCompleted, onDisposed: onDisposed)
}
/**
Subscribes an element handler to an observable sequence.
This method can be only called from `MainThread`.
- parameter onNext: Action to invoke for each element in the observable sequence.
- returns: Subscription object used to unsubscribe from the observable sequence.
*/
@warn_unused_result(message="http://git.io/rxs.ud")
public func driveNext(onNext: E -> Void) -> Disposable {
MainScheduler.ensureExecutingOnScheduler()
MainScheduler.ensureExecutingOnScheduler(driverErrorMessage)
return self.asObservable().subscribeNext(onNext)
}
}

View File

@ -37,7 +37,7 @@ public class UIBindingObserver<UIElementType, Value where UIElementType: AnyObje
Binds next element to owner view as described in `binding`.
*/
public func on(event: Event<Value>) {
MainScheduler.ensureExecutingOnScheduler()
MainScheduler.ensureExecutingOnScheduler("Element can be bound to user interface only on MainThread.")
switch event {
case .Next(let element):

View File

@ -43,9 +43,9 @@ public final class MainScheduler : SerialDispatchQueueScheduler {
/**
In case this method is called on a background thread it will throw an exception.
*/
public class func ensureExecutingOnScheduler() {
public class func ensureExecutingOnScheduler(errorMessage: String? = nil) {
if !NSThread.currentThread().isMainThread {
rxFatalError("Executing on backgound thread. Please use `MainScheduler.instance.schedule` to schedule work on main thread.")
rxFatalError(errorMessage ?? "Executing on backgound thread. Please use `MainScheduler.instance.schedule` to schedule work on main thread.")
}
}