fixing data set binding + cleaning

Author: Ondrej Rafaj

Example/Pods/Pods.xcodeproj/project.pbxproj

@@ -12,10 +12,32 @@ import Presentables
 
 class DataController: PresentableTableViewDataManager {
 
+    // MARK: Initialization
+    
+    override init() {
+        super.init()
+        
+        loadBasicData()
+        
+        // Add new section every couple of seconds
+        Timer.scheduledTimer(withTimeInterval: 10, repeats: true) { (timer) in
+            self.loadBasicData()
+        }
+    }
+    
+    // MARK: Overriding table view delegate
+    
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        return 44
+    }
 
-    // MARK: Data
+}
+
+// MARK: - Data
+
+extension DataController {
 
-    private func newPresenter(_ i: Int) -> MyCellPresenter {
+    fileprivate func newPresenter(_ i: Int) -> MyCellPresenter {
         let presenter = MyCellPresenter()
         presenter.configure = { presentable in
             guard let cell = presentable as? MyCell else {
@@ -26,7 +48,7 @@ class DataController: PresentableTableViewDataManager {
         return presenter
     }
 
-    private func newHeader(_ i: Int) -> MyHeaderPresenter {
+    fileprivate func newHeader(_ i: Int) -> MyHeaderPresenter {
         let header = MyHeaderPresenter()
         header.configure = { presentable in
             guard let header = presentable as? MyHeader else {
@@ -37,7 +59,7 @@ class DataController: PresentableTableViewDataManager {
         return header
     }
 
-    private func loadBasicData() {
+    fileprivate func loadBasicData() {
         let section = PresentableSection()
 
         section.header = newHeader((data.count + 1))
@@ -58,23 +80,4 @@ class DataController: PresentableTableViewDataManager {
         data.append(section)
     }
 
-    // MARK: Initialization
-    
-    override init() {
-        super.init()
-        
-        loadBasicData()
-        
-        // Add new section every couple of seconds
-        Timer.scheduledTimer(withTimeInterval: 10, repeats: true) { (timer) in
-            self.loadBasicData()
-        }
-    }
-    
-    // MARK: Overriding table view delegate
-    
-    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
-        return 44
-    }
-    
 }

Example/Presentables/DataController.swift

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'Presentables'
-  s.version          = '0.1.0'
+  s.version          = '0.1.1'
   s.summary          = 'Simple reactive library written in Swift'
 
 # This description is used to generate tags and improve search results.

Presentables.podspec

@@ -9,6 +9,4 @@
 import Foundation
 
 
-public protocol Presentable: Identifiable {
-    
-}
+public protocol Presentable: Identifiable { }

Presentables/Classes/Presenters/UITableViewCell+Presenter.swift

@@ -16,13 +16,9 @@ public protocol Presenter: Configurable {
 
 }
 
-extension Presenter {
-    
-}
+extension Presenter { }
 
 
 public protocol PresenterHeaderFooter: Presenter { }
-
 public protocol PresenterHeader: PresenterHeaderFooter { }
-
 public protocol PresenterFooter: PresenterHeaderFooter { }

Presentables/Classes/Protocols/Presentable.swift

@@ -66,48 +66,9 @@ extension UITableView: PresentableCollectionElement {
         }
         if section.bindablePresenters.listener == nil {
             section.bindablePresenters.bind(listener: { (presenters) in
-                if section.presenterAnimation == .none {
-                    self.reloadData()
-                }
-                else {
-                    //self.insertAndDeleteCellsForObjects(objects: presenters, originalObjects: presenters)
-                }
+                self.reloadData()
             })
         }
     }
 
 }
-
-extension UITableView {
-    
-    func arrayInsertionDeletionAndNoopIndexes<T: Equatable>(objects: [T], originalObjects: [T]) -> ([Int], [Int], [Int]) {
-        let insertions = objects.filter({ !originalObjects.contains($0) }).map({ objects.index(of: $0)! })
-        let noops = originalObjects.filter({ objects.contains($0) }).map({ originalObjects.index(of: $0)! })
-        let deletions = originalObjects.filter({ !objects.contains($0) }).map({ originalObjects.index(of: $0)! })
-        
-        return (insertions, deletions, noops)
-    }
-    
-    func arrayInsertionDeletionAndNoopIndexPaths<T: Equatable>(objects: [T], originalObjects: [T], section: Int = 0) -> ([IndexPath], [IndexPath], [IndexPath]) {
-        let (insertions, deletions, noops) = arrayInsertionDeletionAndNoopIndexes(objects: objects, originalObjects: originalObjects)
-        
-        let insertionIndexPaths = insertions.map({ IndexPath(row: $0, section: section) })
-        let deletionIndexPaths = deletions.map({ IndexPath(row: $0, section: section) })
-        let noopIndexPaths = noops.map({ IndexPath(row: $0, section: section) })
-        
-        return (insertionIndexPaths, deletionIndexPaths, noopIndexPaths)
-    }
-    
-    func insertAndDeleteCellsForObjects<T: Equatable>(objects: [T], originalObjects: [T], section: Int = 0) {
-        let (insertions, deletions, _) = arrayInsertionDeletionAndNoopIndexPaths(objects: objects, originalObjects: originalObjects, section: section)
-        
-        if insertions.count > 0 || deletions.count > 0 {
-            beginUpdates()
-            insertRows(at: insertions, with: .automatic)
-            deleteRows(at: deletions, with: .automatic)
-            endUpdates()
-        }
-    }
-    
-}
-

Presentables/Classes/Protocols/Presenter.swift

@@ -27,7 +27,103 @@ it, simply add the following line to your Cartfile:
 ```ruby
 github "manGoweb/Presentables"
 ```
+## Usage
 
+Create your cell (or header, implementation is pretty much the same)
+
+```Swift
+import UIKit
+import Presentables
+
+
+class MyCell: UITableViewCell, Presentable {
+
+}
+
+class MyCellPresenter: Presenter {
+
+    var presentable: Presentable.Type = MyCell.self
+
+    var configure: ((Presentable) -> ())?
+
+}
+```
+
+Create a data manager
+
+```Swift
+class MyDataManagager: PresentableTableViewDataManager {
+
+    // MARK: Initialization
+
+    override init() {
+        super.init()
+
+        // Start a new section
+        let section = PresentableSection()
+        
+        // Every section needs a header ... obviously
+        let header = MyHeaderPresenter()
+        header.configure = { presentable in
+            guard let header = presentable as? MyHeader else {
+                return
+            }
+            header.titleLabel.text = "My section"
+        }
+
+        section.header = header
+
+        // Create some basic cells
+        for i: Int in 1...5 {
+            let presenter = MyCellPresenter()
+            presenter.configure = { presentable in
+                guard let cell = presentable as? MyCell else {
+                    return
+                }
+                cell.textLabel?.text = "Cell number: \(i)"
+            }
+            section.presenters.append(presenter)
+        }
+
+        // Add section to the data set
+        data.append(section)
+    }
+
+    // Override any delegate or datasource method you may want to
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        return 44
+    }
+
+}
+```
+
+And lastly, bind your table view to your data manager
+
+```Swift
+import UIKit
+import Presentables
+
+
+class ViewController: UITableViewController {
+
+    let dataController = MyDataManagager()
+
+
+    // MARK: View lifecycle
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        title = "Presentables!"
+
+        var dc: PresentableManager = dataController
+        tableView.bind(withPresentableManager: &dc)
+    }
+
+}
+```
+
+And that's all folks!
 
 ## Author