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

nano-store 0.6.2 → 0.6.3

Files changed (72) hide show

data/vendor/Pods/Documentation/NanoStore/html/Classes/NSFNanoSearch.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.2 </a></h1>
+				<h1><a id="libraryTitle" href="../index.html">NanoStore 2.6.4 </a></h1>
 				<a id="developerHome" href="../index.html">Tito Ciuro</a>
 			</div>
@@ -44,6 +44,8 @@
 	<option value="//api/name/attributesToBeReturned">&nbsp;&nbsp;&nbsp;&nbsp;attributesToBeReturned</option>
+	<option value="//api/name/bag">&nbsp;&nbsp;&nbsp;&nbsp;bag</option>
 	<option value="//api/name/expressions">&nbsp;&nbsp;&nbsp;&nbsp;expressions</option>
 	<option value="//api/name/filterClass">&nbsp;&nbsp;&nbsp;&nbsp;filterClass</option>
@@ -162,6 +164,8 @@
 	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/attributesToBeReturned">attributesToBeReturned</a></span></li>
+	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/bag">bag</a></span></li>
 	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/expressions">expressions</a></span></li>
 	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/filterClass">filterClass</a></span></li>
@@ -552,6 +556,16 @@ NSDictionary *searchResults = [search searchObjectsWithReturnType:NSFReturnObjec
 	</span>
 	<span class="task-item-suffix">property</span>
+</li><li>
+	<span class="tooltip">
+		<code><a href="#//api/name/bag">&nbsp;&nbsp;bag</a></code>
+		<span class="tooltip"><ul>
+<li><a href="#//api/name/limit">limit</a> a Search to a particular bag.</li>
+</ul>
+</span>
+	</span>
+	<span class="task-item-suffix">property</span>
 </li>
 						</ul>
@@ -886,6 +900,53 @@ NSDictionary *searchResults = [search searchObjectsWithReturnType:NSFReturnObjec
+	<div class="method-subsection declared-in-section">
+		<h4 class="method-subtitle">Declared In</h4>
+		<code class="declared-in-ref">NSFNanoSearch.h</code><br />
+	</div>
+</div>
+						<div class="section-method">
+	<a name="//api/name/bag" title="bag"></a>
+	<h3 class="subsubtitle method-title">bag</h3>
+	<div class="method-subsection brief-description">
+		<ul>
+<li><a href="#//api/name/limit">limit</a> a Search to a particular bag.</li>
+</ul>
+	</div>
+	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign, readwrite) NSFNanoBag *bag</code></div>
+	<div class="method-subsection discussion-section">
+		<h4 class="method-subtitle">Discussion</h4>
+		<ul>
+<li><a href="#//api/name/limit">limit</a> a Search to a particular bag.</li>
+</ul>
+	</div>
 	<div class="method-subsection declared-in-section">
 		<h4 class="method-subtitle">Declared In</h4>
 		<code class="declared-in-ref">NSFNanoSearch.h</code><br />
@@ -956,7 +1017,7 @@ NSDictionary *searchResults = [search searchObjectsWithReturnType:NSFReturnObjec
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, strong, readwrite) NSString *filterClass</code></div>
+	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readwrite) NSString *filterClass</code></div>
@@ -2271,7 +2332,7 @@ When invoked, it sets the values of search to its initial state. Resetting and p
 	<div class="method-subsection discussion-section">
 		<h4 class="method-subtitle">Discussion</h4>
-		<p>Performs a search using the values of the properties before, on or after a given date.</p><div class="note"><p><strong>Note:</strong> The <a href="#//api/name/sort">sort</a> descriptor will be ignored when returning requesting NSFReturnKeys.</p></div>
+		<p>Performs a search using the values of the properties before, on or after a given date.</p><div class="note"><p><strong>Note:</strong> The <a href="#//api/name/sort">sort</a> descriptor will be ignored when the return type is NSFReturnKeys.</p></div>
 	</div>
@@ -2341,7 +2402,7 @@ When invoked, it sets the values of search to its initial state. Resetting and p
 	<div class="method-subsection discussion-section">
 		<h4 class="method-subtitle">Discussion</h4>
-		<p>Performs a search using the values of the properties.</p><div class="note"><p><strong>Note:</strong> The <a href="#//api/name/sort">sort</a> descriptor will be ignored when returning requesting NSFReturnKeys.</p></div>
+		<p>Performs a search using the values of the properties.</p><div class="note"><p><strong>Note:</strong> The <a href="#//api/name/sort">sort</a> descriptor will be ignored when the return type is NSFReturnKeys.</p></div>
 	</div>
@@ -2380,7 +2441,7 @@ When invoked, it sets the values of search to its initial state. Resetting and p
 				<div id="footer">
 					<hr />
 					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2013 Tito Ciuro. All rights reserved. (Last updated: 2013-01-22)</span><br />
