Skip to content

Commit 50f2eb8

Browse files
committed
Fixed some issues SwiftLint issues and build test build problems on macOS/tvOS.
All rake targets are running locally! Fingers crossed!
1 parent 3486925 commit 50f2eb8

File tree

6 files changed

+127
-182
lines changed

6 files changed

+127
-182
lines changed

Demo/Demo.xcodeproj/project.pbxproj

Lines changed: 103 additions & 158 deletions
Large diffs are not rendered by default.

Demo/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ DEPENDENCIES:
1212

1313
EXTERNAL SOURCES:
1414
RxViewModel:
15-
:path: ../
15+
:path: "../"
1616

1717
SPEC CHECKSUMS:
1818
Nimble: 657d000e11df8aebe27cdaf9d244de7f30ed87f7
@@ -22,4 +22,4 @@ SPEC CHECKSUMS:
2222

2323
PODFILE CHECKSUM: 5b740ff0f8e82b1a56bee6decd0acad5bd6013b9
2424

25-
COCOAPODS: 1.3.0.beta.2
25+
COCOAPODS: 1.2.1

Demo/Tests/Tests.swift

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ class RxViewModelSpec: QuickSpec {
8181
} as Observable<String?>
8282

8383
vm.forwardSignalWhileActive(input).subscribe(onNext: { value in
84-
values.append(value!)
84+
guard let value = value else { return }
85+
values.append(value)
8586
}, onError: { _ in }, onCompleted: {
8687
completed = true
8788
}).disposed(by: self.disposable)
@@ -114,11 +115,13 @@ class RxViewModelSpec: QuickSpec {
114115
let subject = ReplaySubject<String>.create(bufferSize: 5)
115116
subject.on(.next("0"))
116117

117-
vm.throttleSignalWhileInactive(subject).subscribe( onNext: { value in
118-
values.append(value)
119-
}, onError: { _ in }, onCompleted: {
120-
completed = true
121-
}).disposed(by: self.disposable)
118+
vm.throttleSignalWhileInactive(subject)
119+
.observeOn(MainScheduler.instance)
120+
.subscribe(onNext: { value in
121+
values.append(value)
122+
}, onError: { _ in }, onCompleted: {
123+
completed = true
124+
}).disposed(by: self.disposable)
122125

123126
var expectedValues = ["0"]
124127
expect(values).to(equal(expectedValues))

Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def sdks
2626
return {
2727
ios: 'iphonesimulator',
2828
macos: 'macosx',
29-
tvos: 'appletvsimulator9.2'
29+
tvos: 'appletvsimulator10.2'
3030
}
3131
end
3232

Source/Categories/Observable_Operations.swift

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ returns `true`. Completion and errors are always forwarded immediately.
3737
*/
3838
extension ObservableType {
3939
public func throttle(_ interval: TimeInterval, valuesPassingTest predicate: @escaping (E) -> Bool) -> Observable<E> {
40-
return Observable.create { (o: AnyObserver<E>) -> Disposable in
40+
return Observable.create { (obs: AnyObserver<E>) -> Disposable in
4141
let disposable = CompositeDisposable()
4242
let scheduler = ConcurrentDispatchQueueScheduler(qos: .default)
4343
let nextDisposable = SerialDisposable()
@@ -53,22 +53,22 @@ extension ObservableType {
5353
- parameter send: `Bool` flag indicating where or not the `next` value should be
5454
«flushed» to the `observable` `o` or not.
5555
*/
56-
func flushNext(_ send: Bool) -> Void {
56+
func flushNext(_ send: Bool) {
5757
nextDisposable.dispose()
5858

5959
guard let nV = nextValue, hasNextValue, send else { return }
6060

6161
nextValue = nil
6262
hasNextValue = false
6363

64-
o.on(.next(nV))
64+
obs.on(.next(nV))
6565
}
6666

6767
let shouldThrottle = predicate($0)
6868
flushNext(false)
6969

7070
if !shouldThrottle {
71-
o.on(.next($0))
71+
obs.on(.next($0))
7272

7373
return
7474
}
@@ -85,7 +85,6 @@ extension ObservableType {
8585
_ = disposable.insert(d)
8686
})
8787

88-
8988
_ = disposable.insert(subscriptionDisposable)
9089

9190
return disposable

Source/RxViewModel.swift

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -93,17 +93,17 @@ public class RxViewModel: NSObject {
9393
public func forwardSignalWhileActive<T>(_ observable: Observable<T>) -> Observable<T> {
9494
let signal = self.activeObservable
9595

96-
return Observable.create { (o: AnyObserver<T>) -> Disposable in
96+
return Observable.create { (obs: AnyObserver<T>) -> Disposable in
9797
let disposable = CompositeDisposable()
9898
var signalDisposable: Disposable? = nil
9999
var disposeKey: CompositeDisposable.DisposeKey?
100100

101101
let activeDisposable = signal.subscribe( onNext: { active in
102102
if active == true {
103103
signalDisposable = observable.subscribe( onNext: { value in
104-
o.on(.next(value))
104+
obs.on(.next(value))
105105
}, onError: { error in
106-
o.on(.error(error))
106+
obs.on(.error(error))
107107
}, onCompleted: {})
108108

109109
if let sd = signalDisposable { disposeKey = disposable.insert(sd) }
@@ -116,12 +116,11 @@ public class RxViewModel: NSObject {
116116
}
117117
}
118118
}, onError: { error in
119-
o.on(.error(error))
119+
obs.on(.error(error))
120120
}, onCompleted: {
121-
o.on(.completed)
121+
obs.on(.completed)
122122
})
123123

124-
125124
_ = disposable.insert(activeDisposable)
126125

127126
return disposable
@@ -143,19 +142,18 @@ public class RxViewModel: NSObject {
143142
is deallocated.
144143
*/
145144
public func throttleSignalWhileInactive<T>(_ observable: Observable<T>) -> Observable<T> {
146-
// observable.replay(1)
147145
let result = ReplaySubject<T>.create(bufferSize: 1)
148146

149-
let activeSignal = self.activeObservable.takeUntil(Observable.create { (o: AnyObserver<T>) -> Disposable in
147+
let activeSignal = self.activeObservable.takeUntil(Observable.create { (_: AnyObserver<T>) -> Disposable in
150148
observable.subscribe(onCompleted: {
151149
defer { result.dispose() }
152150

153151
result.on(.completed)
154152
})
155153
})
156154

157-
let _ = Observable.combineLatest(activeSignal, observable) { (active, o) -> (Bool?, T) in (active, o) }
158-
.throttle(throttleTime) { (active: Bool?, value: T) -> Bool in
155+
_ = Observable.combineLatest(activeSignal, observable) { (active, obs) -> (Bool?, T) in (active, obs) }
156+
.throttle(throttleTime) { (active: Bool?, _: T) -> Bool in
159157
return active == false
160158
}.subscribe(onNext: { (value: (Bool?, T)) in
161159
result.on(.next(value.1))

0 commit comments

Comments
 (0)