nano-store 0.5.2 → 0.6.0

data/vendor/Pods/NanoStore/Classes/Public/NSFNanoPredicate.h

@@ -113,11 +113,16 @@
 
 /** * Returns a string representation of the predicate.
  * @note Check properties column, match and value to find out the current state of the predicate.
- * @see \link description - (NSString *)description \endlink
  */
 
 - (NSString *)description;
 
+/** * Returns a JSON representation of the predicate.
+ * @note Check properties column, match and value to find out the current state of the predicate.
+ */
+
+- (NSString *)JSONDescription;
+
 //@}
 
 @end

data/vendor/Pods/NanoStore/Classes/Public/NSFNanoPredicate.m

@@ -26,10 +26,19 @@
 
 #import "NSFNanoExpression.h"
 #import "NanoStore_Private.h"
+#import "NSFOrderedDictionary.h"
 
-@implementation NSFNanoPredicate
+@interface NSFNanoPredicate ()
+
+    /** \cond */
+    @property (nonatomic, assign, readwrite) NSFTableColumnType column;
+    @property (nonatomic, assign, readwrite) NSFMatchType match;
+    @property (nonatomic, copy, readwrite) NSString *value;
+    /** \endcond */
+
+@end
 
-@synthesize column, match, value;
+@implementation NSFNanoPredicate
 
 // ----------------------------------------------
 // Initialization / Cleanup
