motion-yapper 0.0.1 → 0.0.2

data/vendor/Pods/YapDatabase/YapDatabase/Extensions/FilteredViews/YapDatabaseFilteredViewTransaction.h

@@ -1,24 +1,9 @@
 #import <Foundation/Foundation.h>
 
 #import "YapDatabaseViewTransaction.h"
+#import "YapDatabaseFilteredViewTypes.h"
 #import "YapDatabaseFilteredView.h"
 
-#ifndef YapDatabaseViewFilteringBlockDefined
-#define YapDatabaseViewFilteringBlockDefined 1
-
-typedef id YapDatabaseViewFilteringBlock; // One of the YapDatabaseViewGroupingX types below.
-
-typedef BOOL (^YapDatabaseViewFilteringWithKeyBlock)     \
-                                        (NSString *group, NSString *collection, NSString *key);
-typedef BOOL (^YapDatabaseViewFilteringWithObjectBlock)  \
-                                        (NSString *group, NSString *collection, NSString *key, id object);
-typedef BOOL (^YapDatabaseViewFilteringWithMetadataBlock)\
-                                        (NSString *group, NSString *collection, NSString *key, id metadata);
-typedef BOOL (^YapDatabaseViewFilteringWithRowBlock)     \
-                                        (NSString *group, NSString *collection, NSString *key, id object, id metadata);
-
-#endif
-
 
 @interface YapDatabaseFilteredViewTransaction : YapDatabaseViewTransaction
 
@@ -32,8 +17,23 @@ typedef BOOL (^YapDatabaseViewFilteringWithRowBlock)     \
 
 @interface YapDatabaseFilteredViewTransaction (ReadWrite)
 
+/**
+ * This method allows you to change the filterBlock on-the-fly.
+ * 
+ * When you do so, the extension will emit the smallest change-set possible.
+ * That is, it does NOT clear the view and start from scratch.
+ * Rather it performs a quick in-place update.
+ * The end result is a minimal change-set that looks nice for tableView / collectionView animations.
+ * 
+ * For example, in Apple's phone app, in the Recents tab, one can switch between "all" and "missed" calls.
+ * Tapping the "missed" button smoothly animates away all non-red rows. It looks great.
+ * You can get the same effect by using a YapDatabaseFilteredView,
+ * and swapping in/out a filterBlock to allow/disallow non-missed calls.
+ *
+ * Note: You must pass a different versionTag, or this method does nothing.
+**/
 - (void)setFilteringBlock:(YapDatabaseViewFilteringBlock)filteringBlock
        filteringBlockType:(YapDatabaseViewBlockType)filteringBlockType
-                      tag:(NSString *)tag;
+               versionTag:(NSString *)tag;
 
 @end

data/vendor/Pods/YapDatabase/YapDatabase/Extensions/FilteredViews/YapDatabaseFilteredViewTransaction.m

@@ -20,6 +20,11 @@
   static const int ydbLogLevel = YDB_LOG_LEVEL_WARN;
 #endif
 
+#define ExtKey_classVersion    @"classVersion"
+#define ExtKey_persistent      @"persistent"
+#define ExtKey_parentViewName  @"parentViewName"
+#define ExtKey_tag_deprecated  @"tag"
+#define ExtKey_versionTag      @"versionTag"
 
 @implementation YapDatabaseFilteredViewTransaction
 
