mirror of
https://github.com/ReactiveX/RxSwift.git
synced 2024-10-04 14:07:22 +03:00
Prototype of units.
This commit is contained in:
Krunoslav Zaher
parent
15de03e119
commit
2958e0a796
@ -6,7 +6,7 @@ This project tries to be consistent with [ReactiveX.io](http://reactivex.io/). T
|
||||
1. [Observables aka Sequences](#observables-aka-sequences)
|
||||
1. [Disposing](#disposing)
|
||||
1. [Implicit `Observable` guarantees](#implicit-observable-guarantees)
|
||||
1. [Creating your first `Observable` (aka sequence producers)](#creating-your-own-observable-aka-sequence-producers)
|
||||
1. [Creating your first `Observable` (aka observable sequence)](#creating-your-own-observable-aka-observable-sequence)
|
||||
1. [Creating an `Observable` that performs work](#creating-an-observable-that-performs-work)
|
||||
1. [Sharing subscription and `shareReplay` operator](#sharing-subscription-and-sharereplay-operator)
|
||||
1. [Operators](#operators)
|
||||
@ -265,7 +265,7 @@ Event processing ended
|
||||
Event processing ended
|
||||
```
|
||||
|
||||
## Creating your own `Observable` (aka sequence producers)
|
||||
## Creating your own `Observable` (aka observable sequence)
|
||||
|
||||
There is one crucial thing to understand about observables.
|
||||
|
||||
|
||||
22
Documentation/Units.md
Normal file
22
Documentation/Units.md
Normal file
@ -0,0 +1,22 @@
|
||||
Units
|
||||
=====
|
||||
|
||||
This document will try to describe what are units, why are they a useful concept, how to use them and how to create them.
|
||||
|
||||
* [Why](#why)
|
||||
* [Design Rationale](#design-rationale)
|
||||
* ...
|
||||
|
||||
# Why
|
||||
|
||||
The purpose of units is to use the Swift compiler static type checking to prove your code is behaving like designed.
|
||||
|
||||
RxCocoa project already contains several units, but the most elaborate one is called `Driver`, so this unit will be used to explain the idea behind units.
|
||||
|
||||
`Driver` was named that way because it describes sequences that drive certain parts of the app. Those sequences will usually drive UI bindings, UI event pumps that keep your application responsive but also drive application services, etc.
|
||||
|
||||
The purpose of `Driver` unit is to ensure the underlying observable sequence has the following properties.
|
||||
|
||||
* can't fail, all failures are being handled properly
|
||||
* elements are delivered on main thread
|
||||
* sequence computation resources are shared
|
||||
@ -104,11 +104,13 @@ Hang out with us on [rxswift.slack.com](http://slack.rxswift.org) <img src="http
|
||||
1. [Benefits](#benefits)
|
||||
1. [It's not all or nothing](#its-not-all-or-nothing)
|
||||
1. [Getting started](Documentation/GettingStarted.md)
|
||||
1. [Creating observable sequences](Documentation/GettingStarted.md#creating-your-own-observable-aka-observable-sequence)
|
||||
1. [Examples](Documentation/Examples.md)
|
||||
1. [API - RxSwift operators / RxCocoa extensions](Documentation/API.md)
|
||||
1. [Build / Install / Run](#build--install--run)
|
||||
1. [Math behind](Documentation/MathBehindRx.md)
|
||||
1. [Hot and cold observables](Documentation/HotAndColdObservables.md)
|
||||
1. [Units](Documentation/Units.md)
|
||||
1. [Feature comparison with other frameworks](#feature-comparison-with-other-frameworks)
|
||||
1. [Roadmap](https://github.com/ReactiveX/RxSwift/wiki/roadmap)
|
||||
1. [Playgrounds](#playgrounds)
|
||||
|
||||
@ -248,8 +248,8 @@
|
||||
C8093F501B8A732E0088E94D /* RxCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = C8093ECB1B8A732E0088E94D /* RxCocoa.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
C8093F5E1B8A73A20088E94D /* Observable+Blocking.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093F581B8A73A20088E94D /* Observable+Blocking.swift */; };
|
||||
C8093F5F1B8A73A20088E94D /* Observable+Blocking.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093F581B8A73A20088E94D /* Observable+Blocking.swift */; };
|
||||
C80D338F1B91EF9E0014629D /* Observable+CocoaExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C80D338E1B91EF9E0014629D /* Observable+CocoaExtensions.swift */; };
|
||||
C80D33901B91EF9E0014629D /* Observable+CocoaExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C80D338E1B91EF9E0014629D /* Observable+CocoaExtensions.swift */; };
|
||||
C80D338F1B91EF9E0014629D /* Observable+Bind.swift in Sources */ = {isa = PBXBuildFile; fileRef = C80D338E1B91EF9E0014629D /* Observable+Bind.swift */; };
|
||||
C80D33901B91EF9E0014629D /* Observable+Bind.swift in Sources */ = {isa = PBXBuildFile; fileRef = C80D338E1B91EF9E0014629D /* Observable+Bind.swift */; };
|
||||
C80D33981B922FB00014629D /* ControlEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = C80D33931B922FB00014629D /* ControlEvent.swift */; };
|
||||
C80D33991B922FB00014629D /* ControlEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = C80D33931B922FB00014629D /* ControlEvent.swift */; };
|
||||
C80D339A1B922FB00014629D /* ControlProperty.swift in Sources */ = {isa = PBXBuildFile; fileRef = C80D33941B922FB00014629D /* ControlProperty.swift */; };
|
||||
@ -258,6 +258,20 @@
|
||||
C80D342F1B9245A40014629D /* CombineLatest+CollectionType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C80D342D1B9245A40014629D /* CombineLatest+CollectionType.swift */; };
|
||||
C821DBA21BA4DCAB008F3809 /* Buffer.swift in Sources */ = {isa = PBXBuildFile; fileRef = C821DBA11BA4DCAB008F3809 /* Buffer.swift */; };
|
||||
C821DBA31BA4DCAB008F3809 /* Buffer.swift in Sources */ = {isa = PBXBuildFile; fileRef = C821DBA11BA4DCAB008F3809 /* Buffer.swift */; };
|
||||
C8226BC41BADDF2800D7F20C /* Driver+Subscription.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8226BC11BADDD3600D7F20C /* Driver+Subscription.swift */; };
|
||||
C8226BC51BADDF2800D7F20C /* Driver+Subscription.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8226BC11BADDD3600D7F20C /* Driver+Subscription.swift */; };
|
||||
C8226BC71BADE87100D7F20C /* ControlProperty+Driver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8226BC61BADE87100D7F20C /* ControlProperty+Driver.swift */; };
|
||||
C8226BC81BADE87100D7F20C /* ControlProperty+Driver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8226BC61BADE87100D7F20C /* ControlProperty+Driver.swift */; };
|
||||
C8226BCA1BADE87D00D7F20C /* ControlEvent+Driver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8226BC91BADE87D00D7F20C /* ControlEvent+Driver.swift */; };
|
||||
C8226BCB1BADE87D00D7F20C /* ControlEvent+Driver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8226BC91BADE87D00D7F20C /* ControlEvent+Driver.swift */; };
|
||||
C8226BCD1BADE8D600D7F20C /* ObservableConvertibleType+Driver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8226BCC1BADE8D600D7F20C /* ObservableConvertibleType+Driver.swift */; };
|
||||
C8226BCE1BADE8D600D7F20C /* ObservableConvertibleType+Driver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8226BCC1BADE8D600D7F20C /* ObservableConvertibleType+Driver.swift */; };
|
||||
C8226BD01BADEBDF00D7F20C /* Driver+Operators.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8226BCF1BADEBDF00D7F20C /* Driver+Operators.swift */; };
|
||||
C8226BD11BADEBDF00D7F20C /* Driver+Operators.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8226BCF1BADEBDF00D7F20C /* Driver+Operators.swift */; };
|
||||
C836E8E71BA2165500AFEF77 /* Driver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C836E8E51BA2165500AFEF77 /* Driver.swift */; };
|
||||
C836E8E81BA2165500AFEF77 /* Driver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C836E8E51BA2165500AFEF77 /* Driver.swift */; };
|
||||
C849BE2B1BAB5D070019AD27 /* ObservableConvertibleType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C849BE2A1BAB5D070019AD27 /* ObservableConvertibleType.swift */; };
|
||||
C849BE2C1BAB5D070019AD27 /* ObservableConvertibleType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C849BE2A1BAB5D070019AD27 /* ObservableConvertibleType.swift */; };
|
||||
C84B38E91BA43380001B7D88 /* ScheduledItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = C84B38E71BA43380001B7D88 /* ScheduledItem.swift */; };
|
||||
C84B38EA1BA43380001B7D88 /* ScheduledItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = C84B38E71BA43380001B7D88 /* ScheduledItem.swift */; };
|
||||
C84B38EE1BA433CD001B7D88 /* Generate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C84B38ED1BA433CD001B7D88 /* Generate.swift */; };
|
||||
@ -298,6 +312,20 @@
|
||||
C88254341B8A752B00B02D69 /* UITableView+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88254121B8A752B00B02D69 /* UITableView+Rx.swift */; };
|
||||
C88254351B8A752B00B02D69 /* UITextField+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88254131B8A752B00B02D69 /* UITextField+Rx.swift */; };
|
||||
C88254361B8A752B00B02D69 /* UITextView+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88254141B8A752B00B02D69 /* UITextView+Rx.swift */; };
|
||||
C8945FDF1BC6C09D0055219D /* Driver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C836E8E51BA2165500AFEF77 /* Driver.swift */; };
|
||||
C8945FE01BC6C09D0055219D /* Driver+Operators.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8226BCF1BADEBDF00D7F20C /* Driver+Operators.swift */; };
|
||||
C8945FE11BC6C09D0055219D /* Driver+Subscription.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8226BC11BADDD3600D7F20C /* Driver+Subscription.swift */; };
|
||||
C8945FE21BC6C09D0055219D /* ControlProperty+Driver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8226BC61BADE87100D7F20C /* ControlProperty+Driver.swift */; };
|
||||
C8945FE31BC6C09D0055219D /* ControlEvent+Driver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8226BC91BADE87D00D7F20C /* ControlEvent+Driver.swift */; };
|
||||
C8945FE41BC6C09D0055219D /* ObservableConvertibleType+Driver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8226BCC1BADE8D600D7F20C /* ObservableConvertibleType+Driver.swift */; };
|
||||
C8945FE51BC6C09D0055219D /* Driver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C836E8E51BA2165500AFEF77 /* Driver.swift */; };
|
||||
C8945FE61BC6C09D0055219D /* Driver+Operators.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8226BCF1BADEBDF00D7F20C /* Driver+Operators.swift */; };
|
||||
C8945FE71BC6C09D0055219D /* Driver+Subscription.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8226BC11BADDD3600D7F20C /* Driver+Subscription.swift */; };
|
||||
C8945FE81BC6C09D0055219D /* ControlProperty+Driver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8226BC61BADE87100D7F20C /* ControlProperty+Driver.swift */; };
|
||||
C8945FE91BC6C09D0055219D /* ControlEvent+Driver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8226BC91BADE87D00D7F20C /* ControlEvent+Driver.swift */; };
|
||||
C8945FEA1BC6C09D0055219D /* ObservableConvertibleType+Driver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8226BCC1BADE8D600D7F20C /* ObservableConvertibleType+Driver.swift */; };
|
||||
C89461751BC6C1210055219D /* ObservableConvertibleType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C849BE2A1BAB5D070019AD27 /* ObservableConvertibleType.swift */; };
|
||||
C89461761BC6C1220055219D /* ObservableConvertibleType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C849BE2A1BAB5D070019AD27 /* ObservableConvertibleType.swift */; };
|
||||
C8C3D9FE1B935EDF004D233E /* Zip+CollectionType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8C3D9FD1B935EDF004D233E /* Zip+CollectionType.swift */; };
|
||||
C8C3D9FF1B935EDF004D233E /* Zip+CollectionType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8C3D9FD1B935EDF004D233E /* Zip+CollectionType.swift */; };
|
||||
C8C3DA031B9390C4004D233E /* Just.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8C3DA021B9390C4004D233E /* Just.swift */; };
|
||||
@ -442,7 +470,7 @@
|
||||
C8F0C01C1BBBFBB9001B112F /* UILabel+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C882540C1B8A752B00B02D69 /* UILabel+Rx.swift */; };
|
||||
C8F0C01D1BBBFBB9001B112F /* RxSearchBarDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88253FF1B8A752B00B02D69 /* RxSearchBarDelegateProxy.swift */; };
|
||||
C8F0C01E1BBBFBB9001B112F /* RxAlertViewDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88253FB1B8A752B00B02D69 /* RxAlertViewDelegateProxy.swift */; };
|
||||
C8F0C01F1BBBFBB9001B112F /* Observable+CocoaExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C80D338E1B91EF9E0014629D /* Observable+CocoaExtensions.swift */; };
|
||||
C8F0C01F1BBBFBB9001B112F /* Observable+Bind.swift in Sources */ = {isa = PBXBuildFile; fileRef = C80D338E1B91EF9E0014629D /* Observable+Bind.swift */; };
|
||||
C8F0C0201BBBFBB9001B112F /* UISegmentedControl+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C882540F1B8A752B00B02D69 /* UISegmentedControl+Rx.swift */; };
|
||||
C8F0C0211BBBFBB9001B112F /* KVOObservable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093E931B8A732E0088E94D /* KVOObservable.swift */; };
|
||||
C8F0C0221BBBFBB9001B112F /* UIButton+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88254061B8A752B00B02D69 /* UIButton+Rx.swift */; };
|
||||
@ -520,7 +548,7 @@
|
||||
D2138C831BB9BEBE00339B5C /* _RXKVOObserver.m in Sources */ = {isa = PBXBuildFile; fileRef = C8093E871B8A732E0088E94D /* _RXKVOObserver.m */; };
|
||||
D2138C841BB9BEBE00339B5C /* _RXSwizzling.h in Headers */ = {isa = PBXBuildFile; fileRef = C8093E881B8A732E0088E94D /* _RXSwizzling.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
D2138C851BB9BEBE00339B5C /* _RXSwizzling.m in Sources */ = {isa = PBXBuildFile; fileRef = C8093E891B8A732E0088E94D /* _RXSwizzling.m */; };
|
||||
D2138C861BB9BEBE00339B5C /* Observable+CocoaExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C80D338E1B91EF9E0014629D /* Observable+CocoaExtensions.swift */; };
|
||||
D2138C861BB9BEBE00339B5C /* Observable+Bind.swift in Sources */ = {isa = PBXBuildFile; fileRef = C80D338E1B91EF9E0014629D /* Observable+Bind.swift */; };
|
||||
D2138C871BB9BEBE00339B5C /* CLLocationManager+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093E8A1B8A732E0088E94D /* CLLocationManager+Rx.swift */; };
|
||||
D2138C881BB9BEBE00339B5C /* DelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093E8B1B8A732E0088E94D /* DelegateProxy.swift */; };
|
||||
D2138C891BB9BEBE00339B5C /* DelegateProxyType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093E8C1B8A732E0088E94D /* DelegateProxyType.swift */; };
|
||||
@ -851,11 +879,18 @@
|
||||
C8093ECB1B8A732E0088E94D /* RxCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RxCocoa.h; sourceTree = "<group>"; };
|
||||
C8093F581B8A73A20088E94D /* Observable+Blocking.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Observable+Blocking.swift"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
|
||||
C8093F591B8A73A20088E94D /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
|
||||
C80D338E1B91EF9E0014629D /* Observable+CocoaExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Observable+CocoaExtensions.swift"; sourceTree = "<group>"; };
|
||||
C80D338E1B91EF9E0014629D /* Observable+Bind.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Observable+Bind.swift"; sourceTree = "<group>"; };
|
||||
C80D33931B922FB00014629D /* ControlEvent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ControlEvent.swift; sourceTree = "<group>"; };
|
||||
C80D33941B922FB00014629D /* ControlProperty.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ControlProperty.swift; sourceTree = "<group>"; };
|
||||
C80D342D1B9245A40014629D /* CombineLatest+CollectionType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CombineLatest+CollectionType.swift"; sourceTree = "<group>"; };
|
||||
C821DBA11BA4DCAB008F3809 /* Buffer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Buffer.swift; sourceTree = "<group>"; };
|
||||
C8226BC11BADDD3600D7F20C /* Driver+Subscription.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Driver+Subscription.swift"; sourceTree = "<group>"; };
|
||||
C8226BC61BADE87100D7F20C /* ControlProperty+Driver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ControlProperty+Driver.swift"; sourceTree = "<group>"; };
|
||||
C8226BC91BADE87D00D7F20C /* ControlEvent+Driver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ControlEvent+Driver.swift"; sourceTree = "<group>"; };
|
||||
C8226BCC1BADE8D600D7F20C /* ObservableConvertibleType+Driver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ObservableConvertibleType+Driver.swift"; sourceTree = "<group>"; };
|
||||
C8226BCF1BADEBDF00D7F20C /* Driver+Operators.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Driver+Operators.swift"; sourceTree = "<group>"; };
|
||||
C836E8E51BA2165500AFEF77 /* Driver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Driver.swift; sourceTree = "<group>"; };
|
||||
C849BE2A1BAB5D070019AD27 /* ObservableConvertibleType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ObservableConvertibleType.swift; sourceTree = "<group>"; };
|
||||
C84B38E71BA43380001B7D88 /* ScheduledItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScheduledItem.swift; sourceTree = "<group>"; };
|
||||
C84B38ED1BA433CD001B7D88 /* Generate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Generate.swift; sourceTree = "<group>"; };
|
||||
C86409FB1BA593F500D3C4E8 /* Range.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Range.swift; sourceTree = "<group>"; };
|
||||
@ -1012,6 +1047,7 @@
|
||||
C8093C651B8A72BE0088E94D /* ImmediateSchedulerType.swift */,
|
||||
C8093C681B8A72BE0088E94D /* Observable.swift */,
|
||||
C8093C671B8A72BE0088E94D /* Observable+Extensions.swift */,
|
||||
C849BE2A1BAB5D070019AD27 /* ObservableConvertibleType.swift */,
|
||||
C8093C9E1B8A72BE0088E94D /* ObservableType.swift */,
|
||||
C8093CA01B8A72BE0088E94D /* ObserverOf.swift */,
|
||||
C8093CAB1B8A72BE0088E94D /* ObserverType.swift */,
|
||||
@ -1205,7 +1241,7 @@
|
||||
C8093E871B8A732E0088E94D /* _RXKVOObserver.m */,
|
||||
C8093E881B8A732E0088E94D /* _RXSwizzling.h */,
|
||||
C8093E891B8A732E0088E94D /* _RXSwizzling.m */,
|
||||
C80D338E1B91EF9E0014629D /* Observable+CocoaExtensions.swift */,
|
||||
C80D338E1B91EF9E0014629D /* Observable+Bind.swift */,
|
||||
C8093E8A1B8A732E0088E94D /* CLLocationManager+Rx.swift */,
|
||||
C8093E8B1B8A732E0088E94D /* DelegateProxy.swift */,
|
||||
C8093E8C1B8A732E0088E94D /* DelegateProxyType.swift */,
|
||||
@ -1276,6 +1312,12 @@
|
||||
C80D33911B922FB00014629D /* CocoaUnits */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
C836E8E51BA2165500AFEF77 /* Driver.swift */,
|
||||
C8226BCF1BADEBDF00D7F20C /* Driver+Operators.swift */,
|
||||
C8226BC11BADDD3600D7F20C /* Driver+Subscription.swift */,
|
||||
C8226BC61BADE87100D7F20C /* ControlProperty+Driver.swift */,
|
||||
C8226BC91BADE87D00D7F20C /* ControlEvent+Driver.swift */,
|
||||
C8226BCC1BADE8D600D7F20C /* ObservableConvertibleType+Driver.swift */,
|
||||
C80D33931B922FB00014629D /* ControlEvent.swift */,
|
||||
C80D33941B922FB00014629D /* ControlProperty.swift */,
|
||||
);
|
||||
@ -1886,11 +1928,14 @@
|
||||
C882542E1B8A752B00B02D69 /* UILabel+Rx.swift in Sources */,
|
||||
C88254211B8A752B00B02D69 /* RxSearchBarDelegateProxy.swift in Sources */,
|
||||
C882541D1B8A752B00B02D69 /* RxAlertViewDelegateProxy.swift in Sources */,
|
||||
C80D338F1B91EF9E0014629D /* Observable+CocoaExtensions.swift in Sources */,
|
||||
C80D338F1B91EF9E0014629D /* Observable+Bind.swift in Sources */,
|
||||
C88254311B8A752B00B02D69 /* UISegmentedControl+Rx.swift in Sources */,
|
||||
C8226BD01BADEBDF00D7F20C /* Driver+Operators.swift in Sources */,
|
||||
C8226BC41BADDF2800D7F20C /* Driver+Subscription.swift in Sources */,
|
||||
C8093EED1B8A732E0088E94D /* KVOObservable.swift in Sources */,
|
||||
C88254281B8A752B00B02D69 /* UIButton+Rx.swift in Sources */,
|
||||
C8093EDF1B8A732E0088E94D /* CLLocationManager+Rx.swift in Sources */,
|
||||
C8226BC71BADE87100D7F20C /* ControlProperty+Driver.swift in Sources */,
|
||||
C8093EEB1B8A732E0088E94D /* DeinitAction.swift in Sources */,
|
||||
C882541C1B8A752B00B02D69 /* RxActionSheetDelegateProxy.swift in Sources */,
|
||||
C8093ED51B8A732E0088E94D /* _RXDelegateProxy.m in Sources */,
|
||||
@ -1900,11 +1945,13 @@
|
||||
C88254251B8A752B00B02D69 /* UIActionSheet+Rx.swift in Sources */,
|
||||
C80D339A1B922FB00014629D /* ControlProperty.swift in Sources */,
|
||||
C882542B1B8A752B00B02D69 /* UIDatePicker+Rx.swift in Sources */,
|
||||
C8226BCD1BADE8D600D7F20C /* ObservableConvertibleType+Driver.swift in Sources */,
|
||||
C88254221B8A752B00B02D69 /* RxTableViewDataSourceProxy.swift in Sources */,
|
||||
C8093EDD1B8A732E0088E94D /* _RXSwizzling.m in Sources */,
|
||||
C8093EE91B8A732E0088E94D /* Deallocating.swift in Sources */,
|
||||
C882542C1B8A752B00B02D69 /* UIGestureRecognizer+Rx.swift in Sources */,
|
||||
C8093EE11B8A732E0088E94D /* DelegateProxy.swift in Sources */,
|
||||
C8226BCA1BADE87D00D7F20C /* ControlEvent+Driver.swift in Sources */,
|
||||
C8093EF91B8A732E0088E94D /* RxCLLocationManagerDelegateProxy.swift in Sources */,
|
||||
C88254331B8A752B00B02D69 /* UISwitch+Rx.swift in Sources */,
|
||||
C8093EE51B8A732E0088E94D /* Logging.swift in Sources */,
|
||||
@ -1912,6 +1959,7 @@
|
||||
C882541A1B8A752B00B02D69 /* RxCollectionViewDataSourceType.swift in Sources */,
|
||||
C8093EF11B8A732E0088E94D /* NSNotificationCenter+Rx.swift in Sources */,
|
||||
C88254351B8A752B00B02D69 /* UITextField+Rx.swift in Sources */,
|
||||
C836E8E71BA2165500AFEF77 /* Driver.swift in Sources */,
|
||||
C8093EF71B8A732E0088E94D /* NSURLSession+Rx.swift in Sources */,
|
||||
C8093EE71B8A732E0088E94D /* ControlTarget.swift in Sources */,
|
||||
C88254301B8A752B00B02D69 /* UISearchBar+Rx.swift in Sources */,
|
||||
@ -1934,24 +1982,30 @@
|
||||
C8093EFC1B8A732E0088E94D /* RxCocoa.swift in Sources */,
|
||||
C80D33991B922FB00014629D /* ControlEvent.swift in Sources */,
|
||||
C80D339B1B922FB00014629D /* ControlProperty.swift in Sources */,
|
||||
C8226BCE1BADE8D600D7F20C /* ObservableConvertibleType+Driver.swift in Sources */,
|
||||
C8093EF41B8A732E0088E94D /* NSObject+Rx+CoreGraphics.swift in Sources */,
|
||||
C836E8E81BA2165500AFEF77 /* Driver.swift in Sources */,
|
||||
C8093EF01B8A732E0088E94D /* KVOObserver.swift in Sources */,
|
||||
C8093EEE1B8A732E0088E94D /* KVOObservable.swift in Sources */,
|
||||
C8093EE01B8A732E0088E94D /* CLLocationManager+Rx.swift in Sources */,
|
||||
C8093EEC1B8A732E0088E94D /* DeinitAction.swift in Sources */,
|
||||
C8226BD11BADEBDF00D7F20C /* Driver+Operators.swift in Sources */,
|
||||
C8226BC51BADDF2800D7F20C /* Driver+Subscription.swift in Sources */,
|
||||
C8093F461B8A732E0088E94D /* NSButton+Rx.swift in Sources */,
|
||||
C8093ED61B8A732E0088E94D /* _RXDelegateProxy.m in Sources */,
|
||||
C8093EF61B8A732E0088E94D /* NSObject+Rx.swift in Sources */,
|
||||
C8226BC81BADE87100D7F20C /* ControlProperty+Driver.swift in Sources */,
|
||||
C8093EDE1B8A732E0088E94D /* _RXSwizzling.m in Sources */,
|
||||
C8093EEA1B8A732E0088E94D /* Deallocating.swift in Sources */,
|
||||
C8093EE21B8A732E0088E94D /* DelegateProxy.swift in Sources */,
|
||||
C8093EFA1B8A732E0088E94D /* RxCLLocationManagerDelegateProxy.swift in Sources */,
|
||||
C8093EE61B8A732E0088E94D /* Logging.swift in Sources */,
|
||||
C8093EF21B8A732E0088E94D /* NSNotificationCenter+Rx.swift in Sources */,
|
||||
C8226BCB1BADE87D00D7F20C /* ControlEvent+Driver.swift in Sources */,
|
||||
C8093EF81B8A732E0088E94D /* NSURLSession+Rx.swift in Sources */,
|
||||
C8093F4C1B8A732E0088E94D /* NSSlider+Rx.swift in Sources */,
|
||||
C8093EE81B8A732E0088E94D /* ControlTarget.swift in Sources */,
|
||||
C80D33901B91EF9E0014629D /* Observable+CocoaExtensions.swift in Sources */,
|
||||
C80D33901B91EF9E0014629D /* Observable+Bind.swift in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@ -1981,6 +2035,7 @@
|
||||
C8093CE61B8A72BE0088E94D /* NopDisposable.swift in Sources */,
|
||||
C8093CD41B8A72BE0088E94D /* Disposable.swift in Sources */,
|
||||
C8093CEE1B8A72BE0088E94D /* SingleAssignmentDisposable.swift in Sources */,
|
||||
C849BE2C1BAB5D070019AD27 /* ObservableConvertibleType.swift in Sources */,
|
||||
C8C3DA0A1B93941E004D233E /* FailWith.swift in Sources */,
|
||||
C8093D9C1B8A72BE0088E94D /* SchedulerServices+Emulation.swift in Sources */,
|
||||
C8093D6A1B8A72BE0088E94D /* ObserverOf.swift in Sources */,
|
||||
@ -2095,6 +2150,7 @@
|
||||
C8093CE51B8A72BE0088E94D /* NopDisposable.swift in Sources */,
|
||||
C8093CD31B8A72BE0088E94D /* Disposable.swift in Sources */,
|
||||
C8093CED1B8A72BE0088E94D /* SingleAssignmentDisposable.swift in Sources */,
|
||||
C849BE2B1BAB5D070019AD27 /* ObservableConvertibleType.swift in Sources */,
|
||||
C8C3DA091B93941E004D233E /* FailWith.swift in Sources */,
|
||||
C8093D9B1B8A72BE0088E94D /* SchedulerServices+Emulation.swift in Sources */,
|
||||
C8093D691B8A72BE0088E94D /* ObserverOf.swift in Sources */,
|
||||
@ -2209,6 +2265,7 @@
|
||||
C8F0BF951BBBFB8B001B112F /* NopDisposable.swift in Sources */,
|
||||
C8F0BF961BBBFB8B001B112F /* Disposable.swift in Sources */,
|
||||
C8F0BF971BBBFB8B001B112F /* SingleAssignmentDisposable.swift in Sources */,
|
||||
C89461751BC6C1210055219D /* ObservableConvertibleType.swift in Sources */,
|
||||
C8F0BF981BBBFB8B001B112F /* FailWith.swift in Sources */,
|
||||
C8F0BF991BBBFB8B001B112F /* SchedulerServices+Emulation.swift in Sources */,
|
||||
C8F0BF9A1BBBFB8B001B112F /* ObserverOf.swift in Sources */,
|
||||
@ -2331,6 +2388,8 @@
|
||||
C8F0C0111BBBFBB9001B112F /* UIStepper+Rx.swift in Sources */,
|
||||
C8F0C0121BBBFBB9001B112F /* UIImageView+Rx.swift in Sources */,
|
||||
C8F0C0131BBBFBB9001B112F /* ControlEvent.swift in Sources */,
|
||||
C8945FE91BC6C09D0055219D /* ControlEvent+Driver.swift in Sources */,
|
||||
C8945FE71BC6C09D0055219D /* Driver+Subscription.swift in Sources */,
|
||||
C8F0C0141BBBFBB9001B112F /* NSObject+Rx+CoreGraphics.swift in Sources */,
|
||||
C8F0C0151BBBFBB9001B112F /* UIControl+Rx.swift in Sources */,
|
||||
C8F0C0161BBBFBB9001B112F /* UITableView+Rx.swift in Sources */,
|
||||
@ -2342,7 +2401,8 @@
|
||||
C8F0C01C1BBBFBB9001B112F /* UILabel+Rx.swift in Sources */,
|
||||
C8F0C01D1BBBFBB9001B112F /* RxSearchBarDelegateProxy.swift in Sources */,
|
||||
C8F0C01E1BBBFBB9001B112F /* RxAlertViewDelegateProxy.swift in Sources */,
|
||||
C8F0C01F1BBBFBB9001B112F /* Observable+CocoaExtensions.swift in Sources */,
|
||||
C8F0C01F1BBBFBB9001B112F /* Observable+Bind.swift in Sources */,
|
||||
C8945FEA1BC6C09D0055219D /* ObservableConvertibleType+Driver.swift in Sources */,
|
||||
C8F0C0201BBBFBB9001B112F /* UISegmentedControl+Rx.swift in Sources */,
|
||||
C8F0C0211BBBFBB9001B112F /* KVOObservable.swift in Sources */,
|
||||
C8F0C0221BBBFBB9001B112F /* UIButton+Rx.swift in Sources */,
|
||||
@ -2358,10 +2418,13 @@
|
||||
C8F0C02C1BBBFBB9001B112F /* UIDatePicker+Rx.swift in Sources */,
|
||||
C8F0C02D1BBBFBB9001B112F /* RxTableViewDataSourceProxy.swift in Sources */,
|
||||
C8F0C02E1BBBFBB9001B112F /* _RXSwizzling.m in Sources */,
|
||||
C8945FE61BC6C09D0055219D /* Driver+Operators.swift in Sources */,
|
||||
C8F0C02F1BBBFBB9001B112F /* Deallocating.swift in Sources */,
|
||||
C8F0C0301BBBFBB9001B112F /* UIGestureRecognizer+Rx.swift in Sources */,
|
||||
C8F0C0311BBBFBB9001B112F /* DelegateProxy.swift in Sources */,
|
||||
C8F0C0321BBBFBB9001B112F /* RxCLLocationManagerDelegateProxy.swift in Sources */,
|
||||
C8945FE51BC6C09D0055219D /* Driver.swift in Sources */,
|
||||
C8945FE81BC6C09D0055219D /* ControlProperty+Driver.swift in Sources */,
|
||||
C8F0C0331BBBFBB9001B112F /* UISwitch+Rx.swift in Sources */,
|
||||
C8F0C0341BBBFBB9001B112F /* Logging.swift in Sources */,
|
||||
C8F0C0351BBBFBB9001B112F /* UICollectionView+Rx.swift in Sources */,
|
||||
@ -2402,6 +2465,8 @@
|
||||
D2138C951BB9BEDA00339B5C /* NSObject+Rx.swift in Sources */,
|
||||
D2138C881BB9BEBE00339B5C /* DelegateProxy.swift in Sources */,
|
||||
D203C5101BB9C53E00D02D00 /* UISwitch+Rx.swift in Sources */,
|
||||
C8945FE31BC6C09D0055219D /* ControlEvent+Driver.swift in Sources */,
|
||||
C8945FE11BC6C09D0055219D /* Driver+Subscription.swift in Sources */,
|
||||
D203C5121BB9C53E00D02D00 /* UITextField+Rx.swift in Sources */,
|
||||
D203C4F91BB9C53700D02D00 /* RxAlertViewDelegateProxy.swift in Sources */,
|
||||
D203C4F31BB9C4CA00D02D00 /* RxCollectionViewReactiveArrayDataSource.swift in Sources */,
|
||||
@ -2414,6 +2479,7 @@
|
||||
D2138C8E1BB9BED600339B5C /* ControlTarget.swift in Sources */,
|
||||
D203C5041BB9C53E00D02D00 /* UIButton+Rx.swift in Sources */,
|
||||
D2138C891BB9BEBE00339B5C /* DelegateProxyType.swift in Sources */,
|
||||
C8945FE41BC6C09D0055219D /* ObservableConvertibleType+Driver.swift in Sources */,
|
||||
D2138C921BB9BED600339B5C /* KVOObserver.swift in Sources */,
|
||||
D2138C831BB9BEBE00339B5C /* _RXKVOObserver.m in Sources */,
|
||||
D203C5061BB9C53E00D02D00 /* UIControl+Rx.swift in Sources */,
|
||||
@ -2426,13 +2492,16 @@
|
||||
D203C5071BB9C53E00D02D00 /* UIDatePicker+Rx.swift in Sources */,
|
||||
D2138C941BB9BEDA00339B5C /* NSObject+Rx+CoreGraphics.swift in Sources */,
|
||||
D203C50D1BB9C53E00D02D00 /* UISegmentedControl+Rx.swift in Sources */,
|
||||
D2138C861BB9BEBE00339B5C /* Observable+CocoaExtensions.swift in Sources */,
|
||||
D2138C861BB9BEBE00339B5C /* Observable+Bind.swift in Sources */,
|
||||
D203C50A1BB9C53E00D02D00 /* UILabel+Rx.swift in Sources */,
|
||||
D2138C901BB9BED600339B5C /* DeinitAction.swift in Sources */,
|
||||
C8945FE01BC6C09D0055219D /* Driver+Operators.swift in Sources */,
|
||||
D203C4F51BB9C52900D02D00 /* ItemEvents.swift in Sources */,
|
||||
D2138C911BB9BED600339B5C /* KVOObservable.swift in Sources */,
|
||||
D203C4FA1BB9C53700D02D00 /* RxCollectionViewDataSourceProxy.swift in Sources */,
|
||||
D2138C7F1BB9BEBE00339B5C /* _RX.m in Sources */,
|
||||
C8945FDF1BC6C09D0055219D /* Driver.swift in Sources */,
|
||||
C8945FE21BC6C09D0055219D /* ControlProperty+Driver.swift in Sources */,
|
||||
D203C4FE1BB9C53700D02D00 /* RxTableViewDataSourceProxy.swift in Sources */,
|
||||
D203C5001BB9C53700D02D00 /* RxTextViewDelegateProxy.swift in Sources */,
|
||||
D203C5091BB9C53E00D02D00 /* UIImageView+Rx.swift in Sources */,
|
||||
@ -2457,6 +2526,7 @@
|
||||
D2EBEAEB1BB9B69E003A27DC /* AsyncLock.swift in Sources */,
|
||||
D2EBEB281BB9B6C1003A27DC /* Zip.swift in Sources */,
|
||||
D2EBEB3E1BB9B6D8003A27DC /* SerialDispatchQueueScheduler.swift in Sources */,
|
||||
C89461761BC6C1220055219D /* ObservableConvertibleType.swift in Sources */,
|
||||
D2EBEAF71BB9B6B2003A27DC /* ScheduledDisposable.swift in Sources */,
|
||||
D2EBEAE11BB9B697003A27DC /* ImmediateSchedulerType.swift in Sources */,
|
||||
D2EBEB0B1BB9B6C1003A27DC /* Empty.swift in Sources */,
|
||||
|
||||
@ -22,7 +22,7 @@ extension ObservableType {
|
||||
public func toArray() throws -> [E] {
|
||||
let condition = NSCondition()
|
||||
|
||||
var elements = [E]()
|
||||
var elements: [E] = Array<E>()
|
||||
|
||||
var error: ErrorType?
|
||||
|
||||
|
||||
29
RxCocoa/Common/CocoaUnits/ControlEvent+Driver.swift
Normal file
29
RxCocoa/Common/CocoaUnits/ControlEvent+Driver.swift
Normal file
@ -0,0 +1,29 @@
|
||||
//
|
||||
// ControlEvent+Driver.swift
|
||||
// Rx
|
||||
//
|
||||
// Created by Krunoslav Zaher on 9/19/15.
|
||||
// Copyright © 2015 Krunoslav Zaher. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
#if !RX_NO_MODULE
|
||||
import RxSwift
|
||||
#endif
|
||||
|
||||
extension ControlEvent {
|
||||
/**
|
||||
Converts `ControlEvent` to `Driver` unit.
|
||||
|
||||
`ControlEvent` already can't fail, so no special case needs to be handled.
|
||||
*/
|
||||
public func asDriver() -> Driver<E> {
|
||||
return self.asDriver { (error) -> Driver<E> in
|
||||
#if DEBUG
|
||||
rxFatalError("Somehow driver received error from a pipe that was marked as ")
|
||||
#else
|
||||
return Drive.empty()
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
29
RxCocoa/Common/CocoaUnits/ControlProperty+Driver.swift
Normal file
29
RxCocoa/Common/CocoaUnits/ControlProperty+Driver.swift
Normal file
@ -0,0 +1,29 @@
|
||||
//
|
||||
// ControlProperty+Driver.swift
|
||||
// Rx
|
||||
//
|
||||
// Created by Krunoslav Zaher on 9/19/15.
|
||||
// Copyright © 2015 Krunoslav Zaher. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
#if !RX_NO_MODULE
|
||||
import RxSwift
|
||||
#endif
|
||||
|
||||
extension ControlProperty {
|
||||
/**
|
||||
Converts `ControlProperty` to `Driver` unit.
|
||||
|
||||
`ControlProperty` already can't fail, so no special case needs to be handled.
|
||||
*/
|
||||
public func asDriver() -> Driver<E> {
|
||||
return self.asDriver { (error) -> Driver<E> in
|
||||
#if DEBUG
|
||||
rxFatalError("Somehow driver received error from a pipe that was marked as ")
|
||||
#else
|
||||
return Drive.empty()
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
292
RxCocoa/Common/CocoaUnits/Driver+Operators.swift
Normal file
292
RxCocoa/Common/CocoaUnits/Driver+Operators.swift
Normal file
@ -0,0 +1,292 @@
|
||||
//
|
||||
// Driver+Operators.swift
|
||||
// Rx
|
||||
//
|
||||
// Created by Krunoslav Zaher on 9/19/15.
|
||||
// Copyright © 2015 Krunoslav Zaher. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
#if !RX_NO_MODULE
|
||||
import RxSwift
|
||||
#endif
|
||||
|
||||
extension Driver {
|
||||
|
||||
/**
|
||||
Projects each element of an observable sequence into a new form.
|
||||
|
||||
- parameter selector: A transform function to apply to each source element.
|
||||
- returns: An observable sequence whose elements are the result of invoking the transform function on each element of source.
|
||||
*/
|
||||
public func map<R>(selector: E -> R) -> Driver<R> {
|
||||
let source = _source
|
||||
.map(selector)
|
||||
return Driver<R>(source)
|
||||
}
|
||||
|
||||
/**
|
||||
Projects each element of an observable sequence into a new form by incorporating the element's index.
|
||||
|
||||
- parameter selector: A transform function to apply to each source element; the second parameter of the function represents the index of the source element.
|
||||
- returns: An observable sequence whose elements are the result of invoking the transform function on each element of source.
|
||||
*/
|
||||
public func mapWithIndex<R>(selector: (E, Int) -> R) -> Driver<R> {
|
||||
let source = _source
|
||||
.mapWithIndex(selector)
|
||||
return Driver<R>(source)
|
||||
}
|
||||
|
||||
/**
|
||||
Filters the elements of an observable sequence based on a predicate.
|
||||
|
||||
- parameter predicate: A function to test each source element for a condition.
|
||||
- returns: An observable sequence that contains elements from the input sequence that satisfy the condition.
|
||||
*/
|
||||
public func filter(predicate: (E) -> Bool) -> Driver<E> {
|
||||
let source = _source
|
||||
.filter(predicate)
|
||||
return Driver(source)
|
||||
}
|
||||
}
|
||||
|
||||
extension Driver where Element : DriverConvertibleType {
|
||||
|
||||
/**
|
||||
Transforms an observable sequence of observable sequences into an observable sequence
|
||||
producing values only from the most recent observable sequence.
|
||||
|
||||
Each time a new inner observable sequence is received, unsubscribe from the
|
||||
previous inner observable sequence.
|
||||
|
||||
- returns: The observable sequence that at any point in time produces the elements of the most recent inner observable sequence that has been received.
|
||||
*/
|
||||
public func switchLatest() -> Driver<E.E> {
|
||||
let source: Observable<E.E> = _source
|
||||
.map { $0.asDriver() }
|
||||
.switchLatest()
|
||||
return Driver<E.E>(source)
|
||||
}
|
||||
}
|
||||
|
||||
extension Driver {
|
||||
|
||||
/**
|
||||
Invokes an action for each event in the observable sequence, and propagates all observer messages through the result sequence.
|
||||
|
||||
- parameter eventHandler: Action to invoke for each event in the observable sequence.
|
||||
- returns: The source sequence with the side-effecting behavior applied.
|
||||
*/
|
||||
public func doOn(eventHandler: (Event<E>) -> Void)
|
||||
-> Driver<E> {
|
||||
let source = _source
|
||||
.doOn(eventHandler)
|
||||
|
||||
return Driver(source)
|
||||
}
|
||||
|
||||
/**
|
||||
Invokes an action for each event in the observable sequence, and propagates all observer messages through the result sequence.
|
||||
|
||||
- parameter onNext: Action to invoke for each element in the observable sequence.
|
||||
- parameter onError: Action to invoke upon errored termination of the observable sequence.
|
||||
- parameter onCompleted: Action to invoke upon graceful termination of the observable sequence.
|
||||
- returns: The source sequence with the side-effecting behavior applied.
|
||||
*/
|
||||
public func doOn(onNext onNext: (E -> Void)? = nil, onError: (ErrorType -> Void)? = nil, onCompleted: (() -> Void)? = nil)
|
||||
-> Driver<E> {
|
||||
let source = _source
|
||||
.doOn(onNext: onNext, onError: onError, onCompleted: onCompleted)
|
||||
|
||||
return Driver(source)
|
||||
}
|
||||
}
|
||||
|
||||
extension Driver {
|
||||
|
||||
/**
|
||||
Prints received events for all observers on standard output.
|
||||
|
||||
- parameter identifier: Identifier that is printed together with event description to standard output.
|
||||
- returns: An observable sequence whose events are printed to standard output.
|
||||
*/
|
||||
public func debug(identifier: String = "\(__FILE__):\(__LINE__)") -> Driver<E> {
|
||||
let source = _source
|
||||
.debug(identifier)
|
||||
return Driver(source)
|
||||
}
|
||||
}
|
||||
|
||||
extension Driver where Element: Equatable {
|
||||
|
||||
/**
|
||||
Returns an observable sequence that contains only distinct contiguous elements according to equality operator.
|
||||
|
||||
- returns: An observable sequence only containing the distinct contiguous elements, based on equality operator, from the source sequence.
|
||||
*/
|
||||
public func distinctUntilChanged()
|
||||
-> Driver<E> {
|
||||
let source = _source
|
||||
.self.distinctUntilChanged({ $0 }, comparer: { ($0 == $1) })
|
||||
|
||||
return Driver(source)
|
||||
}
|
||||
}
|
||||
|
||||
extension Driver {
|
||||
|
||||
/**
|
||||
Returns an observable sequence that contains only distinct contiguous elements according to the `keySelector`.
|
||||
|
||||
- parameter keySelector: A function to compute the comparison key for each element.
|
||||
- returns: An observable sequence only containing the distinct contiguous elements, based on a computed key value, from the source sequence.
|
||||
*/
|
||||
public func distinctUntilChanged<K: Equatable>(keySelector: (E) -> K) -> Driver<E> {
|
||||
let source = _source
|
||||
.distinctUntilChanged(keySelector, comparer: { $0 == $1 })
|
||||
return Driver(source)
|
||||
}
|
||||
|
||||
/**
|
||||
Returns an observable sequence that contains only distinct contiguous elements according to the `comparer`.
|
||||
|
||||
- parameter comparer: Equality comparer for computed key values.
|
||||
- returns: An observable sequence only containing the distinct contiguous elements, based on `comparer`, from the source sequence.
|
||||
*/
|
||||
public func distinctUntilChanged(comparer: (lhs: E, rhs: E) -> Bool) -> Driver<E> {
|
||||
let source = _source
|
||||
.distinctUntilChanged({ $0 }, comparer: comparer)
|
||||
return Driver(source)
|
||||
}
|
||||
|
||||
/**
|
||||
Returns an observable sequence that contains only distinct contiguous elements according to the keySelector and the comparer.
|
||||
|
||||
- parameter keySelector: A function to compute the comparison key for each element.
|
||||
- parameter comparer: Equality comparer for computed key values.
|
||||
- returns: An observable sequence only containing the distinct contiguous elements, based on a computed key value and the comparer, from the source sequence.
|
||||
*/
|
||||
public func distinctUntilChanged<K>(keySelector: (E) -> K, comparer: (lhs: K, rhs: K) -> Bool) -> Driver<E> {
|
||||
let source = _source
|
||||
.distinctUntilChanged(keySelector, comparer: comparer)
|
||||
return Driver(source)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
extension Driver {
|
||||
|
||||
/**
|
||||
Projects each element of an observable sequence to an observable sequence and merges the resulting observable sequences into one observable sequence.
|
||||
|
||||
- parameter selector: A transform function to apply to each element.
|
||||
- returns: An observable sequence whose elements are the result of invoking the one-to-many transform function on each element of the input sequence.
|
||||
*/
|
||||
public func flatMap<R>(selector: (E) -> Driver<R>) -> Driver<R> {
|
||||
let source = _source
|
||||
.flatMap(selector)
|
||||
|
||||
return Driver<R>(source)
|
||||
}
|
||||
|
||||
/**
|
||||
Projects each element of an observable sequence to an observable sequence by incorporating the element's index and merges the resulting observable sequences into one observable sequence.
|
||||
|
||||
- parameter selector: A transform function to apply to each element; the second parameter of the function represents the index of the source element.
|
||||
- returns: An observable sequence whose elements are the result of invoking the one-to-many transform function on each element of the input sequence.
|
||||
*/
|
||||
public func flatMapWithIndex<R>(selector: (E, Int) -> Driver<R>)
|
||||
-> Driver<R> {
|
||||
let source = _source
|
||||
.flatMapWithIndex(selector)
|
||||
|
||||
return Driver<R>(source.asObservable())
|
||||
}
|
||||
}
|
||||
|
||||
// merge
|
||||
extension Driver where Element : DriverConvertibleType {
|
||||
|
||||
/**
|
||||
Merges elements from all observable sequences in the given enumerable sequence into a single observable sequence.
|
||||
|
||||
- parameter maxConcurrent: Maximum number of inner observable sequences being subscribed to concurrently.
|
||||
- returns: The observable sequence that merges the elements of the observable sequences.
|
||||
*/
|
||||
public func merge() -> Driver<E.E> {
|
||||
let source = _source
|
||||
.map { $0.asDriver() }
|
||||
.merge()
|
||||
return Driver<E.E>(source)
|
||||
}
|
||||
|
||||
/**
|
||||
Merges elements from all inner observable sequences into a single observable sequence, limiting the number of concurrent subscriptions to inner sequences.
|
||||
|
||||
- returns: The observable sequence that merges the elements of the inner sequences.
|
||||
*/
|
||||
public func merge(maxConcurrent maxConcurrent: Int)
|
||||
-> Driver<E.E> {
|
||||
let source = _source
|
||||
.map { $0.asDriver() }
|
||||
.merge(maxConcurrent: maxConcurrent)
|
||||
return Driver<E.E>(source)
|
||||
}
|
||||
}
|
||||
|
||||
// throttle
|
||||
extension Driver {
|
||||
|
||||
/**
|
||||
Ignores elements from an observable sequence which are followed by another element within a specified relative time duration, using the specified scheduler to run throttling timers.
|
||||
|
||||
`throttle` and `debounce` are synonyms.
|
||||
|
||||
- parameter dueTime: Throttling duration for each element.
|
||||
- parameter scheduler: Scheduler to run the throttle timers and send events on.
|
||||
- returns: The throttled sequence.
|
||||
*/
|
||||
public func throttle<S: SchedulerType>(dueTime: S.TimeInterval, _ scheduler: S)
|
||||
-> Driver<E> {
|
||||
let source = _source
|
||||
.throttle(dueTime, scheduler)
|
||||
|
||||
return Driver(source)
|
||||
}
|
||||
|
||||
/**
|
||||
Ignores elements from an observable sequence which are followed by another element within a specified relative time duration, using the specified scheduler to run throttling timers.
|
||||
|
||||
`throttle` and `debounce` are synonyms.
|
||||
|
||||
- parameter dueTime: Throttling duration for each element.
|
||||
- parameter scheduler: Scheduler to run the throttle timers and send events on.
|
||||
- returns: The throttled sequence.
|
||||
*/
|
||||
public func debounce<S: SchedulerType>(dueTime: S.TimeInterval, _ scheduler: S)
|
||||
-> Driver<E> {
|
||||
let source = _source
|
||||
.debounce(dueTime, scheduler)
|
||||
|
||||
return Driver(source)
|
||||
}
|
||||
}
|
||||
|
||||
// scan
|
||||
extension Driver {
|
||||
/**
|
||||
Applies an accumulator function over an observable sequence and returns each intermediate result. The specified seed value is used as the initial accumulator value.
|
||||
|
||||
For aggregation behavior with no intermediate results, see `reduce`.
|
||||
|
||||
- parameter seed: The initial accumulator value.
|
||||
- parameter accumulator: An accumulator function to be invoked on each element.
|
||||
- returns: An observable sequence containing the accumulated values.
|
||||
*/
|
||||
public func scan<A>(seed: A, accumulator: (A, E) -> A)
|
||||
-> Driver<A> {
|
||||
let source = _source
|
||||
.scan(seed, accumulator: accumulator)
|
||||
return Driver<A>(source)
|
||||
}
|
||||
}
|
||||
80
RxCocoa/Common/CocoaUnits/Driver+Subscription.swift
Normal file
80
RxCocoa/Common/CocoaUnits/Driver+Subscription.swift
Normal file
@ -0,0 +1,80 @@
|
||||
//
|
||||
// Driver+Extensions.swift
|
||||
// Rx
|
||||
//
|
||||
// Created by Krunoslav Zaher on 9/19/15.
|
||||
// Copyright © 2015 Krunoslav Zaher. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
#if !RX_NO_MODULE
|
||||
import RxSwift
|
||||
#endif
|
||||
|
||||
extension Driver {
|
||||
/**
|
||||
Creates new subscription and sends elements to observer.
|
||||
|
||||
In this form it's equivalent to `subscribe` method, but it communicates intent better.
|
||||
|
||||
- parameter observer: Observer that receives events.
|
||||
- returns: Disposable object that can be used to unsubscribe the observer from the subject.
|
||||
*/
|
||||
public func drive<O: ObserverType where O.E == E>(observer: O) -> Disposable {
|
||||
return self.asObservable().subscribe(observer)
|
||||
}
|
||||
|
||||
/**
|
||||
Subscribes to observable sequence using custom binder function.
|
||||
|
||||
- parameter with: Function used to bind elements from `self`.
|
||||
- returns: Object representing subscription.
|
||||
*/
|
||||
public func drive<R>(transformation: Observable<E> -> R) -> R {
|
||||
return transformation(self.asObservable())
|
||||
}
|
||||
|
||||
/**
|
||||
Subscribes to observable sequence using custom binder function and final parameter passed to binder function
|
||||
after `self` is passed.
|
||||
|
||||
public func drive<R1, R2>(with: Self -> R1 -> R2, curriedArgument: R1) -> R2 {
|
||||
return with(self)(curriedArgument)
|
||||
}
|
||||
|
||||
- parameter with: Function used to bind elements from `self`.
|
||||
- parameter curriedArgument: Final argument passed to `binder` to finish binding process.
|
||||
- returns: Object representing subscription.
|
||||
*/
|
||||
public func drive<R1, R2>(with: Observable<E> -> R1 -> R2, curriedArgument: R1) -> R2 {
|
||||
return with(self.asObservable())(curriedArgument)
|
||||
}
|
||||
|
||||
/**
|
||||
Subscribes an element handler, a completion handler and disposed handler to an observable sequence.
|
||||
|
||||
Error callback is not exposed because `Driver` can't error out.
|
||||
|
||||
- parameter onNext: Action to invoke for each element in the observable sequence.
|
||||
- parameter onCompleted: Action to invoke upon graceful termination of the observable sequence.
|
||||
gracefully completed, errored, or if the generation is cancelled by disposing subscription)
|
||||
- parameter onDisposed: Action to invoke upon any type of termination of sequence (if the sequence has
|
||||
gracefully completed, errored, or if the generation is cancelled by disposing subscription)
|
||||
- returns: Subscription object used to unsubscribe from the observable sequence.
|
||||
*/
|
||||
public func drive(onNext onNext: ((E) -> Void)? = nil, onCompleted: (() -> Void)? = nil, onDisposed: (() -> Void)? = nil) -> Disposable {
|
||||
return self.asObservable().subscribe(onNext: onNext, onCompleted: onCompleted, onDisposed: onDisposed)
|
||||
}
|
||||
|
||||
/**
|
||||
Subscribes an element handler to an observable sequence.
|
||||
|
||||
- parameter onNext: Action to invoke for each element in the observable sequence.
|
||||
- returns: Subscription object used to unsubscribe from the observable sequence.
|
||||
*/
|
||||
public func driveNext(onNext: E -> Void) -> Disposable {
|
||||
return self.asObservable().subscribeNext(onNext)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
152
RxCocoa/Common/CocoaUnits/Driver.swift
Normal file
152
RxCocoa/Common/CocoaUnits/Driver.swift
Normal file
@ -0,0 +1,152 @@
|
||||
//
|
||||
// Driver.swift
|
||||
// Rx
|
||||
//
|
||||
// Created by Krunoslav Zaher on 8/27/15.
|
||||
// Copyright © 2015 Krunoslav Zaher. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
#if !RX_NO_MODULE
|
||||
import RxSwift
|
||||
#endif
|
||||
|
||||
/**
|
||||
A type that can be converted to `Driver`.
|
||||
*/
|
||||
public protocol DriverConvertibleType : ObservableConvertibleType {
|
||||
|
||||
/**
|
||||
Converts self to `Driver`.
|
||||
*/
|
||||
func asDriver() -> Driver<E>
|
||||
}
|
||||
|
||||
/**
|
||||
Unit that represents observable sequence with following properties:
|
||||
|
||||
- it never fails
|
||||
- it delivers events on `MainScheduler.sharedInstance`
|
||||
- `shareReplay(1)` behavior
|
||||
- all observers share sequence computation resources
|
||||
- it's stateful, upon subscription (calling subscribe) last element is immediatelly replayed if it was produced
|
||||
- computation of elements is reference counted with respect to the number of observers
|
||||
- if there are no subscribers, it will release sequence computation resources
|
||||
- it uses lockless versions of optimized operators (main dispatch queue is used as shared lock)
|
||||
|
||||
`Driver<Element>` can be considered a builder pattern for observable sequences that drive the application.
|
||||
|
||||
To find out more about units and how to use them, please go to `Documentation/Units.md`.
|
||||
*/
|
||||
public struct Driver<Element> : DriverConvertibleType {
|
||||
public typealias E = Element
|
||||
|
||||
let _source: Observable<E>
|
||||
|
||||
init(_ source: Observable<E>) {
|
||||
self._source = source.shareReplay(1)
|
||||
}
|
||||
|
||||
#if EXPANDABLE_DRIVER
|
||||
public static func createUnsafe<O: ObservableType>(source: O) -> Driver<O.E> {
|
||||
return Driver<O.E>(source.asObservable())
|
||||
}
|
||||
#endif
|
||||
|
||||
public func asObservable() -> Observable<E> {
|
||||
return _source.subscribeOn(MainScheduler.sharedInstance)
|
||||
}
|
||||
|
||||
public func asDriver() -> Driver<E> {
|
||||
return self
|
||||
}
|
||||
}
|
||||
|
||||
public struct Drive {
|
||||
|
||||
#if !RX_NO_MODULE
|
||||
|
||||
/**
|
||||
Returns an empty observable sequence, using the specified scheduler to send out the single `Completed` message.
|
||||
|
||||
- returns: An observable sequence with no elements.
|
||||
*/
|
||||
public static func empty<E>() -> Driver<E> {
|
||||
return Driver(RxSwift.empty())
|
||||
}
|
||||
|
||||
/**
|
||||
Returns a non-terminating observable sequence, which can be used to denote an infinite duration.
|
||||
|
||||
- returns: An observable sequence whose observers will never get called.
|
||||
*/
|
||||
public static func never<E>() -> Driver<E> {
|
||||
return Driver(RxSwift.never())
|
||||
}
|
||||
|
||||
/**
|
||||
Returns an observable sequence that contains a single element.
|
||||
|
||||
- parameter element: Single element in the resulting observable sequence.
|
||||
- returns: An observable sequence containing the single specified element.
|
||||
*/
|
||||
public static func just<E>(element: E) -> Driver<E> {
|
||||
return Driver(RxSwift.just(element))
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
/**
|
||||
Returns an empty observable sequence, using the specified scheduler to send out the single `Completed` message.
|
||||
|
||||
- returns: An observable sequence with no elements.
|
||||
*/
|
||||
public static func empty<E>() -> Driver<E> {
|
||||
return Driver(_empty())
|
||||
}
|
||||
|
||||
/**
|
||||
Returns a non-terminating observable sequence, which can be used to denote an infinite duration.
|
||||
|
||||
- returns: An observable sequence whose observers will never get called.
|
||||
*/
|
||||
public static func never<E>() -> Driver<E> {
|
||||
return Driver(_never())
|
||||
}
|
||||
|
||||
/**
|
||||
Returns an observable sequence that contains a single element.
|
||||
|
||||
- parameter element: Single element in the resulting observable sequence.
|
||||
- returns: An observable sequence containing the single specified element.
|
||||
*/
|
||||
public static func just<E>(element: E) -> Driver<E> {
|
||||
return Driver(_just(element))
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
public static func sequenceOf<E>(elements: E ...) -> Driver<E> {
|
||||
let source = elements.asObservable()
|
||||
return Driver(source)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// name clashes :(
|
||||
|
||||
#if RX_NO_MODULE
|
||||
|
||||
func _empty<E>() -> Observable<E> {
|
||||
return empty()
|
||||
}
|
||||
|
||||
func _never<E>() -> Observable<E> {
|
||||
return never()
|
||||
}
|
||||
|
||||
func _just<E>(element: E) -> Observable<E> {
|
||||
return just(element)
|
||||
}
|
||||
|
||||
#endif
|
||||
@ -0,0 +1,60 @@
|
||||
//
|
||||
// ObservableConvertibleType+Driver.swift
|
||||
// Rx
|
||||
//
|
||||
// Created by Krunoslav Zaher on 9/19/15.
|
||||
// Copyright © 2015 Krunoslav Zaher. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
#if !RX_NO_MODULE
|
||||
import RxSwift
|
||||
#endif
|
||||
|
||||
extension ObservableConvertibleType {
|
||||
/**
|
||||
Converts anything convertible to `Observable` to `Driver` unit.
|
||||
|
||||
- parameter onErrorJustReturn: Element to return in case of error and after that complete the sequence.
|
||||
- returns: Driving observable sequence.
|
||||
*/
|
||||
public func asDriver(onErrorJustReturn onErrorJustReturn: E) -> Driver<E> {
|
||||
let source = self
|
||||
.asObservable()
|
||||
.catchErrorJustReturn(onErrorJustReturn)
|
||||
.observeOn(MainScheduler.sharedInstance)
|
||||
return Driver(source)
|
||||
}
|
||||
|
||||
/**
|
||||
Converts anything convertible to `Observable` to `Driver` unit.
|
||||
|
||||
- parameter onErrorDriveWith: Driver that continues to drive the sequence in case of error.
|
||||
- returns: Driving observable sequence.
|
||||
*/
|
||||
public func asDriver(onErrorDriveWith onErrorDriveWith: Driver<E>) -> Driver<E> {
|
||||
let source = self
|
||||
.asObservable()
|
||||
.catchError { _ in
|
||||
onErrorDriveWith.asObservable()
|
||||
}
|
||||
.observeOn(MainScheduler.sharedInstance)
|
||||
return Driver(source)
|
||||
}
|
||||
|
||||
/**
|
||||
Converts anything convertible to `Observable` to `Driver` unit.
|
||||
|
||||
- parameter onErrorRecover: Calculates driver that continues to drive the sequence in case of error.
|
||||
- returns: Driving observable sequence.
|
||||
*/
|
||||
public func asDriver(onErrorRecover onErrorRecover: (error: ErrorType) -> Driver<E>) -> Driver<E> {
|
||||
let source = self
|
||||
.asObservable()
|
||||
.catchError { error in
|
||||
onErrorRecover(error: error).asObservable()
|
||||
}
|
||||
.observeOn(MainScheduler.sharedInstance)
|
||||
return Driver(source)
|
||||
}
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
//
|
||||
// Observable+Extensions.swift
|
||||
// Observable+Bind.swift
|
||||
// Rx
|
||||
//
|
||||
// Created by Krunoslav Zaher on 8/29/15.
|
||||
@ -51,4 +51,14 @@ extension ObservableType {
|
||||
return binder(self)(curriedArgument)
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
Subscribes an element handler to an observable sequence.
|
||||
|
||||
- parameter onNext: Action to invoke for each element in the observable sequence.
|
||||
- returns: Subscription object used to unsubscribe from the observable sequence.
|
||||
*/
|
||||
public func bindNext(onNext: E -> Void) -> Disposable {
|
||||
return subscribeNext(onNext)
|
||||
}
|
||||
}
|
||||
@ -65,11 +65,11 @@ func bindingErrorToInterface(error: ErrorType) {
|
||||
}
|
||||
|
||||
func rxAbstractMethodWithMessage<T>(message: String) -> T {
|
||||
return rxFatalErrorAndDontReturn(message)
|
||||
rxFatalError(message)
|
||||
}
|
||||
|
||||
func rxAbstractMethod<T>() -> T {
|
||||
return rxFatalErrorAndDontReturn("Abstract method")
|
||||
rxFatalError("Abstract method")
|
||||
}
|
||||
|
||||
// workaround for Swift compiler bug, cheers compiler team :)
|
||||
@ -85,7 +85,6 @@ func castOrFatalError<T>(value: AnyObject!, message: String) -> T {
|
||||
let maybeResult: T? = value as? T
|
||||
guard let result = maybeResult else {
|
||||
rxFatalError(message)
|
||||
return maybeResult!
|
||||
}
|
||||
|
||||
return result
|
||||
@ -95,7 +94,6 @@ func castOrFatalError<T>(value: AnyObject!) -> T {
|
||||
let maybeResult: T? = value as? T
|
||||
guard let result = maybeResult else {
|
||||
rxFatalError("Failure converting from \(value) to \(T.self)")
|
||||
return maybeResult!
|
||||
}
|
||||
|
||||
return result
|
||||
@ -109,14 +107,9 @@ let delegateNotSet = "Delegate not set"
|
||||
// }
|
||||
|
||||
|
||||
func rxFatalErrorAndDontReturn<T>(lastMessage: String) -> T {
|
||||
rxFatalError(lastMessage)
|
||||
return (nil as T!)!
|
||||
}
|
||||
|
||||
#if !RX_NO_MODULE
|
||||
|
||||
func rxFatalError(lastMessage: String) {
|
||||
@noreturn func rxFatalError(lastMessage: String) {
|
||||
// The temptation to comment this line is great, but please don't, it's for your own good. The choice is yours.
|
||||
fatalError(lastMessage)
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -15,8 +15,8 @@ import RxCocoa
|
||||
class SearchResultViewModel {
|
||||
let searchResult: WikipediaSearchResult
|
||||
|
||||
var title: Observable<String>
|
||||
var imageURLs: Observable<[NSURL]>
|
||||
var title: Driver<String>
|
||||
var imageURLs: Driver<[NSURL]>
|
||||
|
||||
let API = DefaultWikipediaAPI.sharedAPI
|
||||
let $: Dependencies = Dependencies.sharedDependencies
|
||||
@ -24,13 +24,13 @@ class SearchResultViewModel {
|
||||
init(searchResult: WikipediaSearchResult) {
|
||||
self.searchResult = searchResult
|
||||
|
||||
self.title = never()
|
||||
self.imageURLs = never()
|
||||
self.title = Drive.never()
|
||||
self.imageURLs = Drive.never()
|
||||
|
||||
let URLs = configureImageURLs()
|
||||
|
||||
self.imageURLs = URLs.catchErrorJustReturn([])
|
||||
self.title = configureTitle(URLs).catchErrorJustReturn("Error during fetching")
|
||||
self.imageURLs = URLs.asDriver(onErrorJustReturn: [])
|
||||
self.title = configureTitle(URLs).asDriver(onErrorJustReturn: "Error during fetching")
|
||||
}
|
||||
|
||||
// private methods
|
||||
@ -64,7 +64,5 @@ class SearchResultViewModel {
|
||||
return []
|
||||
}
|
||||
}
|
||||
.observeOn($.mainScheduler)
|
||||
.shareReplay(1)
|
||||
}
|
||||
}
|
||||
|
||||
@ -15,14 +15,14 @@ import RxCocoa
|
||||
class SearchViewModel {
|
||||
|
||||
// outputs
|
||||
let rows: Observable<[SearchResultViewModel]>
|
||||
let rows: Driver<[SearchResultViewModel]>
|
||||
|
||||
let subscriptions = DisposeBag()
|
||||
|
||||
// public methods
|
||||
|
||||
init(searchText: Observable<String>,
|
||||
selectedResult: Observable<SearchResultViewModel>) {
|
||||
init(searchText: Driver<String>,
|
||||
selectedResult: Driver<SearchResultViewModel>) {
|
||||
|
||||
let $: Dependencies = Dependencies.sharedDependencies
|
||||
let wireframe = Dependencies.sharedDependencies.wireframe
|
||||
@ -35,7 +35,7 @@ class SearchViewModel {
|
||||
API.getSearchResults(query)
|
||||
.retry(3)
|
||||
.startWith([]) // clears results on new search term
|
||||
.catchErrorJustReturn([])
|
||||
.asDriver(onErrorJustReturn: [])
|
||||
}
|
||||
.switchLatest()
|
||||
.map { results in
|
||||
@ -47,7 +47,7 @@ class SearchViewModel {
|
||||
}
|
||||
|
||||
selectedResult
|
||||
.subscribeNext { searchResult in
|
||||
.driveNext { searchResult in
|
||||
wireframe.openURL(searchResult.searchResult.URL)
|
||||
}
|
||||
.addDisposableTo(subscriptions)
|
||||
|
||||
@ -33,14 +33,14 @@ public class WikipediaSearchCell: UITableViewCell {
|
||||
didSet {
|
||||
let disposeBag = DisposeBag()
|
||||
|
||||
(viewModel?.title ?? just(""))
|
||||
.subscribe(self.titleOutlet.rx_text)
|
||||
(viewModel?.title ?? Drive.just(""))
|
||||
.drive(self.titleOutlet.rx_text)
|
||||
.addDisposableTo(disposeBag)
|
||||
|
||||
self.URLOutlet.text = viewModel.searchResult.URL.absoluteString ?? ""
|
||||
|
||||
viewModel.imageURLs
|
||||
.bindTo(self.imagesOutlet.rx_itemsWithCellIdentifier("ImageCell")) { [unowned self] (_, URL, cell: CollectionViewImageCell) in
|
||||
.drive(self.imagesOutlet.rx_itemsWithCellIdentifier("ImageCell")) { [unowned self] (_, URL, cell: CollectionViewImageCell) in
|
||||
let loadingPlaceholder: UIImage? = nil
|
||||
|
||||
cell.image = self.imageService.imageFromURL(URL)
|
||||
|
||||
@ -33,17 +33,15 @@ class WikipediaSearchViewController: ViewController {
|
||||
|
||||
resultsTableView.rowHeight = 194
|
||||
|
||||
let selectedResult: Observable<SearchResultViewModel> = resultsTableView.rx_modelSelected().asObservable()
|
||||
|
||||
let viewModel = SearchViewModel(
|
||||
searchText: searchBar.rx_text.asObservable(),
|
||||
selectedResult: selectedResult
|
||||
searchText: searchBar.rx_text.asDriver(),
|
||||
selectedResult: resultsTableView.rx_modelSelected().asDriver()
|
||||
)
|
||||
|
||||
// map table view rows
|
||||
// {
|
||||
viewModel.rows
|
||||
.bindTo(resultsTableView.rx_itemsWithCellIdentifier("WikipediaSearchCell")) { (_, viewModel, cell: WikipediaSearchCell) in
|
||||
.drive(resultsTableView.rx_itemsWithCellIdentifier("WikipediaSearchCell")) { (_, viewModel, cell: WikipediaSearchCell) in
|
||||
cell.viewModel = viewModel
|
||||
}
|
||||
.addDisposableTo(disposeBag)
|
||||
@ -52,7 +50,8 @@ class WikipediaSearchViewController: ViewController {
|
||||
// dismiss keyboard on scroll
|
||||
// {
|
||||
resultsTableView.rx_contentOffset
|
||||
.subscribeNext { _ in
|
||||
.asDriver()
|
||||
.driveNext { _ in
|
||||
if searchBar.isFirstResponder() {
|
||||
_ = searchBar.resignFirstResponder()
|
||||
}
|
||||
|
||||
@ -74,14 +74,14 @@ class DefaultImageService: ImageService {
|
||||
else {
|
||||
// fetch from network
|
||||
decodedImage = self.$.URLSession.rx_data(NSURLRequest(URL: URL))
|
||||
.doOn(next: { data in
|
||||
.doOn(onNext: { data in
|
||||
self.imageDataCache.setObject(data, forKey: URL)
|
||||
})
|
||||
.flatMap(self.decodeImage)
|
||||
}
|
||||
}
|
||||
|
||||
return decodedImage.doOn(next: { image in
|
||||
return decodedImage.doOn(onNext: { image in
|
||||
self.imageCache.setObject(image, forKey: URL)
|
||||
})
|
||||
}.observeOn($.mainScheduler)
|
||||
|
||||
@ -21,7 +21,7 @@ That means that enqueued work could possibly be executed later on a different th
|
||||
class AsyncLock : Disposable {
|
||||
typealias Action = () -> Void
|
||||
|
||||
private var lock = NSRecursiveLock()
|
||||
private let lock = NSRecursiveLock()
|
||||
|
||||
private var queue: Queue<Action> = Queue(capacity: 2)
|
||||
private var isAcquired: Bool = false
|
||||
|
||||
@ -11,7 +11,7 @@ import Foundation
|
||||
extension ObservableType {
|
||||
/**
|
||||
Subscribes an event handler to an observable sequence.
|
||||
|
||||
|
||||
- parameter on: Action to invoke for each event in the observable sequence.
|
||||
- returns: Subscription object used to unsubscribe from the observable sequence.
|
||||
*/
|
||||
@ -26,36 +26,36 @@ extension ObservableType {
|
||||
|
||||
/**
|
||||
Subscribes an element handler, an error handler, a completion handler and disposed handler to an observable sequence.
|
||||
|
||||
- parameter next: Action to invoke for each element in the observable sequence.
|
||||
- parameter error: Action to invoke upon errored termination of the observable sequence.
|
||||
- parameter completed: Action to invoke upon graceful termination of the observable sequence.
|
||||
- parameter disposed: Action to invoke upon any type of termination of sequence (if the sequence has
|
||||
|
||||
- parameter onNext: Action to invoke for each element in the observable sequence.
|
||||
- parameter onError: Action to invoke upon errored termination of the observable sequence.
|
||||
- parameter onCompleted: Action to invoke upon graceful termination of the observable sequence.
|
||||
- parameter onDisposed: Action to invoke upon any type of termination of sequence (if the sequence has
|
||||
gracefully completed, errored, or if the generation is cancelled by disposing subscription)
|
||||
- returns: Subscription object used to unsubscribe from the observable sequence.
|
||||
*/
|
||||
@warn_unused_result
|
||||
public func subscribe(next next: ((E) -> Void)? = nil, error: ((ErrorType) -> Void)? = nil, completed: (() -> Void)? = nil, disposed: (() -> Void)? = nil)
|
||||
public func subscribe(onNext onNext: ((E) -> Void)? = nil, onError: ((ErrorType) -> Void)? = nil, onCompleted: (() -> Void)? = nil, onDisposed: (() -> Void)? = nil)
|
||||
-> Disposable {
|
||||
|
||||
|
||||
let disposable: Disposable
|
||||
|
||||
if let disposed = disposed {
|
||||
|
||||
if let disposed = onDisposed {
|
||||
disposable = AnonymousDisposable(disposed)
|
||||
}
|
||||
else {
|
||||
disposable = NopDisposable.instance
|
||||
}
|
||||
|
||||
|
||||
let observer = AnonymousObserver<E> { e in
|
||||
switch e {
|
||||
case .Next(let value):
|
||||
next?(value)
|
||||
onNext?(value)
|
||||
case .Error(let e):
|
||||
error?(e)
|
||||
onError?(e)
|
||||
disposable.dispose()
|
||||
case .Completed:
|
||||
completed?()
|
||||
onCompleted?()
|
||||
disposable.dispose()
|
||||
}
|
||||
}
|
||||
@ -67,7 +67,7 @@ extension ObservableType {
|
||||
|
||||
/**
|
||||
Subscribes an element handler to an observable sequence.
|
||||
|
||||
|
||||
- parameter onNext: Action to invoke for each element in the observable sequence.
|
||||
- returns: Subscription object used to unsubscribe from the observable sequence.
|
||||
*/
|
||||
@ -84,7 +84,7 @@ extension ObservableType {
|
||||
|
||||
/**
|
||||
Subscribes an error handler to an observable sequence.
|
||||
|
||||
|
||||
- parameter onRrror: Action to invoke upon errored termination of the observable sequence.
|
||||
- returns: Subscription object used to unsubscribe from the observable sequence.
|
||||
*/
|
||||
@ -101,7 +101,7 @@ extension ObservableType {
|
||||
|
||||
/**
|
||||
Subscribes a completion handler to an observable sequence.
|
||||
|
||||
|
||||
- parameter onCompleted: Action to invoke upon graceful termination of the observable sequence.
|
||||
- returns: Subscription object used to unsubscribe from the observable sequence.
|
||||
*/
|
||||
@ -124,4 +124,4 @@ public extension ObservableType {
|
||||
func subscribeSafe<O: ObserverType where O.E == E>(observer: O) -> Disposable {
|
||||
return self.subscribe(observer)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -26,7 +26,7 @@ public class Observable<Element> : ObservableType {
|
||||
}
|
||||
|
||||
public func subscribe<O: ObserverType where O.E == E>(observer: O) -> Disposable {
|
||||
return abstractMethod()
|
||||
abstractMethod()
|
||||
}
|
||||
|
||||
public func asObservable() -> Observable<E> {
|
||||
|
||||
26
RxSwift/ObservableConvertibleType.swift
Normal file
26
RxSwift/ObservableConvertibleType.swift
Normal file
@ -0,0 +1,26 @@
|
||||
//
|
||||
// ObservableConvertibleType.swift
|
||||
// Rx
|
||||
//
|
||||
// Created by Krunoslav Zaher on 9/17/15.
|
||||
// Copyright © 2015 Krunoslav Zaher. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
/**
|
||||
Type that can be converted to observable sequence (`Observer<E>`).
|
||||
*/
|
||||
public protocol ObservableConvertibleType {
|
||||
/**
|
||||
Type of elements in sequence.
|
||||
*/
|
||||
typealias E
|
||||
|
||||
/**
|
||||
Converts `self` to `Observable` sequence.
|
||||
|
||||
- returns: Observable sequence that represents `self`.
|
||||
*/
|
||||
func asObservable() -> Observable<E>
|
||||
}
|
||||
@ -11,7 +11,7 @@ import Foundation
|
||||
/**
|
||||
Represents a push style sequence.
|
||||
*/
|
||||
public protocol ObservableType {
|
||||
public protocol ObservableType : ObservableConvertibleType {
|
||||
/**
|
||||
Type of elements in sequence.
|
||||
*/
|
||||
@ -42,8 +42,14 @@ public protocol ObservableType {
|
||||
*/
|
||||
func subscribe<O: ObserverType where O.E == E>(observer: O) -> Disposable
|
||||
|
||||
}
|
||||
|
||||
extension ObservableType {
|
||||
|
||||
/**
|
||||
- returns: Canonical interface for push style sequence
|
||||
Default implementation of converting `ObservableType` to `Observable`.
|
||||
*/
|
||||
func asObservable() -> Observable<E>
|
||||
public func asObservable() -> Observable<E> {
|
||||
return create(self.subscribe)
|
||||
}
|
||||
}
|
||||
@ -97,7 +97,7 @@ class Catch<Element> : Producer<Element> {
|
||||
|
||||
// catch enumerable
|
||||
|
||||
class CatchSequenceSink<S: SequenceType, O: ObserverType where S.Generator.Element : ObservableType, S.Generator.Element.E == O.E> : TailRecursiveSink<S, O> {
|
||||
class CatchSequenceSink<S: SequenceType, O: ObserverType where S.Generator.Element : ObservableConvertibleType, S.Generator.Element.E == O.E> : TailRecursiveSink<S, O> {
|
||||
typealias Element = O.E
|
||||
typealias Parent = CatchSequence<S>
|
||||
|
||||
@ -141,7 +141,7 @@ class CatchSequenceSink<S: SequenceType, O: ObserverType where S.Generator.Eleme
|
||||
}
|
||||
}
|
||||
|
||||
class CatchSequence<S: SequenceType where S.Generator.Element : ObservableType> : Producer<S.Generator.Element.E> {
|
||||
class CatchSequence<S: SequenceType where S.Generator.Element : ObservableConvertibleType> : Producer<S.Generator.Element.E> {
|
||||
typealias Element = S.Generator.Element.E
|
||||
|
||||
let sources: S
|
||||
|
||||
@ -34,7 +34,7 @@ class CombineLatestSink<O: ObserverType> : Sink<O>, CombineLatestProtocol {
|
||||
}
|
||||
|
||||
func getResult() throws -> Element {
|
||||
return abstractMethod()
|
||||
abstractMethod()
|
||||
}
|
||||
|
||||
func next(index: Int) {
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
import Foundation
|
||||
|
||||
|
||||
class ConcatSink<S: SequenceType, O: ObserverType where S.Generator.Element : ObservableType, S.Generator.Element.E == O.E> : TailRecursiveSink<S, O> {
|
||||
class ConcatSink<S: SequenceType, O: ObserverType where S.Generator.Element : ObservableConvertibleType, S.Generator.Element.E == O.E> : TailRecursiveSink<S, O> {
|
||||
typealias Element = O.E
|
||||
|
||||
override init(observer: O, cancel: Disposable) {
|
||||
@ -38,7 +38,7 @@ class ConcatSink<S: SequenceType, O: ObserverType where S.Generator.Element : Ob
|
||||
}
|
||||
}
|
||||
|
||||
class Concat<S: SequenceType where S.Generator.Element : ObservableType> : Producer<S.Generator.Element.E> {
|
||||
class Concat<S: SequenceType where S.Generator.Element : ObservableConvertibleType> : Producer<S.Generator.Element.E> {
|
||||
typealias Element = S.Generator.Element.E
|
||||
|
||||
let sources: S
|
||||
|
||||
@ -11,7 +11,7 @@ import Foundation
|
||||
// It's value is one because initial source subscription is always in CompositeDisposable
|
||||
let FlatMapNoIterators = 1
|
||||
|
||||
class FlatMapSinkIter<SourceType, S: ObservableType, O: ObserverType where O.E == S.E> : ObserverType {
|
||||
class FlatMapSinkIter<SourceType, S: ObservableConvertibleType, O: ObserverType where O.E == S.E> : ObserverType {
|
||||
typealias Parent = FlatMapSink<SourceType, S, O>
|
||||
typealias DisposeKey = CompositeDisposable.DisposeKey
|
||||
typealias E = O.E
|
||||
@ -52,7 +52,7 @@ class FlatMapSinkIter<SourceType, S: ObservableType, O: ObserverType where O.E =
|
||||
}
|
||||
}
|
||||
|
||||
class FlatMapSink<SourceType, S: ObservableType, O: ObserverType where O.E == S.E> : Sink<O>, ObserverType {
|
||||
class FlatMapSink<SourceType, S: ObservableConvertibleType, O: ObserverType where O.E == S.E> : Sink<O>, ObserverType {
|
||||
typealias ResultType = O.E
|
||||
typealias Element = SourceType
|
||||
typealias Parent = FlatMap<SourceType, S>
|
||||
@ -73,7 +73,7 @@ class FlatMapSink<SourceType, S: ObservableType, O: ObserverType where O.E == S.
|
||||
}
|
||||
|
||||
func performMap(element: SourceType) throws -> S {
|
||||
return abstractMethod()
|
||||
abstractMethod()
|
||||
}
|
||||
|
||||
func on(event: Event<SourceType>) {
|
||||
@ -133,7 +133,7 @@ class FlatMapSink<SourceType, S: ObservableType, O: ObserverType where O.E == S.
|
||||
}
|
||||
}
|
||||
|
||||
class FlatMapSink1<SourceType, S: ObservableType, O : ObserverType where S.E == O.E> : FlatMapSink<SourceType, S, O> {
|
||||
class FlatMapSink1<SourceType, S: ObservableConvertibleType, O : ObserverType where S.E == O.E> : FlatMapSink<SourceType, S, O> {
|
||||
override init(parent: Parent, observer: O, cancel: Disposable) {
|
||||
super.init(parent: parent, observer: observer, cancel: cancel)
|
||||
}
|
||||
@ -143,10 +143,9 @@ class FlatMapSink1<SourceType, S: ObservableType, O : ObserverType where S.E ==
|
||||
}
|
||||
}
|
||||
|
||||
class FlatMapSink2<SourceType, S: ObservableType, O: ObserverType where S.E == O.E> : FlatMapSink<SourceType, S, O> {
|
||||
|
||||
class FlatMapSink2<SourceType, S: ObservableConvertibleType, O: ObserverType where S.E == O.E> : FlatMapSink<SourceType, S, O> {
|
||||
private var _index = 0
|
||||
|
||||
|
||||
override init(parent: Parent, observer: O, cancel: Disposable) {
|
||||
super.init(parent: parent, observer: observer, cancel: cancel)
|
||||
}
|
||||
@ -156,7 +155,7 @@ class FlatMapSink2<SourceType, S: ObservableType, O: ObserverType where S.E == O
|
||||
}
|
||||
}
|
||||
|
||||
class FlatMap<SourceType, S: ObservableType>: Producer<S.E> {
|
||||
class FlatMap<SourceType, S: ObservableConvertibleType>: Producer<S.E> {
|
||||
typealias Selector1 = (SourceType) throws -> S
|
||||
typealias Selector2 = (SourceType, Int) throws -> S
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@ class MapSink<SourceType, O : ObserverType> : Sink<O>, ObserverType {
|
||||
}
|
||||
|
||||
func performMap(element: SourceType) throws -> ResultType {
|
||||
return abstractMethod()
|
||||
abstractMethod()
|
||||
}
|
||||
|
||||
func on(event: Event<SourceType>) {
|
||||
|
||||
@ -10,7 +10,7 @@ import Foundation
|
||||
|
||||
// sequential
|
||||
|
||||
class MergeSinkIter<S: ObservableType, O: ObserverType where O.E == S.E> : ObserverType {
|
||||
class MergeSinkIter<S: ObservableConvertibleType, O: ObserverType where O.E == S.E> : ObserverType {
|
||||
typealias E = O.E
|
||||
typealias DisposeKey = Bag<Disposable>.KeyType
|
||||
typealias Parent = MergeSink<S, O>
|
||||
@ -43,7 +43,7 @@ class MergeSinkIter<S: ObservableType, O: ObserverType where O.E == S.E> : Obser
|
||||
}
|
||||
}
|
||||
|
||||
class MergeSink<S: ObservableType, O: ObserverType where O.E == S.E> : Sink<O>, ObserverType {
|
||||
class MergeSink<S: ObservableConvertibleType, O: ObserverType where O.E == S.E> : Sink<O>, ObserverType {
|
||||
typealias E = S
|
||||
typealias Parent = Merge<S>
|
||||
|
||||
@ -80,7 +80,7 @@ class MergeSink<S: ObservableType, O: ObserverType where O.E == S.E> : Sink<O>,
|
||||
|
||||
if let key = maybeKey {
|
||||
let observer = MergeSinkIter(parent: self, disposeKey: key)
|
||||
let disposable = value.subscribeSafe(observer)
|
||||
let disposable = value.asObservable().subscribeSafe(observer)
|
||||
innerSubscription.disposable = disposable
|
||||
}
|
||||
case .Error(let error):
|
||||
@ -106,7 +106,7 @@ class MergeSink<S: ObservableType, O: ObserverType where O.E == S.E> : Sink<O>,
|
||||
|
||||
// concurrent
|
||||
|
||||
class MergeConcurrentSinkIter<S: ObservableType, O: ObserverType where S.E == O.E> : ObserverType {
|
||||
class MergeConcurrentSinkIter<S: ObservableConvertibleType, O: ObserverType where S.E == O.E> : ObserverType {
|
||||
typealias E = O.E
|
||||
typealias DisposeKey = Bag<Disposable>.KeyType
|
||||
typealias Parent = MergeConcurrentSink<S, O>
|
||||
@ -147,7 +147,7 @@ class MergeConcurrentSinkIter<S: ObservableType, O: ObserverType where S.E == O.
|
||||
}
|
||||
}
|
||||
|
||||
class MergeConcurrentSink<S: ObservableType, O: ObserverType where S.E == O.E> : Sink<O>, ObserverType {
|
||||
class MergeConcurrentSink<S: ObservableConvertibleType, O: ObserverType where S.E == O.E> : Sink<O>, ObserverType {
|
||||
typealias E = S
|
||||
typealias Parent = Merge<S>
|
||||
typealias QueueType = Queue<S>
|
||||
@ -187,7 +187,7 @@ class MergeConcurrentSink<S: ObservableType, O: ObserverType where S.E == O.E> :
|
||||
if let key = key {
|
||||
let observer = MergeConcurrentSinkIter(parent: self, disposeKey: key)
|
||||
|
||||
let disposable = innerSource.subscribeSafe(observer)
|
||||
let disposable = innerSource.asObservable().subscribeSafe(observer)
|
||||
subscription.disposable = disposable
|
||||
}
|
||||
}
|
||||
@ -230,7 +230,7 @@ class MergeConcurrentSink<S: ObservableType, O: ObserverType where S.E == O.E> :
|
||||
}
|
||||
}
|
||||
|
||||
class Merge<S: ObservableType> : Producer<S.E> {
|
||||
class Merge<S: ObservableConvertibleType> : Producer<S.E> {
|
||||
let sources: Observable<S>
|
||||
let maxConcurrent: Int
|
||||
|
||||
|
||||
@ -46,6 +46,8 @@ class ObserveOnSink<O: ObserverType> : ObserverBase<O.E> {
|
||||
|
||||
var cancel: Disposable
|
||||
|
||||
var lock = SpinLock()
|
||||
|
||||
let scheduler: ImmediateSchedulerType
|
||||
var observer: O?
|
||||
|
||||
|
||||
@ -44,6 +44,6 @@ public class Producer<Element> : Observable<Element> {
|
||||
}
|
||||
|
||||
public func run<O : ObserverType where O.E == Element>(observer: O, cancel: Disposable, setSink: (Disposable) -> Void) -> Disposable {
|
||||
return abstractMethod()
|
||||
abstractMethod()
|
||||
}
|
||||
}
|
||||
@ -18,7 +18,7 @@ class SkipUntilSinkOther<ElementType, Other, O: ObserverType where O.E == Elemen
|
||||
|
||||
var disposable: Disposable {
|
||||
get {
|
||||
return abstractMethod()
|
||||
abstractMethod()
|
||||
}
|
||||
set {
|
||||
_singleAssignmentDisposable.disposable = newValue
|
||||
@ -70,7 +70,7 @@ class SkipUntilSink<ElementType, Other, O: ObserverType where O.E == ElementType
|
||||
|
||||
var disposable: Disposable {
|
||||
get {
|
||||
return abstractMethod()
|
||||
abstractMethod()
|
||||
}
|
||||
set {
|
||||
_singleAssignmentDisposable.disposable = newValue
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
import Foundation
|
||||
|
||||
class SwitchSink<S: ObservableType, O: ObserverType where S.E == O.E> : Sink<O>, ObserverType {
|
||||
class SwitchSink<S: ObservableConvertibleType, O: ObserverType where S.E == O.E> : Sink<O>, ObserverType {
|
||||
typealias E = S
|
||||
typealias Parent = Switch<S>
|
||||
|
||||
@ -48,7 +48,7 @@ class SwitchSink<S: ObservableType, O: ObserverType where S.E == O.E> : Sink<O>,
|
||||
innerSubscription.disposable = d
|
||||
|
||||
let observer = SwitchSinkIter(parent: self, id: latest, _self: d)
|
||||
let disposable = observable.subscribeSafe(observer)
|
||||
let disposable = observable.asObservable().subscribeSafe(observer)
|
||||
d.disposable = disposable
|
||||
case .Error(let error):
|
||||
self.lock.performLocked {
|
||||
@ -70,7 +70,7 @@ class SwitchSink<S: ObservableType, O: ObserverType where S.E == O.E> : Sink<O>,
|
||||
}
|
||||
}
|
||||
|
||||
class SwitchSinkIter<S: ObservableType, O: ObserverType where S.E == O.E> : ObserverType {
|
||||
class SwitchSinkIter<S: ObservableConvertibleType, O: ObserverType where S.E == O.E> : ObserverType {
|
||||
typealias E = O.E
|
||||
typealias Parent = SwitchSink<S, O>
|
||||
|
||||
@ -116,7 +116,7 @@ class SwitchSinkIter<S: ObservableType, O: ObserverType where S.E == O.E> : Obse
|
||||
}
|
||||
}
|
||||
|
||||
class Switch<S: ObservableType> : Producer<S.E> {
|
||||
class Switch<S: ObservableConvertibleType> : Producer<S.E> {
|
||||
let sources: Observable<S>
|
||||
|
||||
init(sources: Observable<S>) {
|
||||
|
||||
@ -18,7 +18,7 @@ class TakeUntilSinkOther<ElementType, Other, O: ObserverType where O.E == Elemen
|
||||
|
||||
var disposable: Disposable {
|
||||
get {
|
||||
return abstractMethod()
|
||||
abstractMethod()
|
||||
}
|
||||
set(value) {
|
||||
singleAssignmentDisposable.disposable = value
|
||||
|
||||
@ -33,11 +33,11 @@ class ZipSink<O: ObserverType> : Sink<O>, ZipSinkProtocol {
|
||||
}
|
||||
|
||||
func getResult() throws -> Element {
|
||||
return abstractMethod()
|
||||
abstractMethod()
|
||||
}
|
||||
|
||||
func hasElements(index: Int) -> Bool {
|
||||
return abstractMethod()
|
||||
abstractMethod()
|
||||
}
|
||||
|
||||
func next(index: Int) {
|
||||
|
||||
@ -40,7 +40,7 @@ extension CollectionType where Generator.Element : ObservableType {
|
||||
|
||||
// switch
|
||||
|
||||
extension ObservableType where E : ObservableType {
|
||||
extension ObservableType where E : ObservableConvertibleType {
|
||||
|
||||
/**
|
||||
Transforms an observable sequence of observable sequences into an observable sequence
|
||||
@ -51,7 +51,6 @@ extension ObservableType where E : ObservableType {
|
||||
|
||||
- returns: The observable sequence that at any point in time produces the elements of the most recent inner observable sequence that has been received.
|
||||
*/
|
||||
|
||||
public func switchLatest() -> Observable<E.E> {
|
||||
return Switch(sources: self.asObservable())
|
||||
}
|
||||
@ -59,7 +58,7 @@ extension ObservableType where E : ObservableType {
|
||||
|
||||
// concat
|
||||
|
||||
extension SequenceType where Generator.Element : ObservableType {
|
||||
extension SequenceType where Generator.Element : ObservableConvertibleType {
|
||||
|
||||
/**
|
||||
Concatenates all observable sequences in the given sequence, as long as the previous observable sequence terminated successfully.
|
||||
@ -72,7 +71,7 @@ extension SequenceType where Generator.Element : ObservableType {
|
||||
}
|
||||
}
|
||||
|
||||
extension ObservableType where E : ObservableType {
|
||||
extension ObservableType where E : ObservableConvertibleType {
|
||||
|
||||
/**
|
||||
Concatenates all inner observable sequences, as long as the previous observable sequence terminated successfully.
|
||||
@ -86,7 +85,7 @@ extension ObservableType where E : ObservableType {
|
||||
|
||||
// merge
|
||||
|
||||
extension ObservableType where E : ObservableType {
|
||||
extension ObservableType where E : ObservableConvertibleType {
|
||||
|
||||
/**
|
||||
Merges elements from all observable sequences in the given enumerable sequence into a single observable sequence.
|
||||
@ -137,7 +136,7 @@ extension ObservableType {
|
||||
|
||||
}
|
||||
|
||||
extension SequenceType where Generator.Element : ObservableType {
|
||||
extension SequenceType where Generator.Element : ObservableConvertibleType {
|
||||
/**
|
||||
Continues an observable sequence that is terminated by an error with the next observable sequence.
|
||||
|
||||
@ -198,7 +197,7 @@ extension ObservableType {
|
||||
}
|
||||
}
|
||||
|
||||
extension SequenceType where Generator.Element : ObservableType {
|
||||
extension SequenceType where Generator.Element : ObservableConvertibleType {
|
||||
|
||||
/**
|
||||
Propagates the observable sequence that reacts first.
|
||||
@ -208,7 +207,7 @@ extension SequenceType where Generator.Element : ObservableType {
|
||||
public func amb()
|
||||
-> Observable<Generator.Element.E> {
|
||||
return self.reduce(never()) { a, o in
|
||||
return a.amb(o)
|
||||
return a.amb(o.asObservable())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -77,21 +77,21 @@ extension ObservableType {
|
||||
/**
|
||||
Invokes an action for each event in the observable sequence, and propagates all observer messages through the result sequence.
|
||||
|
||||
- parameter next: Action to invoke for each element in the observable sequence.
|
||||
- parameter error: Action to invoke upon errored termination of the observable sequence.
|
||||
- parameter completed: Action to invoke upon graceful termination of the observable sequence.
|
||||
- parameter onNext: Action to invoke for each element in the observable sequence.
|
||||
- parameter onError: Action to invoke upon errored termination of the observable sequence.
|
||||
- parameter onCompleted: Action to invoke upon graceful termination of the observable sequence.
|
||||
- returns: The source sequence with the side-effecting behavior applied.
|
||||
*/
|
||||
public func doOn(next next: (E throws -> Void)? = nil, error: (ErrorType throws -> Void)? = nil, completed: (() throws -> Void)? = nil)
|
||||
public func doOn(onNext onNext: (E throws -> Void)? = nil, onError: (ErrorType throws -> Void)? = nil, onCompleted: (() throws -> Void)? = nil)
|
||||
-> Observable<E> {
|
||||
return Do(source: self.asObservable()) { e in
|
||||
switch e {
|
||||
case .Next(let element):
|
||||
try next?(element)
|
||||
try onNext?(element)
|
||||
case .Error(let e):
|
||||
try error?(e)
|
||||
try onError?(e)
|
||||
case .Completed:
|
||||
try completed?()
|
||||
try onCompleted?()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -153,7 +153,7 @@ extension ObservableType {
|
||||
- parameter selector: A transform function to apply to each element.
|
||||
- returns: An observable sequence whose elements are the result of invoking the one-to-many transform function on each element of the input sequence.
|
||||
*/
|
||||
public func flatMap<O: ObservableType>(selector: (E) throws -> O)
|
||||
public func flatMap<O: ObservableConvertibleType>(selector: (E) throws -> O)
|
||||
-> Observable<O.E> {
|
||||
return FlatMap(source: self.asObservable(), selector: selector)
|
||||
}
|
||||
@ -164,7 +164,7 @@ extension ObservableType {
|
||||
- parameter selector: A transform function to apply to each element; the second parameter of the function represents the index of the source element.
|
||||
- returns: An observable sequence whose elements are the result of invoking the one-to-many transform function on each element of the input sequence.
|
||||
*/
|
||||
public func flatMapWithIndex<O: ObservableType>(selector: (E, Int) throws -> O)
|
||||
public func flatMapWithIndex<O: ObservableConvertibleType>(selector: (E, Int) throws -> O)
|
||||
-> Observable<O.E> {
|
||||
return FlatMap(source: self.asObservable(), selector: selector)
|
||||
}
|
||||
|
||||
@ -34,7 +34,7 @@ extension ObservableType {
|
||||
- parameter scheduler: Scheduler to run the throttle timers and send events on.
|
||||
- returns: The throttled sequence.
|
||||
*/
|
||||
public func debounce<S: SchedulerType>(dueTime: S.TimeInterval, scheduler: S)
|
||||
public func debounce<S: SchedulerType>(dueTime: S.TimeInterval, _ scheduler: S)
|
||||
-> Observable<E> {
|
||||
return Throttle(source: self.asObservable(), dueTime: dueTime, scheduler: scheduler)
|
||||
}
|
||||
|
||||
@ -11,7 +11,6 @@ import Foundation
|
||||
class ObserverBase<ElementType> : Disposable, ObserverType {
|
||||
typealias E = ElementType
|
||||
|
||||
var lock = SpinLock()
|
||||
var isStopped: Int32 = 0
|
||||
|
||||
init() {
|
||||
@ -34,7 +33,7 @@ class ObserverBase<ElementType> : Disposable, ObserverType {
|
||||
}
|
||||
|
||||
func onCore(event: Event<E>) {
|
||||
return abstractMethod()
|
||||
abstractMethod()
|
||||
}
|
||||
|
||||
func dispose() {
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
import Foundation
|
||||
|
||||
/// This class is usually used with `Generator` version of the operators.
|
||||
class TailRecursiveSink<S: SequenceType, O: ObserverType where S.Generator.Element: ObservableType, S.Generator.Element.E == O.E> : Sink<O>, ObserverType {
|
||||
class TailRecursiveSink<S: SequenceType, O: ObserverType where S.Generator.Element: ObservableConvertibleType, S.Generator.Element.E == O.E> : Sink<O>, ObserverType {
|
||||
typealias E = O.E
|
||||
|
||||
var generators: [S.Generator] = []
|
||||
@ -54,11 +54,11 @@ class TailRecursiveSink<S: SequenceType, O: ObserverType where S.Generator.Eleme
|
||||
}
|
||||
|
||||
func extract(observable: Observable<E>) -> S.Generator? {
|
||||
return abstractMethod()
|
||||
abstractMethod()
|
||||
}
|
||||
|
||||
func on(event: Event<E>) {
|
||||
return abstractMethod()
|
||||
abstractMethod()
|
||||
}
|
||||
|
||||
// should be done on gate locked
|
||||
|
||||
@ -19,13 +19,11 @@ public var resourceCount: Int32 = 0
|
||||
|
||||
// Swift doesn't have a concept of abstract metods.
|
||||
// This function is being used as a runtime check that abstract methods aren't being called.
|
||||
func abstractMethod<T>() -> T {
|
||||
@noreturn func abstractMethod() -> Void {
|
||||
rxFatalError("Abstract method")
|
||||
let dummyValue: T? = nil
|
||||
return dummyValue!
|
||||
}
|
||||
|
||||
func rxFatalError(lastMessage: String) {
|
||||
@noreturn func rxFatalError(lastMessage: String) {
|
||||
// The temptation to comment this line is great, but please don't, it's for your own good. The choice is yours.
|
||||
fatalError(lastMessage)
|
||||
}
|
||||
|
||||
@ -45,11 +45,11 @@ public class RecursiveSchedulerOf<State, TimeInterval> {
|
||||
// abstract methods
|
||||
|
||||
func scheduleRelativeAdapter(state: State, dueTime: TimeInterval, action: State -> Disposable) -> Disposable {
|
||||
return abstractMethod()
|
||||
abstractMethod()
|
||||
}
|
||||
|
||||
func scheduleAdapter(state: State, action: State -> Disposable) -> Disposable {
|
||||
return abstractMethod()
|
||||
abstractMethod()
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -19,7 +19,7 @@ public class ReplaySubject<Element> : Observable<Element>, SubjectType, Observer
|
||||
typealias DisposeKey = Bag<ObserverOf<Element>>.KeyType
|
||||
|
||||
func unsubscribe(key: DisposeKey) {
|
||||
return abstractMethod()
|
||||
abstractMethod()
|
||||
}
|
||||
|
||||
/**
|
||||
@ -28,7 +28,7 @@ public class ReplaySubject<Element> : Observable<Element>, SubjectType, Observer
|
||||
- parameter event: Event to send to the observers.
|
||||
*/
|
||||
public func on(event: Event<E>) {
|
||||
return abstractMethod()
|
||||
abstractMethod()
|
||||
}
|
||||
|
||||
/**
|
||||
@ -73,15 +73,15 @@ class ReplayBufferBase<Element> : ReplaySubject<Element> {
|
||||
}
|
||||
|
||||
func trim() {
|
||||
return abstractMethod()
|
||||
abstractMethod()
|
||||
}
|
||||
|
||||
func addValueToBuffer(value: Element) {
|
||||
return abstractMethod()
|
||||
abstractMethod()
|
||||
}
|
||||
|
||||
func replayBuffer(observer: ObserverOf<Element>) {
|
||||
return abstractMethod()
|
||||
abstractMethod()
|
||||
}
|
||||
|
||||
override func on(event: Event<Element>) {
|
||||
|
||||
@ -91,7 +91,7 @@ extension ObservableCreationTests {
|
||||
return x + 1
|
||||
}
|
||||
.take(4)
|
||||
.subscribe(next: { x in
|
||||
.subscribe(onNext: { x in
|
||||
elements.append(x)
|
||||
})
|
||||
|
||||
|
||||
@ -772,9 +772,9 @@ extension ObservableTimeTest {
|
||||
|
||||
OSSpinLockLock(&lock)
|
||||
|
||||
let d = interval(0, scheduler).takeWhile { $0 < 10 } .subscribe(next: { t in
|
||||
let d = interval(0, scheduler).takeWhile { $0 < 10 } .subscribe(onNext: { t in
|
||||
observer.on(.Next(t))
|
||||
}, completed: {
|
||||
}, onCompleted: {
|
||||
OSSpinLockUnlock(&lock)
|
||||
})
|
||||
|
||||
|
||||
@ -12,77 +12,77 @@ import RxSwift
|
||||
class ObserverTests: RxTest { }
|
||||
|
||||
extension ObserverTests {
|
||||
|
||||
|
||||
func testConvenienceOn_Next() {
|
||||
var observer: ObserverOf<Int>!
|
||||
let a: Observable<Int> = create { o in
|
||||
observer = o
|
||||
return NopDisposable.instance
|
||||
}
|
||||
|
||||
|
||||
var elements = [Int]()
|
||||
|
||||
|
||||
_ = a.subscribeNext { n in
|
||||
elements.append(n)
|
||||
}
|
||||
|
||||
|
||||
XCTAssertEqual(elements, [])
|
||||
|
||||
|
||||
observer.onNext(0)
|
||||
|
||||
|
||||
XCTAssertEqual(elements, [0])
|
||||
}
|
||||
|
||||
|
||||
func testConvenienceOn_Error() {
|
||||
var observer: ObserverOf<Int>!
|
||||
let a: Observable<Int> = create { o in
|
||||
observer = o
|
||||
return NopDisposable.instance
|
||||
}
|
||||
|
||||
|
||||
var elements = [Int]()
|
||||
var errrorNotification: NSError!
|
||||
|
||||
|
||||
_ = a.subscribe(
|
||||
next: { n in elements.append(n) },
|
||||
error: { e in
|
||||
onNext: { n in elements.append(n) },
|
||||
onError: { e in
|
||||
errrorNotification = e as NSError
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
XCTAssertEqual(elements, [])
|
||||
|
||||
|
||||
observer.onNext(0)
|
||||
XCTAssertEqual(elements, [0])
|
||||
|
||||
|
||||
observer.onError(testError)
|
||||
|
||||
|
||||
observer.onNext(1)
|
||||
XCTAssertEqual(elements, [0])
|
||||
XCTAssertEqual(errrorNotification, testError)
|
||||
}
|
||||
|
||||
|
||||
func testConvenienceOn_Complete() {
|
||||
var observer: ObserverOf<Int>!
|
||||
let a: Observable<Int> = create { o in
|
||||
observer = o
|
||||
return NopDisposable.instance
|
||||
}
|
||||
|
||||
|
||||
var elements = [Int]()
|
||||
|
||||
|
||||
_ = a.subscribeNext { n in
|
||||
elements.append(n)
|
||||
}
|
||||
|
||||
|
||||
XCTAssertEqual(elements, [])
|
||||
|
||||
|
||||
observer.onNext(0)
|
||||
XCTAssertEqual(elements, [0])
|
||||
|
||||
|
||||
observer.onComplete()
|
||||
|
||||
|
||||
observer.onNext(1)
|
||||
XCTAssertEqual(elements, [0])
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user