Merge pull request #101 from IntrepidPursuits/ben/swift-3-fixes

Fixes for Swift 3

Author: Benuuu

Intrepid.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "Intrepid"
-  s.version       = "0.6.4"
+  s.version       = "0.6.5"
   s.summary       = "Swift Bag"
   s.description   = <<-DESC
                     Collection of extensions and utility classes by and for the developers at Intrepid Pursuits.
@@ -35,7 +35,7 @@ Pod::Spec.new do |s|
 
   s.subspec "Rx" do |rx|
     rx.source_files = "SwiftWisdom/Rx/**/**/*.swift"
-    rx.dependency 'RxSwift', '~> 3.0.0-beta.2'
-    rx.dependency 'RxCocoa', '~> 3.0.0-beta.2'
+    rx.dependency 'RxSwift', '~> 3.0'
+    rx.dependency 'RxCocoa', '~> 3.0'
   end
 end

Podfile

@@ -6,8 +6,8 @@ use_frameworks!
 
 def commonpods
   pod 'IP-UIKit-Wisdom'
-    pod 'RxSwift', '~> 3.0.0-beta.2'
-    pod 'RxCocoa', '~> 3.0.0-beta.2'
+    pod 'RxSwift', '~> 3.0'
+    pod 'RxCocoa', '~> 3.0'
 end
 
 target 'SwiftWisdom' do

Podfile.lock

@@ -1,19 +1,19 @@
 PODS:
   - IP-UIKit-Wisdom (0.0.9)
-  - RxCocoa (3.0.0-beta.2):
-    - RxSwift (~> 3.0.0-beta.2)
-  - RxSwift (3.0.0-beta.2)
+  - RxCocoa (3.0.1):
+    - RxSwift (~> 3.0)
+  - RxSwift (3.0.1)
 
 DEPENDENCIES:
   - IP-UIKit-Wisdom
-  - RxCocoa (~> 3.0.0-beta.2)
-  - RxSwift (~> 3.0.0-beta.2)
+  - RxCocoa (~> 3.0)
+  - RxSwift (~> 3.0)
 
 SPEC CHECKSUMS:
   IP-UIKit-Wisdom: cd9838571e97427a0c61c05d856eaaca9afd7c1a
-  RxCocoa: 1dd105d8a4e18034ccd7bd6d136445363ce67c8e
-  RxSwift: 0ea939d7d97cb70657190ffde8dc2a9b455778fc
+  RxCocoa: 15a52fc590dcc700cb4a690a633b5c5184ce3a78
+  RxSwift: af5680055c4ad04480189c52d28385b1029493a6
 
-PODFILE CHECKSUM: 2bfd837187f1f7fb6440b6bf36db8dda31ef7394
+PODFILE CHECKSUM: 06dd8b46b0e948c45fae0b822db630434644df71
 
 COCOAPODS: 1.1.1

SwiftWisdom/Core/Downloader/Downloader.swift

