Merge branch 'master' into v0.6.3

* master:
  add gif sample file
  fix crashing sample app when user is not signed in
  fix failing build in objc sample
  Add Runtime and Compile-time countermeasures
  use latest cocoapods on travis
  fix dylibs not being loaded correctly in tests
  add syntax shorthand for data sources
  refactor table view data source
  change tests for new api
  remove cell registration and creation from collection view data source
  work around pods duplicate classes in tests runtime

Author: yramanchuk

.travis.yml

@@ -6,7 +6,7 @@ xcode_scheme: FirebaseUI
 rvm: 2.3.1
 before_install:
   - gem uninstall cocoapods -a
-  - gem install cocoapods -v '1.0.1'
+  - gem install cocoapods -v 1.1.1
   - gem install xcpretty
   - pod install --repo-update
 

FirebaseDatabaseUI/FirebaseArray.h

@@ -47,7 +47,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 /**
  * The delegate object that array changes are surfaced to, which conforms to the
- * [FirebaseArrayDelegate Protocol](FirebaseArrayDelegate).
+ * @c FirebaseArrayDelegate protocol.
  */
 @property(weak, nonatomic, nullable) id<FirebaseArrayDelegate> delegate;
 

FirebaseDatabaseUI/FirebaseCollectionViewDataSource.h

@@ -22,216 +22,20 @@
 
 @import FirebaseDatabase;
 
-@interface FirebaseCollectionViewDataSource ()
-@property(strong, nonatomic, readwrite) void (^populateCell)
-(__kindof UICollectionViewCell *cell, __kindof NSObject *object);
-@end
-
 @implementation FirebaseCollectionViewDataSource
 
 #pragma mark - FirebaseDataSource initializer methods
 