@@ -39,7 +48,7 @@
 {
     if (nil == aValue)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: value is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: value is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     return [[self alloc]initWithColumn:type matching:matching value:aValue];
@@ -49,13 +58,13 @@
 {
     if (nil == aValue)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: value is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: value is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     if ((self = [super init])) {
-        column = type;
-        match = matching;
-        value = aValue;
+        _column = type;
+        _match = matching;
+        _value = aValue;
     }
     
     return self;
@@ -63,12 +72,18 @@
 
 - (NSString *)description
 {
-    NSMutableString *description = [NSMutableString string];
+    return [[self arrayDescription]lastObject];
+}
+
+- (NSArray *)arrayDescription
+{
+    NSMutableArray *values = [NSMutableArray new];
+    
+    NSString *columnValue = nil;
     NSMutableString *mutatedString = nil;
     NSInteger mutatedStringLength = 0;
-    NSString *columnValue = nil;
     
-    switch (column) {
+    switch (_column) {
         case NSFKeyColumn:
             columnValue = NSFKey;
             break;
@@ -81,47 +96,57 @@
     }
     
     // Make sure we escape quotes if present and the value is a string
-    value = [value stringByReplacingOccurrencesOfString:@"'" withString:@"''"];
+    _value = [_value stringByReplacingOccurrencesOfString:@"'" withString:@"''"];
     
-    switch (match) {
+    switch (_match) {
         case NSFEqualTo:
-            [description appendString:[NSString stringWithFormat:@"%@ = '%@'", columnValue, value]];
+            [values addObject:[NSString stringWithFormat:@"%@ = '%@'", columnValue, _value]];
             break;
         case NSFBeginsWith:
-            mutatedString = [NSMutableString stringWithString:value];
-            mutatedStringLength = [value length];
+            mutatedString = [NSMutableString stringWithString:_value];
+            mutatedStringLength = [_value length];
             [mutatedString replaceCharactersInRange:NSMakeRange(mutatedStringLength - 1, 1) withString:[NSString stringWithFormat:@"%c", [mutatedString characterAtIndex:mutatedStringLength - 1]+1]];
-            [description appendString:[NSString stringWithFormat:@"(%@ >= '%@' AND %@ < '%@')", columnValue, value, columnValue, mutatedString]];
+            [values addObject:[NSString stringWithFormat:@"(%@ >= '%@' AND %@ < '%@')", columnValue, _value, columnValue, mutatedString]];
             break;
         case NSFContains:
-            [description appendString:[NSString stringWithFormat:@"%@ GLOB '*%@*'", columnValue, value]];
+            [values addObject:[NSString stringWithFormat:@"%@ GLOB '*%@*'", columnValue, _value]];
             break;
         case NSFEndsWith:
-            [description appendString:[NSString stringWithFormat:@"%@ GLOB '*%@'", columnValue, value]];
+            [values addObject:[NSString stringWithFormat:@"%@ GLOB '*%@'", columnValue, _value]];
             break;
         case NSFInsensitiveEqualTo:
-            [description appendString:[NSString stringWithFormat:@"upper(%@) = '%@'", columnValue, [value uppercaseString]]];
+            [values addObject:[NSString stringWithFormat:@"upper(%@) = '%@'", columnValue, [_value uppercaseString]]];
             break;
         case NSFInsensitiveBeginsWith:
-            mutatedString = [NSMutableString stringWithString:value];
-            mutatedStringLength = [value length];
+            mutatedString = [NSMutableString stringWithString:_value];
+            mutatedStringLength = [_value length];
             [mutatedString replaceCharactersInRange:NSMakeRange(mutatedStringLength - 1, 1) withString:[NSString stringWithFormat:@"%c", [mutatedString characterAtIndex:mutatedStringLength - 1]+1]];
-            [description appendString:[NSString stringWithFormat:@"(upper(%@) >= '%@' AND upper(%@) < '%@')", columnValue, [value uppercaseString], columnValue, [mutatedString uppercaseString]]];
+            [values addObject:[NSString stringWithFormat:@"(upper(%@) >= '%@' AND upper(%@) < '%@')", columnValue, [_value uppercaseString], columnValue, [mutatedString uppercaseString]]];
             break;
         case NSFInsensitiveContains:
-            [description appendString:[NSString stringWithFormat:@"%@ LIKE '%@%@%@'", columnValue, @"%", value, @"%"]];
+            [values addObject:[NSString stringWithFormat:@"%@ LIKE '%@%@%@'", columnValue, @"%", _value, @"%"]];
             break;
         case NSFInsensitiveEndsWith:
-            [description appendString:[NSString stringWithFormat:@"%@ LIKE '%@%@'", columnValue, @"%", value]];
+            [values addObject:[NSString stringWithFormat:@"%@ LIKE '%@%@'", columnValue, @"%", _value]];
             break;
         case NSFGreaterThan:
-            [description appendString:[NSString stringWithFormat:@"%@ > '%@'", columnValue, value]];
+            [values addObject:[NSString stringWithFormat:@"%@ > '%@'", columnValue, _value]];
             break;
         case NSFLessThan:
-            [description appendString:[NSString stringWithFormat:@"%@ < '%@'", columnValue, value]];
+            [values addObject:[NSString stringWithFormat:@"%@ < '%@'", columnValue, _value]];
             break;
     }
     
+    return values;
+}
+
+- (NSString *)JSONDescription
+{
+    NSArray *values = [self arrayDescription];
+    
+    NSError *outError = nil;
+    NSString *description = [NSFNanoObject _NSObjectToJSONString:values error:&outError];
+    
     return description;
 }
 

data/vendor/Pods/NanoStore/Classes/Public/NSFNanoSearch.h

@@ -175,7 +175,11 @@
 /** * The sort holds an array of one or more sort descriptors of type \link NSFNanoSortDescriptor NSFNanoSortDescriptor \endlink. */
 @property (nonatomic, strong, readwrite) NSArray *sort;
 /** * The filterClass allows to filter the results based on a specific object class. */
-@property (nonatomic, strong, readwrite) NSString *filterClass;
+@property (nonatomic, copy, readwrite) NSString *filterClass;
+/** * If an expression has an offset clause, then the first M rows are omitted from the result set returned by the search operation and the next N rows are returned, where M and N are the values that the offset and limit clauses evaluate to, respectively. Or, if the search would return less than M+N rows if it did not have a limit clause, then the first M rows are skipped and the remaining rows (if any) are returned. */
+@property (nonatomic, assign, readwrite) NSUInteger offset;
+/** * The limit clause is used to place an upper bound on the number of rows returned by a Search operation. */
+@property (nonatomic, assign, readwrite) NSUInteger limit;
 
 /** @name Creating and Initializing a Search
  */
@@ -277,7 +281,7 @@
  * NSFNanoSearch *search = [NSFNanoSearch searchWithStore:nanoStore];
  *
  * // Perform the search
- * // The query will be rewritten as @"SELECT NSFKey, NSFPlist, NSFObjectClass FROM NSFKeys"
+ * // The query will be rewritten as @"SELECT NSFKey, NSFKeyedArchive, NSFObjectClass FROM NSFKeys"
  * NSDictionary *results = [search executeSQL:@"SELECT foo, bar FROM NSFKeys" returnType:NSFReturnObjects error:nil];
  * @endcode
  * @note The sort descriptor will be ignored when executing custom SQL statements.
@@ -380,4 +384,14 @@
 
 //@}
 
+/** Returns a string representation of the search.
+ */
+
+- (NSString *)description;
+
+/** Returns a JSON representation of the search.
+ */
+
+- (NSString *)JSONDescription;
+
 @end

data/vendor/Pods/NanoStore/Classes/Public/NSFNanoSearch.m

@@ -27,17 +27,17 @@
 #import "NanoStore.h"
 #import "NanoStore_Private.h"
 #import "NSFNanoSearch_Private.h"
+#import "NSFNanoExpression_Private.h"
 
-@implementation NSFNanoSearch
-{
-    /** \cond */
-@protected
-    NSFReturnType returnedObjectType;
-    /** \endcond */
-}
+@interface NSFNanoSearch ()
 
+/** \cond */
+@property (nonatomic, copy, readwrite) NSString *sql;
+@property (nonatomic) NSFReturnType returnedObjectType;
+/** \endcond */
+@end
 
-@synthesize nanoStore, attributesToBeReturned, key, attribute, value, match, expressions, groupValues, sql, sort, filterClass;
+@implementation NSFNanoSearch
 
 // ----------------------------------------------
 // Initialization / Cleanup
@@ -52,12 +52,12 @@
 {
     if (nil == store) {
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: store is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: store is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     }
     
     if ((self = [self init])) {
-        nanoStore = store;
+        _nanoStore = store;
         [self reset];
     }
     
@@ -77,30 +77,10 @@
 
 - (NSString *)sql
 {
-    if (nil == sql)
+    if (nil == _sql)
         return [self _preparedSQL];
     
-    return sql;
-}
-
-- (NSString *)description
-{
-    NSMutableString *description = [NSMutableString string];
-    
-    [description appendString:@"\n"];
-    [description appendString:[NSString stringWithFormat:@"NanoSearch address        : 0x%x\n", self]];
-    [description appendString:[NSString stringWithFormat:@"Document store            : 0x%x\n", nanoStore]];
-    [description appendString:[NSString stringWithFormat:@"Attributes to be returned : %@\n", (attributesToBeReturned ? [attributesToBeReturned componentsJoinedByString:@","] : @"All")]];
-    [description appendString:[NSString stringWithFormat:@"Key                       : %@\n", key]];
-    [description appendString:[NSString stringWithFormat:@"Attribute                 : %@\n", attribute]];
-    [description appendString:[NSString stringWithFormat:@"Value                     : %@\n", value]];
-    [description appendString:[NSString stringWithFormat:@"Match                     : %@\n", NSFStringFromMatchType(match)]];
-    [description appendString:[NSString stringWithFormat:@"Expressions               : %@\n", expressions]];
-    [description appendString:[NSString stringWithFormat:@"Group values?             : %@\n", (groupValues ? @"YES" : @"NO")]];
-    [description appendString:[NSString stringWithFormat:@"Sort                      : %@\n", sort]];
-    [description appendString:[NSString stringWithFormat:@"Filter class              : %@\n", filterClass]];
-
-    return description;
+    return _sql;
 }
 
 #pragma mark -
@@ -109,13 +89,13 @@
 {
     if (nil == theSQLStatement) {
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: the SQL statement is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: the SQL statement is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     }
     
     if (0 == [theSQLStatement length]) {
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: the SQL statement is empty.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: the SQL statement is empty.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     }
     
@@ -124,8 +104,8 @@
     [self reset];
     self.sort = savedSort;
     
-    returnedObjectType = theReturnType;
-    sql = [theSQLStatement copy];
+    _returnedObjectType = theReturnType;
+    _sql = theSQLStatement;
     
     NSDictionary *results = [self _retrieveDataWithError:outError];
     
@@ -136,63 +116,64 @@
 {
     if (nil == theSQLStatement) {
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: the SQL statement is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: the SQL statement is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     }
     
     if (0 == [theSQLStatement length]) {
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: the SQL statement is empty.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: the SQL statement is empty.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     }
     
     // Make sure we don't have any lingering parameters that could mess with the results...
     [self reset];
     
-    sql = theSQLStatement;
+    _sql = theSQLStatement;
     
-    return [nanoStore _executeSQL:theSQLStatement];
+    return [_nanoStore _executeSQL:theSQLStatement];
 }
 
 - (NSFNanoResult *)explainSQL:(NSString *)theSQLStatement
 {
     if (nil == theSQLStatement) {
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: the SQL statement is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: the SQL statement is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     }
     
     if (0 == [theSQLStatement length]) {
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: the SQL statement is empty.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: the SQL statement is empty.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     }
     
-    return [nanoStore _executeSQL:[NSString stringWithFormat:@"EXPLAIN %@", theSQLStatement]];
+    return [_nanoStore _executeSQL:[NSString stringWithFormat:@"EXPLAIN %@", theSQLStatement]];
 }
 
 - (void)reset
 {
-     attributesToBeReturned= nil;
-     key = nil;
-     attribute = nil;
-     value = nil;
-    match = NSFContains;
-    groupValues = NO;
-     sql = nil;
-     sort = nil;
-
-     returnedObjectType = NSFReturnObjects;
+    _attributesToBeReturned = nil;
+    _key = nil;
+    _attribute = nil;
+    _value = nil;
+    _match = NSFContains;
+    _groupValues = NO;
+    _sql = nil;
+    _sort = nil;
+    _offset = 0;
+    _limit = 0;
+    _returnedObjectType = NSFReturnObjects;
 }
 
 #pragma mark -
 
 - (id)searchObjectsWithReturnType:(NSFReturnType)theReturnType error:(out NSError **)outError
 {
-    returnedObjectType = theReturnType;
+    _returnedObjectType = theReturnType;
     
     // Make sure we don't have a SQL statement around...
-    sql = nil;
+    _sql = nil;
     
     id results = [self _retrieveDataWithError:outError];
     
@@ -201,10 +182,10 @@
 
 - (id)searchObjectsAdded:(NSFDateMatchType)theDateMatch date:(NSDate *)theDate returnType:(NSFReturnType)theReturnType error:(out NSError **)outError
 {
-    returnedObjectType = theReturnType;
+    _returnedObjectType = theReturnType;
     
     // Make sure we don't have a SQL statement around...
-    sql = nil;
+    _sql = nil;
     
     id results = [self _retrieveDataAdded:theDateMatch calendarDate:theDate error:outError];
     
@@ -217,11 +198,11 @@
 
 - (NSNumber *)aggregateOperation:(NSFAggregateFunctionType)theFunctionType onAttribute:(NSString *)theAttribute
 {    
-    NSFReturnType savedObjectTypeReturned = returnedObjectType;
-    returnedObjectType = NSFReturnKeys;
+    NSFReturnType savedObjectTypeReturned = _returnedObjectType;
+    _returnedObjectType = NSFReturnKeys;
     
-    NSString *savedSQL = sql;
-    sql = nil;
+    NSString *savedSQL = _sql;
+    _sql = nil;
     
     NSString *theSearchSQLStatement = [self sql];
     NSMutableString *theAggregatedSQLStatement = [NSMutableString new];
@@ -250,10 +231,10 @@
             break;
     }
     
-    NSFNanoResult *result = [nanoStore _executeSQL:theAggregatedSQLStatement];
+    NSFNanoResult *result = [_nanoStore _executeSQL:theAggregatedSQLStatement];
 
-    returnedObjectType = savedObjectTypeReturned;
-    sql = savedSQL;
+    _returnedObjectType = savedObjectTypeReturned;
+    _sql = savedSQL;
     
     return [NSNumber numberWithFloat:[[result firstValue]floatValue]];
 }
@@ -266,13 +247,13 @@
 
 - (NSDictionary *)_retrieveDataWithError:(out NSError **)outError
 {
-    if (YES == [nanoStore isClosed]) {
+    if (YES == [_nanoStore isClosed]) {
         return nil;
     }
     
     NSMutableDictionary *searchResults = [NSMutableDictionary dictionary];
     
-    NSString *aSQLQuery = sql;
+    NSString *aSQLQuery = _sql;
 
     if (nil != aSQLQuery) {
         // We are going to check whether the user has specified the proper columns based on the search type selected.
@@ -281,13 +262,13 @@
         // We basically honor the specified query but replace the columns with the expected ones per returned type.
         
         NSString *subStatement = [aSQLQuery substringFromIndex:[aSQLQuery rangeOfString:@"FROM" options:NSCaseInsensitiveSearch].location];
-        NSFReturnType returnType = returnedObjectType;
+        NSFReturnType returnType = _returnedObjectType;
         switch (returnType) {
             case NSFReturnKeys:
                 aSQLQuery = [NSString stringWithFormat:@"SELECT NSFKey %@", subStatement];
                 break;
             case NSFReturnObjects:
-                aSQLQuery = [NSString stringWithFormat:@"SELECT NSFKey, NSFPlist, NSFObjectClass %@", subStatement];
+                aSQLQuery = [NSString stringWithFormat:@"SELECT NSFKey, NSFKeyedArchive, NSFObjectClass %@", subStatement];
                 break;
         }
     } else {
@@ -296,7 +277,7 @@
     
     _NSFLog(@"_dataWithKey SQL query: %@", aSQLQuery);
     
-    sqlite3 *sqliteStore = [[nanoStore nanoStoreEngine]sqlite];    
+    sqlite3 *sqliteStore = [[_nanoStore nanoStoreEngine]sqlite];    
     sqlite3_stmt *theSQLiteStatement = NULL;
     
     int status = sqlite3_prepare_v2 (sqliteStore, [aSQLQuery UTF8String], -1, &theSQLiteStatement, NULL );
@@ -304,7 +285,7 @@
     status = [NSFNanoEngine NSFP_stripBitsFromExtendedResultCode:status];
     
     if (SQLITE_OK == status) {        
-        switch (returnedObjectType) {
+        switch (_returnedObjectType) {
             case NSFReturnKeys:
                 while (SQLITE_ROW == sqlite3_step (theSQLiteStatement)) {
                     // Sanity check: some queries return NULL, which would cause a crash below.
@@ -322,26 +303,25 @@
             default:
                 while (SQLITE_ROW == sqlite3_step (theSQLiteStatement)) {
                     char *keyUTF8 = (char *)sqlite3_column_text (theSQLiteStatement, 0);
-                    char *dictXMLUTF8 = (char *)sqlite3_column_text (theSQLiteStatement, 1);
+                    NSData *dictBinData = [[NSData alloc] initWithBytes:sqlite3_column_blob(theSQLiteStatement, 1) length: sqlite3_column_bytes(theSQLiteStatement, 1)];
                     char *objectClassUTF8 = (char *)sqlite3_column_text (theSQLiteStatement, 2);
                     
                     // Sanity check: some queries return NULL, which would a crash below.
                     // Since these are values that are NanoStore's resposibility, they should *never* be NULL. Log it for posterity.
-                    if ((NULL == keyUTF8) || (NULL == dictXMLUTF8) || (NULL == objectClassUTF8)) {
-                        NSLog(@"*** Warning! These values are NanoStore's resposibility and should *never* be NULL: keyUTF8 (%s) - dictXMLUTF8 (%s) - objectClassUTF8 (%s)", keyUTF8, dictXMLUTF8, objectClassUTF8);
+
+                    if ((NULL == keyUTF8) || (dictBinData == nil) || (NULL == objectClassUTF8)) {
+                        NSLog(@"*** Warning! These values are NanoStore's resposibility and should *never* be NULL: keyUTF8 (%s) - binArchinve (%@) - objectClassUTF8 (%s)", keyUTF8, [dictBinData debugDescription], objectClassUTF8);
                         continue;
                     }
-                    
+                    NSDictionary *info = [NSKeyedUnarchiver unarchiveObjectWithData:dictBinData];
                     NSString *keyValue = [[NSString alloc]initWithUTF8String:keyUTF8];
-                    NSString *dictXML = [[NSString alloc]initWithUTF8String:dictXMLUTF8];
                     NSString *objectClass = [[NSString alloc]initWithUTF8String:objectClassUTF8];
                     
-                    NSDictionary *info = [NSFNanoEngine _plistToDictionary:dictXML];
                     if (nil == info) {
                         continue;
                     }
                     
-                    if ([attributesToBeReturned count] == 0) {
+                    if ([_attributesToBeReturned count] == 0) {
                         // Will be released below...
                     } else {
                         // Since we want a subset of the attributes, we need to traverse
@@ -351,7 +331,7 @@
                         
                         NSMutableDictionary *subset = [NSMutableDictionary new];
                         
-                        for (NSString *attributeValue in attributesToBeReturned) {
+                        for (NSString *attributeValue in _attributesToBeReturned) {
                             id theValue = [info valueForKeyPath:attributeValue];
                             if (nil != theValue) {
                                 if (NSNotFound == [attributeValue rangeOfString:@"."].location) {
@@ -378,7 +358,7 @@
                         saveOriginalClassReference = YES;
                     }
                     
-                    id nanoObject = [[storedObjectClass alloc]initNanoObjectFromDictionaryRepresentation:info forKey:keyValue store:nanoStore];
+                    id nanoObject = [[storedObjectClass alloc]initNanoObjectFromDictionaryRepresentation:info forKey:keyValue store:_nanoStore];
                     
                     // If this process does not have knowledge of the original class as was saved in the store, keep a reference
                     // so that we can later on restore the object properly (otherwise it would be stored as a NanoObject.)
@@ -396,10 +376,10 @@
         
     } else {
         if (nil != outError) {
-            NSString *msg = [NSString stringWithFormat:@"SQLite error ID: %ld", status];
+            NSString *msg = [NSString stringWithFormat:@"SQLite error ID: %d", status];
             *outError = [NSError errorWithDomain:NSFDomainKey
                                             code:NSFNanoStoreErrorKey
-                                        userInfo:[NSDictionary dictionaryWithObject:[NSString stringWithFormat:@"*** -[%@ %s]: %@", [self class], _cmd, msg]
+                                        userInfo:[NSDictionary dictionaryWithObject:[NSString stringWithFormat:@"*** -[%@ %@]: %@", [self class], NSStringFromSelector(_cmd), msg]
                                                                              forKey:NSLocalizedFailureReasonErrorKey]];
         }
         searchResults = nil;
@@ -410,7 +390,7 @@
 
 - (NSDictionary *)_retrieveDataAdded:(NSFDateMatchType)aDateMatch calendarDate:(NSDate *)aDate error:(out NSError **)outError
 {
-    if ([nanoStore isClosed] == YES) {
+    if ([_nanoStore isClosed] == YES) {
         return nil;
     }
     
@@ -420,46 +400,46 @@
     switch (aDateMatch) {
         case NSFBeforeDate:
             if (self.filterClass.length > 0) {
-                theSQLStatement = [[NSString alloc]initWithFormat:@"SELECT %@, %@, %@ FROM %@ WHERE (NSFObjectClass = '%@') AND %@ < '%@'", NSFKey, NSFPlist, NSFObjectClass, NSFKeys, self.filterClass, NSFCalendarDate, normalizedDateString];
+                theSQLStatement = [[NSString alloc]initWithFormat:@"SELECT %@, %@, %@ FROM %@ WHERE (NSFObjectClass = '%@') AND %@ < '%@'", NSFKey, NSFKeyedArchive, NSFObjectClass, NSFKeys, self.filterClass, NSFCalendarDate, normalizedDateString];
             } else {
-                theSQLStatement = [[NSString alloc]initWithFormat:@"SELECT %@, %@, %@ FROM %@ WHERE %@ < '%@'", NSFKey, NSFPlist, NSFObjectClass, NSFKeys, NSFCalendarDate, normalizedDateString];
+                theSQLStatement = [[NSString alloc]initWithFormat:@"SELECT %@, %@, %@ FROM %@ WHERE %@ < '%@'", NSFKey, NSFKeyedArchive, NSFObjectClass, NSFKeys, NSFCalendarDate, normalizedDateString];
             }
             break;
         case NSFOnDate:
             if (self.filterClass.length > 0) {
-                theSQLStatement = [[NSString alloc]initWithFormat:@"SELECT %@, %@, %@ FROM %@ WHERE (NSFObjectClass = '%@') AND %@ = '%@'", NSFKey, NSFPlist, NSFObjectClass, NSFKeys, self.filterClass, NSFCalendarDate, normalizedDateString];
+                theSQLStatement = [[NSString alloc]initWithFormat:@"SELECT %@, %@, %@ FROM %@ WHERE (NSFObjectClass = '%@') AND %@ = '%@'", NSFKey, NSFKeyedArchive, NSFObjectClass, NSFKeys, self.filterClass, NSFCalendarDate, normalizedDateString];
             } else {
-                theSQLStatement = [[NSString alloc]initWithFormat:@"SELECT %@, %@, %@ FROM %@ WHERE %@ = '%@'", NSFKey, NSFPlist, NSFObjectClass, NSFKeys, NSFCalendarDate, normalizedDateString];
+                theSQLStatement = [[NSString alloc]initWithFormat:@"SELECT %@, %@, %@ FROM %@ WHERE %@ = '%@'", NSFKey, NSFKeyedArchive, NSFObjectClass, NSFKeys, NSFCalendarDate, normalizedDateString];
             }
             break;
         case NSFAfterDate:
             if (self.filterClass.length > 0) {
-                theSQLStatement = [[NSString alloc]initWithFormat:@"SELECT %@, %@, %@ FROM %@ WHERE (NSFObjectClass = '%@') AND %@ > '%@'", NSFKey, NSFPlist, NSFObjectClass, NSFKeys, self.filterClass, NSFCalendarDate, normalizedDateString];
+                theSQLStatement = [[NSString alloc]initWithFormat:@"SELECT %@, %@, %@ FROM %@ WHERE (NSFObjectClass = '%@') AND %@ > '%@'", NSFKey, NSFKeyedArchive, NSFObjectClass, NSFKeys, self.filterClass, NSFCalendarDate, normalizedDateString];
             } else {
-                theSQLStatement = [[NSString alloc]initWithFormat:@"SELECT %@, %@, %@ FROM %@ WHERE %@ > '%@'", NSFKey, NSFPlist, NSFObjectClass, NSFKeys, NSFCalendarDate, normalizedDateString];
+                theSQLStatement = [[NSString alloc]initWithFormat:@"SELECT %@, %@, %@ FROM %@ WHERE %@ > '%@'", NSFKey, NSFKeyedArchive, NSFObjectClass, NSFKeys, NSFCalendarDate, normalizedDateString];
             }
             break;
     }
     
-    NSFNanoResult *result = [nanoStore _executeSQL:theSQLStatement];
+    NSFNanoResult *result = [_nanoStore _executeSQL:theSQLStatement];
     
     NSMutableDictionary *searchResults = [NSMutableDictionary dictionaryWithCapacity:result.numberOfRows];
     
     if (result.numberOfRows > 0) {
-        if (NSFReturnKeys == returnedObjectType) {
+        if (NSFReturnKeys == _returnedObjectType) {
             NSArray *resultsKeys = [result valuesForColumn:[NSString stringWithFormat:@"%@.%@", NSFKeys, NSFKey]];
             for (NSString *resultKey in resultsKeys)
                 [searchResults setObject:[NSNull null] forKey:resultKey];
             return searchResults;
         } else {
                 NSArray *resultsObjectClass = [result valuesForColumn:[NSString stringWithFormat:@"%@.%@", NSFKeys, NSFObjectClass]];
-                NSArray *resultsObjects = [result valuesForColumn:[NSString stringWithFormat:@"%@.%@", NSFKeys, NSFPlist]];
+                NSArray *resultsObjects = [result valuesForColumn:[NSString stringWithFormat:@"%@.%@", NSFKeys, NSFKeyedArchive]];
                 NSArray *resultsKeys = [result valuesForColumn:[NSString stringWithFormat:@"%@.%@", NSFKeys, NSFKey]];
                 NSUInteger i, count = [resultsKeys count];
                 
             for (i = 0; i < count; i++) {
                 @autoreleasepool {
-                    NSDictionary *info = [NSFNanoEngine _plistToDictionary:[resultsObjects objectAtIndex:i]];
+                    NSDictionary *info = [NSKeyedUnarchiver unarchiveObjectWithData:[resultsObjects objectAtIndex:i]];
                     if (nil != info) {
                         NSString *keyValue = [resultsKeys objectAtIndex:i];
                         
@@ -471,7 +451,7 @@
                             saveOriginalClassReference = YES;
                         }
                         
-                        id nanoObject = [[storedObjectClass alloc]initNanoObjectFromDictionaryRepresentation:info forKey:keyValue store:nanoStore];
+                        id nanoObject = [[storedObjectClass alloc]initNanoObjectFromDictionaryRepresentation:info forKey:keyValue store:_nanoStore];
                         
                         // If this process does not have knowledge of the original class as was saved in the store, keep a reference
                         // so that we can later on restore the object properly (otherwise it would be stored as a NanoObject.)
@@ -493,10 +473,20 @@
 {
     NSString *aSQLQuery = nil;
     
-    if (nil == expressions) {
-        aSQLQuery = [self _prepareSQLQueryStringWithKey:key attribute:attribute value:value matching:match];
+    if (nil == _expressions) {
+        aSQLQuery = [self _prepareSQLQueryStringWithKey:_key attribute:_attribute value:_value matching:_match];
     } else {
-        aSQLQuery = [self _prepareSQLQueryStringWithExpressions:expressions];
+        aSQLQuery = [self _prepareSQLQueryStringWithExpressions:_expressions];
+    }
+    
+    // Add the limit clause if required
+    if (_limit > 0) {
+        aSQLQuery = [NSString stringWithFormat:@"%@ LIMIT %li", aSQLQuery, _limit];
+    }
+    
+    // Add the offset clause if required
+    if (_offset > 0) {
+        aSQLQuery = [NSString stringWithFormat:@"%@ OFFSET %li", aSQLQuery, _offset];
     }
     
     return aSQLQuery;
@@ -512,9 +502,9 @@
         aValue = [aValue stringByReplacingOccurrencesOfString:@"'" withString:@"''"];
     }
     
-    if (nil != attributesToBeReturned) {
+    if (nil != _attributesToBeReturned) {
         // Prepare the list of attributes we need to gather. Include NSFKEY as well.
-        NSMutableSet *set = [[NSMutableSet alloc]initWithArray:attributesToBeReturned];
+        NSMutableSet *set = [[NSMutableSet alloc]initWithArray:_attributesToBeReturned];
         NSArray *objects = [set allObjects];
         NSMutableArray *quotedObjects = [NSMutableArray new];
         for (NSString *object in objects) {
@@ -524,7 +514,7 @@
         attributes = [quotedObjects componentsJoinedByString:@","];
     }
     
-    NSFReturnType returnType = returnedObjectType;
+    NSFReturnType returnType = _returnedObjectType;
     
     if ((nil == aKey) && (nil == anAttribute) && (nil == aValue)) {
         switch (returnType) {
@@ -532,13 +522,13 @@
                 return @"SELECT NSFKEY FROM NSFKeys";
                 break;
             default:
-                return @"SELECT NSFKey, NSFPlist, NSFObjectClass FROM NSFKeys";
+                return @"SELECT NSFKey, NSFKeyedArchive, NSFObjectClass FROM NSFKeys";
                 break;
         }
     } else {
         switch (returnType) {
             case NSFReturnKeys:
-                if (NO == groupValues) {
+                if (NO == _groupValues) {
                     theSQLStatement = [NSMutableString stringWithString:@"SELECT DISTINCT (NSFKEY) FROM NSFValues WHERE "];
                 } else {
                     theSQLStatement = [NSMutableString stringWithString:@"SELECT NSFKEY FROM NSFValues WHERE "];
@@ -573,10 +563,14 @@
         if (NSNotFound == [anAttribute rangeOfString:@"."].location) {
             segment = [NSFNanoSearch _querySegmentForAttributeColumnWithValue:anAttribute matching:aMatch valueColumnWithValue:aValue];
         } else {
-             if (nil == aValue)
+            if (nil == aValue) {
                 segment = [NSFNanoSearch _querySegmentForColumn:NSFAttribute value:anAttribute matching:aMatch];
-            else
+            } else {
                 segment = [NSFNanoSearch _querySegmentForColumn:NSFAttribute value:anAttribute matching:NSFEqualTo];
+                [theSQLStatement appendString:segment];
+                [theSQLStatement appendString:@" AND "];
+                segment = [NSFNanoSearch _querySegmentForColumn:NSFValue value:aValue matching:NSFEqualTo];
+            }
         }
         
         [theSQLStatement appendString:segment];
@@ -589,15 +583,19 @@
         }
     }
     
-    if (YES == groupValues) {
+    if ((_limit > 0) || (_offset > 0)) {
+        [theSQLStatement appendString:@" ORDER BY ROWID"];
+    }
+    
+    if (YES == _groupValues) {
         [theSQLStatement appendString:@" GROUP BY NSFValue"];
     }
     
     if (NSFReturnObjects == returnType) {
         if (self.filterClass.length > 0) {
-            theSQLStatement = [NSString stringWithFormat:@"SELECT DISTINCT (NSFKey),NSFPlist,NSFObjectClass FROM NSFKeys WHERE (NSFObjectClass = '%@') AND NSFKey IN (%@)", self.filterClass, theSQLStatement];
+            theSQLStatement = [NSString stringWithFormat:@"SELECT DISTINCT (NSFKey),NSFKeyedArchive,NSFObjectClass FROM NSFKeys WHERE (NSFObjectClass = '%@') AND NSFKey IN (%@)", self.filterClass, theSQLStatement];
         } else {
-            theSQLStatement = [NSString stringWithFormat:@"SELECT DISTINCT (NSFKey),NSFPlist,NSFObjectClass FROM NSFKeys WHERE NSFKey IN (%@)", theSQLStatement];
+            theSQLStatement = [NSString stringWithFormat:@"SELECT DISTINCT (NSFKey),NSFKeyedArchive,NSFObjectClass FROM NSFKeys WHERE NSFKey IN (%@)", theSQLStatement];
         }
     } else {
         if (self.filterClass.length > 0) {
@@ -613,7 +611,7 @@
     NSUInteger i, count = [someExpressions count];
     NSMutableArray *sqlComponents = [NSMutableArray new];
     NSMutableString *parentheses = [NSMutableString new];
-    NSFReturnType returnType = returnedObjectType;
+    NSFReturnType returnType = _returnedObjectType;
 
     if (count == 0) {
         if (NSFReturnObjects == returnType) {
@@ -648,9 +646,9 @@
     
     if (NSFReturnObjects == returnType) {
         if (self.filterClass.length > 0) {
-            theValue = [NSString stringWithFormat:@"SELECT DISTINCT (NSFKey),NSFPlist,NSFObjectClass FROM NSFKeys WHERE (NSFObjectClass = '%@') AND NSFKey IN (%@)", self.filterClass, theValue];
+            theValue = [NSString stringWithFormat:@"SELECT DISTINCT (NSFKey),NSFKeyedArchive,NSFObjectClass FROM NSFKeys WHERE (NSFObjectClass = '%@') AND NSFKey IN (%@)", self.filterClass, theValue];
         } else {
-            theValue = [NSString stringWithFormat:@"SELECT DISTINCT (NSFKey),NSFPlist,NSFObjectClass FROM NSFKeys WHERE NSFKey IN (%@)", theValue];   
+            theValue = [NSString stringWithFormat:@"SELECT DISTINCT (NSFKey),NSFKeyedArchive,NSFObjectClass FROM NSFKeys WHERE NSFKey IN (%@)", theValue];
         }
     } else {
         if (self.filterClass.length > 0) {
@@ -674,7 +672,7 @@
     [theSQLStatement appendString:[preparedKeys componentsJoinedByString:@","]];
     [theSQLStatement appendString:@")"];
     
-    theSQLStatement = [NSString stringWithFormat:@"SELECT DISTINCT (NSFKey),NSFPlist,NSFObjectClass FROM NSFKeys WHERE NSFKey IN (%@)", theSQLStatement];
+    theSQLStatement = [NSString stringWithFormat:@"SELECT DISTINCT (NSFKey),NSFKeyedArchive,NSFObjectClass FROM NSFKeys WHERE NSFKey IN (%@)", theSQLStatement];
     
     return theSQLStatement;
 }
@@ -873,10 +871,10 @@
 {
     id theResults = results;
     
-    if (nil != sort) {
+    if ([_sort count] > 0) {
         NSMutableArray *cocoaSortDescriptors = [NSMutableArray new];
         
-        for (NSFNanoSortDescriptor *descriptor in sort) {
+        for (NSFNanoSortDescriptor *descriptor in _sort) {
             NSString *targetKeyPath = [[NSString alloc]initWithFormat:@"rootObject.%@", descriptor.attribute];
             NSSortDescriptor *cocoaSort = [[NSSortDescriptor alloc]initWithKey:targetKeyPath ascending:descriptor.isAscending];
             [cocoaSortDescriptors addObject:cocoaSort];
@@ -887,15 +885,58 @@
         } else {
             theResults = [results allKeys];
         }
-    }
-    else if (NSFReturnKeys == theReturnType)
-    {
+    } else if (NSFReturnKeys == theReturnType) {
         theResults = [results allKeys];
     }
     
     return theResults;
 }
 
+- (NSString *)description
+{
+    return [self JSONDescription];
+}
+
+- (NSFOrderedDictionary *)dictionaryDescription
+{
+    NSFOrderedDictionary *values = [NSFOrderedDictionary new];
+    
+    values[@"NanoSearch address"] = [NSString stringWithFormat:@"%p", self];
+    values[@"Document store"] = [_nanoStore dictionaryDescription];
+    values[@"Attributes to be returned"] = (_attributesToBeReturned ? [_attributesToBeReturned componentsJoinedByString:@","] : @"All");
+    values[@"Key"] = (_key ? _key : @"<nil>");
+    values[@"Attribute"] = (_attribute ? _attribute : @"<nil>");
+    values[@"Value"] = (_value ? _value : @"<nil>");
+    values[@"Match"] = NSFStringFromMatchType(_match);
+    
+    NSMutableArray *tempExpressions = [NSMutableArray new];
+    for (NSFNanoExpression *expression in _expressions) {
+        [tempExpressions addObject:[expression description]];
+    }
+    values[@"Expressions"] = ([tempExpressions count] > 0 ? tempExpressions : @"<nil>");
+    
+    values[@"Group values?"] = (_groupValues ? @"YES" : @"NO");
+    
+    NSString *tempSQL = [self sql];
+    values[@"SQL"] = (tempSQL ? tempSQL : @"<nil>");
+    values[@"Sort"] = (_sort ? _sort : @"<nil>");
+    values[@"Filter class"] = (_filterClass ? _filterClass : @"<nil>");
+    values[@"Offset"] = @(_offset);
+    values[@"Limit"] = @(_limit);
+    
+    return values;
+}
+
+- (NSString *)JSONDescription
+{
+    NSFOrderedDictionary *values = [self dictionaryDescription];
+    
+    NSError *outError = nil;
+    NSString *description = [NSFNanoObject _NSObjectToJSONString:values error:&outError];
+    
+    return description;
+}
+
 /** \endcond */
 
 @end