Merge pull request #26 from hamtiko/master

Adding validation to response

Author: hamtiko

Example/Podfile

@@ -1,4 +1,4 @@
-platform :ios, '9.3'
+platform :ios, '10.0'
 
 use_frameworks!
 

Example/Podfile.lock

@@ -18,7 +18,7 @@ PODS:
     - RxSwift (~> 5)
   - RxRelay (5.0.0):
     - RxSwift (~> 5)
-  - RxRestClient (1.2.0):
+  - RxRestClient (1.2.1):
     - Alamofire (~> 4)
     - RxAlamofire (~> 5)
     - RxCocoa (~> 5)
@@ -65,10 +65,10 @@ SPEC CHECKSUMS:
   RxCocoa: fcf32050ac00d801f34a7f71d5e8e7f23026dcd8
   RxOptional: 9904e2219d59260c3c171273d475b2126de187e8
   RxRelay: 4f7409406a51a55cd88483f21ed898c234d60f18
-  RxRestClient: 8bffa40d201a99a25e6537921bed2c596a7cc908
+  RxRestClient: 4bf25b1d2355c6f6815d0d71f2f6e32e3d34f0d9
   RxSwift: 8b0671caa829a763bbce7271095859121cbd895f
   SDWebImage: 3f3f0c02f09798048c47a5ed0a13f17b063572d8
 
-PODFILE CHECKSUM: e36ea5b45e7317f482ff7b8fb57fc3a886f1a890
+PODFILE CHECKSUM: c8e4a5269ca34cd9b67088527c787471660ff793
 
 COCOAPODS: 1.7.0

Example/RxRestClient.xcodeproj/project.pbxproj

@@ -562,7 +562,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -611,7 +611,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";

RxRestClient.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'RxRestClient'
-  s.version          = '1.2.0'
+  s.version          = '1.2.1'
   s.summary          = 'Simple REST Client based on RxSwift and Alamofire.'
   s.swift_version = '5.0'
 
@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
   s.author           = { 'Tigran Hambardzumyan' => 'tigran@stdevmail.com' }
   s.source           = { :git => 'https://github.com/stdevteam/RxRestClient.git', :tag => s.version.to_s }
 
-  s.ios.deployment_target = '9.3'
+  s.ios.deployment_target = '10.0'
 
   s.source_files = 'RxRestClient/Classes/**/*'
 

RxRestClient/Classes/Models/BaseResponse.swift

@@ -16,7 +16,7 @@ import Foundation
 /// - notFound: When recieve **404** status code from server.
 /// - validationProblem: When recieve **422** status code from server.
 /// - unexpectedError: When recieve `Internal Sever Error`.
-public enum BaseResponse {
+public enum BaseResponse: Error {
     case serviceOffline
 
     case badRequest(body: Any?)

RxRestClient/Classes/RxRestClient.swift

@@ -466,6 +466,9 @@ open class RxRestClient {
     /// - Returns: An observable of a the response state
     public func run<T: ResponseState>(_ request: Observable<DataRequest>) -> Observable<T> {
         return request
+            .validate { [unowned self] request, response, data in
+                return self.validate(request, response, data)
+            }
             .flatMap { [options] request -> Observable<(HTTPURLResponse, T.Body?)> in
                 options.logger?.log(request)
 
@@ -476,16 +479,17 @@ open class RxRestClient {
                     return request.rx.responseData().map { ($0.0, $0.1 as? T.Body) }
                 }
             }
-            .retry(options.retryCount)
             .observeOn(backgroundWorkScheduler)
             .map { (httpResponse, body) -> RestResponseStatus in
-
-                if let response = RxRestClient.checkBaseResponse(httpResponse, body) {
-                    return .base(state: RxRestClient.checkBaseState(response: response))
-                } else {
-                    return .custom(response: (httpResponse, body))
+                return .custom(response: (httpResponse, body))
+            }
+            .catchError { e in
+                if let response = e as? BaseResponse {
+                    return Observable.just(.base(state: RxRestClient.checkBaseState(response: response)))
                 }
+                return Observable.error(e)
             }
+            .retry(options.retryCount)
             .retryOnBecomesReachable(.base(state: BaseState.offline), reachabilityService: reachabilityService)
             .flatMap { response -> Observable<T> in
                 switch response {
@@ -670,6 +674,21 @@ open class RxRestClient {
         )
     }
 
+    /// Do validation of response
+    ///
+    /// - Parameters:
+    ///   - request: URL Request
+    ///   - response: URL Response
+    ///   - data: Response body
+    /// - Returns: ValidationResult
+    open func validate(_ request: URLRequest?, _ response: HTTPURLResponse, _ data: Data?) -> Request.ValidationResult {
+
+        if let baseResponse = RxRestClient.checkBaseResponse(response, data) {
+            return .failure(baseResponse)
+        }
+        return .success
+    }
+
     // MARK: - Checking base response cases
     /// Checking base response cases.
     ///