nano-store 0.5.2 → 0.6.0

data/vendor/Pods/NanoStore/Classes/Private/NSFNanoEngine_Private.h

@@ -30,10 +30,12 @@
 #import "NSFNanoEngine.h"
 #import "NSFNanoGlobals_Private.h"
 #import "NSFNanoResult.h"
+#import "NSFOrderedDictionary.h"
 
 /** \cond */
 
 @interface NSFNanoEngine (Private)
+- (NSFOrderedDictionary *)dictionaryDescription;
 + (NSArray *)NSFP_sharedROWIDKeywords;
 - (NSString *)NSFP_cacheMethodToString;
 - (NSString*)NSFP_nestedDescriptionWithPrefixedSpace:(NSString *)prefixedSpace;

data/vendor/Pods/NanoStore/Classes/Private/NSFNanoExpression_Private.h

@@ -29,7 +29,7 @@
 /** \cond */
 
 @interface NSFNanoExpression (Private)
-// Just a placeholder.
+- (NSArray *)arrayDescription;
 @end
 
 /** \endcond */

data/vendor/Pods/NanoStore/Classes/Private/NSFNanoGlobals_Private.h

@@ -53,6 +53,10 @@
  
  */
 
+extern NSDictionary * safeJSONDictionaryFromDictionary (NSDictionary *dictionary);
+extern NSArray * safeJSONArrayFromArray (NSArray *array);
+extern id safeJSONObjectFromObject (id object);
+
 extern NSString * NSFStringFromMatchType (NSFMatchType aMatchType);
 
 extern void _NSFLog (NSString  *format, ...);
@@ -67,13 +71,13 @@ extern NSString * const NSFValue;
 extern NSString * const NSFDatatype;
 extern NSString * const NSFCalendarDate;
 extern NSString * const NSFObjectClass;
-extern NSString * const NSFPlist;
+extern NSString * const NSFKeyedArchive;
 extern NSString * const NSFAttribute;
 
 #pragma mark -
 
 extern NSString * const NSF_Private_NSFKeys_NSFKey;
-extern NSString * const NSF_Private_NSFKeys_NSFPlist;
+extern NSString * const NSF_Private_NSFKeys_NSFKeyedArchive;
 extern NSString * const NSF_Private_NSFValues_NSFKey;
 extern NSString * const NSF_Private_NSFValues_NSFAttribute;
 extern NSString * const NSF_Private_NSFValues_NSFValue;

data/vendor/Pods/NanoStore/Classes/Private/NSFNanoObject_Private.h

@@ -30,6 +30,10 @@
 
 @interface NSFNanoObject (Private)
 - (void)_setOriginalClassString:(NSString *)theClassString;
++ (NSString *)_NSObjectToJSONString:(id)object error:(NSError **)error;
++ (NSDictionary *)_safeDictionaryFromDictionary:(NSDictionary *)dictionary;
++ (NSArray *)_safeArrayFromArray:(NSArray *)array;
++ (id)_safeObjectFromObject:(id)object;
 @end
 
 /** \endcond */

data/vendor/Pods/NanoStore/Classes/Private/NSFNanoStore_Private.h

@@ -25,10 +25,12 @@
  */
 
 #import "NSFNanoStore.h"
+#import "NSFOrderedDictionary.h"
 
 /** \cond */
 
 @interface NSFNanoStore (Private)
+- (NSFOrderedDictionary *)dictionaryDescription;
 + (NSFNanoStore *)_createAndOpenDebugDatabase;
 - (NSFNanoResult *)_executeSQL:(NSString *)theSQLStatement;
 - (NSString*)_nestedDescriptionWithPrefixedSpace:(NSString *)prefixedSpace;
@@ -37,7 +39,7 @@
 - (void)_setIsOurTransaction:(BOOL)value;
 - (BOOL)_isOurTransaction;
 - (BOOL)_setupCachingSchema;
