From 3ec88fcf7efa56d9e9991822f5471a5534180e8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fl=C3=A1vio=20Caetano?= <flavio@vieiracaetano.com>
Date: Tue, 6 Mar 2018 19:06:18 -0300
Subject: [PATCH] Fix: Using Single for rx.validate

fix #26
---
 .../xcshareddata/xcschemes/ReCaptcha-Example.xcscheme    | 2 +-
 .../ReCaptcha_Tests/RxSwift/ReCaptcha+Rx__Tests.swift    | 2 +-
 ReCaptcha/Classes/Rx/ReCaptcha+Rx.swift                  | 9 ++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Example/ReCaptcha.xcodeproj/xcshareddata/xcschemes/ReCaptcha-Example.xcscheme b/Example/ReCaptcha.xcodeproj/xcshareddata/xcschemes/ReCaptcha-Example.xcscheme
index 332962e..81d7408 100644
--- a/Example/ReCaptcha.xcodeproj/xcshareddata/xcschemes/ReCaptcha-Example.xcscheme
+++ b/Example/ReCaptcha.xcodeproj/xcshareddata/xcschemes/ReCaptcha-Example.xcscheme
@@ -55,7 +55,7 @@
             </BuildableReference>
          </TestableReference>
          <TestableReference
-            skipped = "YES">
+            skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "F28FAC9B200E425600E14987"
diff --git a/Example/ReCaptcha_Tests/RxSwift/ReCaptcha+Rx__Tests.swift b/Example/ReCaptcha_Tests/RxSwift/ReCaptcha+Rx__Tests.swift
index c38d738..61f4c7d 100644
--- a/Example/ReCaptcha_Tests/RxSwift/ReCaptcha+Rx__Tests.swift
+++ b/Example/ReCaptcha_Tests/RxSwift/ReCaptcha+Rx__Tests.swift
@@ -90,7 +90,7 @@ class ReCaptcha_Rx__Tests: XCTestCase {
             _ = try manager.rx.validate(on: presenterView, resetOnError: false)
                 .toBlocking()
                 .single()
-                
+
             XCTFail("should have thrown exception")
         }
         catch let error {
diff --git a/ReCaptcha/Classes/Rx/ReCaptcha+Rx.swift b/ReCaptcha/Classes/Rx/ReCaptcha+Rx.swift
index 29d8123..72bce5d 100644
--- a/ReCaptcha/Classes/Rx/ReCaptcha+Rx.swift
+++ b/ReCaptcha/Classes/Rx/ReCaptcha+Rx.swift
@@ -30,16 +30,14 @@ public extension Reactive where Base: ReCaptchaWebViewManager {
      - See: `ReCaptchaWebViewManager.stop()`
      */
     func validate(on view: UIView, resetOnError: Bool = true) -> Observable<String> {
-        return Observable<String>.create { [weak base] (observer: AnyObserver<String>) in
+        return Single<String>.create { [weak base] single in
             base?.validate(on: view, resetOnError: resetOnError) { result in
-                defer { observer.onCompleted() }
-
                 switch result {
                 case .token(let token):
-                    observer.onNext(token)
+                    single(.success(token))
 
                 case .error(let error):
-                    observer.onError(error)
+                    single(.error(error))
                 }
             }
 
@@ -47,6 +45,7 @@ public extension Reactive where Base: ReCaptchaWebViewManager {
                 base?.stop()
             }
         }
+        .asObservable()
     }
 
     /**