update example and readme, removed objectmapper

michaelhenry · michaelhenry · commit 5c3ddf9d3b45 · 2018-03-20T15:36:43.000+09:00
diff --git a/Example/RxRetroSwift/Models/Address.swift b/Example/RxRetroSwift/Models/Address.swift
@@ -7,8 +7,6 @@
 //
 
 import Foundation
-import ObjectMapper
-import RxRetroSwift
 
 struct Address:Codable {
  
diff --git a/Example/RxRetroSwift/Models/Album.swift b/Example/RxRetroSwift/Models/Album.swift
@@ -7,8 +7,6 @@
 //
 
 import Foundation
-import ObjectMapper
-
 
 struct Album:Codable {
   
diff --git a/Example/RxRetroSwift/Models/Comment.swift b/Example/RxRetroSwift/Models/Comment.swift
@@ -7,8 +7,6 @@
 //
 
 import Foundation
-import ObjectMapper
-
 
 struct Comment:Codable {
   
diff --git a/Example/RxRetroSwift/Models/Company.swift b/Example/RxRetroSwift/Models/Company.swift
@@ -7,8 +7,6 @@
 //
 
 import Foundation
-import ObjectMapper
-import RxRetroSwift
 
 struct Company:Codable {
   
diff --git a/Example/RxRetroSwift/Models/ErrorModel.swift b/Example/RxRetroSwift/Models/ErrorModel.swift
@@ -7,13 +7,9 @@
 //
 
 import Foundation
-import ObjectMapper
 import RxRetroSwift
-import RxCocoa
-import RxSwift
 
 struct ErrorModel:HasErrorCode, Codable {
   
   var errorCode: Int = 0
-
 }
diff --git a/Example/RxRetroSwift/Models/Photo.swift b/Example/RxRetroSwift/Models/Photo.swift
@@ -7,8 +7,6 @@
 //
 
 import Foundation
-import ObjectMapper
-
 
 struct Photo:Codable {
   
diff --git a/Example/RxRetroSwift/Models/Post.swift b/Example/RxRetroSwift/Models/Post.swift
@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import ObjectMapper
 
 struct Post:Codable {
   
diff --git a/Example/RxRetroSwift/Models/Todo.swift b/Example/RxRetroSwift/Models/Todo.swift
@@ -7,8 +7,6 @@
 //
 
 import Foundation
-import ObjectMapper
-
 
 struct Todo:Codable {
   
diff --git a/Example/RxRetroSwift/Models/User.swift b/Example/RxRetroSwift/Models/User.swift
@@ -6,8 +6,6 @@
 //  Copyright © 2018 iamkel.net. All rights reserved.
 //
 import Foundation
-import ObjectMapper
-import RxRetroSwift
 
 struct User:Codable {
   var id:Int = 0
diff --git a/Example/RxRetroSwift/Services/APIClient.swift b/Example/RxRetroSwift/Services/APIClient.swift
@@ -7,10 +7,9 @@
 //
 
 import Foundation
-import ObjectMapper
 import RxRetroSwift
-import RxCocoa
 import RxSwift
+import RxCocoa
 
 fileprivate extension Encodable {
   var dictionaryValue:[String: Any?]? {
diff --git a/README.md b/README.md
@@ -43,17 +43,17 @@ Using [JSONPlaceholder API](https://jsonplaceholder.typicode.com).
 You can also check the [Sample Project](Example/)
 
 ```swift
-class DefaultAPIClient:APIClient {
+class APIClient {
  
-  static var shared = DefaultAPIClient()
-  var caller = DefaultRequestCaller.shared
+  static var shared = APIClient()
+  var caller = RequestCaller.shared
   
   private init() {
     
     RequestModel.defaults.baseUrl = "https://jsonplaceholder.typicode.com"
   }
   
-  func getPosts() -> Observable<Result<[Post], ErrorModel>> {
+  func fetchPosts() -> Observable<Result<[Post], ErrorModel>> {
     let request = RequestModel(
       httpMethod: .get,
       path: "posts")
@@ -66,13 +66,13 @@ class DefaultAPIClient:APIClient {
     let request = RequestModel(
       httpMethod: .post,
       path: "posts",
-      payload: post.toJSON())
+      payload: post.dictionaryValue)
       .asURLRequest()
     
     return caller.call(request)
   }
 
-  func getComments() -> Observable<Result<[Comment], ErrorModel>> {
+  func fetchComments() -> Observable<Result<[Comment], ErrorModel>> {
     let request = RequestModel(
       httpMethod: .get,
       path: "comments")
@@ -81,7 +81,7 @@ class DefaultAPIClient:APIClient {
     return caller.call(request)
   }
   
-  func getAlbums() -> Observable<Result<[Album], ErrorModel>> {
+  func fetchAlbums() -> Observable<Result<[Album], ErrorModel>> {
     let request = RequestModel(
       httpMethod: .get,
       path: "albums")
@@ -90,7 +90,7 @@ class DefaultAPIClient:APIClient {
     return caller.call(request)
   }
   
-  func getPhotos() -> Observable<Result<[Photo], ErrorModel>> {
+  func fetchPhotos() -> Observable<Result<[Photo], ErrorModel>> {
     let request = RequestModel(
       httpMethod: .get,
       path: "photos")
@@ -99,7 +99,7 @@ class DefaultAPIClient:APIClient {
     return caller.call(request)
   }
   
-  func getTodos() -> Observable<Result<[Todo], ErrorModel>> {
+  func fetchTodos() -> Observable<Result<[Todo], ErrorModel>> {
     let request = RequestModel(
       httpMethod: .get,
       path: "todos")
@@ -108,7 +108,7 @@ class DefaultAPIClient:APIClient {
     return caller.call(request)
   }
   
-  func getUsers() -> Observable<Result<[User],ErrorModel>> {
+  func fetchUsers() -> Observable<Result<[User],ErrorModel>> {
     
     let request = RequestModel(
       httpMethod: .get,
@@ -132,10 +132,10 @@ class TestAPIClient:QuickSpec {
     
     describe("Using JSONPlaceholder API") {
       
-      let apiClient = DefaultAPIClient.shared
+      let apiClient = APIClient.shared
       
       it("Check Posts result count"){
-        let observable = apiClient.getPosts()
+        let observable = apiClient.fetchPosts()
         expect(observable.map { $0.value!.count }).first == 100
       }
       
@@ -155,27 +155,27 @@ class TestAPIClient:QuickSpec {
       }
       
       it("Check Comments result count"){
-        let observable = apiClient.getComments()
+        let observable = apiClient.fetchComments()
         expect(observable.map { $0.value!.count }).first == 500
       }
       
       it("Check Albums result count"){
-        let observable = apiClient.getAlbums()
+        let observable = apiClient.fetchAlbums()
         expect(observable.map { $0.value!.count }).first == 100
       }
       
       it("Check Photos result count"){
-        let observable = apiClient.getPhotos()
+        let observable = apiClient.fetchPhotos()
         expect(observable.map { $0.value!.count }).first == 5000
       }
       
       it("Check Todos result count"){
-        let observable = apiClient.getTodos()
+        let observable = apiClient.fetchTodos()
         expect(observable.map { $0.value!.count }).first == 200
       }
       
       it("Check Users result count"){
-        let observable = apiClient.getUsers()
+        let observable = apiClient.fetchUsers()
         expect(observable.map { $0.value!.count }).first == 10
       }
     }
@@ -191,7 +191,7 @@ Just feel free to submit pull request or suggest anything that would be useful.
 
 ## Credits
 
-This uses RxSwift, Alamofire, ObjectMapper and Other 3rd party libraries.
+This library requires RxSwift.
 
 
 ## Author
diff --git a/RxRetroSwift/Classes/Services/RequestCaller.swift b/RxRetroSwift/Classes/Services/RequestCaller.swift
@@ -45,7 +45,7 @@ public class RequestCaller{
                 error.errorCode = statusCode
                 observer.onNext(Result.failure(error))
               } else {
-                var error = try! _self.decoder.decode(CodableErrorModel.self, from: Data())
+                var error = CodableErrorModel()
                 error.errorCode = statusCode
                 observer.onNext(Result.failure(error))
               }
