Adds NSProgressIndicator and NSTextView bindings for RxCocoa on Mac

CHANGELOG.md

@@ -9,6 +9,8 @@ All notable changes to this project will be documented in this file.
 
 * Adds `rx_title` to `UIViewController`.
 * Adds `rx_scrollEnabled` to `UIScrollView`.
+* Adds bindings to `NSTextView`
+* Adds bindings to `NSProgressIndicator`
 
 
 ## [2.5.0](https://github.com/ReactiveX/RxSwift/releases/tag/2.5.0)

Rx.xcodeproj/project.pbxproj

@@ -987,6 +987,10 @@
 		CB30D9EA1BF0E3500084C1C0 /* SingleAsync.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB30D9E81BF0E3500084C1C0 /* SingleAsync.swift */; };
 		CB30D9EB1BF0E3500084C1C0 /* SingleAsync.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB30D9E81BF0E3500084C1C0 /* SingleAsync.swift */; };
 		CB30D9EC1BF0E3500084C1C0 /* SingleAsync.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB30D9E81BF0E3500084C1C0 /* SingleAsync.swift */; };
+		CB832B331D19654700C27230 /* NSProgressIndicator+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB832B311D1964E300C27230 /* NSProgressIndicator+Rx.swift */; };
+		CB832B371D19669100C27230 /* RxTextFieldDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB832B361D19669100C27230 /* RxTextFieldDelegateProxy.swift */; };
+		CB832B391D19673900C27230 /* NSTextView+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB832B381D19673900C27230 /* NSTextView+Rx.swift */; };
+		CB832B3B1D1967A900C27230 /* RxTextViewDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB832B3A1D1967A900C27230 /* RxTextViewDelegateProxy.swift */; };
 		CB883B3B1BE24355000AC2EE /* Window.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB883B3A1BE24355000AC2EE /* Window.swift */; };
 		CB883B3C1BE24355000AC2EE /* Window.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB883B3A1BE24355000AC2EE /* Window.swift */; };
 		CB883B3D1BE24355000AC2EE /* Window.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB883B3A1BE24355000AC2EE /* Window.swift */; };
@@ -1742,6 +1746,10 @@
 		C8FD21AD1C67E14C00863EC3 /* UIBindingObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIBindingObserver.swift; sourceTree = "<group>"; };
 		CB255BD61BC46A9C00798A4C /* RetryWhen.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RetryWhen.swift; sourceTree = "<group>"; };
 		CB30D9E81BF0E3500084C1C0 /* SingleAsync.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SingleAsync.swift; sourceTree = "<group>"; };
+		CB832B311D1964E300C27230 /* NSProgressIndicator+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSProgressIndicator+Rx.swift"; sourceTree = "<group>"; };
+		CB832B361D19669100C27230 /* RxTextFieldDelegateProxy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxTextFieldDelegateProxy.swift; sourceTree = "<group>"; };
+		CB832B381D19673900C27230 /* NSTextView+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSTextView+Rx.swift"; sourceTree = "<group>"; };
+		CB832B3A1D1967A900C27230 /* RxTextViewDelegateProxy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxTextViewDelegateProxy.swift; sourceTree = "<group>"; };
 		CB883B3A1BE24355000AC2EE /* Window.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Window.swift; sourceTree = "<group>"; };
 		CB883B3F1BE24C15000AC2EE /* RefCountDisposable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RefCountDisposable.swift; sourceTree = "<group>"; };
 		CB883B441BE256D4000AC2EE /* BooleanDisposable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BooleanDisposable.swift; sourceTree = "<group>"; };
@@ -2194,11 +2202,14 @@
 		C8093EC51B8A732E0088E94D /* OSX */ = {
 			isa = PBXGroup;
 			children = (
+				CB832B351D19667900C27230 /* Proxies */,
 				C8093EC61B8A732E0088E94D /* NSButton+Rx.swift */,
 				C8093EC71B8A732E0088E94D /* NSControl+Rx.swift */,
 				C8093EC81B8A732E0088E94D /* NSImageView+Rx.swift */,
+				CB832B311D1964E300C27230 /* NSProgressIndicator+Rx.swift */,
 				C8093EC91B8A732E0088E94D /* NSSlider+Rx.swift */,
 				C8093ECA1B8A732E0088E94D /* NSTextField+Rx.swift */,
+				CB832B381D19673900C27230 /* NSTextView+Rx.swift */,
 				C8BCD3F11C14B62B005F1280 /* NSView+Rx.swift */,
 			);
 			path = OSX;
@@ -2591,6 +2602,15 @@
 			path = Schedulers;
 			sourceTree = "<group>";
 		};
