decouple data source from FUIArray

Author: morganchen12

FirebaseDatabaseUI/FUICollectionViewDataSource.h

@@ -67,7 +67,7 @@ NS_ASSUME_NONNULL_BEGIN
                                                          NSIndexPath *indexPath,
                                                          FIRDataSnapshot *object))populateCell NS_DESIGNATED_INITIALIZER;
 
-- (instancetype)initWithArray:(FUIArray *)array NS_UNAVAILABLE;
+- (instancetype)initWithCollection:(id<FUICollection>)collection NS_UNAVAILABLE;
 
 @end
 

FirebaseDatabaseUI/FUICollectionViewDataSource.m

@@ -32,7 +32,7 @@ - (instancetype)initWithQuery:(FIRDatabaseQuery *)query
                                                          NSIndexPath *,
                                                          FIRDataSnapshot *))populateCell {
   FUIArray *array = [[FUIArray alloc] initWithQuery:query];
-  self = [super initWithArray:array];
+  self = [super initWithCollection:array];
   if (self) {
     _collectionView = collectionView;
     _populateCellAtIndexPath = populateCell;

FirebaseDatabaseUI/FUIDataSource.h

@@ -44,7 +44,7 @@
  */
 @property (nonatomic, readonly) NSUInteger count;
 
-- (instancetype)initWithArray:(FUIArray *)array NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithCollection:(id<FUICollection>)collection NS_DESIGNATED_INITIALIZER;
 
 - (instancetype)init NS_UNAVAILABLE;
 
@@ -53,11 +53,6 @@
  */
 - (FIRDataSnapshot *)objectAtIndex:(NSUInteger)index;
 
-/**
- * Pass through of [FirebaseArray refForIndex:].
- */
-- (FIRDatabaseReference *)refForIndex:(NSUInteger)index;
-
 /**
  * Provides a block which is called when the backing array cancels its query.
  * @param block the block

FirebaseDatabaseUI/FUIDataSource.m

@@ -27,40 +27,36 @@ @interface FUIDataSource ()
 /**
  * The FirebaseArray which backs the instance of the datasource.
  */
-@property(strong, nonatomic, nonnull) FUIArray *array;
+@property(strong, nonatomic, nonnull) id<FUICollection> collection;
 
 @end
 
 @implementation FUIDataSource
 
 #pragma mark - Initializer methods
 
-- (instancetype)initWithArray:(FUIArray *)array {
+- (instancetype)initWithCollection:(id<FUICollection>)collection {
   self = [super init];
   if (self) {
-    _array = array;
-    _array.delegate = self;
-    [array observeQuery];
+    _collection = collection;
+    _collection.delegate = self;
+    [_collection observeQuery];
   }
   return self;
 }
 
 #pragma mark - API methods
 
 - (NSArray *)items {
-  return [self.array.items copy];
+  return [self.collection.items copy];
 }
 
 - (NSUInteger)count {
-  return self.array.count;
+  return self.collection.count;
 }
 
 - (FIRDataSnapshot *)objectAtIndex:(NSUInteger)index {
-  return [self.array snapshotAtIndex:index];
-}
-
-- (FIRDatabaseReference *)refForIndex:(NSUInteger)index {
-  return [self.array refForIndex:index];
+  return [self.collection snapshotAtIndex:index];
 }
 
 - (void)cancelWithBlock:(void (^)(NSError *))block {

FirebaseDatabaseUI/FUITableViewDataSource.h

@@ -63,7 +63,7 @@ NS_ASSUME_NONNULL_BEGIN
                                                     NSIndexPath *indexPath,
                                                     FIRDataSnapshot *object))populateCell NS_DESIGNATED_INITIALIZER;
 
-- (instancetype)initWithArray:(FUIArray *)array NS_UNAVAILABLE;
+- (instancetype)initWithCollection:(id<FUICollection>)collection NS_UNAVAILABLE;
 
 @end
 

FirebaseDatabaseUI/FUITableViewDataSource.m

@@ -41,7 +41,7 @@ - (instancetype)initWithQuery:(FIRDatabaseQuery *)query
                                                     NSIndexPath *,
                                                     FIRDataSnapshot *))populateCell {
   FUIArray *array = [[FUIArray alloc] initWithQuery:query];
-  self = [super initWithArray:array];
+  self = [super initWithCollection:array];
   if (self) {
     self.tableView = tableView;
     self.populateCell = populateCell;

FirebaseDatabaseUITests/FUIArrayTest.m

@@ -41,6 +41,7 @@ - (void)setUp {
   self.observable = [[FUITestObservable alloc] init];
   self.firebaseArray = [[FUIArray alloc] initWithQuery:self.observable];
   self.firebaseArray.delegate = self.arrayDelegate;
+  [self.firebaseArray observeQuery];
 }
 
 - (void)tearDown {