@@ -86,11 +86,11 @@ extension URLSessionTask {
 // MARK: Operator Overloads
 
 extension Downloader {
-    public static func == (lhs: Downloader, rhs: Downloader) -> Bool {
+    @nonobjc public static func == (lhs: Downloader, rhs: Downloader) -> Bool {
         return lhs.id == rhs.id
     }
 
-    public static func != (lhs: Downloader, rhs: Downloader) -> Bool {
+    @nonobjc public static func != (lhs: Downloader, rhs: Downloader) -> Bool {
         return !(lhs == rhs)
     }
 }

SwiftWisdom/Core/Foundation/Time/NSDate+Comparable.swift

@@ -10,16 +10,16 @@ import Foundation
 // Date already conforms to comparable. But NSDate does not.
 
 extension NSDate : Comparable {
-    public static func < (lhs: NSDate, rhs: NSDate) -> Bool {
+    @nonobjc public static func < (lhs: NSDate, rhs: NSDate) -> Bool {
         return lhs.timeIntervalSince1970 < rhs.timeIntervalSince1970
     }
-    public static func <= (lhs: NSDate, rhs: NSDate) -> Bool {
+    @nonobjc public static func <= (lhs: NSDate, rhs: NSDate) -> Bool {
         return lhs.timeIntervalSince1970 <= rhs.timeIntervalSince1970
     }
-    public static func >= (lhs: NSDate, rhs: NSDate) -> Bool {
+    @nonobjc public static func >= (lhs: NSDate, rhs: NSDate) -> Bool {
         return lhs.timeIntervalSince1970 >= rhs.timeIntervalSince1970
     }
-    public static func > (lhs: NSDate, rhs: NSDate) -> Bool {
+    @nonobjc public static func > (lhs: NSDate, rhs: NSDate) -> Bool {
         return lhs.timeIntervalSince1970 > rhs.timeIntervalSince1970
     }
 }

SwiftWisdom/Rx/Rx+Extensions.swift

@@ -23,18 +23,20 @@ infix operator <-> : Binding
 infix operator <- : Binding
 infix operator >>> : Disposing
 
-public func <- <T>(property: AnyObserver<T>, variable: Observable<T>) -> Disposable {
-    return variable
-        .observeOn(MainScheduler.instance)
-        .bindTo(property)
+public func <- <T: ObserverType, O: ObservableType>(observer: T, observable: O) -> Disposable where T.E == O.E {
+    return observable.observeOn(MainScheduler.instance).bindTo(observer)
+}
+
+public func <- <T: ObserverType, O>(observer: T, variable: Variable<O>) -> Disposable where T.E == O {
+    return observer <- variable.asObservable()
 }
 
-public func <- <T>(property: AnyObserver<T>, variable: Variable<T>) -> Disposable {
-    return property <- variable.asObservable()
+public func <- <T, O: ObservableType>(variable: Variable<T>, observable: O) -> Disposable where O.E == T {
+    return observable.bindTo(variable)
 }
 
-public func <- <T>(variable: Variable<T>, property: ControlProperty<T>) -> Disposable {
-    return property.bindTo(variable)
+public func <- <T>(observer: Variable<T>, observable: Variable<T>) -> Disposable {
+    return observer <- observable.asObservable()
 }
 
 public func >>> (disposable: Disposable, disposeBag: DisposeBag) {

SwiftWisdomTests/Rx/Rx+ExtensionsTest.swift

@@ -6,6 +6,43 @@ import RxCocoa
 
 class OperatorTests: XCTestCase {
 
+    func testVariableBinding() {
+        let disposeBag = DisposeBag()
+        let label = UILabel()
+        let variable = Variable<String?>(nil)
+
+        label.rx.text <- variable >>> disposeBag
+        XCTAssertEqual(nil, label.text)
+
+        variable.value = "hello"
+        XCTAssertEqual("hello", label.text)
+
+        variable.value = nil
+        XCTAssertEqual(nil, label.text)
+    }
+
+    func testObserverBinding() {
+        let disposeBag = DisposeBag()
+        let button = UIButton()
+        let observable = Observable<String?>.just("hello")
+        XCTAssertEqual(nil, button.title(for: .normal))
+        button.rx.title(for: .normal) <- observable >>> disposeBag
+        XCTAssertEqual("hello", button.title(for: .normal))
+    }
+
+    func testBindingToVariable() {
+        let disposeBag = DisposeBag()
+        let sut = Variable<String>("")
+        let variable = Variable<String>("hello")
+
+        sut <- variable >>> disposeBag
+        XCTAssertEqual(variable.value, sut.value)
+        XCTAssertEqual("hello", sut.value)
+
+        variable.value = "world"
+        XCTAssertEqual(variable.value, sut.value)
+    }
+
     func testAddCompositeDisposable() {
         let compositeDisposable = CompositeDisposable()
         let observable = Observable<String?>.never()