@@ -35,31 +40,68 @@
 **/
 - (BOOL)createIfNeeded
 {
+	YDBLogAutoTrace();
+	
+	__unsafe_unretained YapDatabaseFilteredView *filteredView = (YapDatabaseFilteredView *)(viewConnection->view);
+	
+	int classVersion = YAP_DATABASE_VIEW_CLASS_VERSION;
+	BOOL isPersistent = [self isPersistentView];
+	
+	NSString *parentViewName = filteredView->parentViewName;
+	NSString *versionTag = filteredView->versionTag;
+	
+	// Figure out what steps we need to take in order to register the view
+	
 	BOOL needsCreateTables = NO;
 	
+	BOOL oldIsPersistent = NO;
+	BOOL hasOldIsPersistent = NO;
+	
+	NSString *oldParentViewName = nil;
+	NSString *oldVersionTag = nil;
+	
 	// Check classVersion (the internal version number of view implementation)
 	
-	int oldClassVersion = [self intValueForExtensionKey:@"classVersion"];
-	int classVersion = YAP_DATABASE_VIEW_CLASS_VERSION;
+	int oldClassVersion = 0;
+	BOOL hasOldClassVersion = [self getIntValue:&oldClassVersion forExtensionKey:ExtKey_classVersion];
 	
-	if (oldClassVersion != classVersion)
+	if (!hasOldClassVersion)
+	{
+		needsCreateTables = YES;
+	}
+	else if (oldClassVersion != classVersion)
+	{
+		[self dropTablesForOldClassVersion:oldClassVersion];
 		needsCreateTables = YES;
+	}
 	
 	// Check persistence.
 	// Need to properly transition from persistent to non-persistent, and vice-versa.
 	
-	BOOL oldIsPersistent = NO;
-	BOOL hasOldIsPersistent = [self getBoolValue:&oldIsPersistent forExtensionKey:@"persistent"];
-	
-	BOOL isPersistent = [self isPersistentView];
-	
-	if (hasOldIsPersistent && (oldIsPersistent != isPersistent))
+	if (!needsCreateTables || hasOldClassVersion)
 	{
-		[[viewConnection->view class]
-		  dropTablesForRegisteredName:[self registeredName]
-		              withTransaction:(YapDatabaseReadWriteTransaction *)databaseTransaction];
+		hasOldIsPersistent = [self getBoolValue:&oldIsPersistent forExtensionKey:ExtKey_persistent];
 		
-		needsCreateTables = YES;
+		if (hasOldIsPersistent && oldIsPersistent && !isPersistent)
+		{
+			[[viewConnection->view class]
+			  dropTablesForRegisteredName:[self registeredName]
+			              withTransaction:(YapDatabaseReadWriteTransaction *)databaseTransaction];
+		}
+		
+		if (!hasOldIsPersistent || (oldIsPersistent != isPersistent))
+		{
+			needsCreateTables = YES;
+		}
+		else if (!isPersistent)
+		{
+			// We always have to create & populate the tables for non-persistent views.
+			// Even when re-registering from previous app launch.
+			needsCreateTables = YES;
+			
+			oldParentViewName = [self stringValueForExtensionKey:ExtKey_parentViewName];
+			oldVersionTag = [self stringValueForExtensionKey:ExtKey_versionTag];
+		}
 	}
 	
 	// Create or re-populate if needed
@@ -71,34 +113,75 @@
 		if (![self createTables]) return NO;
 		if (![self populateView]) return NO;
 		
-		[self setIntValue:classVersion forExtensionKey:@"classVersion"];
+		if (!hasOldClassVersion || (oldClassVersion != classVersion)) {
+			[self setIntValue:classVersion forExtensionKey:ExtKey_classVersion];
+		}
+		
+		if (!hasOldIsPersistent || (oldIsPersistent != isPersistent)) {
+			[self setBoolValue:isPersistent forExtensionKey:ExtKey_persistent];
+		}
 		
-		[self setBoolValue:isPersistent forExtensionKey:@"persistent"];
+		if (![oldParentViewName isEqualToString:parentViewName]) {
+			[self setStringValue:parentViewName forExtensionKey:ExtKey_parentViewName];
+		}
 		
-		int userSuppliedConfigVersion = viewConnection->view->version;
-		[self setIntValue:userSuppliedConfigVersion forExtensionKey:@"version"];
+		if (![oldVersionTag isEqualToString:versionTag]) {
+			[self setStringValue:versionTag forExtensionKey:ExtKey_versionTag];
+		}
 	}
 	else
 	{
+		BOOL needsRepopulateView = NO;
+		
+		// Check parentViewName.
+		// Need to re-populate if the parent changed.
+		
+		oldParentViewName = [self stringValueForExtensionKey:ExtKey_parentViewName];
+		
+		if (![oldParentViewName isEqualToString:parentViewName])
+		{
+			needsRepopulateView = YES;
+		}
+		
 		// Check user-supplied tag.
 		// We may need to re-populate the database if the groupingBlock or sortingBlock changed.
 		
-		__unsafe_unretained YapDatabaseFilteredView *filteredView =
-		  (YapDatabaseFilteredView *)viewConnection->view;
+		oldVersionTag = [self stringValueForExtensionKey:ExtKey_versionTag];
 		
-		NSString *oldTag = [self stringValueForExtensionKey:@"tag"];
-		NSString *newTag = filteredView->tag;
+		NSString *oldTag_deprecated = nil;
+		if (oldVersionTag == nil)
+		{
+			oldTag_deprecated = [self stringValueForExtensionKey:ExtKey_tag_deprecated];
+			if (oldTag_deprecated)
+			{
+				oldVersionTag = oldTag_deprecated;
+			}
+		}
 		
-		if (![oldTag isEqualToString:newTag])
+		if (![oldVersionTag isEqualToString:versionTag])
+		{
+			needsRepopulateView = YES;
+		}
+		
+		if (needsRepopulateView)
 		{
 			if (![self populateView]) return NO;
 			
-			[self setStringValue:newTag forExtensionKey:@"tag"];
+			if (![oldParentViewName isEqualToString:parentViewName]) {
+				[self setStringValue:parentViewName forExtensionKey:ExtKey_parentViewName];
+			}
+			
+			if (![oldVersionTag isEqualToString:versionTag]) {
+				[self setStringValue:versionTag forExtensionKey:ExtKey_versionTag];
+			}
+			
+			if (oldTag_deprecated)
+				[self removeValueForExtensionKey:ExtKey_tag_deprecated];
 		}
-		
-		if (!hasOldIsPersistent)
+		else if (oldTag_deprecated)
 		{
-			[self setBoolValue:isPersistent forExtensionKey:@"persistent"];
+			[self removeValueForExtensionKey:ExtKey_tag_deprecated];
+			[self setStringValue:versionTag forExtensionKey:ExtKey_versionTag];
 		}
 	}
 	
