motion-yapper 0.0.1 → 0.0.2

data/vendor/Pods/BuildHeaders/YapDatabase/NSDictionary+YapDatabase.h

@@ -0,0 +1,8 @@
+#import <Foundation/Foundation.h>
+
+
+@interface NSDictionary (YapDatabase)
+
+- (BOOL)ydb_containsKey:(id)key;
+
+@end

data/vendor/Pods/BuildHeaders/YapDatabase/YapCache.h

@@ -63,6 +63,7 @@
 - (void)removeObjectsForKeys:(NSArray *)keys;
 
 - (void)enumerateKeysWithBlock:(void (^)(id key, BOOL *stop))block;
+- (void)enumerateKeysAndObjectsWithBlock:(void (^)(id key, id obj, BOOL *stop))block;
 
 //
 // Some debugging stuff that gets compiled out

data/vendor/Pods/BuildHeaders/YapDatabase/YapCollectionKey.h

@@ -14,6 +14,9 @@
 @property (nonatomic, strong, readonly) NSString *collection;
 @property (nonatomic, strong, readonly) NSString *key;
 
+- (BOOL)isEqualToCollectionKey:(YapCollectionKey *)collectionKey;
+
+// These methods are overriden and optimized:
 - (BOOL)isEqual:(id)anObject;
 - (NSUInteger)hash;
 

data/vendor/Pods/BuildHeaders/YapDatabase/YapDatabase.h

@@ -330,7 +330,7 @@ extern NSString *const YapDatabaseAllKeysRemovedKey;
 
 #if TARGET_OS_IPHONE
 /**
- * Allows you to set the default autoFlushMemoryLevel for all new connections.
+ * Allows you to set the default autoFlushMemoryFlags for all new connections.
  *
  * When you create a connection via [database newConnection], that new connection will inherit
  * its initial configuration via the default values configured for the parent database.
@@ -339,12 +339,12 @@ extern NSString *const YapDatabaseAllKeysRemovedKey;
  * Changing the default values only affects future connections that will be created.
  * It does not affect connections that have already been created.
  * 
- * The default defaultAutoFlushMemoryLevel is YapDatabaseConnectionFlushMemoryLevelMild.
+ * The default defaultAutoFlushMemoryFlags is YapDatabaseConnectionFlushMemoryFlags_All.
  *
  * For more detailed documentation on these properties, see the YapDatabaseConnection header file.
- * @see YapDatabaseConnection autoFlushMemoryLevel
+ * @see YapDatabaseConnection autoFlushMemoryFlags
 **/
-@property (atomic, assign, readwrite) int defaultAutoFlushMemoryLevel;
+@property (atomic, assign, readwrite) int defaultAutoFlushMemoryFlags;
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

data/vendor/Pods/BuildHeaders/YapDatabase/YapDatabaseConnection.h

@@ -29,12 +29,14 @@
  * But for conncurrent access between multiple threads you must use multiple connections.
 **/
 
