RubyGems - nano-store - Versions diffs - 0.6.1 → 0.6.2 - Mend

nano-store 0.6.1 → 0.6.2

Files changed (68) hide show

data/vendor/Pods/Documentation/NanoStore/html/Classes/NSFNanoSortDescriptor.html CHANGED

@@ -12,7 +12,7 @@
 	<body>
 		<header id="top_header">
 			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.7 </a></h1>
+				<h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.2 </a></h1>
 				<a id="developerHome" href="../index.html">Tito Ciuro</a>
 			</div>
@@ -296,7 +296,7 @@ NSLog(@&ldquo;%@&rdquo;, [[object info]objectForKey:@&ldquo;City&rdquo;]);
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly) NSString *attribute</code></div>
+	<div class="method-subsection method-declaration"><code>@property (nonatomic, readonly) NSString *attribute</code></div>

data/vendor/Pods/Documentation/NanoStore/html/Classes/NSFNanoStore.html CHANGED

@@ -12,7 +12,7 @@
 	<body>
 		<header id="top_header">
 			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.7 </a></h1>
+				<h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.2 </a></h1>
 				<a id="developerHome" href="../index.html">Tito Ciuro</a>
 			</div>

data/vendor/Pods/Documentation/NanoStore/html/Classes/NSFOrderedDictionary.html CHANGED

@@ -12,7 +12,7 @@
 	<body>
 		<header id="top_header">
 			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.7 </a></h1>
+				<h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.2 </a></h1>
 				<a id="developerHome" href="../index.html">Tito Ciuro</a>
 			</div>

data/vendor/Pods/Documentation/NanoStore/html/Protocols/NSFNanoObjectProtocol.html CHANGED

@@ -12,7 +12,7 @@
 	<body>
 		<header id="top_header">
 			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.7 </a></h1>
+				<h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.2 </a></h1>
 				<a id="developerHome" href="../index.html">Tito Ciuro</a>
 			</div>

data/vendor/Pods/Documentation/NanoStore/html/hierarchy.html CHANGED

@@ -2,7 +2,7 @@
 <html>
 	<head>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<title>NanoStore 2.5.7 Hierarchy</title>
+		<title>NanoStore 2.5.2 Hierarchy</title>
 			<link rel="stylesheet" type="text/css" href="css/styles.css" media="all" />
 			<link rel="stylesheet" type="text/css" media="print" href="css/stylesPrint.css" />
 		<meta name="generator" content="appledoc 2.0.5 (build 789)" />
@@ -10,12 +10,12 @@
 	<body>
 		<header id="top_header">
 			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="index.html">NanoStore 2.5.7 </a></h1>
+				<h1><a id="libraryTitle" href="index.html">NanoStore 2.5.2 </a></h1>
 				<a id="developerHome" href="index.html">Tito Ciuro</a>
 			</div>
 			<div id="title" role="banner">
-				<h1 class="hideInXcode">NanoStore 2.5.7 Hierarchy</h1>
+				<h1 class="hideInXcode">NanoStore 2.5.2 Hierarchy</h1>
 			</div>
 			<ul id="headerButtons" role="toolbar"></ul>
 		</header>
@@ -26,7 +26,7 @@
 				</div>
 				<div id="header">
 					<div class="section-header">
-						<h1 class="title title-header">NanoStore 2.5.7 Hierarchy</h1>
+						<h1 class="title title-header">NanoStore 2.5.2 Hierarchy</h1>
 					</div>
 				</div>
 				<div id="container">

data/vendor/Pods/Documentation/NanoStore/html/index.html CHANGED

@@ -2,7 +2,7 @@
 <html>
 	<head>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<title>NanoStore 2.5.7 Reference</title>
+		<title>NanoStore 2.5.2 Reference</title>
 		<link rel="stylesheet" type="text/css" href="css/styles.css" media="all" />
 		<link rel="stylesheet" type="text/css" media="print" href="css/stylesPrint.css" />
 		<meta name="generator" content="appledoc 2.0.5 (build 789)" />
@@ -10,12 +10,12 @@
 	<body>
 		<header id="top_header">
 			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="index.html">NanoStore 2.5.7 </a></h1>
+				<h1><a id="libraryTitle" href="index.html">NanoStore 2.5.2 </a></h1>
 				<a id="developerHome" href="index.html">Tito Ciuro</a>
 			</div>
 			<div id="title" role="banner">