-- (instancetype)initWithRef:(FIRDatabaseReference *)ref
-        cellReuseIdentifier:(NSString *)identifier
-                       view:(UICollectionView *)collectionView {
-  return [self initWithQuery:ref
-                  modelClass:nil
-                   cellClass:nil
-         cellReuseIdentifier:identifier
-                        view:collectionView];
-}
-
-- (instancetype)initWithRef:(FIRDatabaseReference *)ref
-   prototypeReuseIdentifier:(NSString *)identifier
-                       view:(UICollectionView *)collectionView {
-  return [self initWithQuery:ref
-                    modelClass:nil
-      prototypeReuseIdentifier:identifier
-                          view:collectionView];
-}
-
-- (instancetype)initWithRef:(FIRDatabaseReference *)ref
-                  cellClass:(Class)cell
-        cellReuseIdentifier:(NSString *)identifier
-                       view:(UICollectionView *)collectionView {
-  return [self initWithQuery:ref
-                  modelClass:nil
-                   cellClass:cell
-         cellReuseIdentifier:identifier
-                        view:collectionView];
-}
-
-- (instancetype)initWithRef:(FIRDatabaseReference *)ref
-                   nibNamed:(NSString *)nibName
-        cellReuseIdentifier:(NSString *)identifier
-                       view:(UICollectionView *)collectionView {
-  return [self initWithQuery:ref
-                  modelClass:nil
-                    nibNamed:nibName
-         cellReuseIdentifier:identifier
-                        view:collectionView];
-}
-
-- (instancetype)initWithRef:(FIRDatabaseReference *)ref
-                 modelClass:(Class)model
-        cellReuseIdentifier:(NSString *)identifier
-                       view:(UICollectionView *)collectionView {
-  return [self initWithQuery:ref
-                  modelClass:model
-                   cellClass:nil
-         cellReuseIdentifier:identifier
-                        view:collectionView];
-}
-
-- (instancetype)initWithRef:(FIRDatabaseReference *)ref
-                 modelClass:(Class)model
-   prototypeReuseIdentifier:(NSString *)identifier
-                       view:(UICollectionView *)collectionView {
-  return [self initWithQuery:ref
-                  modelClass:model
-    prototypeReuseIdentifier:identifier
-                        view:collectionView];
-}
-
-- (instancetype)initWithRef:(FIRDatabaseReference *)ref
-                 modelClass:(Class)model
-                  cellClass:(Class)cell
-        cellReuseIdentifier:(NSString *)identifier
-                       view:(UICollectionView *)collectionView {
-  return [self initWithQuery:ref
-                  modelClass:model
-                   cellClass:cell
-         cellReuseIdentifier:identifier
-                        view:collectionView];
-}
-
-- (instancetype)initWithRef:(FIRDatabaseReference *)ref
-                 modelClass:(Class)model
-                   nibNamed:(NSString *)nibName
-        cellReuseIdentifier:(NSString *)identifier
-                       view:(UICollectionView *)collectionView {
-  return [self initWithQuery:ref
-                  modelClass:model
-                    nibNamed:nibName
-         cellReuseIdentifier:identifier
-                        view:collectionView];
-}
-
-- (instancetype)initWithQuery:(FIRDatabaseQuery *)query
-          cellReuseIdentifier:(NSString *)identifier
-                         view:(UICollectionView *)collectionView {
-  return [self initWithQuery:query
-                  modelClass:nil
-                   cellClass:nil
-         cellReuseIdentifier:identifier
-                        view:collectionView];
-}
-
-- (instancetype)initWithQuery:(FIRDatabaseQuery *)query
-     prototypeReuseIdentifier:(NSString *)identifier
-                         view:(UICollectionView *)collectionView {
-  self.hasPrototypeCell = YES;
-  return [self initWithQuery:query
-                  modelClass:nil
-                   cellClass:nil
-         cellReuseIdentifier:identifier
-                        view:collectionView];
-}
-
-- (instancetype)initWithQuery:(FIRDatabaseQuery *)query
-                    cellClass:(Class)cell
-          cellReuseIdentifier:(NSString *)identifier
-                         view:(UICollectionView *)collectionView {
-  return [self initWithQuery:query
-                  modelClass:nil
-                   cellClass:cell
-         cellReuseIdentifier:identifier
-                        view:collectionView];
-}
-
-- (instancetype)initWithQuery:(FIRDatabaseQuery *)query
-                     nibNamed:(NSString *)nibName
-          cellReuseIdentifier:(NSString *)identifier
-                         view:(UICollectionView *)collectionView {
-  return [self initWithQuery:query
-                  modelClass:nil
-                    nibNamed:nibName
-         cellReuseIdentifier:identifier
-                        view:collectionView];
-}
-
-- (instancetype)initWithQuery:(FIRDatabaseQuery *)query
-                   modelClass:(Class)model
-          cellReuseIdentifier:(NSString *)identifier
-                         view:(UICollectionView *)collectionView {
-  return [self initWithQuery:query
-                  modelClass:model
-                   cellClass:nil
-         cellReuseIdentifier:identifier
-                        view:collectionView];
-}
-
 - (instancetype)initWithQuery:(FIRDatabaseQuery *)query