+						<p><span class="copyright">&copy; 2013 Tito Ciuro. All rights reserved. (Last updated: 2013-03-08)</span><br />
 						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.0.5 (build 789)</a>.</span></p>

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.2 </a></h1>
+				<h1><a id="libraryTitle" href="../index.html">NanoStore 2.6.4 </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, readonly) NSString *attribute</code></div>
+	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly) NSString *attribute</code></div>
@@ -610,7 +610,7 @@ NSLog(@&ldquo;%@&rdquo;, [[object info]objectForKey:@&ldquo;City&rdquo;]);
 				<div id="footer">
 					<hr />
 					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2013 Tito Ciuro. All rights reserved. (Last updated: 2013-01-22)</span><br />
+						<p><span class="copyright">&copy; 2013 Tito Ciuro. All rights reserved. (Last updated: 2013-03-08)</span><br />
 						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.0.5 (build 789)</a>.</span></p>

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.2 </a></h1>
+				<h1><a id="libraryTitle" href="../index.html">NanoStore 2.6.4 </a></h1>
 				<a id="developerHome" href="../index.html">Tito Ciuro</a>
 			</div>
@@ -3620,7 +3620,7 @@ Therefore, it&rsquo;s always a good idea to call \link saveStoreAndReturnError:
 				<div id="footer">
 					<hr />
 					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2013 Tito Ciuro. All rights reserved. (Last updated: 2013-01-22)</span><br />
+						<p><span class="copyright">&copy; 2013 Tito Ciuro. All rights reserved. (Last updated: 2013-03-08)</span><br />
 						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.0.5 (build 789)</a>.</span></p>

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.2 </a></h1>
+				<h1><a id="libraryTitle" href="../index.html">NanoStore 2.6.4 </a></h1>
 				<a id="developerHome" href="../index.html">Tito Ciuro</a>
 			</div>
@@ -209,7 +209,7 @@
 				<div id="footer">
 					<hr />
 					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2013 Tito Ciuro. All rights reserved. (Last updated: 2013-01-22)</span><br />
+						<p><span class="copyright">&copy; 2013 Tito Ciuro. All rights reserved. (Last updated: 2013-03-08)</span><br />
 						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.0.5 (build 789)</a>.</span></p>

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.2 </a></h1>
+				<h1><a id="libraryTitle" href="../index.html">NanoStore 2.6.4 </a></h1>
 				<a id="developerHome" href="../index.html">Tito Ciuro</a>
 			</div>
@@ -548,7 +548,7 @@ NSFNanoSortDescriptor *sortedCities = [[NSFNanoSortDescriptor alloc]initWithAttr
 				<div id="footer">
 					<hr />
 					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2013 Tito Ciuro. All rights reserved. (Last updated: 2013-01-22)</span><br />
+						<p><span class="copyright">&copy; 2013 Tito Ciuro. All rights reserved. (Last updated: 2013-03-08)</span><br />
 						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.0.5 (build 789)</a>.</span></p>

data/vendor/Pods/Documentation/NanoStore/html/css/styles.css CHANGED

File without changes

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.2 Hierarchy</title>
+		<title>NanoStore 2.6.4 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.2 </a></h1>
+				<h1><a id="libraryTitle" href="index.html">NanoStore 2.6.4 </a></h1>
 				<a id="developerHome" href="index.html">Tito Ciuro</a>
 			</div>
 			<div id="title" role="banner">
-				<h1 class="hideInXcode">NanoStore 2.5.2 Hierarchy</h1>
+				<h1 class="hideInXcode">NanoStore 2.6.4 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.2 Hierarchy</h1>
+						<h1 class="title title-header">NanoStore 2.6.4 Hierarchy</h1>
 					</div>
 				</div>
 				<div id="container">
@@ -93,7 +93,7 @@
 				<div id="footer">
 					<hr />
 					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2013 Tito Ciuro. All rights reserved. (Last updated: 2013-01-22)</span><br />
+						<p><span class="copyright">&copy; 2013 Tito Ciuro. All rights reserved. (Last updated: 2013-03-08)</span><br />
 						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.0.5 (build 789)</a>.</span></p>

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.2 Reference</title>
+		<title>NanoStore 2.6.4 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.2 </a></h1>
+				<h1><a id="libraryTitle" href="index.html">NanoStore 2.6.4 </a></h1>
 				<a id="developerHome" href="index.html">Tito Ciuro</a>
 			</div>
 			<div id="title" role="banner">
-				<h1 class="hideInXcode">NanoStore 2.5.2 Reference</h1>
+				<h1 class="hideInXcode">NanoStore 2.6.4 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.2 Reference</h1>
+						<h1 class="title title-header">NanoStore 2.6.4 Reference</h1>
 					</div>
 				</div>
 				<div id="container">
@@ -641,7 +641,7 @@ time reading the journal file and writing the changes to the store.
 				<div id="footer">
 					<hr />
 					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2013 Tito Ciuro. All rights reserved. (Last updated: 2013-01-22)</span><br />
+						<p><span class="copyright">&copy; 2013 Tito Ciuro. All rights reserved. (Last updated: 2013-03-08)</span><br />
 						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.0.5 (build 789)</a>.</span></p>

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

@@ -144,7 +144,9 @@ typedef enum {
     /** * Greater Ththanan */
     NSFGreaterThan,
     /** * Less than */
-    NSFLessThan
+    NSFLessThan,
+    /** * Not Equal to from */
+    NSFNotEqualTo
 } 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, copy, readonly) NSString *value;