-				<h1 class="hideInXcode">NanoStore 2.5.7 Reference</h1>
+				<h1 class="hideInXcode">NanoStore 2.5.2 Reference</h1>
 			</div>
 			<ul id="headerButtons" role="toolbar"></ul>
 		</header>
@@ -26,7 +26,7 @@
 				</div>
 				<div id="header">
 					<div class="section-header">
-						<h1 class="title title-header">NanoStore 2.5.7 Reference</h1>
+						<h1 class="title title-header">NanoStore 2.5.2 Reference</h1>
 					</div>
 				</div>
 				<div id="container">

data/vendor/Pods/Headers/NanoStore/NSFNanoGlobals.h CHANGED

@@ -144,9 +144,7 @@ typedef enum {
     /** * Greater Ththanan */
     NSFGreaterThan,
     /** * Less than */
-    NSFLessThan,
-    /** * Not Equal to from */
-    NSFNotEqualTo
+    NSFLessThan
 } NSFMatchType;
 /** * Column types for the Attributes table.

data/vendor/Pods/Headers/NanoStore/NSFNanoPredicate.h CHANGED

@@ -77,7 +77,7 @@
 /** * The comparison operator to be used. */
 @property (nonatomic, assign, readonly) NSFMatchType match;
 /** * The value to be used for comparison.  */
-@property (nonatomic, readonly) id value;
+@property (nonatomic, copy, readonly) NSString *value;
 /** @name Creating and Initializing a Predicate
  */
@@ -87,22 +87,22 @@
 /** * Creates and returns a predicate.
  * @param theType is the column type. Can be \link Globals::NSFKeyColumn NSFKeyColumn \endlink, \link Globals::NSFAttributeColumn NSFAttributeColumn \endlink or \link Globals::NSFValueColumn NSFValueColumn \endlink.
  * @param theMatch is the match operator.
- * @param theValue can be an NSString or [NSNull null]
+ * @param theValue is the value.
  * @return A predicate which can be used in an NSFNanoExpression.
  * @see \link initWithColumn:matching:value: - (id)initWithColumn:(NSFTableColumnType)theType matching:(NSFMatchType)theMatch value:(NSString *)theValue \endlink
  */
-+ (NSFNanoPredicate*)predicateWithColumn:(NSFTableColumnType)theType matching:(NSFMatchType)theMatch value:(id)theValue;
++ (NSFNanoPredicate*)predicateWithColumn:(NSFTableColumnType)theType matching:(NSFMatchType)theMatch value:(NSString *)theValue;
 /** * Initializes a newly allocated predicate.
  * @param theType is the column type. Can be \link Globals::NSFKeyColumn NSFKeyColumn \endlink, \link Globals::NSFAttributeColumn NSFAttributeColumn \endlink or \link Globals::NSFValueColumn NSFValueColumn \endlink.
  * @param theMatch is the match operator.
- * @param theValue can be an NSString or [NSNull null]
+ * @param theValue is the value.
  * @return A predicate which can be used in an NSFNanoExpression.
  * @see \link predicateWithColumn:matching:value: + (NSFNanoPredicate*)predicateWithColumn:(NSFTableColumnType)theType matching:(NSFMatchType)theMatch value:(NSString *)theValue \endlink
  */
-- (id)initWithColumn:(NSFTableColumnType)theType matching:(NSFMatchType)theMatch value:(id)theValue;
+- (id)initWithColumn:(NSFTableColumnType)theType matching:(NSFMatchType)theMatch value:(NSString *)theValue;
 //@}

data/vendor/Pods/Headers/NanoStore/NSFNanoSearch.h CHANGED

@@ -175,13 +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, copy, readwrite) NSString *filterClass;
+@property (nonatomic, strong, 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;
-/** * limit a Search to a particular bag. */
-@property (nonatomic, assign, readwrite) NSFNanoBag *bag;
 /** @name Creating and Initializing a Search
  */
@@ -215,7 +213,7 @@
  * @param theReturnType the type of object to be returned. Can be \link Globals::NSFReturnObjects NSFReturnObjects \endlink or \link Globals::NSFReturnKeys NSFReturnKeys \endlink.
  * @param outError is used if an error occurs. May be NULL.
  * @return An array is returned if: 1) the sort has been specified or 2) the return type is \link Globals::NSFReturnKeys NSFReturnKeys \endlink. Otherwise, a dictionary is returned.
