From 7c012db9276d93912cc0b85de910ad41c9db62ab Mon Sep 17 00:00:00 2001
From: Ivan Smolin <ivan.smolin@touchin.ru>
Date: Thu, 22 Mar 2018 13:17:15 +0300
Subject: [PATCH] code review notes

---
 .../PaginationDataLoading/PaginationDataLoadingModel.swift  | 4 ++--
 .../PaginationDataLoading/PaginationWrapper.swift           | 6 +++---
 Sources/Classes/DataLoading/RxDataLoadingModel.swift        | 4 +---
 .../GeneralDataLoading/GeneralDataLoadingState.swift        | 2 +-
 .../PaginationDataLoading/PaginationDataLoadingState.swift  | 6 +++---
 Sources/Protocols/DataLoading/DataLoadingState.swift        | 2 +-
 6 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/Sources/Classes/DataLoading/PaginationDataLoading/PaginationDataLoadingModel.swift b/Sources/Classes/DataLoading/PaginationDataLoading/PaginationDataLoadingModel.swift
index 053dc7c2..dc513b07 100644
--- a/Sources/Classes/DataLoading/PaginationDataLoading/PaginationDataLoadingModel.swift
+++ b/Sources/Classes/DataLoading/PaginationDataLoading/PaginationDataLoadingModel.swift
@@ -63,7 +63,7 @@ public final class PaginationDataLoadingModel<Cursor: ResettableRxDataSourceCurs
                 state = .initial
             }
 