-                   modelClass:(Class)model
-     prototypeReuseIdentifier:(NSString *)identifier
-                         view:(UICollectionView *)collectionView {
-  self.hasPrototypeCell = YES;
-  return [self initWithQuery:query
-                  modelClass:model
-                   cellClass:nil
-         cellReuseIdentifier:identifier
-                        view:collectionView];
-}
-
-- (instancetype)initWithQuery:(FIRDatabaseQuery *)query
-                   modelClass:(Class)model
-                    cellClass:(Class)cell
-          cellReuseIdentifier:(NSString *)identifier
-                         view:(UICollectionView *)collectionView {
+                         view:(UICollectionView *)collectionView
+                 populateCell:(UICollectionViewCell *(^)(UICollectionView *,
+                                                         NSIndexPath *,
+                                                         FIRDataSnapshot *))populateCell {
   FirebaseArray *array = [[FirebaseArray alloc] initWithQuery:query];
   self = [super initWithArray:array];
   if (self) {
-    if (!model) {
-      model = [FIRDataSnapshot class];
-    }
-
-    if (!cell) {
-      cell = [UICollectionViewCell class];
-    }
-
-    self.collectionView = collectionView;
-    self.modelClass = model;
-    self.cellClass = cell;
-    self.reuseIdentifier = identifier;
-    self.populateCell = ^(id cell, id object) {};
-
-    if (!self.hasPrototypeCell) {
-      [self.collectionView registerClass:self.cellClass
-              forCellWithReuseIdentifier:self.reuseIdentifier];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithQuery:(FIRDatabaseQuery *)query
-                   modelClass:(Class)model
-                     nibNamed:(NSString *)nibName
-          cellReuseIdentifier:(NSString *)identifier
-                         view:(UICollectionView *)collectionView {
-  FirebaseArray *array = [[FirebaseArray alloc] initWithQuery:query];
-  self = [super initWithArray:array];
-  if (self) {
-    if (!model) {
-      model = [FIRDataSnapshot class];
-    }
-
-    self.collectionView = collectionView;
-    self.modelClass = model;
-    self.reuseIdentifier = identifier;
-    self.populateCell = ^(id cell, id object) {};
-
-    UINib *nib = [UINib nibWithNibName:nibName bundle:nil];
-    [self.collectionView registerNib:nib forCellWithReuseIdentifier:self.reuseIdentifier];
+    _collectionView = collectionView;
+    _populateCellAtIndexPath = populateCell;
   }
   return self;
 }
@@ -263,19 +67,9 @@ - (void)array:(FirebaseArray *)array didMoveObject:(id)object
 
 - (nonnull UICollectionViewCell *)collectionView:(nonnull UICollectionView *)collectionView
                           cellForItemAtIndexPath:(nonnull NSIndexPath *)indexPath {
-  id cell = [self.collectionView dequeueReusableCellWithReuseIdentifier:self.reuseIdentifier
-                                                           forIndexPath:indexPath];
-
   FIRDataSnapshot *snap = [self.items objectAtIndex:indexPath.row];
-  if (![self.modelClass isSubclassOfClass:[FIRDataSnapshot class]]) {
-    id model = [[self.modelClass alloc] init];
-    // TODO: replace setValuesForKeysWithDictionary with client API
-    // valueAsObject method
-    [model setValuesForKeysWithDictionary:snap.value];
-    self.populateCell(cell, model);
-  } else {
-    self.populateCell(cell, snap);
-  }
+
+  UICollectionViewCell *cell = self.populateCellAtIndexPath(collectionView, indexPath, snap);
 
   return cell;
 }
@@ -289,27 +83,18 @@ - (NSInteger)collectionView:(nonnull UICollectionView *)collectionView
   return self.count;
 }
 
-- (void)populateCellWithBlock:(void (^)(__kindof UICollectionViewCell *cell,
-                                        __kindof NSObject *object))callback {
-  self.populateCell = callback;
-}
+@end
 
-#pragma mark - Accessors
+@implementation UICollectionView (FirebaseCollectionViewDataSource)
 
-- (void)setModelClass:(Class)modelClass {
-  if (modelClass == nil) {
-    _modelClass = [FIRDataSnapshot class];
-  } else {
-    _modelClass = modelClass;
-  }
-}
-
-- (void)setCellClass:(Class)cellClass {
-  if (cellClass == nil) {
-    _cellClass = [UICollectionViewCell class];
-  } else {
-    _cellClass = cellClass;
-  }
+- (FirebaseCollectionViewDataSource *)bindToQuery:(FIRDatabaseQuery *)query
+                                     populateCell:(UICollectionViewCell *(^)(UICollectionView *,
+                                                                             NSIndexPath *,
+                                                                             FIRDataSnapshot *))populateCell {
+  FirebaseCollectionViewDataSource *dataSource =
+    [[FirebaseCollectionViewDataSource alloc] initWithQuery:query view:self populateCell:populateCell];
+  self.dataSource = dataSource;
+  return dataSource;
 }
 
 @end