- * @note The sort descriptor will be ignored when the return type is NSFReturnKeys.
+ * @note The sort descriptor will be ignored when returning requesting NSFReturnKeys.
  * @see \link searchObjectsAdded:date:returnType:error: - (id)searchObjectsAdded:(NSFDateMatchType)theDateMatch date:(NSDate *)theDate returnType:(NSFReturnType)theReturnType error:(out NSError **)outError \endlink
  */
@@ -227,7 +225,7 @@
  * @param theReturnType the type of object to be returned. Can be \link Globals::NSFReturnObjects NSFReturnObjects \endlink or \link Globals::NSFReturnKeys NSFReturnKeys \endlink.
  * @param outError is used if an error occurs. May be NULL.
  * @return If theReturnType is \link Globals::NSFReturnObjects NSFReturnObjects \endlink, a dictionary is returned. Otherwise, an array is returned.
- * @note The sort descriptor will be ignored when the return type is NSFReturnKeys.
+ * @note The sort descriptor will be ignored when returning requesting NSFReturnKeys.
  * @see \link searchObjectsWithReturnType:error: - (id)searchObjectsWithReturnType:(NSFReturnType)theReturnType error:(out NSError **)outError \endlink
  */

data/vendor/Pods/Headers/NanoStore/NSFNanoSortDescriptor.h CHANGED

@@ -75,7 +75,7 @@
 @interface NSFNanoSortDescriptor : NSObject
 /** * The property key to use when performing a comparison */
-@property (nonatomic, copy, readonly) NSString *attribute;
+@property (nonatomic, readonly) NSString *attribute;
 /** * The property to indicate whether the comparison should be performed in ascending mode */
 @property (nonatomic, readonly) BOOL isAscending;

data/vendor/Pods/Headers/NanoStore/NanoStore.h CHANGED

@@ -64,13 +64,6 @@
  - iOS library runs on the device and simulator
  - ARC compliant
- @section latest_changes Latest changes
- v2.5 - January 1, 2013
- Starting with v2.5, the plist mechanism has been replaced with NSKeyedArchiver. There are several reasons for it: it's more compact, faster and uses less memory. Perhaps the most important reason is that it opens the possibility to store other data types.
- NSNull is now supported. Big thanks to Wanny (https://github.com/mrwanny) for taking the time to improve this section of NanoStore.
  @section installation_sec Installation
  Building NanoStore is very easy. Just follow these steps:
@@ -430,35 +423,6 @@
  [sortByLastName release];
  @endcode
- @section paging_limit_sec Paging using Limit and Offset
- SQLite provides a really cool feature called OFFSET that is usually used with a LIMIT clause.
- The LIMIT clause is used to limit the number of results returned in a SQL statement. So if you have 1000 rows in table, but only want to return the first 10, you would do something like this:
- @code
- SELECT column FROM table LIMIT 10
- @endcode
- Now suppose you wanted to show results 11-20. With the OFFSET keyword it's just as easy. The following query will do:
- @code
- SELECT column FROM table LIMIT 10 OFFSET 10
- @endcode
- Using pagination is also quite easy with NanoStore. This example based on one of the unit tests provided with the NanoStore distro:
- @code
- NSFNanoStore *nanoStore = [NSFNanoStore createAndOpenStoreWithType:NSFMemoryStoreType path:nil error:nil];
- // Assume we have added objects to the store
- NSFNanoSearch *search = [NSFNanoSearch searchWithStore:nanoStore];
- search.value = @"Barcelona";
- search.match = NSFEqualTo;
- search.limit = 5;
- search.offset = 3;
- NSDictionary *searchResults = [search searchObjectsWithReturnType:NSFReturnObjects error:nil];
- // Assuming the query matches some results, NanoStore should have retrieved
- // the first 5 records right after the 3rd one from the result set.
- @endcode
  @section performancetips_sec Performance Tips
  NanoStore by defaults saves every object to disk one by one. To speed up inserts and edited objects, increase NSFNanoStore's \link NSFNanoStore::saveInterval saveInterval \endlink property.

data/vendor/Pods/NanoStore/Classes/Advanced/NSFNanoEngine.m CHANGED

@@ -45,19 +45,23 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 #pragma mark -
-@interface NSFNanoEngine ()
-/** \cond */
-@property (nonatomic, weak) sqlite3 *sqlite;
-@property (nonatomic, copy, readwrite) NSString *path;
-@property (nonatomic) NSMutableDictionary *schema;
-@property (nonatomic) BOOL willCommitChangeSchema;
-@property (nonatomic) unsigned int busyTimeout;
-/** \endcond */
-@end
 @implementation NSFNanoEngine
+{
+@protected
+    sqlite3                 *sqlite;
+    NSString                *path;
+    NSFCacheMethod           cacheMethod;
+    /** \cond */
+    NSMutableDictionary     *schema;
+    BOOL                    willCommitChangeSchema;
+    unsigned int            busyTimeout;
+    /** \endcond */
+}
+@synthesize sqlite;
+@synthesize path;
+@synthesize cacheMethod;
 #pragma mark -
@@ -83,7 +87,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
                                userInfo:nil]raise];
     if ((self = [self init])) {
-        _path = thePath;
+        path = [thePath copy];
     }
     return self;