-typedef enum  {
-	YapDatabaseConnectionFlushMemoryLevelNone     = 0,
-	YapDatabaseConnectionFlushMemoryLevelMild     = 1,
-	YapDatabaseConnectionFlushMemoryLevelModerate = 2,
-	YapDatabaseConnectionFlushMemoryLevelFull     = 3,
-} YapDatabaseConnectionFlushMemoryLevel;
+enum  {
+	YapDatabaseConnectionFlushMemoryFlags_None       = 0,
+	YapDatabaseConnectionFlushMemoryFlags_Caches     = 1 << 0,
+	YapDatabaseConnectionFlushMemoryFlags_Statements = 1 << 1,
+	YapDatabaseConnectionFlushMemoryFlags_All        = (YapDatabaseConnectionFlushMemoryFlags_Caches |
+	                                                    YapDatabaseConnectionFlushMemoryFlags_Statements),
+};
+typedef int YapDatabaseConnectionFlushMemoryFlags;
 
 typedef enum {
 	YapDatabasePolicyContainment = 0,
@@ -418,30 +420,30 @@ typedef enum {
  * Depending upon how often you use the database connection,
  * you may want to be more or less aggressive on how much stuff you flush.
  *
- * YapDatabaseConnectionFlushMemoryLevelNone (0):
- *     No-op. Doesn't flush any caches or anything from internal memory.
+ * YapDatabaseConnectionFlushMemoryFlags_None:
+ *     No-op. Doesn't flush anything.
  * 
- * YapDatabaseConnectionFlushMemoryLevelMild (1):
- *     Flushes the object cache and metadata cache.
+ * YapDatabaseConnectionFlushMemoryFlags_Caches:
+ *     Flushes all caches, including the object cache and metadata cache.
  * 
- * YapDatabaseConnectionFlushMemoryLevelModerate (2):
- *     Mild plus drops less common pre-compiled sqlite statements.
+ * YapDatabaseConnectionFlushMemoryFlags_Statements:
+ *     Flushes all pre-compiled sqlite statements.
  * 
- * YapDatabaseConnectionFlushMemoryLevelFull (3):
- *     Full flush of all caches and removes all pre-compiled sqlite statements.
+ * YapDatabaseConnectionFlushMemoryFlags_All:
+ *     Full flush of all caches and  pre-compiled sqlite statements.
 **/
-- (void)flushMemoryWithLevel:(int)level;
+- (void)flushMemoryWithFlags:(YapDatabaseConnectionFlushMemoryFlags)flags;
 
 #if TARGET_OS_IPHONE
 /**
  * When a UIApplicationDidReceiveMemoryWarningNotification is received,
- * the code automatically invokes flushMemoryWithLevel and passes this set level.
+ * the code automatically invokes flushMemoryWithFlags and passes the set flags.
  * 
- * The default value is YapDatabaseConnectionFlushMemoryLevelMild.
+ * The default value is YapDatabaseConnectionFlushMemoryFlags_All.
  * 
- * @see flushMemoryWithLevel:
+ * @see flushMemoryWithFlags:
 **/
-@property (atomic, assign, readwrite) int autoFlushMemoryLevel;
+@property (atomic, assign, readwrite) YapDatabaseConnectionFlushMemoryFlags autoFlushMemoryFlags;
 #endif
 
 @end

data/vendor/Pods/BuildHeaders/YapDatabase/YapDatabaseDefaults.h

@@ -31,7 +31,7 @@
 @property (nonatomic, assign, readwrite) YapDatabasePolicy metadataPolicy;
 
 #if TARGET_OS_IPHONE
-@property (nonatomic, assign, readwrite) int autoFlushMemoryLevel;
+@property (nonatomic, assign, readwrite) YapDatabaseConnectionFlushMemoryFlags autoFlushMemoryFlags;
 #endif
 
 @end

data/vendor/Pods/BuildHeaders/YapDatabase/YapDatabaseExtensionPrivate.h

@@ -7,6 +7,7 @@
 #import "YapDatabase.h"
 #import "YapDatabaseConnection.h"
 #import "YapDatabaseTransaction.h"
+#import "YapCollectionKey.h"
 
 #import "sqlite3.h"
 
@@ -136,34 +137,19 @@
  * This method will be invoked in order to flush memory.
  * Subclasses are encouraged to do something similar to the following:
  * 
- * if (level >= YapDatabaseConnectionFlushMemoryLevelMild)
+ * if (flags & YapDatabaseConnectionFlushMemoryFlags_Caches)
  * {
  *     // Dump all caches
  * }
  * 
- * if (level >= YapDatabaseConnectionFlushMemoryLevelModerate)
+ * if (flags & YapDatabaseConnectionFlushMemoryFlags_Statements)
  * {
- *     // Release any prepared statements that aren't constantly used.
- *     //
- *     // For example, any statements that make modifications to the database,
- *     // and any other statements that are likely to be used infrequently.
+ *     // Dump all pre-compiled statements
  *
  *     sqlite_finalize_null(&myStatement);
  * }
- * 
- * if (level >= YapDatabaseConnectionFlushMemoryLevelFull)
- * {
- *     // Release all other prepared statements
- *     
- *     sqlite_finalize_null(&myOtherStatement);
- *     
- *     // And flush any state that may have been prepared via 
- *     // the extTransaction's prepareIfNeeded method.
- * 
- *     viewGroups = nil;
- * }
 **/
-- (void)_flushMemoryWithLevel:(int)level;
+- (void)_flushMemoryWithFlags:(YapDatabaseConnectionFlushMemoryFlags)flags;
 
 /**
  * Subclasses MUST implement this method.
@@ -325,6 +311,21 @@
 **/
 - (BOOL)prepareIfNeeded;
 
+/**
+ * Subclasses may OPTIONALLY implement this method.
+ * This method is only called if within a readwrite transaction.
+ *
+ * Subclasses should ONLY implement this method if they need to make changes to the 'database' table.
+ * That is, the main collection/key/value table that directly stores the user's objects.
+ *
+ * Return NO if the extension does not directly modify the main database table.
+ * Return YES if the extension does modify the main database table,
+ * regardless of whether it made changes during this invocation.
+ *
+ * This method may be invoked several times in a row.
+**/
+- (BOOL)flushPendingChangesToMainDatabaseTable;
+
 /**
  * Subclasses may OPTIONALLY implement this method.
  * This method is only called if within a readwrite transaction.
@@ -332,7 +333,7 @@
  * Subclasses may implement it to perform any "cleanup" before the changeset is requested.
  * Remember, the changeset is requested before the commitTransaction method is invoked.
 **/
-- (void)preCommitReadWriteTransaction;
+- (void)prepareChangeset;
 
 /**
  * Subclasses MUST implement this method.
@@ -400,6 +401,8 @@
 - (NSData *)dataValueForExtensionKey:(NSString *)key;
 - (void)setDataValue:(NSData *)value forExtensionKey:(NSString *)key;
 
+- (void)removeValueForExtensionKey:(NSString *)key;
+
 @end
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -413,26 +416,27 @@
 @required
 
 - (void)handleInsertObject:(id)object
-                    forKey:(NSString *)key
-              inCollection:(NSString *)collection
+          forCollectionKey:(YapCollectionKey *)collectionKey
               withMetadata:(id)metadata
                      rowid:(int64_t)rowid;
 
 - (void)handleUpdateObject:(id)object
-                    forKey:(NSString *)key
-              inCollection:(NSString *)collection
+          forCollectionKey:(YapCollectionKey *)collectionKey
               withMetadata:(id)metadata
                      rowid:(int64_t)rowid;
 
-- (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;
+
+- (void)handleReplaceMetadata:(id)metadata
+             forCollectionKey:(YapCollectionKey *)collectionKey
+                    withRowid:(int64_t)rowid;
 
-- (void)handleTouchObjectForKey:(NSString *)key inCollection:(NSString *)collection withRowid:(int64_t)rowid;
-- (void)handleTouchMetadataForKey:(NSString *)key inCollection:(NSString *)collection withRowid:(int64_t)rowid;
+- (void)handleTouchObjectForCollectionKey:(YapCollectionKey *)collectionKey withRowid:(int64_t)rowid;
+- (void)handleTouchMetadataForCollectionKey:(YapCollectionKey *)collectionKey withRowid:(int64_t)rowid;
 
-- (void)handleRemoveObjectForKey:(NSString *)key inCollection:(NSString *)collection withRowid:(int64_t)rowid;
+- (void)handleRemoveObjectForCollectionKey:(YapCollectionKey *)collectionKey withRowid:(int64_t)rowid;
 - (void)handleRemoveObjectsForKeys:(NSArray *)keys inCollection:(NSString *)collection withRowids:(NSArray *)rowids;
 
 - (void)handleRemoveAllObjectsInAllCollections;

data/vendor/Pods/BuildHeaders/YapDatabase/YapDatabaseFilteredView.h

@@ -1,26 +1,12 @@
 #import <Foundation/Foundation.h>
 
 #import "YapDatabaseView.h"
+
+#import "YapDatabaseFilteredViewTypes.h"
 #import "YapDatabaseFilteredViewConnection.h"
 #import "YapDatabaseFilteredViewTransaction.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 YapDatabaseFilteredView : YapDatabaseView
 
 /**
@@ -40,6 +26,8 @@ typedef BOOL (^YapDatabaseViewFilteringWithRowBlock)     \
  *   It allows you to filter items from this view that exist in the parent view.
  *   You should pick a block type that requires the minimum number of parameters that you need.
  *
+ *   @see YapDatabaseViewTypes.h for block type definition(s).
+ *
  * @param filteringBlockType
  *
  *   This parameter identifies the type of filtering block being used.
@@ -48,6 +36,8 @@ typedef BOOL (^YapDatabaseViewFilteringWithRowBlock)     \
  *    - YapDatabaseViewBlockTypeWithObject
  *    - YapDatabaseViewBlockTypeWithMetadata
  *    - YapDatabaseViewBlockTypeWithRow
+ * 
+ *   @see YapDatabaseViewTypes.h for block type definition(s).
  *
  * @param tag
  *
@@ -70,12 +60,12 @@ typedef BOOL (^YapDatabaseViewFilteringWithRowBlock)     \
 - (id)initWithParentViewName:(NSString *)viewName
               filteringBlock:(YapDatabaseViewFilteringBlock)filteringBlock
           filteringBlockType:(YapDatabaseViewBlockType)filteringBlockType
-                         tag:(NSString *)tag;
+                  versionTag:(NSString *)versionTag;
 
 - (id)initWithParentViewName:(NSString *)viewName
               filteringBlock:(YapDatabaseViewFilteringBlock)filteringBlock
           filteringBlockType:(YapDatabaseViewBlockType)filteringBlockType
-                         tag:(NSString *)tag
+                  versionTag:(NSString *)versionTag
                      options:(YapDatabaseViewOptions *)options;
 
 @property (nonatomic, strong, readonly) NSString *parentViewName;
@@ -83,23 +73,6 @@ typedef BOOL (^YapDatabaseViewFilteringWithRowBlock)     \
 @property (nonatomic, strong, readonly) YapDatabaseViewFilteringBlock filteringBlock;
 @property (nonatomic, assign, readonly) YapDatabaseViewBlockType filteringBlockType;
 
-/**
- * The tag assists you in updating the filteringBlock.
- *
- * Whenever you change the filteringBlock, just specify a tag to associate with the block.
- * The tag can help you to identify the filtering criteria, or perhaps be used as a versioning scheme.
- *
- * Here's how it works:
- * The very first time you create the filteredView, it will populate itself from the parentView + filteringBlock.
- * On subsequent app launches, when you re-register the filteredView, it will check the passed tag with
- * the tag it has stored from the previous app session. If the tags match then the filteredView knows it doesn't
- * have to do anything. (It's already setup from last app session.) However, if the tags don't match, then
- * the filteredView will re-populate itself.
- * 
- * It works the same way if you change the filteringBlock on-the-fly. (See setFilteringBlock:filteringBlockType:tag:)
-**/
-@property (nonatomic, copy, readonly) NSString *tag;
-
 /**
  * The options allow you to specify things like creating an IN-MEMORY-ONLY VIEW (non persistent).
 **/

data/vendor/Pods/BuildHeaders/YapDatabase/YapDatabaseFilteredViewPrivate.h

@@ -12,8 +12,6 @@
 	
 	YapDatabaseViewFilteringBlock filteringBlock;
 	YapDatabaseViewBlockType filteringBlockType;
-	
-	NSString *tag;
 }
 
 @end

data/vendor/Pods/BuildHeaders/YapDatabase/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/BuildHeaders/YapDatabase/YapDatabaseFilteredViewTypes.h

@@ -0,0 +1,32 @@
+#import <Foundation/Foundation.h>
+
+
+/**
+ * The filtering block removes items from this view that are in the parent view.
+ *
+ * A YapDatabaseFilteredView will have the same groups and same sort order as the parent,
+ * with the exception of those groups/rows that the filter block returned NO for.
+ *
+ * Here's how it works:
+ * When you initialize a YapDatabaseFilteredView instance, it will enumerate the parentView
+ * and invoke the filter block for every row in every group. So it can quickly copy a parentView as it
+ * doesn't have to perform any sorting.
+ * 
+ * After its initialization, the filterView will automatically run for inserted / updated rows
+ * after the parentView has processed them. It then gets the group from parentView,
+ * and invokes the filterBlock again (if needed).
+ *
+ * You should choose a block type that takes the minimum number of required parameters.
+ * The filterView can make various optimizations based on required parameters of the block.
+**/
+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);
+

