Skip to content

Commit 65e468c

Browse files
econaecona
committed
Bump version to 1.1.0
1 parent fbf75a4 commit 65e468c

File tree

7 files changed

+89
-78
lines changed

7 files changed

+89
-78
lines changed

‎Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
github "Clipy/Screeen"
2-
github "ReactiveX/RxSwift" "3.0.0-beta.1"
2+
github "ReactiveX/RxSwift"

‎Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "ReactiveX/RxSwift" "3.0.0-beta.1"
1+
github "ReactiveX/RxSwift" "3.0.1"
22
github "Clipy/Screeen" "v1.0.0"

‎Carthage/Checkouts/RxSwift

Submodule RxSwift updated 735 files

‎Example/Example/AppDelegate.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ class AppDelegate: NSObject, NSApplicationDelegate {
2121

2222
func applicationDidFinishLaunching(_ aNotification: Notification) {
2323

24-
screeen.rx_addedImage
24+
screeen.rx.addedImage
2525
.subscribe(onNext: { image in
2626
Swift.print("Added image")
2727
}).addDisposableTo(rx_disposeBag)
2828

29-
screeen.rx_updatedImage
29+
screeen.rx.updatedImage
3030
.observeOn(MainScheduler.instance)
3131
.subscribe(onNext: { image in
3232
Swift.print("Updated image")

‎Lib/RxScreeen/Screeen+Rx.swift

Lines changed: 76 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -11,103 +11,114 @@ import Screeen
1111
import RxSwift
1212
import RxCocoa
1313

14-
public extension ScreenShotObserver {
14+
extension Reactive where Base: ScreenShotObserver {
15+
1516
/**
1617
Reactive wrapper for `delegate`.
18+
1719
For more information take a look at `DelegateProxyType` protocol documentation.
1820
*/
19-
public var rx_delegate: DelegateProxy {
20-
return proxyForObject(RxScreeenDelegateProxy.self, self)
21+
public var delegate: DelegateProxy {
22+
return RxScreeenDelegateProxy.proxyForObject(base)
2123
}
22-
}
23-
24-
public extension ScreenShotObserver {
2524

2625
// MARK: - Responding to screenshot image
27-
public var rx_image: Observable<NSImage> {
28-
return Observable
29-
.of(rx_delegate.observe(#selector(ScreenShotObserverDelegate.screenShotObserver(_:addedItem:))),
30-
rx_delegate.observe(#selector(ScreenShotObserverDelegate.screenShotObserver(_:updatedItem:))),
31-
rx_delegate.observe(#selector(ScreenShotObserverDelegate.screenShotObserver(_:removedItem:))))
32-
.merge()
33-
.flatMap { a -> Observable<NSImage> in
34-
guard let metadataItem = a[1] as? NSMetadataItem else { return Observable.empty() }
35-
guard let imagePath = metadataItem.value(forAttribute: "kMDItemPath") as? String else { return Observable.empty() }
36-
guard let image = NSImage(contentsOfFile: imagePath) else { return Observable.empty() }
37-
38-
return Observable.just(image)
39-
}
26+
public var image: Observable<NSImage> {
27+
return Observable.of(
28+
delegate.methodInvoked(#selector(ScreenShotObserverDelegate.screenShotObserver(_:addedItem:))),
29+
delegate.methodInvoked(#selector(ScreenShotObserverDelegate.screenShotObserver(_:updatedItem:))),
30+
delegate.methodInvoked(#selector(ScreenShotObserverDelegate.screenShotObserver(_:removedItem:)))
31+
)
32+
.merge()
33+
.flatMap { a -> Observable<NSImage> in
34+
guard let metadataItem = a[1] as? NSMetadataItem else { return Observable.empty() }
35+
guard let imagePath = metadataItem.value(forAttribute: "kMDItemPath") as? String else { return Observable.empty() }
36+
guard let image = NSImage(contentsOfFile: imagePath) else { return Observable.empty() }
37+
38+
return Observable.just(image)
39+
}
4040
}
4141

4242
// MARK: - Responding to screenshot item
43-
public var rx_item: Observable<NSMetadataItem> {
44-
return Observable
45-
.of(rx_delegate.observe(#selector(ScreenShotObserverDelegate.screenShotObserver(_:addedItem:))),
46-
rx_delegate.observe(#selector(ScreenShotObserverDelegate.screenShotObserver(_:updatedItem:))),
47-
rx_delegate.observe(#selector(ScreenShotObserverDelegate.screenShotObserver(_:removedItem:))))
48-
.merge()
49-
.flatMap { a -> Observable<NSMetadataItem> in
50-
guard let metadataItem = a[1] as? NSMetadataItem else { return Observable.empty() }
51-
return Observable.just(metadataItem)
52-
}
43+
public var item: Observable<NSMetadataItem> {
44+
return Observable.of(
45+
delegate.methodInvoked(#selector(ScreenShotObserverDelegate.screenShotObserver(_:addedItem:))),
46+
delegate.methodInvoked(#selector(ScreenShotObserverDelegate.screenShotObserver(_:updatedItem:))),
47+
delegate.methodInvoked(#selector(ScreenShotObserverDelegate.screenShotObserver(_:removedItem:)))
48+
)
49+
.merge()
50+
.flatMap { a -> Observable<NSMetadataItem> in
51+
guard let metadataItem = a[1] as? NSMetadataItem else { return Observable.empty() }
52+
53+
return Observable.just(metadataItem)
54+
}
5355
}
5456

5557
// MARK: - Delegate methods
56-
public var rx_addedItem: Observable<NSMetadataItem> {
57-
return rx_delegate.observe(#selector(ScreenShotObserverDelegate.screenShotObserver(_:addedItem:)))
58-
.flatMap { a -> Observable<NSMetadataItem> in
59-
guard let metadataItem = a[1] as? NSMetadataItem else { return Observable.empty() }
60-
return Observable.just(metadataItem)
61-
}
58+
public var addedItem: Observable<NSMetadataItem> {
59+
return delegate
60+
.methodInvoked(#selector(ScreenShotObserverDelegate.screenShotObserver(_:addedItem:)))
61+
.flatMap { a -> Observable<NSMetadataItem> in
62+
guard let metadataItem = a[1] as? NSMetadataItem else { return Observable.empty() }
63+
64+
return Observable.just(metadataItem)
65+
}
6266
}
6367

64-
public var rx_addedImage: Observable<NSImage> {
65-
return rx_delegate.observe(#selector(ScreenShotObserverDelegate.screenShotObserver(_:addedItem:)))
66-
.flatMap { a -> Observable<NSImage> in
67-
guard let metadataItem = a[1] as? NSMetadataItem else { return Observable.empty() }
68-
guard let imagePath = metadataItem.value(forAttribute: "kMDItemPath") as? String else { return Observable.empty() }
69-
guard let image = NSImage(contentsOfFile: imagePath) else { return Observable.empty() }
68+
public var addedImage: Observable<NSImage> {
69+
return delegate
70+
.methodInvoked(#selector(ScreenShotObserverDelegate.screenShotObserver(_:addedItem:)))
71+
.flatMap { a -> Observable<NSImage> in
72+
guard let metadataItem = a[1] as? NSMetadataItem else { return Observable.empty() }
73+
guard let imagePath = metadataItem.value(forAttribute: "kMDItemPath") as? String else { return Observable.empty() }
74+
guard let image = NSImage(contentsOfFile: imagePath) else { return Observable.empty() }
7075

71-
return Observable.just(image)
72-
}
76+
return Observable.just(image)
77+
}
7378
}
7479

75-
public var rx_updatedItem: Observable<NSMetadataItem> {
76-
return rx_delegate.observe(#selector(ScreenShotObserverDelegate.screenShotObserver(_:updatedItem:)))
77-
.flatMap { a -> Observable<NSMetadataItem> in
78-
guard let metadataItem = a[1] as? NSMetadataItem else { return Observable.empty() }
79-
return Observable.just(metadataItem)
80-
}
80+
public var updatedItem: Observable<NSMetadataItem> {
81+
return delegate
82+
.methodInvoked(#selector(ScreenShotObserverDelegate.screenShotObserver(_:updatedItem:)))
83+
.flatMap { a -> Observable<NSMetadataItem> in
84+
guard let metadataItem = a[1] as? NSMetadataItem else { return Observable.empty() }
85+
86+
return Observable.just(metadataItem)
87+
}
8188
}
8289

83-
public var rx_updatedImage: Observable<NSImage> {
84-
return rx_delegate.observe(#selector(ScreenShotObserverDelegate.screenShotObserver(_:updatedItem:)))
85-
.flatMap { a -> Observable<NSImage> in
86-
guard let metadataItem = a[1] as? NSMetadataItem else { return Observable.empty() }
87-
guard let imagePath = metadataItem.value(forAttribute: "kMDItemPath") as? String else { return Observable.empty() }
88-
guard let image = NSImage(contentsOfFile: imagePath) else { return Observable.empty() }
90+
public var updatedImage: Observable<NSImage> {
91+
return delegate
92+
.methodInvoked(#selector(ScreenShotObserverDelegate.screenShotObserver(_:updatedItem:)))
93+
.flatMap { a -> Observable<NSImage> in
94+
guard let metadataItem = a[1] as? NSMetadataItem else { return Observable.empty() }
95+
guard let imagePath = metadataItem.value(forAttribute: "kMDItemPath") as? String else { return Observable.empty() }
96+
guard let image = NSImage(contentsOfFile: imagePath) else { return Observable.empty() }
8997

90-
return Observable.just(image)
98+
return Observable.just(image)
9199
}
92100
}
93101

94-
public var rx_removedItem: Observable<NSMetadataItem> {
95-
return rx_delegate.observe(#selector(ScreenShotObserverDelegate.screenShotObserver(_:removedItem:)))
96-
.flatMap { a -> Observable<NSMetadataItem> in
97-
guard let metadataItem = a[1] as? NSMetadataItem else { return Observable.empty() }
98-
return Observable.just(metadataItem)
99-
}
102+
public var removedItem: Observable<NSMetadataItem> {
103+
return delegate
104+
.methodInvoked(#selector(ScreenShotObserverDelegate.screenShotObserver(_:removedItem:)))
105+
.flatMap { a -> Observable<NSMetadataItem> in
106+
guard let metadataItem = a[1] as? NSMetadataItem else { return Observable.empty() }
107+
108+
return Observable.just(metadataItem)
109+
}
100110
}
101111

102-
public var rx_removedImage: Observable<NSImage> {
103-
return rx_delegate.observe(#selector(ScreenShotObserverDelegate.screenShotObserver(_:removedItem:)))
112+
public var removedImage: Observable<NSImage> {
113+
return delegate
114+
.methodInvoked(#selector(ScreenShotObserverDelegate.screenShotObserver(_:removedItem:)))
104115
.flatMap { a -> Observable<NSImage> in
105116
guard let metadataItem = a[1] as? NSMetadataItem else { return Observable.empty() }
106117
guard let imagePath = metadataItem.value(forAttribute: "kMDItemPath") as? String else { return Observable.empty() }
107118
guard let image = NSImage(contentsOfFile: imagePath) else { return Observable.empty() }
108119

109120
return Observable.just(image)
110-
}
121+
}
111122
}
112123

113124
}

‎README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,27 +31,27 @@ github "ReactiveX/RxSwift"
3131
## Example
3232
```
3333
let observer = ScreenShotObserver()
34-
observer.rx_image
34+
observer.rx.image
3535
.subscribe(onNext: { image in
3636
// Add / Update / Remove events images
3737
})
3838
39-
observer.rx_item
39+
observer.rx.item
4040
.subscribe(onNext: { item in
4141
// Add / Update / Remove events NSMetadataItem
4242
})
4343
44-
observer.rx_addedImage
44+
observer.rx.addedImage
4545
.subscribe(onNext: { image in
4646
// Add events image
4747
})
4848
49-
observer.rx_updatedImage
49+
observer.rx.updatedImage
5050
.subscribe(onNext: { image in
5151
// Update events image
5252
})
5353
54-
observer.rx_removedImage
54+
observer.rx.removedImage
5555
.subscribe(onNext: { image in
5656
// Remove events image
5757
})

‎RxScreeen.podspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "RxScreeen"
3-
s.version = "1.0.0"
3+
s.version = "1.1.0"
44
s.summary = "RxScreeen is a RxSwift wrapper for Screeen."
55
s.license = { :type => 'MIT', :file => 'LICENSE' }
66
s.homepage = "https://github.com/Clipy/RxScreeen"
@@ -10,6 +10,6 @@ Pod::Spec.new do |s|
1010
s.source_files = 'Lib/RxScreeen/*.swift'
1111
s.frameworks = 'Cocoa'
1212
s.dependency 'Screeen', '~> 1.0'
13-
s.dependency 'RxSwift', '3.0.0-beta.1'
14-
s.dependency 'RxCocoa', '3.0.0-beta.1'
13+
s.dependency 'RxSwift', '~> 3.0'
14+
s.dependency 'RxCocoa', '~> 3.0'
1515
end

0 commit comments

Comments
 (0)