update removing throwable

Author: michaelhenry

Example/RxRetroSwift/Models/ErrorModel.swift

@@ -9,7 +9,8 @@
 import Foundation
 import RxRetroSwift
 
-struct ErrorModel:HasErrorCode, Codable {
+struct ErrorModel:HasErrorInfo, Codable {
 
   var errorCode: Int?
+  var errorDetail: String?
 }

README.md

@@ -8,11 +8,9 @@
 
 ## What does it do?
 
-What does it do?
+It simplifies your **RESTful API** calls, automatically convert the `HttpResponse` into specified Model as well as the Error using the new apple ’s [Codable](https://developer.apple.com/documentation/swift/codable) feature.
 
-It simplifies your RESTful API calls, automatically convert the `HttpResponse` into specified Model as well as the Error using the new apple ’s [Codable](https://developer.apple.com/documentation/swift/codable) feature.
-
-For example in a request for fetching specific user information and you have a `User` model, all you have to do is make the User model conforms to [Codable] and specify it when using the [RequestCaller](Sources/Services/RequestCaller.swift).
+For example in a request for fetching specific user information and you have a `User` model, all you have to do is make the User model conforms to [Codable](https://developer.apple.com/documentation/swift/codable) and specify it when using the [RequestCaller](Sources/Services/RequestCaller.swift).
 
 ```json
 {
@@ -60,10 +58,10 @@ func fetchUsers() -> Observable<Result<[User], ErrorModel>> {
 
 About handling ResponseError:
 
-**RxRetroSwift** provided a typealias **ErrorCodable** which is a combination of [HasErrorCode](Sources/Protocols/HasErrorCode.swift) and [Decodable](https://developer.apple.com/documentation/swift/decodable) protocol:
+**RxRetroSwift** provided a typealias **ErrorCodable** which is a combination of [HasErrorInfo](Sources/Protocols/HasErrorInfo.swift) and [Decodable](https://developer.apple.com/documentation/swift/decodable) protocol:
 
 ```Swift
-public typealias CodableError = Decodable & HasErrorCode
+public typealias DecodableError = Decodable & HasErrorInfo
 ```
 
 For example, the json error response of your login request is
@@ -87,6 +85,30 @@ struct ErrorModel {
 }
 ```
 
+How about dealing to a request that don't expect to return an object or model?
+
+**RxRetroSwift** provide a method that will return Observable<Result<[RawResponse](Sources/RxRetroSwift/Models/RawResponse.swift)>, DecodableErrorModel>>.
+
+```swift
+
+public func call<DecodableErrorModel:DecodableError>(_ request: URLRequest)
+  -> Observable<Result<RawResponse, DecodableErrorModel>>
+```
+
+```swift
+
+public struct RawResponse {
+  
+  public var statusCode:Int
+  public var data:Data?
+  
+  init(statusCode:Int, data:Data?) {
+    self.statusCode = statusCode
+    self.data       = data
+  }
+}
+```
+
 ## Example
 
 To run the example project, clone the repo, and run `pod install` from the Example directory first.

…/RxRetroSwift/Models/PlainResponse.swift …es/RxRetroSwift/Models/RawResponse.swiftSources/RxRetroSwift/Models/PlainResponse.swift renamed to Sources/RxRetroSwift/Models/RawResponse.swift Sources/RxRetroSwift/Models/PlainResponse.swift renamed to Sources/RxRetroSwift/Models/RawResponse.swift

@@ -1,5 +1,5 @@
 //
-//  PlainResponse.swift
+//  RawResponse.swift
 //  Nimble
 //
 //  Created by Michael Pantaleon on 2018/03/28.

…xRetroSwift/Protocols/HasErrorCode.swift …xRetroSwift/Protocols/HasErrorInfo.swiftSources/RxRetroSwift/Protocols/HasErrorCode.swift renamed to Sources/RxRetroSwift/Protocols/HasErrorInfo.swift Sources/RxRetroSwift/Protocols/HasErrorCode.swift renamed to Sources/RxRetroSwift/Protocols/HasErrorInfo.swift

@@ -7,9 +7,10 @@
 
 import Foundation
 
-public protocol HasErrorCode {
+public protocol HasErrorInfo {
 
   var errorCode:Int? { get set }
+  var errorDetail:String? { get set }
 
   init()
 }

Sources/RxRetroSwift/Services/RequestCaller.swift

@@ -9,7 +9,7 @@ import Foundation
 import RxSwift
 import RxCocoa
 
-public typealias DecodableError = Decodable & HasErrorCode
+public typealias DecodableError = Decodable & HasErrorInfo
 
 public class RequestCaller{
 
@@ -38,17 +38,21 @@ public class RequestCaller{
 
             if let httpResponse = response as? HTTPURLResponse{
               let statusCode = httpResponse.statusCode
-              if let value = data,
-                let objs = try? _self.decoder.decode(ItemModel.self, from: value) {
-                observer.onNext(Result.successful(objs))
-              } else if let value = data,
-                var error = try? _self.decoder.decode(DecodableErrorModel.self, from: value) {
-                error.errorCode = statusCode
-                observer.onNext(Result.failure(error))
-              } else {
-                var error = DecodableErrorModel()
-                error.errorCode = statusCode
-                observer.onNext(Result.failure(error))
+              
+              do {
+                if (200...399).contains(statusCode) {
+                  let objs = try _self.decoder.decode(ItemModel.self, from: data!)
+                  observer.onNext(Result.successful(objs))
+                } else {
+                  var error = try _self.decoder.decode(DecodableErrorModel.self, from: data!)
+                  error.errorCode = statusCode
+                  observer.onNext(Result.failure(error))
+                }
+              } catch {
+                var decodingError = DecodableErrorModel()
+                decodingError.errorCode = -1
+                decodingError.errorDetail = error.localizedDescription
+                observer.onNext(Result.failure(decodingError))
               }
             }
             observer.on(.completed)
@@ -60,7 +64,6 @@ public class RequestCaller{
       }
   }
 
-  
   public func call<DecodableErrorModel:DecodableError>(_ request: URLRequest)
     -> Observable<Result<RawResponse, DecodableErrorModel>> {
 
@@ -73,20 +76,25 @@ public class RequestCaller{
 
             if let httpResponse = response as? HTTPURLResponse{
               let statusCode = httpResponse.statusCode
-              if (200...399).contains(statusCode) {
-                let plainResponse = RawResponse(statusCode: statusCode, data: data)
-                observer.onNext(Result.successful(plainResponse))
-              } else if let value = data,
-                var error = try? _self.decoder.decode(DecodableErrorModel.self, from: value) {
-                error.errorCode = statusCode
-                observer.onNext(Result.failure(error))
-              } else {
-                var error = DecodableErrorModel()
-                error.errorCode = statusCode
-                observer.onNext(Result.failure(error))
+              
+              do {
+                if (200...399).contains(statusCode) {
+                  let plainResponse = RawResponse(statusCode: statusCode, data: data)
+                  observer.onNext(Result.successful(plainResponse))
+                } else {
+                  var error = try _self.decoder.decode(DecodableErrorModel.self, from: data!)
+                  error.errorCode = statusCode
+                  observer.onNext(Result.failure(error))
+                }
+                
+              } catch {
+                var decodingError = DecodableErrorModel()
+                decodingError.errorCode = -1
+                decodingError.errorDetail = error.localizedDescription
+                observer.onNext(Result.failure(decodingError))
               }
+              observer.on(.completed)
             }
-            observer.on(.completed)
         }
         task.resume()
         return Disposables.create {