@@ -122,16 +205,6 @@
 	YapDatabaseViewTransaction *parentViewTransaction =
 	  [databaseTransaction ext:filteredView->parentViewName];
 	
-	__unsafe_unretained YapDatabaseView *parentView = parentViewTransaction->viewConnection->view;
-	
-	// Capture grouping & sorting block
-	
-	filteredView->groupingBlock = parentView->groupingBlock;
-	filteredView->groupingBlockType = parentView->groupingBlockType;
-	
-	filteredView->sortingBlock = parentView->sortingBlock;
-	filteredView->sortingBlockType = parentView->sortingBlockType;
-	
 	// Remove everything from the database
 	
 	[self removeAllRowids];
@@ -155,19 +228,15 @@
 			[parentViewTransaction enumerateRowidsInGroup:group
 			                                   usingBlock:^(int64_t rowid, NSUInteger parentIndex, BOOL *stop)
 			{
-				NSString *key = nil;
-				NSString *collection = nil;
-				[databaseTransaction getKey:&key collection:&collection forRowid:rowid];
+				YapCollectionKey *ck = [databaseTransaction collectionKeyForRowid:rowid];
 				
-				if (filterBlock(group, collection, key))
+				if (filterBlock(group, ck.collection, ck.key))
 				{
-					YapCollectionKey *collectionKey = [[YapCollectionKey alloc] initWithCollection:collection key:key];
-					
 					if (filteredIndex == 0)
-						[self insertRowid:rowid collectionKey:collectionKey inNewGroup:group];
+						[self insertRowid:rowid collectionKey:ck inNewGroup:group];
 					else
-						[self insertRowid:rowid collectionKey:collectionKey inGroup:group atIndex:filteredIndex
-						                                                      withExistingPageKey:nil];
+						[self insertRowid:rowid collectionKey:ck inGroup:group atIndex:filteredIndex
+						                                           withExistingPageKey:nil];
 					filteredIndex++;
 				}
 			}];
@@ -185,20 +254,17 @@
 			[parentViewTransaction enumerateRowidsInGroup:group
 			                                   usingBlock:^(int64_t rowid, NSUInteger parentIndex, BOOL *stop)
 			{
-				NSString *key = nil;
-				NSString *collection = nil;
+				YapCollectionKey *ck = nil;
 				id object = nil;
-				[databaseTransaction getKey:&key collection:&collection object:&object forRowid:rowid];
+				[databaseTransaction getCollectionKey:&ck object:&object forRowid:rowid];
 				
-				if (filterBlock(group, collection, key, object))
+				if (filterBlock(group, ck.collection, ck.key, object))
 				{
-					YapCollectionKey *collectionKey = [[YapCollectionKey alloc] initWithCollection:collection key:key];
-					
 					if (filteredIndex == 0)
-						[self insertRowid:rowid collectionKey:collectionKey inNewGroup:group];
+						[self insertRowid:rowid collectionKey:ck inNewGroup:group];
 					else
-						[self insertRowid:rowid collectionKey:collectionKey inGroup:group atIndex:filteredIndex
-						                                                      withExistingPageKey:nil];
+						[self insertRowid:rowid collectionKey:ck inGroup:group atIndex:filteredIndex
+						                                           withExistingPageKey:nil];
 					filteredIndex++;
 				}
 			}];
@@ -216,20 +282,17 @@
 			[parentViewTransaction enumerateRowidsInGroup:group
 			                                   usingBlock:^(int64_t rowid, NSUInteger parentIndex, BOOL *stop)
 			{
-				NSString *key = nil;
-				NSString *collection = nil;
+				YapCollectionKey *ck = nil;
 				id metadata = nil;
-				[databaseTransaction getKey:&key collection:&collection metadata:&metadata forRowid:rowid];
+				[databaseTransaction getCollectionKey:&ck metadata:&metadata forRowid:rowid];
 				
-				if (filterBlock(group, collection, key, metadata))
+				if (filterBlock(group, ck.collection, ck.key, metadata))
 				{
-					YapCollectionKey *collectionKey = [[YapCollectionKey alloc] initWithCollection:collection key:key];
-					
 					if (filteredIndex == 0)
-						[self insertRowid:rowid collectionKey:collectionKey inNewGroup:group];
+						[self insertRowid:rowid collectionKey:ck inNewGroup:group];
 					else
-						[self insertRowid:rowid collectionKey:collectionKey inGroup:group atIndex:filteredIndex
-						                                                      withExistingPageKey:nil];
+						[self insertRowid:rowid collectionKey:ck inGroup:group atIndex:filteredIndex
+						                                           withExistingPageKey:nil];
 					filteredIndex++;
 				}
 			}];