-- (BOOL)_storeDictionary:(NSDictionary *)someInfo forKey:(NSString *)aKey forClassNamed:(NSString *)classType usingSQLite3Statement:(sqlite3_stmt *)storeValuesStatement error:(out NSError **)outError;
+- (BOOL)_storeDictionary:(NSDictionary *)someInfo forKey:(NSString *)aKey forClassNamed:(NSString *)classType error:(out NSError **)outError;
 - (BOOL)__storeDictionaries:(NSArray *)someObjects forKeys:(NSArray *)someKeys error:(out NSError **)outError;
 - (BOOL)_bindValue:(id)aValue forAttribute:(NSString *)anAttribute parameterNumber:(NSInteger)aParamNumber usingSQLite3Statement:(sqlite3_stmt *)aStatement;
 - (BOOL)_checkNanoStoreIsReadyAndReturnError:(out NSError **)outError;

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

@@ -302,11 +302,16 @@
 
 /** * Returns a string representation of the bag.
  * @note Check properties savedObjects, unsavedObjects and removedObjects to find out the current state of the bag.
- * @see \link dictionaryRepresentation - (NSDictionary *)dictionaryRepresentation \endlink
  */
 
 - (NSString *)description;
 
+/** Returns a JSON representation of the bag.
+ * @note Check properties savedObjects, unsavedObjects and removedObjects to find out the current state of the bag.
+ */
+
+- (NSString *)JSONDescription;
+
 //@}
 
 @end

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

@@ -30,19 +30,18 @@
 #import "NSFNanoGlobals_Private.h"
 #import "NSFNanoStore_Private.h"
 #import "NSFNanoSearch_Private.h"
+#import "NSFOrderedDictionary.h"
+#import "NSFNanoObject_Private.h"
 
 @implementation NSFNanoBag
 {
-@protected
     /** \cond */
-    NSMutableDictionary     *savedObjects;
-    NSMutableDictionary     *unsavedObjects;
-    NSMutableDictionary     *removedObjects;
+    NSMutableDictionary *_savedObjects;
+    NSMutableDictionary *_unsavedObjects;
+    NSMutableDictionary *_removedObjects;
     /** \endcond */
 }
 
