Merge branch 'feature/error_message'

# Conflicts:
#	README.md
#	Sources/RxRetroSwift/Protocols/HasErrorInfo.swift
#	Sources/RxRetroSwift/Services/RequestCaller.swift

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

@@ -34,34 +34,34 @@ Example:
 
 let caller = RequestCaller(config: URLSessionConfiguration.default)
 
-func fetchUser(byUserId userId) throws -> Observable<Result<User, ErrorModel>> {
+func fetchUser(byUserId userId) -> Observable<Result<User, ErrorModel>> {
     let request:URLRequest = RequestModel(
       httpMethod: .get,
       path: "v1/users/\(userId)")
       .asURLRequest()
-    return try caller.call(request)
+    return caller.call(request)
   }
 ```
 
 **Let say it’s an array of users; since Array conforms to Codable, all you have to do is specify the type to be `[User]`.**
 
 Example:
 ```Swift
-func fetchUsers() throws -> Observable<Result<[User], ErrorModel>> {
+func fetchUsers() -> Observable<Result<[User], ErrorModel>> {
     let request:URLRequest = RequestModel(
       httpMethod: .get,
       path: "v1/users")
       .asURLRequest()
-    return try caller.call(request)
+    return caller.call(request)
   }
 ```
 
 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
@@ -91,7 +91,7 @@ How about dealing to a request that don't expect to return an object or model?
 
 ```swift
 
-public func call<DecodableErrorModel:DecodableError>(_ request: URLRequest) throws
+public func call<DecodableErrorModel:DecodableError>(_ request: URLRequest)
   -> Observable<Result<RawResponse, DecodableErrorModel>>
 ```
 
@@ -162,69 +162,69 @@ class APIClient {
     RequestModel.defaults.baseUrl = "https://jsonplaceholder.typicode.com"
   }
 
-  func fetchPosts() throws -> Observable<Result<[Post], ErrorModel>> {
+  func fetchPosts() -> Observable<Result<[Post], ErrorModel>> {
     let request = RequestModel(
       httpMethod: .get,
       path: "posts")
       .asURLRequest()
 
-    return try caller.call(request)
+    return caller.call(request)
   }
 
-  func insertPost(post:Post) throws -> Observable<Result<Post, ErrorModel>> {
+  func insertPost(post:Post) -> Observable<Result<Post, ErrorModel>> {
     let request = RequestModel(
       httpMethod: .post,
       path: "posts",
       payload: post.dictionaryValue)
       .asURLRequest()
 
-    return try caller.call(request)
+    return caller.call(request)
   }
 
-  func fetchComments() throws -> Observable<Result<[Comment], ErrorModel>> {
+  func fetchComments() -> Observable<Result<[Comment], ErrorModel>> {
     let request = RequestModel(
       httpMethod: .get,
       path: "comments")
       .asURLRequest()
 
-    return try caller.call(request)
+    return caller.call(request)
   }
 
-  func fetchAlbums() throws -> Observable<Result<[Album], ErrorModel>> {
+  func fetchAlbums() -> Observable<Result<[Album], ErrorModel>> {
     let request = RequestModel(
       httpMethod: .get,
       path: "albums")
       .asURLRequest()
 
-    return try caller.call(request)
+    return caller.call(request)
   }
 
-  func fetchPhotos() throws -> Observable<Result<[Photo], ErrorModel>> {
+  func fetchPhotos() -> Observable<Result<[Photo], ErrorModel>> {
     let request = RequestModel(
       httpMethod: .get,
       path: "photos")
       .asURLRequest()
 
-    return try caller.call(request)
+    return caller.call(request)
   }
 
-  func fetchTodos() throws -> Observable<Result<[Todo], ErrorModel>> {
+  func fetchTodos() -> Observable<Result<[Todo], ErrorModel>> {
     let request = RequestModel(
       httpMethod: .get,
       path: "todos")
       .asURLRequest()
 
-    return try caller.call(request)
+    return caller.call(request)
   }
 
-  func fetchUsers() throws -> Observable<Result<[User],ErrorModel>> {
+  func fetchUsers() -> Observable<Result<[User],ErrorModel>> {
 
     let request = RequestModel(
       httpMethod: .get,
       path: "users")
       .asURLRequest()
 
-    return try caller.call(request)
+    return caller.call(request)
   }
 }
 ```
@@ -305,3 +305,7 @@ Michael Henry Pantaleon, me@iamkel.net
 ## License
 
 RxRetroSwift is available under the MIT license. See the LICENSE file for more info.
+
+
+
+

…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,7 +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{
 
@@ -26,7 +26,7 @@ public class RequestCaller{
     self.config = config
   }
 
-  public func call<ItemModel:Decodable, DecodableErrorModel:DecodableError>(_ request: URLRequest) throws
+  public func call<ItemModel:Decodable, DecodableErrorModel:DecodableError>(_ request: URLRequest)
     -> Observable<Result<ItemModel, DecodableErrorModel>> {
 
       return Observable.create { [weak self] observer in
@@ -38,13 +38,21 @@ public class RequestCaller{
 
             if let httpResponse = response as? HTTPURLResponse{
               let statusCode = httpResponse.statusCode
-              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))
+              
+              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)
@@ -56,7 +64,7 @@ public class RequestCaller{
       }
   }
 
-  public func call<DecodableErrorModel:DecodableError>(_ request: URLRequest) throws
+  public func call<DecodableErrorModel:DecodableError>(_ request: URLRequest)
     -> Observable<Result<RawResponse, DecodableErrorModel>> {
 
       return Observable.create { [weak self] observer in
@@ -68,13 +76,22 @@ 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 {
-                var error = try! _self.decoder.decode(DecodableErrorModel.self, from: data!)
-                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)
             }