@@ -247,26 +310,22 @@
 			[parentViewTransaction enumerateRowidsInGroup:group
 			                                   usingBlock:^(int64_t rowid, NSUInteger parentIndex, BOOL *stop)
 			{
-				NSString *key = nil;
-				NSString *collection = nil;
+				YapCollectionKey *ck = nil;
 				id object = nil;
 				id metadata = nil;
 				
-				[databaseTransaction getKey:&key
-				                 collection:&collection
-				                     object:&object
-				                   metadata:&metadata
-				                   forRowid:rowid];
+				[databaseTransaction getCollectionKey:&ck
+				                               object:&object
+				                             metadata:&metadata
+				                             forRowid:rowid];
 				
-				if (filterBlock(group, collection, key, object, metadata))
+				if (filterBlock(group, ck.collection, ck.key, object, metadata))
 				{
-					YapCollectionKey *collectionKey = [[YapCollectionKey alloc] initWithCollection:collection key:key];
-					
 					if (filteredIndex == 0)
-						[self insertRowid:rowid collectionKey:collectionKey inNewGroup:group];
+						[self insertRowid:rowid collectionKey:ck inNewGroup:group];
 					else
-						[self insertRowid:rowid collectionKey:collectionKey inGroup:group atIndex:filteredIndex
-						                                                      withExistingPageKey:nil];
+						[self insertRowid:rowid collectionKey:ck inGroup:group atIndex:filteredIndex
+						                                           withExistingPageKey:nil];
 					filteredIndex++;
 				}
 			}];
