Merge branch 'feature/observable_changes' into 'master'

Feature/observable changes



See merge request !3

Author: Roman Kyrylenko

DBClient/Core/RequestObservable.swift

@@ -16,7 +16,7 @@ import Foundation
 public enum ObservableChange<T: Stored> {
 
   case initial([T])
-  case update(deletions: [Int], insertions: [(index: Int, element: T)], modifications: [(index: Int, element: T)])
+  case change(objects: [T], deletions: [Int], insertions: [(index: Int, element: T)], modifications: [(index: Int, element: T)])
   case error(Error)
 
 }

DBClient/CoreData/CoreDataObservable.swift

@@ -67,11 +67,11 @@ class CoreDataObservable<T: Stored, U: NSManagedObject>: RequestObservable<T> {
       observer = closure
 
       fetchedResultsControllerDelegate.observer = { [unowned self] change in
-        if case .update(deletions: let deletions, insertions: let insertions, modifications: let modifications) = change {
+        if case .change(objects: let objects, deletions: let deletions, insertions: let insertions, modifications: let modifications) = change {
           let mappedInsertions = insertions.map { ($0, coreDataModelType.from($1) as! T) }
           let mappedModifications = modifications.map { ($0, coreDataModelType.from($1) as! T) }
-          
-          self.observer?(.update(deletions: deletions, insertions: mappedInsertions, modifications: mappedModifications))
+          let mappedObjects = objects.map { coreDataModelType.from($0) as! T }
+            self.observer?(.change(objects: mappedObjects, deletions: deletions, insertions: mappedInsertions, modifications: mappedModifications))
         }
       }
 
@@ -112,7 +112,7 @@ private class FetchedResultsControllerDelegate<T: NSManagedObject>: NSObject, NS
     let inserted = batchChanges.filter { $0.isInsertion }.map { (index: $0.index(), element: $0.object()) }
     let updated = batchChanges.filter { $0.isUpdate }.map { (index: $0.index(), element: $0.object()) }
 
-    observer?(.update(deletions: deleted, insertions: inserted, modifications: updated))
+    observer?(.change(objects: controller.fetchedObjects as? [T] ?? [], deletions: deleted, insertions: inserted, modifications: updated))
     batchChanges = []
   }
 

DBClient/Realm/RealmObservable.swift

@@ -46,7 +46,7 @@ public class RealmObservable<T: Stored>: RequestObservable<T> {
         let mappedObjects = objects.map { realmModelType.from($0) as! T }
         let insertions = insertions.map { (index: $0, element: mappedObjects[$0]) }
         let modifications = modifications.map { (index: $0, element: mappedObjects[$0]) }
-        closure(.update(deletions: deletions, insertions: insertions, modifications: modifications))
+        closure(.change(objects: Array(mappedObjects), deletions: deletions, insertions: insertions, modifications: modifications))
 
       case .error(let error):
         closure(.error(error))

Example/Example/MasterViewController.swift

@@ -26,22 +26,18 @@ class MasterViewController: UITableViewController, DBClientInjectable {
                 self.objects.append(contentsOf: initial)
                 self.tableView.reloadData()
 
-            case .update(deletions: let deletions, insertions: let insertions, modifications: let modifications):
+            case .change(objects: let objects, deletions: let deletions, insertions: let insertions, modifications: let modifications):
+                self.objects = objects
                 self.tableView.beginUpdates()
 
                 let insertedIndexPaths = insertions.map { IndexPath(row: $0.index, section: 0) }
-                insertions.forEach { index, object in self.objects.insert(object, at: index) }
                 self.tableView.insertRows(at: insertedIndexPaths, with: .automatic)
 
                 let deletedIndexPaths = deletions.map { IndexPath(row: $0, section: 0) }
-                deletions.forEach { self.objects.remove(at: $0) }
                 self.tableView.deleteRows(at: deletedIndexPaths, with: .automatic)
 
                 let updatedIndexPaths = modifications.map { IndexPath(row: $0.index, section: 0) }
                 self.tableView.reloadRows(at: updatedIndexPaths, with: .automatic)
-                modifications.forEach { index, object in
-                    self.objects.insert(object, at: index)
-                }
 
                 self.tableView.endUpdates()
 

Example/Podfile.lock

@@ -19,14 +19,14 @@ DEPENDENCIES:
 
 EXTERNAL SOURCES:
   DBClient:
-    :path: "../"
+    :path: ../
 
 SPEC CHECKSUMS:
   Bolts-Swift: fa98d1b59fc1acea9b21a21306dcdca1c85e3737
   DBClient: fcf29df338854a8509d00cad7356ab3190be4006
   Realm: efe855f4d977c8ce5a82d3116d9f1ff155a6550c
   RealmSwift: 17d6ee30b6f9df86364408c2197492e33bfea567
 
-PODFILE CHECKSUM: cb4df083d69e58f50f893c10dae15238468392b4
+PODFILE CHECKSUM: 179eda0e5897e0216cdd26b5cd14adae089b4671
 
-COCOAPODS: 1.2.0.beta.3
+COCOAPODS: 1.2.0.rc.1