-            state = .loading(after: state)
+            state = .initialLoading(after: state)
         case .next:
             if case .exhausted = state {
                 fatalError("You shouldn't call load(.next) after got .exhausted state!")
@@ -76,7 +76,7 @@ public final class PaginationDataLoadingModel<Cursor: ResettableRxDataSourceCurs
     }
 
     override func onGot(error: Error) {
-        if case .exhausted? = error as? CursorError, case .loading(let after) = state {
+        if case .exhausted? = error as? CursorError, case .initialLoading(let after) = state {
             switch after {
             case .initial, .empty: // cursor exhausted after creation
                 state = .empty
diff --git a/Sources/Classes/DataLoading/PaginationDataLoading/PaginationWrapper.swift b/Sources/Classes/DataLoading/PaginationDataLoading/PaginationWrapper.swift
index 8ad40b57..9299b395 100644
--- a/Sources/Classes/DataLoading/PaginationDataLoading/PaginationWrapper.swift
+++ b/Sources/Classes/DataLoading/PaginationDataLoading/PaginationWrapper.swift
@@ -150,7 +150,7 @@ final public class PaginationWrapper<Cursor: ResettableRxDataSourceCursor, Deleg
 
         wrappedView.scrollView.isUserInteractionEnabled = true
 
-        if case .loading = afterState {
+        if case .initialLoading = afterState {
             delegate?.paginationWrapper(didReload: newItems, using: cursor)
 
             removeCurrentPlaceholderView()
@@ -166,7 +166,7 @@ final public class PaginationWrapper<Cursor: ResettableRxDataSourceCursor, Deleg
     }
 
     private func onErrorState(error: Error, afterState: LoadingState) {
-        if case .loading = afterState {
+        if case .initialLoading = afterState {
             defer {
                 wrappedView.scrollView.support.refreshControl?.endRefreshing()
             }
@@ -334,7 +334,7 @@ private extension PaginationWrapper {
             switch value {
             case .initial:
                 base.onInitialState()
-            case .loading(let after):
+            case .initialLoading(let after):
                 base.onLoadingState(afterState: after)
             case .loadingMore(let after):
                 base.onLoadingMoreState(afterState: after)
diff --git a/Sources/Classes/DataLoading/RxDataLoadingModel.swift b/Sources/Classes/DataLoading/RxDataLoadingModel.swift
index 67a10c9b..8babf8a8 100644
--- a/Sources/Classes/DataLoading/RxDataLoadingModel.swift
+++ b/Sources/Classes/DataLoading/RxDataLoadingModel.swift
@@ -35,7 +35,6 @@ open class RxDataLoadingModel<DLS: DataLoadingState>: DataLoadingModel
 
     private let stateVariable = Variable<LoadingStateType>(.initialState)
     var currentRequestDisposable: Disposable?
-    let scheduler = SerialDispatchQueueScheduler(qos: .default)
 
     var dataSource: DataSourceType
     let emptyResultChecker: EmptyResultChecker
@@ -64,7 +63,7 @@ open class RxDataLoadingModel<DLS: DataLoadingState>: DataLoadingModel
             state = .initialState
         }
 
-        state = .loadingState(after: state)
+        state = .initialLoadingState(after: state)
 
         requestResult(from: dataSource)
     }
@@ -89,7 +88,6 @@ open class RxDataLoadingModel<DLS: DataLoadingState>: DataLoadingModel
     func requestResult(from dataSource: DataSourceType) {
         currentRequestDisposable = dataSource
             .resultSingle()
-            .observeOn(scheduler)
             .subscribe(onSuccess: { [weak self] result in
                 self?.onGot(result: result, from: dataSource)
             }, onError: { [weak self] error in
diff --git a/Sources/Enums/DataLoading/GeneralDataLoading/GeneralDataLoadingState.swift b/Sources/Enums/DataLoading/GeneralDataLoading/GeneralDataLoadingState.swift
index 3c895a07..0b550995 100644
--- a/Sources/Enums/DataLoading/GeneralDataLoading/GeneralDataLoadingState.swift
+++ b/Sources/Enums/DataLoading/GeneralDataLoading/GeneralDataLoadingState.swift
@@ -38,7 +38,7 @@ public enum GeneralDataLoadingState<DS: DataSource>: DataLoadingState {
         return .empty
     }
 
-    public static func loadingState(after: GeneralDataLoadingState<DS>) -> GeneralDataLoadingState<DS> {
+    public static func initialLoadingState(after: GeneralDataLoadingState<DS>) -> GeneralDataLoadingState<DS> {
         return .loading
     }
 
diff --git a/Sources/Enums/DataLoading/PaginationDataLoading/PaginationDataLoadingState.swift b/Sources/Enums/DataLoading/PaginationDataLoading/PaginationDataLoadingState.swift
index 42effe47..a995f774 100644
--- a/Sources/Enums/DataLoading/PaginationDataLoading/PaginationDataLoadingState.swift
+++ b/Sources/Enums/DataLoading/PaginationDataLoading/PaginationDataLoadingState.swift
@@ -23,7 +23,7 @@
 public indirect enum PaginationDataLoadingState<DS: DataSource>: DataLoadingState {
 
     case initial
-    case loading(after: PaginationDataLoadingState)
+    case initialLoading(after: PaginationDataLoadingState)
     case loadingMore(after: PaginationDataLoadingState)
     case results(newItems: DS.ResultType, from: DS, after: PaginationDataLoadingState)
     case error(error: Error, after: PaginationDataLoadingState)
@@ -40,8 +40,8 @@ public indirect enum PaginationDataLoadingState<DS: DataSource>: DataLoadingStat
         return .empty
     }
 
-    public static func loadingState(after: PaginationDataLoadingState<DS>) -> PaginationDataLoadingState<DS> {
-        return .loading(after: after)
+    public static func initialLoadingState(after: PaginationDataLoadingState<DS>) -> PaginationDataLoadingState<DS> {
+        return .initialLoading(after: after)
     }
 
     public static func resultState(result: DS.ResultType,
diff --git a/Sources/Protocols/DataLoading/DataLoadingState.swift b/Sources/Protocols/DataLoading/DataLoadingState.swift
index f0e6899d..29a02f72 100644
--- a/Sources/Protocols/DataLoading/DataLoadingState.swift
+++ b/Sources/Protocols/DataLoading/DataLoadingState.swift
@@ -35,7 +35,7 @@ public protocol DataLoadingState {
     ///
     /// - Parameter after: Previous state of data loading process.
     /// - Returns: Instance of loading state with given argument.
-    static func loadingState(after: Self) -> Self
+    static func initialLoadingState(after: Self) -> Self
 
     /// Method that returns result state from a specific data source after a given state.
     ///