Merge pull request #98 from richardjrossiii/master

Added support for deletion from PFQueryTableViewController and PFQueryCollectionViewController.

Author: nlutsenko

ParseUI.xcodeproj/project.pbxproj

@@ -116,6 +116,10 @@
 		A5375DF534FF03442906BCAC /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B91892E5A1364B4A9F064902 /* Pods.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		AACBBE4A0F95108600F1A2B1 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AACBBE490F95108600F1A2B1 /* Foundation.framework */; };
 		BD1FB4C4DFB833BFFD3E209A /* (null) in Frameworks */ = {isa = PBXBuildFile; };
+		F57F3D231B0C03D40087F60B /* DeletionCollectionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F57F3D201B0C03C90087F60B /* DeletionCollectionViewController.m */; };
+		F57F3D241B0C03DB0087F60B /* DeletionTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F57F3D1C1B0C03BA0087F60B /* DeletionTableViewController.m */; };
+		F57F3D271B0C050C0087F60B /* DeletionTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F57F3D251B0C04EF0087F60B /* DeletionTableViewController.swift */; };
+		F57F3D291B0C05280087F60B /* DeletionCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F57F3D281B0C05280087F60B /* DeletionCollectionViewController.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -240,6 +244,12 @@
 		B774A7483212431D2C034600 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
 		B91892E5A1364B4A9F064902 /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		D2AAC07E0554694100DB518D /* ParseUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ParseUI.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		F57F3D1B1B0C03BA0087F60B /* DeletionTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeletionTableViewController.h; sourceTree = "<group>"; };
+		F57F3D1C1B0C03BA0087F60B /* DeletionTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DeletionTableViewController.m; sourceTree = "<group>"; };
+		F57F3D1F1B0C03C90087F60B /* DeletionCollectionViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeletionCollectionViewController.h; sourceTree = "<group>"; };
+		F57F3D201B0C03C90087F60B /* DeletionCollectionViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DeletionCollectionViewController.m; sourceTree = "<group>"; };
+		F57F3D251B0C04EF0087F60B /* DeletionTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DeletionTableViewController.swift; sourceTree = "<group>"; };
+		F57F3D281B0C05280087F60B /* DeletionCollectionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DeletionCollectionViewController.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -467,6 +477,8 @@
 		81472FA11A1AB37500FD6EED /* QueryTableViewController */ = {
 			isa = PBXGroup;
 			children = (
+				F57F3D1B1B0C03BA0087F60B /* DeletionTableViewController.h */,
+				F57F3D1C1B0C03BA0087F60B /* DeletionTableViewController.m */,
 				81472F971A1AB37500FD6EED /* SimpleTableViewController.h */,
 				81472F981A1AB37500FD6EED /* SimpleTableViewController.m */,
 				81472F991A1AB37500FD6EED /* PaginatedTableViewController.h */,
@@ -558,6 +570,8 @@
 		81C5993C1A64344800F574E8 /* QueryCollectionViewController */ = {
 			isa = PBXGroup;
 			children = (
+				F57F3D1F1B0C03C90087F60B /* DeletionCollectionViewController.h */,
+				F57F3D201B0C03C90087F60B /* DeletionCollectionViewController.m */,
 				81C5993D1A64346000F574E8 /* SimpleCollectionViewController.h */,
 				81C5993E1A64346000F574E8 /* SimpleCollectionViewController.m */,
 				81C599401A6454C900F574E8 /* PaginatedCollectionViewController.h */,
@@ -685,6 +699,7 @@
 		81FC6B571A9D1BFC00104E45 /* QueryTableViewController */ = {
 			isa = PBXGroup;
 			children = (
+				F57F3D251B0C04EF0087F60B /* DeletionTableViewController.swift */,
 				81FC6B5B1A9D1BFC00104E45 /* SimpleTableViewController.swift */,
 				81FC6B591A9D1BFC00104E45 /* PaginatedTableViewController.swift */,
 				81FC6B5A1A9D1BFC00104E45 /* SectionedTableViewController.swift */,
@@ -698,6 +713,7 @@
 		81FC6B661A9D1CE900104E45 /* QueryCollectionViewController */ = {
 			isa = PBXGroup;
 			children = (
+				F57F3D281B0C05280087F60B /* DeletionCollectionViewController.swift */,
 				81FC6B691A9D1CE900104E45 /* SimpleCollectionViewController.swift */,
 				81FC6B671A9D1CE900104E45 /* PaginatedCollectionViewController.swift */,
 				81FC6B681A9D1CE900104E45 /* SectionedCollectionViewController.swift */,
@@ -1078,7 +1094,9 @@
 				81FC6B601A9D1BFC00104E45 /* SectionedTableViewController.swift in Sources */,
 				81FC6B5F1A9D1BFC00104E45 /* PaginatedTableViewController.swift in Sources */,
 				81FC6B611A9D1BFC00104E45 /* SimpleTableViewController.swift in Sources */,
+				F57F3D291B0C05280087F60B /* DeletionCollectionViewController.swift in Sources */,
 				81FC6B6E1A9D1CE900104E45 /* SimpleCollectionViewController.swift in Sources */,
+				F57F3D271B0C050C0087F60B /* DeletionTableViewController.swift in Sources */,
 				81FC6B6D1A9D1CE900104E45 /* SectionedCollectionViewController.swift in Sources */,
 				81FC6B561A9D1ADB00104E45 /* CustomSignUpViewController.swift in Sources */,
 				81FC6B621A9D1BFC00104E45 /* StoryboardTableViewController.swift in Sources */,
@@ -1103,8 +1121,10 @@
 				81472FB41A1AB37500FD6EED /* CustomLogInViewController.m in Sources */,
 				81472FB91A1AB37500FD6EED /* CustomProductTableViewController.m in Sources */,
 				819A4B3A1A6808EA00D01241 /* SubtitleImageCollectionViewController.m in Sources */,
+				F57F3D241B0C03DB0087F60B /* DeletionTableViewController.m in Sources */,
 				812E5C041A7A8EFB000FBDE1 /* StoryboardCollectionViewController.m in Sources */,
 				81472FB51A1AB37500FD6EED /* SimpleTableViewController.m in Sources */,
+				F57F3D231B0C03D40087F60B /* DeletionCollectionViewController.m in Sources */,
 				81472FB61A1AB37500FD6EED /* PaginatedTableViewController.m in Sources */,
 				81C8D9BD1A890BCA007B8DCF /* StoryboardTableViewController.m in Sources */,
 				81472FB71A1AB37500FD6EED /* SectionedTableViewController.m in Sources */,

ParseUI/Classes/QueryCollectionViewController/PFQueryCollectionViewController.h

@@ -25,6 +25,7 @@
 
 PFUI_ASSUME_NONNULL_BEGIN
 
+@class BFTask;
 @class PFCollectionViewCell;
 @class PFObject;
 @class PFQuery;
@@ -139,23 +140,37 @@ PFUI_ASSUME_NONNULL_BEGIN
  */
 - (PFUI_NULLABLE PFObject *)objectAtIndexPath:(PFUI_NULLABLE NSIndexPath *)indexPath;
 
+/*!
+ @abstract Removes an object at the specified index path, animated.
+ */
+- (void)removeObjectAtIndexPath:(PFUI_NULLABLE NSIndexPath *)indexPath;
+
+/*!
+ @abstract Removes all objects at the specified index paths, animated.
+ */
+- (void)removeObjectsAtIndexPaths:(PFUI_NULLABLE NSArray *)indexes;
+
 ///--------------------------------------
 /// @name Loading Data
 ///--------------------------------------
 
 /*!
  @abstract Clears the collection view and loads the first page of objects.
+
+ @returns An awaitable task that completes when the reload succeeds
  */
-- (void)loadObjects;
+- (BFTask *)loadObjects;
 
 /*!
  @abstract Loads the objects of the <parseClassName> at the specified page and appends it to the
  objects already loaded and refreshes the collection.
 
  @param page  The page of objects to load.
  @param clear Whether to clear the collection view after receiving the objects.
+
+ @returns An awaitable task that completes when the reload succeeds
  */
-- (void)loadObjects:(NSInteger)page clear:(BOOL)clear;
+- (BFTask *)loadObjects:(NSInteger)page clear:(BOOL)clear;
 
 /*!
  @abstract Loads the next page of objects, appends to table, and refreshes.

ParseUI/Classes/QueryCollectionViewController/PFQueryCollectionViewController.m

@@ -21,6 +21,9 @@
 
 #import "PFQueryCollectionViewController.h"
 
+#import <Bolts/BFTask.h>
+#import <Bolts/BFTaskCompletionSource.h>
+
 #import <Parse/Parse.h>
 
 #import "PFActivityIndicatorCollectionReusableView.h"
@@ -164,17 +167,71 @@ - (PFObject *)objectAtIndexPath:(NSIndexPath *)indexPath {
     return self.objects[indexPath.row];
 }
 
+#pragma mark -
+#pragma mark Removing Objects
+
+- (void)removeObjectAtIndexPath:(NSIndexPath *)indexPath {
+    [self removeObjectsAtIndexPaths:@[ indexPath ]];
+}
+
+- (void)removeObjectsAtIndexPaths:(NSArray *)indexPaths {
+    if (indexPaths.count == 0) {
+        return;
+    }
+
+    // We need the contents as both an index set and a list of index paths.
+    NSMutableIndexSet *indexes = [NSMutableIndexSet indexSet];
+
+    for (NSIndexPath *indexPath in indexPaths) {
+        if (indexPath.section != 0) {
+            [NSException raise:NSRangeException format:@"Index Path section %lu out of range!", (long)indexPath.section];
+        }
+
+        if (indexPath.row >= self.objects.count) {
+            [NSException raise:NSRangeException format:@"Index Path row %lu out of range!", (long)indexPath.row];
+        }
+
+        [indexes addIndex:indexPath.row];
+    }
+
+    BFContinuationBlock deletionHandlerBlock = ^id (BFTask *task) {
+        self.refreshControl.enabled = YES;
+
+        if (task.error) {
+            [self _handleDeletionError:task.error];
+        }
+
+        return nil;
+    };
+
+    NSMutableArray *allDeletionTasks = [NSMutableArray arrayWithCapacity:indexes.count];
+    NSArray *objectsToRemove = [self.objects objectsAtIndexes:indexes];
+
+    // Remove the contents from our local cache so we can give the user immediate feedback.
+    [_mutableObjects removeObjectsInArray:objectsToRemove];
+    [self.collectionView deleteItemsAtIndexPaths:indexPaths];
+
+    for (id obj in objectsToRemove) {
+        [allDeletionTasks addObject:[obj deleteInBackground]];
+    }
+
+    [[BFTask taskForCompletionOfAllTasks:allDeletionTasks]
+                       continueWithBlock:deletionHandlerBlock];
+}
+
 #pragma mark -
 #pragma mark Loading Data
 
-- (void)loadObjects {
-    [self loadObjects:0 clear:YES];
+- (BFTask *)loadObjects {
+    return [self loadObjects:0 clear:YES];
 }
 
-- (void)loadObjects:(NSInteger)page clear:(BOOL)clear {
+- (BFTask *)loadObjects:(NSInteger)page clear:(BOOL)clear {
     self.loading = YES;
     [self objectsWillLoad];
 
+    BFTaskCompletionSource *source = [BFTaskCompletionSource taskCompletionSource];
+
     PFQuery *query = [self queryForCollection];
     [self _alterQuery:query forLoadingPage:page];
     [query findObjectsInBackgroundWithBlock:^(NSArray *foundObjects, NSError *error) {
@@ -197,15 +254,18 @@ - (void)loadObjects:(NSInteger)page clear:(BOOL)clear {
             if (clear) {
                 [_mutableObjects removeAllObjects];
             }
-            [_mutableObjects addObjectsFromArray:foundObjects];
 
-            // Reload the table data
+            [_mutableObjects addObjectsFromArray:foundObjects];
             [self.collectionView reloadData];
         }
 
         [self objectsDidLoad:error];
         [self.refreshControl endRefreshing];
+
+        [source setError:error];
     }];
+
+    return source.task;
 }
 
 - (void)loadNextPage {
@@ -322,6 +382,38 @@ - (NSIndexPath *)_indexPathForPaginationReusableView {
     return [NSIndexPath indexPathForItem:0 inSection:[self numberOfSectionsInCollectionView:self.collectionView] - 1];
 }
 
+#pragma mark -
+#pragma mark Error handling
+
+- (void)_handleDeletionError:(NSError *)error {
+    // Fully reload on error.
+    [self loadObjects];
+
+    NSString *errorMessage = [NSString stringWithFormat:@"%@: \"%@\"",
+                              NSLocalizedString(@"Error occurred during deletion", @"Error occurred during deletion"),
+                              error.localizedDescription];
+
+    if ([UIAlertController class]) {
+        UIAlertController *errorController = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Error", @"Error")
+                                                                                 message:errorMessage
+                                                                          preferredStyle:UIAlertControllerStyleAlert];
+
+        [errorController addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"OK", @"OK")
+                                                            style:UIAlertActionStyleCancel
+                                                          handler:nil]];
+
+        [self presentViewController:errorController animated:YES completion:nil];
+    } else {
+        UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Error", @"Error")
+                                                            message:errorMessage
+                                                           delegate:nil
+                                                  cancelButtonTitle:NSLocalizedString(@"OK", @"OK")
+                                                  otherButtonTitles:nil];
+
+        [alertView show];
+    }
+}
+
 #pragma mark -
 #pragma mark Actions
 

ParseUI/Classes/QueryTableViewController/PFQueryTableViewController.h

@@ -25,6 +25,7 @@
 
 PFUI_ASSUME_NONNULL_BEGIN
 
+@class BFTask;
 @class PFObject;
 @class PFQuery;
 @class PFTableViewCell;
@@ -161,24 +162,48 @@ PFUI_ASSUME_NONNULL_BEGIN
  */
 - (PFUI_NULLABLE PFObject *)objectAtIndexPath:(PFUI_NULLABLE NSIndexPath *)indexPath;
 
+/*!
+ @abstract Removes an object at the specified index path, animated.
+ */
+- (void)removeObjectAtIndexPath:(PFUI_NULLABLE NSIndexPath *)indexPath;
+
+/*!
+ @abstract Removes an object at the specified index path, with or without animation.
+ */
+- (void)removeObjectAtIndexPath:(PFUI_NULLABLE NSIndexPath *)indexPath animated:(BOOL)animated;
+
+/*!
+ @abstract Removes all objects at the specified index paths, animated.
+ */
+- (void)removeObjectsAtIndexPaths:(PFUI_NULLABLE NSArray *)indexes;
+
+/*!
+ @abstract Removes all objects at the specified index paths, with or without animation.
+ */
+- (void)removeObjectsAtIndexPaths:(PFUI_NULLABLE NSArray *)indexes animated:(BOOL)animated;
+
 /*!
  @abstract Clears the table of all objects.
  */
 - (void)clear;
 
 /*!
  @abstract Clears the table and loads the first page of objects.
+
+ @returns An awaitable task that completes when the reload succeeds
  */
-- (void)loadObjects;
+- (BFTask *)loadObjects;
 
 /*!
  @abstract Loads the objects of the className at the specified page and appends it to the
  objects already loaded and refreshes the table.
 
  @param page The page of objects to load.
- @param clear Whether to clear the table after receiving the objects.
+ @param clear Whether to clear the table after receiving the objects
+
+ @returns An awaitable task that completes when the reload succeeds
  */
-- (void)loadObjects:(NSInteger)page clear:(BOOL)clear;
+- (BFTask *)loadObjects:(NSInteger)page clear:(BOOL)clear;
 
 /*!
  @abstract Loads the next page of objects, appends to table, and refreshes.