Improve objectAtIndexPath safety + change file name

3lvis · Nov 18, 2015 · 7a88d1a · 7a88d1a
1 parent d12928e
commit 7a88d1a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Source/DataSource.swift → Source/DATASource.swift b/Source/DataSource.swift → Source/DATASource.swift
@@ -163,7 +163,11 @@ public class DATASource: NSObject {
      - returns: The object at a given index path in the fetch results.
      */
     public func objectAtIndexPath(indexPath: NSIndexPath) -> NSManagedObject? {
-        return self.fetchedResultsController.objectAtIndexPath(indexPath) as? NSManagedObject ?? nil
+        if self.fetchedResultsController.fetchedObjects?.count > 0 {
+            return self.fetchedResultsController.objectAtIndexPath(indexPath) as? NSManagedObject ?? nil
+        }
+
+        return nil
     }
 
     /**
@@ -554,12 +558,12 @@ extension DATASource: NSFetchedResultsControllerDelegate {
 
     private func configureCell(cell: UIView, indexPath: NSIndexPath) {
         var item: NSManagedObject?
-
+        
         let rowIsInsideBounds = indexPath.row < self.fetchedResultsController.fetchedObjects?.count
         if rowIsInsideBounds {
             item = self.fetchedResultsController.objectAtIndexPath(indexPath) as? NSManagedObject
         }
-
+        
         if let item = item {
             if let _ = self.tableView, configuration = self.tableConfigurationBlock {
                 configuration(cell: cell as! UITableViewCell, item: item, indexPath: indexPath)

diff --git a/Source/DataSourceCollectionHeaderView.swift → Source/DATASourceCollectionHeaderView.swift b/Source/DataSourceCollectionHeaderView.swift → Source/DATASourceCollectionHeaderView.swift