+@property (nonatomic, readonly) id 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 is the value.
+ * @param theValue can be an NSString or [NSNull null]
  * @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:(NSString *)theValue;
++ (NSFNanoPredicate*)predicateWithColumn:(NSFTableColumnType)theType matching:(NSFMatchType)theMatch value:(id)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 is the value.
+ * @param theValue can be an NSString or [NSNull null]
  * @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:(NSString *)theValue;
+- (id)initWithColumn:(NSFTableColumnType)theType matching:(NSFMatchType)theMatch value:(id)theValue;
 //@}

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

@@ -175,11 +175,13 @@
 /** * 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;
+/** * limit a Search to a particular bag. */
+@property (nonatomic, assign, readwrite) NSFNanoBag *bag;
 /** @name Creating and Initializing a Search
  */
@@ -213,7 +215,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 returning requesting NSFReturnKeys.
+ * @note The sort descriptor will be ignored when the return type is NSFReturnKeys.
  * @see \link searchObjectsAdded:date:returnType:error: - (id)searchObjectsAdded:(NSFDateMatchType)theDateMatch date:(NSDate *)theDate returnType:(NSFReturnType)theReturnType error:(out NSError **)outError \endlink
  */
@@ -225,7 +227,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 returning requesting NSFReturnKeys.
+ * @note The sort descriptor will be ignored when the return type is 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, readonly) NSString *attribute;
+@property (nonatomic, copy, 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,6 +64,13 @@
  - 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:
@@ -423,6 +430,35 @@
  [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,23 +45,19 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 #pragma mark -
-@implementation NSFNanoEngine
-{
-@protected
-    sqlite3                 *sqlite;
-    NSString                *path;
-    NSFCacheMethod           cacheMethod;
-    /** \cond */
-    NSMutableDictionary     *schema;
-    BOOL                    willCommitChangeSchema;
-    unsigned int            busyTimeout;
-    /** \endcond */
-}
+@interface NSFNanoEngine ()
+/** \cond */
+@property (nonatomic, assign, readwrite) sqlite3 *sqlite;
+@property (nonatomic, copy, readwrite) NSString *path;
+@property (nonatomic) NSMutableDictionary *schema;
+@property (nonatomic) BOOL willCommitChangeSchema;
+@property (nonatomic) unsigned int busyTimeout;
+/** \endcond */
+@end
-@synthesize sqlite;
-@synthesize path;
-@synthesize cacheMethod;
+@implementation NSFNanoEngine
 #pragma mark -
@@ -87,7 +83,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
                                userInfo:nil]raise];
     if ((self = [self init])) {
-        path = [thePath copy];
+        _path = thePath;
     }
     return self;
@@ -103,8 +99,8 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 - (id)init
 {
     if ((self = [super init])) {
-        path = nil;
-        schema = nil;
+        _path = nil;
+        _schema = nil;
     }
     return self;
 }
@@ -126,7 +122,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;
@@ -148,7 +144,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
@@ -166,7 +162,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);
@@ -192,7 +188,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
     }
     // Save whether we want data to be fetched lazily
-    cacheMethod = theCacheMethod;
+    _cacheMethod = theCacheMethod;
     [self setBusyTimeout:250];
@@ -229,7 +225,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
@@ -252,7 +248,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
     if (YES == [self isTransactionActive])
         return NO;
-    willCommitChangeSchema = NO;
+    _willCommitChangeSchema = NO;
     return [self beginDeferredTransaction];
 }
@@ -262,7 +258,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
     if (YES == [self isTransactionActive])
         return NO;
-    willCommitChangeSchema = NO;
+    _willCommitChangeSchema = NO;
     return [self NSFP_beginTransactionMode:@"BEGIN DEFERRED TRANSACTION;"];
 }
@@ -270,19 +266,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;
 }
@@ -290,13 +286,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;
 }
@@ -717,14 +713,9 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
         theTimeout = 250;
     }
-    busyTimeout = theTimeout;
+    _busyTimeout = theTimeout;
-    sqlite3_busy_timeout(self.sqlite, busyTimeout);
-}
-- (unsigned int)busyTimeout
-{
-    return busyTimeout;
+    sqlite3_busy_timeout(self.sqlite, _busyTimeout);
 }
 + (NSInteger)systemPageSize
@@ -1078,7 +1069,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 - (NSString *)NSFP_cacheMethodToString
 {
-    switch (cacheMethod) {
+    switch (_cacheMethod) {
         case CacheAllData:
             return @"Cache all data";
             break;
@@ -1190,8 +1181,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];
@@ -1202,14 +1193,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;
     }
@@ -1513,8 +1504,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)
@@ -1535,7 +1526,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
             [tableDictionary setObject:[datatypes objectAtIndex:j] forKey:[columns objectAtIndex:j]];
         }
-        [schema setObject:tableDictionary forKey:table];
+        [_schema setObject:tableDictionary forKey:table];
     }
 }
@@ -1738,8 +1729,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];