-@synthesize store, name, key, savedObjects, unsavedObjects, removedObjects, hasUnsavedChanges;
-
 + (NSFNanoBag*)bag
 {
     return [[self alloc]initBagWithName:nil andObjects:[NSArray array]];
@@ -67,15 +66,15 @@
 {
     if (nil == someObjects) {
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: 'someObjects' cannot be nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: 'someObjects' cannot be nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     }
     
     if ((self = [self init])) {
         [self addObjectsFromArray:someObjects error:nil];
         
-        name = [theName copy];
-        hasUnsavedChanges = YES;
+        _name = theName;
+        _hasUnsavedChanges = YES;
     }
     
     return self;
@@ -86,12 +85,13 @@
 - (id)init
 {
     if ((self = [super init])) {
-        key = [NSFNanoEngine stringWithUUID];
-        savedObjects = [NSMutableDictionary new];
-        unsavedObjects = [NSMutableDictionary new];
-        removedObjects = [NSMutableDictionary new];
-        
-        hasUnsavedChanges = NO;
+        _store = nil;
+        _key = [NSFNanoEngine stringWithUUID];
+        _name = nil;
+        _savedObjects = [NSMutableDictionary new];
+        _unsavedObjects = [NSMutableDictionary new];
+        _removedObjects = [NSMutableDictionary new];
+        _hasUnsavedChanges = NO;
     }
     
     return self;
@@ -99,7 +99,7 @@
 
 - (id)copyWithZone:(NSZone *)zone
 {
-    NSFNanoBag *copy = [[[self class]allocWithZone:zone]initNanoObjectFromDictionaryRepresentation:[self dictionaryRepresentation] forKey:[NSFNanoEngine stringWithUUID] store:store];
+    NSFNanoBag *copy = [[[self class]allocWithZone:zone]initNanoObjectFromDictionaryRepresentation:[self dictionaryRepresentation] forKey:[NSFNanoEngine stringWithUUID] store:_store];
     return copy;
 }
 
@@ -113,38 +113,70 @@
 
 - (void)setName:(NSString *)aName
 {
-    name = [aName copy];
-    hasUnsavedChanges = YES;
+    _name = aName;
+    _hasUnsavedChanges = YES;
 }
 
 /** \endcond */
 
-- (NSString *)name
+- (NSUInteger)count
 {
-    return name;
+    return _savedObjects.count + _unsavedObjects.count;
 }
 
-- (NSUInteger)count
+- (NSString *)description
 {
-    return savedObjects.count + unsavedObjects.count;
+    return [self JSONDescription];
 }
 
-- (NSString*)description
+- (NSDictionary *)dictionaryDescription
 {
-    NSMutableString *description = [NSMutableString string];
+    NSFOrderedDictionary *values = [NSFOrderedDictionary new];
+    
+    values[@"NanoBag address"] = [NSString stringWithFormat:@"%p", self];
+    values[@"Key"] = _key;
+    values[@"Name"] = (nil != _name) ? _name : @"<untitled>";
+    values[@"Document store"] = ([_store dictionaryDescription] ? [_store dictionaryDescription] : @"<nil>");
+    values[@"Has unsaved changes?"] = (_hasUnsavedChanges ? @"YES" : @"NO");
+    values[@"Saved objects"] = @([_savedObjects count]);
+    values[@"Unsaved objects"] = @([_unsavedObjects count]);
+    values[@"Removed objects"] = @([_removedObjects count]);
     
-    [description appendString:@"\n"];
-    [description appendString:[NSString stringWithFormat:@"NanoBag address      : 0x%x\n", self]];
-    [description appendString:[NSString stringWithFormat:@"Name                 : %@\n", (nil != name) ? name : @"<untitled>"]];
-    [description appendString:[NSString stringWithFormat:@"Document store       : 0x%x\n", store]];
-    [description appendString:[NSString stringWithFormat:@"Has unsaved changes? : %@\n", (hasUnsavedChanges ? @"YES" : @"NO")]];
-    [description appendString:[NSString stringWithFormat:@"Saved objects        : %ld key/value pairs\n", [savedObjects count]]];
-    [description appendString:[NSString stringWithFormat:@"Unsaved objects      : %ld key/value pairs\n", [unsavedObjects count]]];
-    [description appendString:[NSString stringWithFormat:@"Removed objects      : %ld key/value pairs\n", [removedObjects count]]];
+    return values;
+}
 
+- (NSString *)JSONDescription
+{
+    NSDictionary *values = [self dictionaryDescription];
+    
+    NSError *outError = nil;
+    NSString *description = [NSFNanoObject _NSObjectToJSONString:values error:&outError];
+    
     return description;
 }
 
+- (NSDictionary *)dictionaryRepresentation
+{
+    // Iterate the objects collecting the object keys
+    NSMutableArray *objectKeys = [NSMutableArray new];
+    for (NSString *objectKey in _savedObjects) {
+        [objectKeys addObject:objectKey];
+    }
+    for (NSString *objectKey in _unsavedObjects) {
+        [objectKeys addObject:objectKey];
+    }
+    
+    NSMutableDictionary *info = [NSMutableDictionary dictionary];
+    
+    if (nil != _name) {
+        [info setObject:_name forKey:NSF_Private_NSFNanoBag_Name];
+    }
+    [info setObject:self.key forKey:NSF_Private_NSFNanoBag_NSFKey];
+    [info setObject:objectKeys forKey:NSF_Private_NSFNanoBag_NSFObjectKeys];
+    
+    return info;
+}
+
 - (BOOL)isEqualToNanoBag:(NSFNanoBag *)otherNanoBag
 {
     if (self == otherNanoBag) {
@@ -153,17 +185,17 @@
     
     BOOL success = YES;
     
-    NSArray *sortedArraySelf = [[[self savedObjects]allKeys]sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
+    NSArray *sortedArraySelf = [[_savedObjects allKeys]sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
     NSArray *sortedArrayOther = [[[otherNanoBag savedObjects]allKeys]sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
     if (NO == [sortedArraySelf isEqualToArray:sortedArrayOther]) {
         success = NO;
     } else {
-        sortedArraySelf = [[[self unsavedObjects]allKeys]sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
+        sortedArraySelf = [[_unsavedObjects allKeys]sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
         sortedArrayOther = [[[otherNanoBag unsavedObjects]allKeys]sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
         if (NO == [sortedArraySelf isEqualToArray:sortedArrayOther]) {
             success = NO;
         } else {
-            sortedArraySelf = [[[self removedObjects]allKeys]sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
+            sortedArraySelf = [[_removedObjects allKeys]sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
             sortedArrayOther = [[[otherNanoBag removedObjects]allKeys]sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
             if (NO == [sortedArraySelf isEqualToArray:sortedArrayOther]) {
                 success = NO;
@@ -174,35 +206,13 @@
     return success;
 }
 
-- (NSDictionary *)dictionaryRepresentation
-{
-    // Iterate the objects collecting the object keys
-    NSMutableArray *objectKeys = [NSMutableArray new];
-    for (NSString *objectKey in self.savedObjects) {
-        [objectKeys addObject:objectKey];
-    }
-    for (NSString *objectKey in self.unsavedObjects) {
-        [objectKeys addObject:objectKey];
-    }
-    
-    NSMutableDictionary *info = [NSMutableDictionary dictionary];
-    
-    if (nil != name) {
-        [info setObject:name forKey:NSF_Private_NSFNanoBag_Name];
-    }
-    [info setObject:self.key forKey:NSF_Private_NSFNanoBag_NSFKey];
-    [info setObject:objectKeys forKey:NSF_Private_NSFNanoBag_NSFObjectKeys];
-    
-    return info;
-}
-
 #pragma mark -
 
 - (BOOL)addObject:(id <NSFNanoObjectProtocol>)object error:(out NSError **)outError
 {
     if (NO == [(id)object conformsToProtocol:@protocol(NSFNanoObjectProtocol)]) {
         [[NSException exceptionWithName:NSFNonConformingNanoObjectProtocolException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: the object does not conform to NSFNanoObjectProtocol.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: the object does not conform to NSFNanoObjectProtocol.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];            
     }
     
@@ -210,16 +220,16 @@
     NSDictionary *info = [(id)object dictionaryRepresentation];
     
     if (objectKey && info) {
-        [savedObjects removeObjectForKey:objectKey];
-        [unsavedObjects setObject:object forKey:objectKey];
-        [removedObjects removeObjectForKey:objectKey];
-        hasUnsavedChanges = YES;
+        [_savedObjects removeObjectForKey:objectKey];
+        [_unsavedObjects setObject:object forKey:objectKey];
+        [_removedObjects removeObjectForKey:objectKey];
+        _hasUnsavedChanges = YES;
     } else {
         NSString *message = nil;
         if (nil == objectKey)
-            message = [NSString stringWithFormat:@"*** -[%@ %s]: unexpected NSFNanoObject behavior. Reason: the object's key is nil.", [self class], _cmd];
+            message = [NSString stringWithFormat:@"*** -[%@ %@]: unexpected NSFNanoObject behavior. Reason: the object's key is nil.", [self class], NSStringFromSelector(_cmd)];
         else
-            message = [NSString stringWithFormat:@"*** -[%@ %s]: unexpected NSFNanoObject behavior. Reason: the object's dictionary is nil.", [self class], _cmd];  
+            message = [NSString stringWithFormat:@"*** -[%@ %@]: unexpected NSFNanoObject behavior. Reason: the object's dictionary is nil.", [self class], NSStringFromSelector(_cmd)];  
         
         [[NSException exceptionWithName:NSFNanoObjectBehaviorException reason:message userInfo:nil]raise];  
     }
@@ -233,7 +243,7 @@
         if (nil != outError) {
             *outError = [NSError errorWithDomain:NSFDomainKey
                                             code:NSFNanoStoreErrorKey
-                                        userInfo:[NSDictionary dictionaryWithObject:[NSString stringWithFormat:@"*** -[%@ %s]: the object cannot be added because the list provided is nil.", [self class], _cmd]
+                                        userInfo:[NSDictionary dictionaryWithObject:[NSString stringWithFormat:@"*** -[%@ %@]: the object cannot be added because the list provided is nil.", [self class], NSStringFromSelector(_cmd)]
                                                                              forKey:NSLocalizedFailureReasonErrorKey]];
         }
         return NO;
@@ -254,7 +264,7 @@
 {
     if (NO == [(id)object conformsToProtocol:@protocol(NSFNanoObjectProtocol)]) {
         [[NSException exceptionWithName:NSFNonConformingNanoObjectProtocolException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: the object does not conform to NSFNanoObjectProtocol.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: the object does not conform to NSFNanoObjectProtocol.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];    
     }
     
@@ -263,21 +273,20 @@
 
 - (void)removeAllObjects
 {
-    NSMutableDictionary *objects = [[NSMutableDictionary alloc]initWithCapacity:(savedObjects.count + removedObjects.count)];
+    NSMutableDictionary *objects = [[NSMutableDictionary alloc]initWithCapacity:(_savedObjects.count + _removedObjects.count)];
     
     // Save the object and its key
-    for (id object in savedObjects) {
+    for (id object in _savedObjects) {
         [objects setObject:object forKey:[object performSelector:@selector(key)]];
     }
     
     // Save the previously removed objects (if any)
-    [objects addEntriesFromDictionary:removedObjects];
-    
-    [savedObjects removeAllObjects];
-    [unsavedObjects removeAllObjects];
-    [removedObjects setDictionary:objects];
-    hasUnsavedChanges = YES;
+    [objects addEntriesFromDictionary:_removedObjects];
     
+    [_savedObjects removeAllObjects];
+    [_unsavedObjects removeAllObjects];
+    [_removedObjects setDictionary:objects];
+    _hasUnsavedChanges = YES;
 }
 
 - (void)removeObjectsInArray:(NSArray *)someObjects
@@ -291,27 +300,27 @@
 {
     if (nil == objectKey) {
         [[NSException exceptionWithName:NSFNanoObjectBehaviorException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: unexpected NSFNanoObject behavior. Reason: the object's key is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: unexpected NSFNanoObject behavior. Reason: the object's key is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise]; 
     }
     
     // Is the object an existing one?
-    id object = [savedObjects objectForKey:objectKey];
+    id object = [_savedObjects objectForKey:objectKey];
     if (nil != object) {
-        [savedObjects removeObjectForKey:objectKey];
+        [_savedObjects removeObjectForKey:objectKey];
     } else {
         // Is the object still unsaved?
-        object = [unsavedObjects objectForKey:objectKey];
+        object = [_unsavedObjects objectForKey:objectKey];
         if (nil != object) {
-            [unsavedObjects removeObjectForKey:objectKey];
+            [_unsavedObjects removeObjectForKey:objectKey];
         }
     }
     
     if (nil == object) {
         // The object doesn't exist, so there is no need to mark the bag as dirty
     } else {
-        [removedObjects setObject:object forKey:objectKey];
-        hasUnsavedChanges = YES;
+        [_removedObjects setObject:object forKey:objectKey];
+        _hasUnsavedChanges = YES;
     }
 }
 
@@ -328,58 +337,58 @@
         return YES;
     }
     
-    if (nil == store) {
+    if (nil == _store) {
         if (nil != outError) {
             *outError = [NSError errorWithDomain:NSFDomainKey
                                             code:NSFNanoStoreErrorKey
-                                        userInfo:[NSDictionary dictionaryWithObject:[NSString stringWithFormat:@"*** -[%@ %s]: unable to save the bag. Reason: the store has not been set.", [self class], _cmd]
+                                        userInfo:[NSDictionary dictionaryWithObject:[NSString stringWithFormat:@"*** -[%@ %@]: unable to save the bag. Reason: the store has not been set.", [self class], NSStringFromSelector(_cmd)]
                                                                              forKey:NSLocalizedFailureReasonErrorKey]];
         }
         return NO;
     }
     
-    return [self _saveInStore:store error:outError];
+    return [self _saveInStore:_store error:outError];
 }
 
 #pragma mark -
 
 - (void)deflateBag
 {
-    NSArray *savedObjectsCopy = [[NSArray alloc]initWithArray:[savedObjects allKeys]];
+    NSArray *savedObjectsCopy = [[NSArray alloc]initWithArray:[_savedObjects allKeys]];
     
     for (id saveObjectKey in savedObjectsCopy) {
-        [savedObjects setObject:[NSNull null] forKey:saveObjectKey];
+        [_savedObjects setObject:[NSNull null] forKey:saveObjectKey];
     }
     
 }
 
 - (void)inflateBag
 {
-    NSArray *objectKeys = [savedObjects allKeys];
+    NSArray *objectKeys = [_savedObjects allKeys];
     [self _inflateObjectsWithKeys:objectKeys];
 }
 
 - (BOOL)reloadBagWithError:(out NSError **)outError
 {
     // If the bag is not associated to a document store, there is no need to continue
-    if (nil == store) {
+    if (nil == _store) {
         return YES;
     }
     
     // Refresh the bag to match the contents stored on the database
-    [self _inflateObjectsWithKeys:[NSArray arrayWithObject:key]];
-    NSFNanoBag *savedBag = [savedObjects objectForKey:key];
+    [self _inflateObjectsWithKeys:[NSArray arrayWithObject:_key]];
+    NSFNanoBag *savedBag = [_savedObjects objectForKey:_key];
     if (nil != savedBag) {
-        [savedObjects removeAllObjects];
-        [savedObjects addEntriesFromDictionary:savedBag.savedObjects];
-        for (NSString *objectKey in unsavedObjects) {
-            [savedObjects removeObjectForKey:objectKey];
+        [_savedObjects removeAllObjects];
+        [_savedObjects addEntriesFromDictionary:savedBag.savedObjects];
+        for (NSString *objectKey in _unsavedObjects) {
+            [_savedObjects removeObjectForKey:objectKey];
         }
     } else {
         if (nil != outError) {
             *outError = [NSError errorWithDomain:NSFDomainKey
                                             code:NSFNanoStoreErrorKey
-                                        userInfo:[NSDictionary dictionaryWithObject:[NSString stringWithFormat:@"*** -[%@ %s]: the bag could not be refreshed.", [self class], _cmd]
+                                        userInfo:[NSDictionary dictionaryWithObject:[NSString stringWithFormat:@"*** -[%@ %@]: the bag could not be refreshed.", [self class], NSStringFromSelector(_cmd)]
                                                                              forKey:NSLocalizedFailureReasonErrorKey]];
         }
         return NO;
@@ -390,11 +399,11 @@
 
 - (BOOL)undoChangesWithError:(out NSError **)outError
 {
-    [savedObjects removeAllObjects];
-    [unsavedObjects removeAllObjects];
-    [removedObjects removeAllObjects];
+    [_savedObjects removeAllObjects];
+    [_unsavedObjects removeAllObjects];
+    [_removedObjects removeAllObjects];
     
-    hasUnsavedChanges = NO;
+    _hasUnsavedChanges = NO;
     
     return [self reloadBagWithError:outError];
 }
@@ -408,18 +417,18 @@
 - (id)initNanoObjectFromDictionaryRepresentation:(NSDictionary *)dictionary forKey:(NSString *)aKey store:(NSFNanoStore *)aStore
 {
     if ((self = [self init])) {
-        name = [[dictionary objectForKey:NSF_Private_NSFNanoBag_Name]copy];
-        store = aStore;
-        key = aKey;
-        savedObjects = [NSMutableDictionary new];
-        unsavedObjects = [NSMutableDictionary new];
-        removedObjects = [NSMutableDictionary new];
+        _name = [dictionary objectForKey:NSF_Private_NSFNanoBag_Name];
+        _store = aStore;
+        _key = aKey;
+        _savedObjects = [NSMutableDictionary new];
+        _unsavedObjects = [NSMutableDictionary new];
+        _removedObjects = [NSMutableDictionary new];
         
         NSArray *objectKeys = [dictionary objectForKey:NSF_Private_NSFNanoBag_NSFObjectKeys];
         
         [self _inflateObjectsWithKeys:objectKeys];
         
-        hasUnsavedChanges = NO;
+        _hasUnsavedChanges = NO;
     }
     
     return self;
@@ -432,35 +441,35 @@
 
 - (NSString *)nanoObjectKey
 {
-    return key;
+    return _key;
 }
 
 - (void)_setStore:(NSFNanoStore *)aStore
 {
-    store = aStore;
+    _store = aStore;
 }
 
 - (BOOL)_saveInStore:(NSFNanoStore *)someStore error:(out NSError **)outError
 {
     // Save the unsaved objects first...
-    NSArray *contentsToBeSaved = [unsavedObjects allValues];
+    NSArray *contentsToBeSaved = [_unsavedObjects allValues];
     if ([contentsToBeSaved count] > 0) {
         [someStore _addObjectsFromArray:contentsToBeSaved forceSave:YES error:outError];
     }
     
     // Move the existing objects to the unsaved list, in order to save the bag
-    [unsavedObjects addEntriesFromDictionary:savedObjects];
-    [savedObjects removeAllObjects];
-    [removedObjects removeAllObjects];
+    [_unsavedObjects addEntriesFromDictionary:_savedObjects];
+    [_savedObjects removeAllObjects];
+    [_removedObjects removeAllObjects];
     
     // Save the unsaved bag...
     BOOL success = [someStore _addObjectsFromArray:[NSArray arrayWithObject:self] forceSave:YES error:outError];
     
     if (YES == success) {
-        [unsavedObjects removeAllObjects];
+        [_unsavedObjects removeAllObjects];
         success = [self reloadBagWithError:outError];
         if (YES == success) {
-            hasUnsavedChanges = NO;
+            _hasUnsavedChanges = NO;
         }
         return success;
     }
@@ -471,14 +480,14 @@
 - (void)_inflateObjectsWithKeys:(NSArray *)someKeys
 {
     if ([someKeys count] != 0) {
-        NSFNanoSearch *search = [NSFNanoSearch searchWithStore:store];
+        NSFNanoSearch *search = [NSFNanoSearch searchWithStore:_store];
         NSString *quotedString = [NSFNanoSearch _quoteStrings:someKeys joiningWithDelimiter:@","];
-        NSString *theSQLStatement = [NSString stringWithFormat:@"SELECT NSFKey, NSFPlist, NSFObjectClass FROM NSFKeys WHERE NSFKey IN (%@)", quotedString];
+        NSString *theSQLStatement = [NSString stringWithFormat:@"SELECT NSFKey, NSFKeyedArchive, NSFObjectClass FROM NSFKeys WHERE NSFKey IN (%@)", quotedString];
         
         NSDictionary *results = [search executeSQL:theSQLStatement returnType:NSFReturnObjects error:nil];
         
         if (nil != results) {
-            [savedObjects addEntriesFromDictionary:results];
+            [_savedObjects addEntriesFromDictionary:results];
         }
     }
 }