@@ -280,7 +339,7 @@
 #pragma mark Logic
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-- (void)repopulate
+- (void)repopulateView
 {
 	YDBLogAutoTrace();
 	
@@ -320,11 +379,9 @@
 			[parentViewTransaction enumerateRowidsInGroup:group
 			                                   usingBlock:^(int64_t rowid, NSUInteger parentIndex, BOOL *stop)
 			{
-				NSString *key = nil;
-				NSString *collection = nil;
-				[databaseTransaction getKey:&key collection:&collection forRowid:rowid];
+				YapCollectionKey *ck = [databaseTransaction collectionKeyForRowid:rowid];
 				
-				if (filterBlock(group, collection, key))
+				if (filterBlock(group, ck.collection, ck.key))
 				{
 					if (existing && (existingRowid == rowid))
 					{
@@ -339,8 +396,6 @@
 						// The row was not previously in the view (disallowed by previous filter),
 						// but is now in the view (allowed by new filter).
 						
-						YapCollectionKey *ck = [[YapCollectionKey alloc] initWithCollection:collection key:key];
-						
 						if (index == 0 && ([viewConnection->group_pagesMetadata_dict objectForKey:group] == nil))
 							[self insertRowid:rowid collectionKey:ck inNewGroup:group];
 						else
@@ -356,8 +411,6 @@
 						// The row was previously in the view (allowed by previous filter),
 						// but is no longer in the view (disallowed by new filter).
 						
-						YapCollectionKey *ck = [[YapCollectionKey alloc] initWithCollection:collection key:key];
-						
 						[self removeRowid:rowid collectionKey:ck atIndex:index inGroup:group];
 						existing = [self getRowid:&existingRowid atIndex:index inGroup:group];
 					}
@@ -387,12 +440,11 @@
 			[parentViewTransaction enumerateRowidsInGroup:group
 			                                   usingBlock:^(int64_t rowid, NSUInteger parentIndex, BOOL *stop)
 			{
-				NSString *key = nil;
-				NSString *collection = nil;
+				YapCollectionKey *ck = nil;
 				id object = nil;
-				[databaseTransaction getKey:&key collection:&collection object:&object forRowid:rowid];
+				[databaseTransaction getCollectionKey:&ck object:&object forRowid:rowid];
 				
-				if (filterBlock(group, collection, key, object))
+				if (filterBlock(group, ck.collection, ck.key, object))
 				{
 					if (existing && (existingRowid == rowid))
 					{
@@ -407,8 +459,6 @@
 						// The row was not previously in the view (disallowed by previous filter),
 						// but is now in the view (allowed by new filter).
 						
-						YapCollectionKey *ck = [[YapCollectionKey alloc] initWithCollection:collection key:key];
-						
 						if (index == 0 && ([viewConnection->group_pagesMetadata_dict objectForKey:group] == nil))
 							[self insertRowid:rowid collectionKey:ck inNewGroup:group];
 						else
@@ -424,8 +474,6 @@
 						// The row was previously in the view (allowed by previous filter),
 						// but is no longer in the view (disallowed by new filter).
 						
-						YapCollectionKey *ck = [[YapCollectionKey alloc] initWithCollection:collection key:key];
-						
 						[self removeRowid:rowid collectionKey:ck atIndex:index inGroup:group];
 						existing = [self getRowid:&existingRowid atIndex:index inGroup:group];
 					}
@@ -455,12 +503,11 @@
 			[parentViewTransaction enumerateRowidsInGroup:group
 			                                   usingBlock:^(int64_t rowid, NSUInteger parentIndex, BOOL *stop)
 			{
-				NSString *key = nil;
-				NSString *collection = nil;
+				YapCollectionKey *ck = nil;
 				id metadata = nil;
-				[databaseTransaction getKey:&key collection:&collection metadata:&metadata forRowid:rowid];
+				[databaseTransaction getCollectionKey:&ck metadata:&metadata forRowid:rowid];
 				
-				if (filterBlock(group, collection, key, metadata))
+				if (filterBlock(group, ck.collection, ck.key, metadata))
 				{
 					if (existing && (existingRowid == rowid))
 					{
@@ -475,8 +522,6 @@
 						// The row was not previously in the view (disallowed by previous filter),
 						// but is now in the view (allowed by new filter).
 						
-						YapCollectionKey *ck = [[YapCollectionKey alloc] initWithCollection:collection key:key];
-						
 						if (index == 0 && ([viewConnection->group_pagesMetadata_dict objectForKey:group] == nil))
 							[self insertRowid:rowid collectionKey:ck inNewGroup:group];
 						else
@@ -492,8 +537,6 @@
 						// The row was previously in the view (allowed by previous filter),
 						// but is no longer in the view (disallowed by new filter).
 						
-						YapCollectionKey *ck = [[YapCollectionKey alloc] initWithCollection:collection key:key];
-						
 						[self removeRowid:rowid collectionKey:ck atIndex:index inGroup:group];
 						existing = [self getRowid:&existingRowid atIndex:index inGroup:group];
 					}
@@ -523,18 +566,16 @@
 			[parentViewTransaction enumerateRowidsInGroup:group
 			                                   usingBlock:^(int64_t rowid, NSUInteger parentIndex, BOOL *stop)
 			{
-				NSString *key = nil;
-				NSString *collection = nil;
+				YapCollectionKey *ck = nil;
 				id object = nil;
 				id metadata = nil;
 				
-				[databaseTransaction getKey:&key
-				                 collection:&collection
-				                     object:&object
-				                   metadata:&metadata
-				                   forRowid:rowid];
+				[databaseTransaction getCollectionKey:&ck
+				                              object:&object
+				                            metadata:&metadata
+				                            forRowid:rowid];
 				
-				if (filterBlock(group, collection, key, object, metadata))
+				if (filterBlock(group, ck.collection, ck.key, object, metadata))
 				{
 					if (existing && (existingRowid == rowid))
 					{
@@ -549,8 +590,6 @@
 						// The row was not previously in the view (disallowed by previous filter),
 						// but is now in the view (allowed by new filter).
 						
-						YapCollectionKey *ck = [[YapCollectionKey alloc] initWithCollection:collection key:key];
-						
 						if (index == 0 && ([viewConnection->group_pagesMetadata_dict objectForKey:group] == nil))
 							[self insertRowid:rowid collectionKey:ck inNewGroup:group];
 						else
@@ -566,8 +605,6 @@
 						// The row was previously in the view (allowed by previous filter),
 						// but is no longer in the view (disallowed by new filter).
 						
-						YapCollectionKey *ck = [[YapCollectionKey alloc] initWithCollection:collection key:key];
-						
 						[self removeRowid:rowid collectionKey:ck atIndex:index inGroup:group];
 						existing = [self getRowid:&existingRowid atIndex:index inGroup:group];
 					}
@@ -592,8 +629,7 @@
  * This method overrides the version in YapDatabaseViewTransaction.
 **/
 - (void)handleInsertObject:(id)object
-                    forKey:(NSString *)key
-              inCollection:(NSString *)collection
+          forCollectionKey:(YapCollectionKey *)collectionKey
               withMetadata:(id)metadata
                      rowid:(int64_t)rowid
 {
@@ -602,6 +638,9 @@
 	__unsafe_unretained YapDatabaseFilteredView *filteredView =
 	  (YapDatabaseFilteredView *)viewConnection->view;
 	
+	__unsafe_unretained NSString *collection = collectionKey.collection;
+	__unsafe_unretained NSString *key = collectionKey.key;
+	
 	// Instead of going to the groupingBlock,
 	// just ask the parentViewTransaction what the last group was.
 	
@@ -656,7 +695,6 @@
 	{
 		// This was an insert operation, so we know the key wasn't already in the view.
 		
-		YapCollectionKey *collectionKey = [[YapCollectionKey alloc] initWithCollection:collection key:key];
 		int flags = (YapDatabaseViewChangedObject | YapDatabaseViewChangedMetadata);
 		
 		[self insertRowid:rowid
@@ -684,8 +722,7 @@
  * This method overrides the version in YapDatabaseViewTransaction.
 **/
 - (void)handleUpdateObject:(id)object
-                    forKey:(NSString *)key
-              inCollection:(NSString *)collection
+          forCollectionKey:(YapCollectionKey *)collectionKey
               withMetadata:(id)metadata
                      rowid:(int64_t)rowid
 {
@@ -694,7 +731,8 @@
 	__unsafe_unretained YapDatabaseFilteredView *filteredView =
 	  (YapDatabaseFilteredView *)viewConnection->view;
 	
-	YapCollectionKey *collectionKey = [[YapCollectionKey alloc] initWithCollection:collection key:key];
+	__unsafe_unretained NSString *collection = collectionKey.collection;
+	__unsafe_unretained NSString *key = collectionKey.key;
 	
 	// Instead of going to the groupingBlock,
 	// just ask the parentViewTransaction what the last group was.
@@ -782,17 +820,156 @@
  * This method is invoked by a YapDatabaseReadWriteTransaction as a post-operation-hook.
  * This method overrides the version in YapDatabaseViewTransaction.
 **/
-- (void)handleUpdateMetadata:(id)metadata
-                      forKey:(NSString *)key
-                inCollection:(NSString *)collection
-                   withRowid:(int64_t)rowid
+- (void)handleReplaceObject:(id)object forCollectionKey:(YapCollectionKey *)collectionKey withRowid:(int64_t)rowid
 {
 	YDBLogAutoTrace();
 	
 	__unsafe_unretained YapDatabaseFilteredView *filteredView =
 	  (YapDatabaseFilteredView *)viewConnection->view;
 	
-	YapCollectionKey *collectionKey = [[YapCollectionKey alloc] initWithCollection:collection key:key];
+	__unsafe_unretained NSString *collection = collectionKey.collection;
+	__unsafe_unretained NSString *key = collectionKey.key;
+	
+	BOOL groupMayHaveChanged = filteredView->groupingBlockType == YapDatabaseViewBlockTypeWithRow ||
+	                           filteredView->groupingBlockType == YapDatabaseViewBlockTypeWithObject;
+	
+	BOOL sortMayHaveChanged = filteredView->sortingBlockType == YapDatabaseViewBlockTypeWithRow ||
+	                          filteredView->sortingBlockType == YapDatabaseViewBlockTypeWithObject;
+	
+	// Instead of going to the groupingBlock,
+	// just ask the parentViewTransaction what the last group was.
+	
+	YapDatabaseViewTransaction *parentViewTransaction =
+	  [databaseTransaction ext:filteredView->parentViewName];
+	
+	NSString *group = parentViewTransaction->lastHandledGroup;
+	
+	if (group == nil)
+	{
+		// Not included in parentView.
+		
+		if (groupMayHaveChanged)
+		{
+			// Remove key from view (if needed).
+			// This was an update operation, so the key may have previously been in the view.
+			
+			[self removeRowid:rowid collectionKey:collectionKey];
+		}
+		else
+		{
+			// The group hasn't changed.
+			// Thus it wasn't previously in view, and still isn't in the view.
+		}
+		
+		lastHandledGroup = nil;
+		return;
+	}
+	
+	BOOL filterMayHaveChanged = filteredView->filteringBlockType == YapDatabaseViewBlockTypeWithRow ||
+	                            filteredView->filteringBlockType == YapDatabaseViewBlockTypeWithObject;
+	
+	if (!groupMayHaveChanged && !sortMayHaveChanged && !filterMayHaveChanged)
+	{
+		// Nothing has changed that could possibly affect the view.
+		// Just note the touch.
+		
+		int flags = YapDatabaseViewChangedObject;
+		
+		NSString *pageKey = [self pageKeyForRowid:rowid];
+		NSUInteger existingIndex = [self indexForRowid:rowid inGroup:group withPageKey:pageKey];
+		
+		[viewConnection->changes addObject:
+		    [YapDatabaseViewRowChange updateKey:collectionKey changes:flags inGroup:group atIndex:existingIndex]];
+		
+		lastHandledGroup = group;
+		return;
+	}
+	
+	// Ask filter block if we should add key to view.
+	
+	BOOL passesFilter;
+	id metadata = nil;
+	
+	if (filteredView->filteringBlockType == YapDatabaseViewBlockTypeWithKey)
+	{
+		YapDatabaseViewFilteringWithKeyBlock filterBlock =
+		  (YapDatabaseViewFilteringWithKeyBlock)filteredView->filteringBlock;
+		
+		passesFilter = filterBlock(group, collection, key);
+	}
+	else if (filteredView->filteringBlockType == YapDatabaseViewBlockTypeWithObject)
+	{
+		YapDatabaseViewFilteringWithObjectBlock filterBlock =
+		  (YapDatabaseViewFilteringWithObjectBlock)filteredView->filteringBlock;
+		
+		passesFilter = filterBlock(group, collection, key, object);
+	}
+	else if (filteredView->filteringBlockType == YapDatabaseViewBlockTypeWithMetadata)
+	{
+		YapDatabaseViewFilteringWithMetadataBlock filterBlock =
+		  (YapDatabaseViewFilteringWithMetadataBlock)filteredView->filteringBlock;
+		
+		metadata = [databaseTransaction metadataForCollectionKey:collectionKey withRowid:rowid];
+		passesFilter = filterBlock(group, collection, key, metadata);
+	}
+	else // if (filteredView->filteringBlockType == YapDatabaseViewBlockTypeWithRow)
+	{
+		YapDatabaseViewFilteringWithRowBlock filterBlock =
+		  (YapDatabaseViewFilteringWithRowBlock)filteredView->filteringBlock;
+		
+		metadata = [databaseTransaction metadataForCollectionKey:collectionKey withRowid:rowid];
+		passesFilter = filterBlock(group, collection, key, object, metadata);
+	}
+	
+	if (passesFilter)
+	{
+		// Add key to view (or update position).
+		// This was an update operation, so the key may have previously been in the view.
+		
+		int flags = (YapDatabaseViewChangedObject | YapDatabaseViewChangedMetadata);
+		
+		BOOL sortingBlockNeedsMetadata = filteredView->sortingBlockType == YapDatabaseViewBlockTypeWithRow ||
+		                                 filteredView->sortingBlockType == YapDatabaseViewBlockTypeWithMetadata;
+		if (sortingBlockNeedsMetadata && metadata == nil)
+		{
+			metadata = [databaseTransaction metadataForCollectionKey:collectionKey withRowid:rowid];
+		}
+		
+		[self insertRowid:rowid
+		    collectionKey:collectionKey
+		           object:object
+		         metadata:metadata
+		          inGroup:group
+		      withChanges:flags
+		            isNew:NO];
+		
+		lastHandledGroup = group;
+	}
+	else
+	{
+		// Filtered from this view.
+		// Remove key from view (if needed).
+		// This was an update operation, so the key may have previously been in the view.
+		
+		[self removeRowid:rowid collectionKey:collectionKey];
+		lastHandledGroup = nil;
+	}
+}
+
+/**
+ * YapDatabase extension hook.
+ * This method is invoked by a YapDatabaseReadWriteTransaction as a post-operation-hook.
+ * This method overrides the version in YapDatabaseViewTransaction.
+**/
+- (void)handleReplaceMetadata:(id)metadata forCollectionKey:(YapCollectionKey *)collectionKey withRowid:(int64_t)rowid
+{
+	YDBLogAutoTrace();
+	
+	__unsafe_unretained YapDatabaseFilteredView *filteredView =
+	  (YapDatabaseFilteredView *)viewConnection->view;
+	
+	__unsafe_unretained NSString *collection = collectionKey.collection;
+	__unsafe_unretained NSString *key = collectionKey.key;
 	
 	BOOL groupMayHaveChanged = filteredView->groupingBlockType == YapDatabaseViewBlockTypeWithRow ||
 	                           filteredView->groupingBlockType == YapDatabaseViewBlockTypeWithMetadata;
@@ -866,7 +1043,7 @@
 		YapDatabaseViewFilteringWithObjectBlock filterBlock =
 		  (YapDatabaseViewFilteringWithObjectBlock)filteredView->filteringBlock;
 		
-		object = [databaseTransaction objectForKey:key inCollection:collection withRowid:rowid];
+		object = [databaseTransaction objectForCollectionKey:collectionKey withRowid:rowid];
 		passesFilter = filterBlock(group, collection, key, object);
 	}
 	else if (filteredView->filteringBlockType == YapDatabaseViewBlockTypeWithMetadata)
@@ -881,7 +1058,7 @@
 		YapDatabaseViewFilteringWithRowBlock filterBlock =
 		  (YapDatabaseViewFilteringWithRowBlock)filteredView->filteringBlock;
 		
-		object = [databaseTransaction objectForKey:key inCollection:collection withRowid:rowid];
+		object = [databaseTransaction objectForCollectionKey:collectionKey withRowid:rowid];
 		passesFilter = filterBlock(group, collection, key, object, metadata);
 	}
 	
@@ -892,10 +1069,11 @@
 		
 		int flags = (YapDatabaseViewChangedObject | YapDatabaseViewChangedMetadata);
 		
-		BOOL sortingBlockNeedsObject = sortMayHaveChanged; // same thing, different name
+		BOOL sortingBlockNeedsObject = filteredView->sortingBlockType == YapDatabaseViewBlockTypeWithRow ||
+		                               filteredView->sortingBlockType == YapDatabaseViewBlockTypeWithObject;
 		if (sortingBlockNeedsObject && object == nil)
 		{
-			object = [databaseTransaction objectForKey:key inCollection:collection withRowid:rowid];
+			object = [databaseTransaction objectForCollectionKey:collectionKey withRowid:rowid];
 		}
 		
 		[self insertRowid:rowid
@@ -923,6 +1101,67 @@
 /// All other hook methods are handled by superclass (YapDatabaseViewTransaction).
 ///
 
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark YapDatabaseViewDependency Protocol
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+/**
+ * This method is invoked if our parentView repopulates.
+ * For example:
+ *
+ * - The parentView is a YapDatabaseView, and the groupingBlock and/or sortingBlock was changed.
+ * - The parentView is a YapDatabaseFilteredView, and the filterBlock was changed.
+ * - The parentView of the parentView was changed...
+ * 
+ * When this happens, there has likely been a significant change in the content of the parentView,
+ * and a full repopulate is required on our part.
+**/
+- (void)viewDidRepopulate:(NSString *)parentViewName
+{
+	YDBLogAutoTrace();
+	
+	if (!databaseTransaction->isReadWriteTransaction)
+	{
+		YDBLogWarn(@"%@ - Method only allowed in readWrite transaction", THIS_METHOD);
+		return;
+	}
+	
+	__unsafe_unretained YapDatabaseFilteredView *filteredView =
+	  (YapDatabaseFilteredView *)viewConnection->view;
+	
+	if (![parentViewName isEqualToString:filteredView->parentViewName])
+	{
+		YDBLogWarn(@"%@ - Method inappropriately invoked. Doesn't match parentViewName.", THIS_METHOD);
+		return;
+	}
+	
+	// The parentView has significantly changed.
+	// We need to repopulate.
+	
+	[self repopulateView];
+	
+	// Propogate the notification onward to any extensions dependent upon this one.
+	
+	__unsafe_unretained NSString *registeredName = [self registeredName];
+	__unsafe_unretained NSDictionary *extensionDependencies = databaseTransaction->connection->extensionDependencies;
+	
+	[extensionDependencies enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop){
+		
+		__unsafe_unretained NSString *extName = (NSString *)key;
+		__unsafe_unretained NSSet *extDependencies = (NSSet *)obj;
+		
+		if ([extDependencies containsObject:registeredName])
+		{
+			YapDatabaseExtensionTransaction *extTransaction = [databaseTransaction ext:extName];
+			
+			if ([extTransaction respondsToSelector:@selector(viewDidRepopulate:)])
+			{
+				[(id <YapDatabaseViewDependency>)extTransaction viewDidRepopulate:registeredName];
+			}
+		}
+	}];
+}
+
 @end
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -933,11 +1172,19 @@
 
 - (void)setFilteringBlock:(YapDatabaseViewFilteringBlock)inFilteringBlock
        filteringBlockType:(YapDatabaseViewBlockType)inFilteringBlockType
-                      tag:(NSString *)inTag
+               versionTag:(NSString *)inVersionTag
 
 {
 	YDBLogAutoTrace();
 	
+	NSAssert(inFilteringBlock != NULL, @"Invalid filteringBlock");
+	
+	NSAssert(inFilteringBlockType == YapDatabaseViewBlockTypeWithKey ||
+	         inFilteringBlockType == YapDatabaseViewBlockTypeWithObject ||
+	         inFilteringBlockType == YapDatabaseViewBlockTypeWithMetadata ||
+	         inFilteringBlockType == YapDatabaseViewBlockTypeWithRow,
+	         @"Invalid filteringBlockType");
+	
 	if (!databaseTransaction->isReadWriteTransaction)
 	{
 		YDBLogWarn(@"%@ - Method only allowed in readWrite transaction", THIS_METHOD);
@@ -947,20 +1194,42 @@
 	__unsafe_unretained YapDatabaseFilteredView *filteredView =
 	  (YapDatabaseFilteredView *)viewConnection->view;
 	
-	NSString *newTag = inTag ? [inTag copy] : @"";
+	NSString *newVersionTag = inVersionTag ? [inVersionTag copy] : @"";
 	
-	if ([filteredView->tag isEqualToString:newTag])
+	if ([filteredView->versionTag isEqualToString:newVersionTag])
 	{
-		YDBLogWarn(@"%@ - Tag didn't change, so not updating view", THIS_METHOD);
+		YDBLogWarn(@"%@ - versionTag didn't change, so not updating view", THIS_METHOD);
 		return;
 	}
 	
 	filteredView->filteringBlock = inFilteringBlock;
 	filteredView->filteringBlockType = inFilteringBlockType;
 	
-	filteredView->tag = newTag;
+	filteredView->versionTag = newVersionTag;
+	
+	[self repopulateView];
+	[self setStringValue:newVersionTag forExtensionKey:ExtKey_versionTag];
+	
+	// Notify any extensions dependent upon this one that we repopulated.
 	
-	[self repopulate];
+	NSString *registeredName = [self registeredName];
+	NSDictionary *extensionDependencies = databaseTransaction->connection->extensionDependencies;
+	
+	[extensionDependencies enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop){
+		
+		__unsafe_unretained NSString *extName = (NSString *)key;
+		__unsafe_unretained NSSet *extDependencies = (NSSet *)obj;
+		
+		if ([extDependencies containsObject:registeredName])
+		{
+			YapDatabaseExtensionTransaction *extTransaction = [databaseTransaction ext:extName];
+			
+			if ([extTransaction respondsToSelector:@selector(viewDidRepopulate:)])
+			{
+				[(id <YapDatabaseViewDependency>)extTransaction viewDidRepopulate:registeredName];
+			}
+		}
+	}];
 }
 
 @end