+		CB832B351D19667900C27230 /* Proxies */ = {
+			isa = PBXGroup;
+			children = (
+				CB832B361D19669100C27230 /* RxTextFieldDelegateProxy.swift */,
+				CB832B3A1D1967A900C27230 /* RxTextViewDelegateProxy.swift */,
+			);
+			path = Proxies;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -3450,6 +3470,8 @@
 				C80D339B1B922FB00014629D /* ControlProperty.swift in Sources */,
 				C8BCD3F51C14B6D1005F1280 /* NSLayoutConstraint+Rx.swift in Sources */,
 				C8093EF01B8A732E0088E94D /* KVOObserver.swift in Sources */,
+				CB832B331D19654700C27230 /* NSProgressIndicator+Rx.swift in Sources */,
+				CB832B391D19673900C27230 /* NSTextView+Rx.swift in Sources */,
 				C8093EEE1B8A732E0088E94D /* KVOObservable.swift in Sources */,
 				C8F6A1461BF0B9B2007DF367 /* NSObject+Rx+RawRepresentable.swift in Sources */,
 				C8093EE01B8A732E0088E94D /* CLLocationManager+Rx.swift in Sources */,
@@ -3466,11 +3488,13 @@
 				C80DDE941BCE69BA006A1832 /* ControlEvent+Driver.swift in Sources */,
 				C80DDEB21BCE8CA3006A1832 /* Driver+Operators+arity.swift in Sources */,
 				C811C89E1C24D80100A2DDD4 /* DeallocObservable.swift in Sources */,
+				CB832B3B1D1967A900C27230 /* RxTextViewDelegateProxy.swift in Sources */,
 				C8BCD3F21C14B62B005F1280 /* NSView+Rx.swift in Sources */,
 				C8093EE21B8A732E0088E94D /* DelegateProxy.swift in Sources */,
 				C8093EFA1B8A732E0088E94D /* RxCLLocationManagerDelegateProxy.swift in Sources */,
 				C8093EE61B8A732E0088E94D /* Logging.swift in Sources */,
 				C8093EF21B8A732E0088E94D /* NSNotificationCenter+Rx.swift in Sources */,
+				CB832B371D19669100C27230 /* RxTextFieldDelegateProxy.swift in Sources */,
 				C8093EF81B8A732E0088E94D /* NSURLSession+Rx.swift in Sources */,
 				C80DDE9C1BCE69BA006A1832 /* Driver+Operators.swift in Sources */,
 				C8093F4C1B8A732E0088E94D /* NSSlider+Rx.swift in Sources */,

RxCocoa/OSX/NSProgressIndicator+Rx.swift

@@ -0,0 +1,27 @@
+//
+//  NSProgressIndicator+Rx.swift
+//  Rx
+//
+//  Created by Junior B. on 21/06/16.
+//  Copyright © 2016 Krunoslav Zaher. All rights reserved.
+//
+
+import Foundation
+import Cocoa
+#if !RX_NO_MODULE
+import RxSwift
+#endif
+
+
+extension NSProgressIndicator {
+
+    /**
+    Bindable sink for `progress` property
+    */
+    public var rx_progress: AnyObserver<Double> {
+        return UIBindingObserver(UIElement: self) { progressView, progress in
+            progressView.doubleValue = progress
+        }.asObserver()
+    }
+
+}

RxCocoa/OSX/NSTextField+Rx.swift

@@ -12,70 +12,6 @@ import Cocoa
 import RxSwift
 #endif
 
-/**
- Delegate proxy for `NSTextField`.
-
- For more information take a look at `DelegateProxyType`.
-*/
-public class RxTextFieldDelegateProxy
-    : DelegateProxy
-    , NSTextFieldDelegate
-    , DelegateProxyType {
-
-    private let textSubject = PublishSubject<String>()
-
-    /**
-     Typed parent object.
-    */
-    public weak private(set) var textField: NSTextField?
-
-    /**
-     Initializes `RxTextFieldDelegateProxy`
-     
-     - parameter parentObject: Parent object for delegate proxy.
-    */
-    public required init(parentObject: AnyObject) {
-        self.textField = (parentObject as! NSTextField)
-        super.init(parentObject: parentObject)
-    }
-
-    // MARK: Delegate methods
-
-    public override func controlTextDidChange(notification: NSNotification) {
-        let textField = notification.object as! NSTextField
-        let nextValue = textField.stringValue
-        self.textSubject.on(.Next(nextValue))
-    }
-
-    // MARK: Delegate proxy methods
-
-    /**
-    For more information take a look at `DelegateProxyType`.
-    */
-    public override class func createProxyForObject(object: AnyObject) -> AnyObject {
-        let control = (object as! NSTextField)
-
-        return castOrFatalError(control.rx_createDelegateProxy())
-    }
-
-    /**
-    For more information take a look at `DelegateProxyType`.
-    */
-    public class func currentDelegateFor(object: AnyObject) -> AnyObject? {
-        let textField: NSTextField = castOrFatalError(object)
-        return textField.delegate
-    }
-
-    /**
-    For more information take a look at `DelegateProxyType`.
-    */
-    public class func setCurrentDelegate(delegate: AnyObject?, toObject object: AnyObject) {
-        let textField: NSTextField = castOrFatalError(object)
-        textField.delegate = castOptionalOrFatalError(delegate)
-    }
-    
-}
-
 extension NSTextField : RxTextInput {
 
     /**

RxCocoa/OSX/NSTextView+Rx.swift

@@ -0,0 +1,51 @@
+//
+//  NSTextView+Rx.swift
+//  Rx
+//
+//  Created by Junior B. on 21/06/16.
+//  Copyright © 2016 Krunoslav Zaher. All rights reserved.
+//
+
+import Foundation
+import Cocoa
+#if !RX_NO_MODULE
+    import RxSwift
+#endif
+
+extension NSTextView {
+    
+    /**
+     Factory method that enables subclasses to implement their own `rx_delegate`.
+     
+     - returns: Instance of delegate proxy that wraps `delegate`.
+     */
+    public func rx_createDelegateProxy() -> RxTextViewDelegateProxy {
+        return RxTextViewDelegateProxy(parentObject: self)
+    }
+    
+    /**
+     Reactive wrapper for `delegate`.
+     
+     For more information take a look at `DelegateProxyType` protocol documentation.
+     */
+    public var rx_delegate: DelegateProxy {
+        return RxTextViewDelegateProxy.proxyForObject(self)
+    }
+    
+    /**
+     Reactive wrapper for `attributedString` property.
+     */
+    public var rx_textStorage: ControlProperty<NSAttributedString> {
+        let delegate = RxTextViewDelegateProxy.proxyForObject(self)
+        
+        let source = Observable.deferred { [weak self] in
+            delegate.textSubject.startWith(self?.textStorage ?? NSTextStorage())
+            }.takeUntil(rx_deallocated)
+        
+        let observer = UIBindingObserver(UIElement: self) { control, value in
+            control.textStorage?.setAttributedString(value)
+        }
+        
+        return ControlProperty(values: source, valueSink: observer.asObserver())
+    }
+}

RxCocoa/OSX/Proxies/RxTextFieldDelegateProxy.swift

@@ -0,0 +1,77 @@
+//
+//  RxTextFieldDelegateProxy.swift
+//  Rx
+//
+//  Created by Junior B. on 21/06/16.
+//  Copyright © 2016 Krunoslav Zaher. All rights reserved.
+//
+
+import Foundation
+import Cocoa
+#if !RX_NO_MODULE
+import RxSwift
+#endif
+
+/**
+ Delegate proxy for `NSTextField`.
+ 
+ For more information take a look at `DelegateProxyType`.
+ */
+public class RxTextFieldDelegateProxy
+    : DelegateProxy
+    , NSTextFieldDelegate
+, DelegateProxyType {
+    
+    public let textSubject = PublishSubject<String>()
+    
+    /**
+     Typed parent object.
+     */
+    public weak private(set) var textField: NSTextField?
+    
+    /**
+     Initializes `RxTextFieldDelegateProxy`
+     
+     - parameter parentObject: Parent object for delegate proxy.
+     */
+    public required init(parentObject: AnyObject) {
+        self.textField = (parentObject as! NSTextField)
+        super.init(parentObject: parentObject)
+    }
+    
+    // MARK: Delegate methods
+    
+    public override func controlTextDidChange(notification: NSNotification) {
+        let textField = notification.object as! NSTextField
+        let nextValue = textField.stringValue
+        self.textSubject.on(.Next(nextValue))
+    }
+    
+    // MARK: Delegate proxy methods
+    
+    /**
+     For more information take a look at `DelegateProxyType`.
+     */
+    public override class func createProxyForObject(object: AnyObject) -> AnyObject {
+        let control = (object as! NSTextField)
+        
+        return castOrFatalError(control.rx_createDelegateProxy())
+    }
+    
+    /**
+     For more information take a look at `DelegateProxyType`.
+     */
+    public class func currentDelegateFor(object: AnyObject) -> AnyObject? {
+        let textField: NSTextField = castOrFatalError(object)
+        return textField.delegate
+    }
+    
+    /**
+     For more information take a look at `DelegateProxyType`.
+     */
+    public class func setCurrentDelegate(delegate: AnyObject?, toObject object: AnyObject) {
+        let textField: NSTextField = castOrFatalError(object)
+        textField.delegate = castOptionalOrFatalError(delegate)
+    }
+    
+}

RxCocoa/OSX/Proxies/RxTextViewDelegateProxy.swift

@@ -0,0 +1,76 @@
+//
+//  RxTextViewDelegateProxy.swift
+//  Rx
+//
+//  Created by Junior B. on 21/06/16.
+//  Copyright © 2016 Krunoslav Zaher. All rights reserved.
+//
+
+import Foundation
+import Cocoa
+#if !RX_NO_MODULE
+    import RxSwift
+#endif
+
+/**
+ Delegate proxy for `NSTextView`.
+ 
+ For more information take a look at `DelegateProxyType`.
+ */
+public class RxTextViewDelegateProxy
+    : DelegateProxy
+    , NSTextViewDelegate
+, DelegateProxyType {
+    
+    public let textSubject = PublishSubject<NSAttributedString>()
+    
+    /**
+     Typed parent object.
+     */
+    public weak private(set) var textView: NSTextView?
+    
+    /**
+     Initializes `RxTextViewDelegateProxy`
+     
+     - parameter parentObject: Parent object for delegate proxy.
+     */
+    public required init(parentObject: AnyObject) {
+        self.textView = (parentObject as! NSTextView)
+        super.init(parentObject: parentObject)
+    }
+    
+    // MARK: Delegate methods
+    
+    public override func controlTextDidChange(notification: NSNotification) {
+        let textView = notification.object as! NSTextView
+        let nextValue = textView.attributedString()
+        self.textSubject.on(.Next(nextValue))
+    }
+    
+    // MARK: Delegate proxy methods
+    
+    /**
+     For more information take a look at `DelegateProxyType`.
+     */
+    public override class func createProxyForObject(object: AnyObject) -> AnyObject {
+        let control = (object as! NSTextField)
+        
+        return castOrFatalError(control.rx_createDelegateProxy())
+    }
+    
+    /**
+     For more information take a look at `DelegateProxyType`.
+     */
+    public class func currentDelegateFor(object: AnyObject) -> AnyObject? {
+        let textField: NSTextField = castOrFatalError(object)
+        return textField.delegate
+    }
+    
+    /**
+     For more information take a look at `DelegateProxyType`.
+     */
+    public class func setCurrentDelegate(delegate: AnyObject?, toObject object: AnyObject) {
+        let textField: NSTextField = castOrFatalError(object)
+        textField.delegate = castOptionalOrFatalError(delegate)
+    }
+}