@@ -99,8 +103,8 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 - (id)init
 {
     if ((self = [super init])) {
-        _path = nil;
-        _schema = nil;
+        path = nil;
+        schema = nil;
     }
     return self;
 }
@@ -122,7 +126,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
     NSFOrderedDictionary *values = [NSFOrderedDictionary new];
     values[@"SQLite address"] = [NSString stringWithFormat:@"%p", self.sqlite];
-    values[@"Database path"] = _path;
+    values[@"Database path"] = path;
     values[@"Cache method"] = [self NSFP_cacheMethodToString];
     return values;
@@ -144,7 +148,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 - (BOOL)openWithCacheMethod:(NSFCacheMethod)theCacheMethod useFastMode:(BOOL)useFastMode
 {
-    int status = sqlite3_open_v2( [_path UTF8String], &_sqlite,
+    int status = sqlite3_open_v2( [path UTF8String], &sqlite,
                                  SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_AUTOPROXY | SQLITE_OPEN_FULLMUTEX, NULL);
     // Set NanoStoreEngine's page size to match the system current page size
@@ -162,7 +166,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
     if ((SQLITE_OK != status) || (sqlite3_extended_result_codes(self.sqlite, 1) != SQLITE_OK))
         return NO;
-    if ([[_path lowercaseString]isEqualToString:NSFMemoryDatabase] == YES) {
+    if ([[path lowercaseString]isEqualToString:NSFMemoryDatabase] == YES) {
         sqlite3_exec(self.sqlite, "PRAGMA fullfsync = OFF;", NULL, NULL, NULL);
         sqlite3_exec(self.sqlite, "PRAGMA temp_store = MEMORY", NULL, NULL, NULL);
@@ -188,7 +192,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
     }
     // Save whether we want data to be fetched lazily
-    _cacheMethod = theCacheMethod;
+    cacheMethod = theCacheMethod;
     [self setBusyTimeout:250];
@@ -225,7 +229,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
     }
     int status = sqlite3_close(self.sqlite);
-    _sqlite = NULL;
+    sqlite = NULL;
     // Since we're operating with extended result code support, extract the bits
     // and obtain the regular result code
@@ -248,7 +252,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
     if (YES == [self isTransactionActive])
         return NO;
-    _willCommitChangeSchema = NO;
+    willCommitChangeSchema = NO;
     return [self beginDeferredTransaction];
 }
@@ -258,7 +262,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
     if (YES == [self isTransactionActive])
         return NO;
-    _willCommitChangeSchema = NO;
+    willCommitChangeSchema = NO;
     return [self NSFP_beginTransactionMode:@"BEGIN DEFERRED TRANSACTION;"];
 }
@@ -266,19 +270,19 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 - (BOOL)commitTransaction
 {
     if (NO == [self isTransactionActive]) {
-        _willCommitChangeSchema = NO;
+        willCommitChangeSchema = NO;
         return NO;
     }
-    if (NO == _willCommitChangeSchema)
+    if (NO == willCommitChangeSchema)
         [self NSFP_uninstallCommitCallback];
     BOOL success = (nil == [[self executeSQL:@"COMMIT TRANSACTION;"]error]);
-    if (NO == _willCommitChangeSchema)
+    if (NO == willCommitChangeSchema)
         [self NSFP_installCommitCallback];
-    _willCommitChangeSchema = NO;
+    willCommitChangeSchema = NO;
     return success;
 }
