From e69531c9ae5b4cdb0daa4ba7fbb2af75a1df9816 Mon Sep 17 00:00:00 2001
From: Ivan Smolin <ivan.smolin@touchin.ru>
Date: Wed, 23 Nov 2016 17:31:16 +0300
Subject: [PATCH] remove weak self capturing and deallocated error

---
 .../Classes/Cursors/FixedPageCursor.swift     | 30 ++++++-------------
 .../LeadKit/Classes/Cursors/MapCursor.swift   | 12 +++-----
 .../Classes/Cursors/StaticCursor.swift        | 16 ++++------
 LeadKit/LeadKit/Enums/CursorError.swift       |  2 --
 4 files changed, 18 insertions(+), 42 deletions(-)

diff --git a/LeadKit/LeadKit/Classes/Cursors/FixedPageCursor.swift b/LeadKit/LeadKit/Classes/Cursors/FixedPageCursor.swift
index 19a36b8c..09914bd9 100644
--- a/LeadKit/LeadKit/Classes/Cursors/FixedPageCursor.swift
+++ b/LeadKit/LeadKit/Classes/Cursors/FixedPageCursor.swift
@@ -38,38 +38,26 @@ public class FixedPageCursor<Cursor: CursorType>: CursorType where Cursor.LoadRe
     }
 
     public func loadNextBatch() -> Observable<LoadResultType> {
-        return Observable.create { [weak self] observer in
-            guard let strongSelf = self else {
-                observer.onError(CursorError.deallocated)
-
-                return Disposables.create()
-            }
-
-            if strongSelf.exhausted {
+        return Observable.create { observer in
+            if self.exhausted {
                 observer.onError(CursorError.exhausted)
 
                 return Disposables.create()
             }
 
-            let restOfLoaded = strongSelf.cursor.count - strongSelf.count
+            let restOfLoaded = self.cursor.count - self.count
 
-            if restOfLoaded >= strongSelf.pageSize || strongSelf.cursor.exhausted {
-                let startIndex = strongSelf.count
-                strongSelf.count += min(restOfLoaded, strongSelf.pageSize)
+            if restOfLoaded >= self.pageSize || self.cursor.exhausted {
+                let startIndex = self.count
+                self.count += min(restOfLoaded, self.pageSize)
 
-                observer.onNext(startIndex..<strongSelf.count)
+                observer.onNext(startIndex..<self.count)
 
                 return Disposables.create()
             }
 
-            return strongSelf.cursor.loadNextBatch()
-                .map { [weak self] _ -> Observable<LoadResultType> in
-                    guard let strongSelf = self else {
-                        throw CursorError.deallocated
-                    }
-
-                    return strongSelf.loadNextBatch()
-                }
+            return self.cursor.loadNextBatch()
+                .map { _ in self.loadNextBatch() }
                 .subscribe()
         }
     }
diff --git a/LeadKit/LeadKit/Classes/Cursors/MapCursor.swift b/LeadKit/LeadKit/Classes/Cursors/MapCursor.swift
index c0d5f8a7..bb345382 100644
--- a/LeadKit/LeadKit/Classes/Cursors/MapCursor.swift
+++ b/LeadKit/LeadKit/Classes/Cursors/MapCursor.swift
@@ -58,15 +58,11 @@ public class MapCursor<Cursor: CursorType, T>: CursorType where Cursor.LoadResul
     }
 
     public func loadNextBatch() -> Observable<LoadResultType> {
-        return cursor.loadNextBatch().map { [weak self] loadedRange -> LoadResultType in
-            guard let strongSelf = self else {
-                throw CursorError.deallocated
-            }
+        return cursor.loadNextBatch().map { loadedRange in
+            let startIndex = self.elements.count
+            self.elements += self.cursor[loadedRange].flatMap(self.transform)
 
-            let startIndex = strongSelf.elements.count
-            strongSelf.elements += strongSelf.cursor[loadedRange].flatMap(strongSelf.transform)
-
-            return startIndex..<strongSelf.elements.count
+            return startIndex..<self.elements.count
         }
     }
     
diff --git a/LeadKit/LeadKit/Classes/Cursors/StaticCursor.swift b/LeadKit/LeadKit/Classes/Cursors/StaticCursor.swift
index 03f826ca..edd1472c 100644
--- a/LeadKit/LeadKit/Classes/Cursors/StaticCursor.swift
+++ b/LeadKit/LeadKit/Classes/Cursors/StaticCursor.swift
@@ -31,24 +31,18 @@ public class StaticCursor<Element>: CursorType {
     }
 
     public func loadNextBatch() -> Observable<LoadResultType> {
-        return Observable.create { [weak self] observer in
-            guard let strongSelf = self else {
-                observer.onError(CursorError.deallocated)
-
-                return Disposables.create()
-            }
-
-            if strongSelf.exhausted {
+        return Observable.create { observer in
+            if self.exhausted {
                 observer.onError(CursorError.exhausted)
 
                 return Disposables.create()
             }
 
-            strongSelf.count = strongSelf.content.count
+            self.count = self.content.count
 
-            strongSelf.exhausted = true
+            self.exhausted = true
 
-            observer.onNext(0..<strongSelf.count)
+            observer.onNext(0..<self.count)
 
             return Disposables.create()
         }
diff --git a/LeadKit/LeadKit/Enums/CursorError.swift b/LeadKit/LeadKit/Enums/CursorError.swift
index e0d3b85e..639c7d02 100644
--- a/LeadKit/LeadKit/Enums/CursorError.swift
+++ b/LeadKit/LeadKit/Enums/CursorError.swift
@@ -12,11 +12,9 @@ import Foundation
 ///
 /// - busy: cursor is currently processing another request
 /// - exhausted: cursor did load all available results
-/// - deallocated: cursor was deallocated during processing request
 public enum CursorError: Error {
 
     case busy
     case exhausted
-    case deallocated
 
 }