data/vendor/Pods/BuildHeaders/YapDatabase/YapDatabaseFullTextSearchPrivate.h

@@ -8,6 +8,14 @@
 
 #import "sqlite3.h"
 
+/**
+ * This version number is stored in the yap2 table.
+ * If there is a major re-write to this class, then the version number will be incremented,
+ * and the class can automatically rebuild the tables as needed.
+**/
+#define YAP_DATABASE_FTS_CLASS_VERSION 1
+
+
 @interface YapDatabaseFullTextSearch () {
 @public
 	

data/vendor/Pods/BuildHeaders/YapDatabase/YapDatabasePrivate.h

@@ -8,6 +8,7 @@
 
 #import "YapCache.h"
 #import "YapMemoryTable.h"
+#import "YapCollectionKey.h"
 
 #import "sqlite3.h"
 
@@ -25,6 +26,8 @@ NS_INLINE void sqlite_finalize_null(sqlite3_stmt **stmtPtr)
 extern NSString *const YapDatabaseRegisteredExtensionsKey;
 extern NSString *const YapDatabaseRegisteredTablesKey;
 extern NSString *const YapDatabaseExtensionsOrderKey;
+extern NSString *const YapDatabaseExtensionDependenciesKey;
+extern NSString *const YapDatabaseRemovedRowidsKey;
 extern NSString *const YapDatabaseNotificationKey;
 
 @interface YapDatabase () {
@@ -41,8 +44,8 @@ extern NSString *const YapDatabaseNotificationKey;
 	NSDictionary *registeredExtensions;
 	NSDictionary *registeredTables;
 	
-	NSDictionary *extensionDependencies;
 	NSArray *extensionsOrder;
+	NSDictionary *extensionDependencies;
 	
 	YapDatabaseConnection *registrationConnection;
 	
@@ -81,6 +84,7 @@ extern NSString *const YapDatabaseNotificationKey;
 **/
 - (BOOL)tableExists:(NSString *)tableName using:(sqlite3 *)aDb;
 - (NSArray *)columnNamesForTable:(NSString *)tableName using:(sqlite3 *)aDb;
+- (NSDictionary *)columnNamesAndAffinityForTable:(NSString *)tableName using:(sqlite3 *)aDb;
 
 /**
  * New connections inherit their default values from this structure.
@@ -104,6 +108,7 @@ extern NSString *const YapDatabaseNotificationKey;
 **/
 - (NSDictionary *)registeredTables;
 - (NSArray *)extensionsOrder;
+- (NSDictionary *)extensionDependencies;
 
 /**
  * This method is only accessible from within the snapshotQueue.
@@ -182,13 +187,15 @@ extern NSString *const YapDatabaseNotificationKey;
 	
 	sqlite3 *db;
 	
-	dispatch_queue_t connectionQueue;     // Only for YapDatabaseExtensionConnection subclasses
-	void *IsOnConnectionQueueKey;         // Only for YapDatabaseExtensionConnection subclasses
+	dispatch_queue_t connectionQueue;     // For YapDatabaseExtensionConnection subclasses
+	void *IsOnConnectionQueueKey;         // For YapDatabaseExtensionConnection subclasses
 	
 	NSArray *extensionsOrder;             // Read-only by YapDatabaseTransaction
+	NSDictionary *extensionDependencies;  // Read-only for YapDatabaseExtensionTransaction subclasses
 	
 	BOOL hasDiskChanges;
 	
+	YapCache *keyCache;
 	YapCache *objectCache;
 	YapCache *metadataCache;
 	
@@ -204,6 +211,7 @@ extern NSString *const YapDatabaseNotificationKey;
 	NSMutableDictionary *metadataChanges;
 	NSMutableSet *removedKeys;
 	NSMutableSet *removedCollections;
+	NSMutableSet *removedRowids;
 	BOOL allKeysRemoved;
 }
 
@@ -215,6 +223,7 @@ extern NSString *const YapDatabaseNotificationKey;
 
 - (sqlite3_stmt *)yapGetDataForKeyStatement;   // Against "yap" database, for internal use
 - (sqlite3_stmt *)yapSetDataForKeyStatement;   // Against "yap" database, for internal use
+- (sqlite3_stmt *)yapRemoveForKeyStatement;    // Against "yap" database, for internal use
 - (sqlite3_stmt *)yapRemoveExtensionStatement; // Against "yap" database, for internal use
 
 - (sqlite3_stmt *)getCollectionCountStatement;
@@ -223,15 +232,15 @@ extern NSString *const YapDatabaseNotificationKey;
 - (sqlite3_stmt *)getCountForRowidStatement;
 - (sqlite3_stmt *)getRowidForKeyStatement;
 - (sqlite3_stmt *)getKeyForRowidStatement;
-- (sqlite3_stmt *)getKeyDataForRowidStatement;
-- (sqlite3_stmt *)getKeyMetadataForRowidStatement;
 - (sqlite3_stmt *)getDataForRowidStatement;
+- (sqlite3_stmt *)getMetadataForRowidStatement;
 - (sqlite3_stmt *)getAllForRowidStatement;
 - (sqlite3_stmt *)getDataForKeyStatement;
 - (sqlite3_stmt *)getMetadataForKeyStatement;
 - (sqlite3_stmt *)getAllForKeyStatement;
 - (sqlite3_stmt *)insertForRowidStatement;
 - (sqlite3_stmt *)updateAllForRowidStatement;
+- (sqlite3_stmt *)updateObjectForRowidStatement;
 - (sqlite3_stmt *)updateMetadataForRowidStatement;
 - (sqlite3_stmt *)removeForRowidStatement;
 - (sqlite3_stmt *)removeCollectionStatement;
@@ -330,33 +339,30 @@ extern NSString *const YapDatabaseNotificationKey;
 - (NSData *)dataValueForKey:(NSString *)key extension:(NSString *)extensionName;
 - (void)setDataValue:(NSData *)value forKey:(NSString *)key extension:(NSString *)extensionName;
 
+- (void)removeValueForKey:(NSString *)key extension:(NSString *)extensionName;
 - (void)removeAllValuesForExtension:(NSString *)extensionName;
 
 - (NSException *)mutationDuringEnumerationException;
 
 - (BOOL)getRowid:(int64_t *)rowidPtr forKey:(NSString *)key inCollection:(NSString *)collection;
 
-- (BOOL)getKey:(NSString **)keyPtr collection:(NSString **)collectionPtr forRowid:(int64_t)rowid;
+- (YapCollectionKey *)collectionKeyForRowid:(int64_t)rowid;
 
-- (BOOL)getKey:(NSString **)keyPtr
-    collection:(NSString **)collectionPtr
-        object:(id *)objectPtr
-      forRowid:(int64_t)rowid;
+- (BOOL)getCollectionKey:(YapCollectionKey **)collectionKeyPtr object:(id *)objectPtr forRowid:(int64_t)rowid;
+- (BOOL)getCollectionKey:(YapCollectionKey **)collectionKeyPtr metadata:(id *)metadataPtr forRowid:(int64_t)rowid;
 
-- (BOOL)getKey:(NSString **)keyPtr
-    collection:(NSString **)collectionPtr
-      metadata:(id *)metadataPtr
-      forRowid:(int64_t)rowid;
+- (BOOL)getCollectionKey:(YapCollectionKey **)collectionKeyPtr
+				  object:(id *)objectPtr
+				metadata:(id *)metadataPtr
+				forRowid:(int64_t)rowid;
 
-- (BOOL)getKey:(NSString **)keyPtr
-    collection:(NSString **)collectionPtr
-        object:(id *)objectPtr
-      metadata:(id *)metadataPtr
-      forRowid:(int64_t)rowid;
-
-- (BOOL)hasRowForRowid:(int64_t)rowid;
+- (BOOL)hasRowid:(int64_t)rowid;
 
 - (id)objectForKey:(NSString *)key inCollection:(NSString *)collection withRowid:(int64_t)rowid;
+- (id)objectForCollectionKey:(YapCollectionKey *)cacheKey withRowid:(int64_t)rowid;
+
+- (id)metadataForKey:(NSString *)key inCollection:(NSString *)collection withRowid:(int64_t)rowid;
+- (id)metadataForCollectionKey:(YapCollectionKey *)cacheKey withRowid:(int64_t)rowid;
 
 - (void)_enumerateKeysInCollection:(NSString *)collection
                         usingBlock:(void (^)(int64_t rowid, NSString *key, BOOL *stop))block;
@@ -422,3 +428,19 @@ extern NSString *const YapDatabaseNotificationKey;
      withFilter:(BOOL (^)(int64_t rowid, NSString *collection, NSString *key))filter;
 
 @end
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+@interface YapDatabaseReadWriteTransaction ()
+
+- (void)replaceObject:(id)object forKey:(NSString *)key inCollection:(NSString *)collection withRowid:(int64_t)rowid;
+- (void)replaceMetadata:(id)metadata
+                 forKey:(NSString *)key
+           inCollection:(NSString *)collection
+              withRowid:(int64_t)rowid;
+
+- (void)removeObjectForKey:(NSString *)key inCollection:(NSString *)collection withRowid:(int64_t)rowid;
+
+@end