@@ -286,13 +290,13 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 - (BOOL)rollbackTransaction
 {
     if ([self isTransactionActive] == NO) {
-        _willCommitChangeSchema = NO;
+        willCommitChangeSchema = NO;
         return NO;
     }
     BOOL success = (nil == [[self executeSQL:@"ROLLBACK TRANSACTION;"]error]);
-    _willCommitChangeSchema = NO;
+    willCommitChangeSchema = NO;
     return success;
 }
@@ -713,9 +717,14 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
         theTimeout = 250;
     }
-    _busyTimeout = theTimeout;
+    busyTimeout = theTimeout;
-    sqlite3_busy_timeout(self.sqlite, _busyTimeout);
+    sqlite3_busy_timeout(self.sqlite, busyTimeout);
+}
+- (unsigned int)busyTimeout
+{
+    return busyTimeout;
 }
 + (NSInteger)systemPageSize
@@ -1069,7 +1078,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 - (NSString *)NSFP_cacheMethodToString
 {
-    switch (_cacheMethod) {
+    switch (cacheMethod) {
         case CacheAllData:
             return @"Cache all data";
             break;
@@ -1181,8 +1190,8 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
     NSString  *datatype = nil;
     // Check to see if the schema has been cached; take advantage of it if possible...
-    if (nil != _schema) {
-        datatype = [[_schema objectForKey:table]objectForKey:column];
+    if (nil != schema) {
+        datatype = [[schema objectForKey:table]objectForKey:column];
         if (nil == datatype) datatype = NSFStringFromNanoDataType(NSFNanoTypeUnknown);
     } else {
         NSString  *theSQLStatement = [NSString stringWithFormat:@"SELECT %@ from %@ WHERE %@ = '%@' AND %@ = '%@';", NSFP_DatatypeIdentifier, NSFP_SchemaTable, NSFP_TableIdentifier, table, NSFP_ColumnIdentifier, column];
@@ -1193,14 +1202,14 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
         if (nil == datatype) datatype = NSFStringFromNanoDataType(NSFNanoTypeUnknown);
-        NSMutableDictionary *tempSchema = [_schema objectForKey:table];
+        NSMutableDictionary *tempSchema = [schema objectForKey:table];
         if (nil != tempSchema)
             tempSchema = [[NSMutableDictionary alloc]init];
         else
             ;
         [tempSchema setObject:datatype forKey:column];
-        [_schema setObject:tempSchema forKey:table];
+        [schema setObject:tempSchema forKey:table];
         tempSchema = nil;
     }
@@ -1504,8 +1513,8 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 - (void)NSFP_rebuildDatatypeCache
 {
     // Cleanup
-    _schema = nil;
-    _schema = [[NSMutableDictionary alloc]init];
+    schema = nil;
+    schema = [[NSMutableDictionary alloc]init];
     NSArray *tables = [self NSFP_flattenAllTables];
     if ([tables count] == 0)
@@ -1526,7 +1535,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
             [tableDictionary setObject:[datatypes objectAtIndex:j] forKey:[columns objectAtIndex:j]];
         }
-        [_schema setObject:tableDictionary forKey:table];
+        [schema setObject:tableDictionary forKey:table];
     }
 }
@@ -1729,8 +1738,8 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
     NSString *rowUIDDatatype = NSFStringFromNanoDataType(NSFNanoTypeRowUID);
-    if (nil != _schema)
-        return [[[_schema objectForKey:table]objectForKey:column]isEqualToString:rowUIDDatatype];
+    if (nil != schema)
+        return [[[schema objectForKey:table]objectForKey:column]isEqualToString:rowUIDDatatype];
     NSString  *theSQLStatement = [NSString stringWithFormat:@"SELECT %@ FROM %@ WHERE %@ = '%@' AND %@ = '%@';", NSFP_DatatypeIdentifier, NSFP_SchemaTable, NSFP_TableIdentifier, table, NSFP_ColumnIdentifier, column];
     NSFNanoResult* result = [self executeSQL:theSQLStatement];