nano-store 0.6.1 → 0.6.2

data/vendor/Pods/NanoStore/Classes/Advanced/NSFNanoResult.m

@@ -27,17 +27,16 @@
 #import "NSFNanoResult.h"
 #import "NanoStore_Private.h"
 
-@interface NSFNanoResult ()
-
-/** \cond */
-@property (nonatomic, assign, readwrite) NSUInteger numberOfRows;
-@property (nonatomic, strong, readwrite) NSError *error;
-@property (nonatomic) NSDictionary *results;
-/** \endcond */
-
-@end
-
 @implementation NSFNanoResult
+{
+@protected
+    /** \cond */
+    NSDictionary    *results;
+    /** \endcond */
+}
+
+@synthesize numberOfRows;
+@synthesize error;
 
 /** \cond */
 
@@ -58,24 +57,24 @@
 
 - (NSString *)description
 {
-    NSUInteger numberOfColumns = [[_results allKeys]count];
+    NSUInteger numberOfColumns = [[results allKeys]count];
     
     NSMutableString *description = [NSMutableString string];
     [description appendString:@"\n"];
     [description appendString:[NSString stringWithFormat:@"Result address     : %p\n", self]];
     [description appendString:[NSString stringWithFormat:@"Number of columns  : %ld\n", numberOfColumns]];
-    if (nil == _error)
+    if (nil == error)
         if ([[self columns]count] > 0)
             [description appendString:[NSString stringWithFormat:@"Columns            : %@\n", [[self columns]componentsJoinedByString:@", "]]];
         else
             [description appendString:[NSString stringWithFormat:@"Columns            : %@\n", @"()"]];
         else
             [description appendString:[NSString stringWithFormat:@"Columns            : %@\n", @"<column info not available>"]];
-    [description appendString:[NSString stringWithFormat:@"Number of rows     : %ld\n", _numberOfRows]];
-    if (nil == _error)
+    [description appendString:[NSString stringWithFormat:@"Number of rows     : %ld\n", numberOfRows]];
+    if (nil == error)
         [description appendString:[NSString stringWithFormat:@"Error              : %@\n", @"<no error>"]];
     else
-        [description appendString:[NSString stringWithFormat:@"Error              : %@\n", [_error localizedDescription]]];
+        [description appendString:[NSString stringWithFormat:@"Error              : %@\n", [error localizedDescription]]];
     
     // Print up to the first ten rows to help visualize the cursor
     if (0 != numberOfColumns) {
@@ -106,11 +105,11 @@
         }
         
         // Print the preview of the contents
-        if (_numberOfRows > 0) {
-            NSInteger numberOfRowsToPrint = _numberOfRows;
+        if (numberOfRows > 0) {
+            NSInteger numberOfRowsToPrint = numberOfRows;
             NSUInteger j;
             
-            if (_numberOfRows > 100) {
+            if (numberOfRows > 100) {
                 numberOfRowsToPrint = 100;
             }
             
@@ -142,13 +141,13 @@
 
 - (NSFOrderedDictionary *)dictionaryDescription
 {
-    NSUInteger numberOfColumns = [[_results allKeys]count];
+    NSUInteger numberOfColumns = [[results allKeys]count];
 
     NSFOrderedDictionary *values = [NSFOrderedDictionary new];
     
     values[@"Result address"] = [NSString stringWithFormat:@"%p", self];
     values[@"Number of columns"] = @(numberOfColumns);
-    if (nil == _error) {
+    if (nil == error) {
         if ([[self columns]count] > 0) {
             values[@"Columns"] = [[self columns]componentsJoinedByString:@", "];
         } else {
@@ -157,11 +156,11 @@
     } else {
         values[@"Columns"] = @"<column info not available>";
     }
-    values[@"Number of rows"] = @(_numberOfRows);
-    if (nil == _error) {
+    values[@"Number of rows"] = @(numberOfRows);
+    if (nil == error) {
         values[@"Error"] = @"<nil>";
     } else {
-        values[@"Error"] = [NSString stringWithFormat:@"%@", [_error localizedDescription]];
+        values[@"Error"] = [NSString stringWithFormat:@"%@", [error localizedDescription]];
     }
     
     // Print up to the first ten rows to help visualize the cursor
@@ -197,11 +196,11 @@
         [printedContent addObject:[contentString copy]];
 
         // Print the preview of the contents
-        if (_numberOfRows > 0) {
-            NSInteger numberOfRowsToPrint = _numberOfRows;
+        if (numberOfRows > 0) {
+            NSInteger numberOfRowsToPrint = numberOfRows;
             NSUInteger j;
             
-            if (_numberOfRows > 100) {
+            if (numberOfRows > 100) {
                 numberOfRowsToPrint = 100;
             }
             
@@ -252,17 +251,17 @@
 
 - (NSArray *)columns
 {
-    return [_results allKeys];
+    return [results allKeys];
 }
 
 - (NSString *)valueAtIndex:(NSUInteger)index forColumn:(NSString *)column
 {
-    return [[_results objectForKey:column]objectAtIndex:index];
+    return [[results objectForKey:column]objectAtIndex:index];
 }
 
 - (NSArray *)valuesForColumn:(NSString *)column
 {
-    NSArray *values = [_results objectForKey:column];
+    NSArray *values = [results objectForKey:column];
     
     if (nil == values)
         values = [NSArray array];
@@ -272,17 +271,22 @@
 
 - (NSString *)firstValue
 {
-    NSArray *columns = [_results allKeys];
-    if (([columns count] > 0) && (_numberOfRows > 0)) {
-        return [[_results objectForKey:[columns objectAtIndex:0]]objectAtIndex:0];
+    NSArray *columns = [results allKeys];
+    if (([columns count] > 0) && (numberOfRows > 0)) {
+        return [[results objectForKey:[columns objectAtIndex:0]]objectAtIndex:0];
     }
     
     return nil;
 }
 
+- (NSError *)error
+{
+    return [error copy];
+}
+
 - (void)writeToFile:(NSString *)path;
 {
-    [_results writeToFile:[path stringByExpandingTildeInPath] atomically:YES];
+    [results writeToFile:[path stringByExpandingTildeInPath] atomically:YES];
 }
 
 #pragma mark - Private Methods
@@ -312,7 +316,7 @@
                                userInfo:nil]raise];
     
     if ((self = [self init])) {
-        _results = theResults;
+        results = theResults;
         [self _calculateNumberOfRows];
     }
     
@@ -332,29 +336,36 @@
                                userInfo:nil]raise];
     
     if ((self = [self init])) {
-        _error = theError;
+        error = theError;
         [self _calculateNumberOfRows];
     }
     
     return self;
 }
 
+- (void)_setError:(NSError *)theError
+{
+    if (error != theError) {
+        error = theError;
+    }
+}
+
 - (void)_reset
 {
-    _numberOfRows = -1;
-    _results = nil;
-    _error = nil;
+    numberOfRows = -1;
+    results = nil;
+    error = nil;
 }
 
 - (void)_calculateNumberOfRows
 {
     // We cache the value once, for performance reasons
-    if (-1 == _numberOfRows) {
-        NSArray *allKeys = [_results allKeys];
+    if (-1 == numberOfRows) {
+        NSArray *allKeys = [results allKeys];
         if ([allKeys count] == 0)
-            _numberOfRows = 0;
+            numberOfRows = 0;
         else
-            _numberOfRows = [[_results objectForKey:[allKeys lastObject]]count];
+            numberOfRows = [[results objectForKey:[allKeys lastObject]]count];
     }
 }
 /** \endcond */

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

@@ -35,13 +35,16 @@
 
 @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]];
@@ -73,8 +76,8 @@
     if ((self = [self init])) {
         [self addObjectsFromArray:someObjects error:nil];
         
-        _name = theName;
-        _hasUnsavedChanges = YES;
+        name = [theName copy];
+        hasUnsavedChanges = YES;
     }
     
     return self;
@@ -85,13 +88,13 @@
 - (id)init
 {
     if ((self = [super init])) {
-        _store = nil;
-        _key = [NSFNanoEngine stringWithUUID];
-        _name = nil;
-        _savedObjects = [NSMutableDictionary new];
-        _unsavedObjects = [NSMutableDictionary new];
-        _removedObjects = [NSMutableDictionary new];
-        _hasUnsavedChanges = NO;
+        store = nil;
+        key = [NSFNanoEngine stringWithUUID];
+        savedObjects = [NSMutableDictionary new];
+        unsavedObjects = [NSMutableDictionary new];
+        removedObjects = [NSMutableDictionary new];
+        
+        hasUnsavedChanges = NO;
     }
     
     return self;
@@ -99,7 +102,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,15 +116,20 @@
 
 - (void)setName:(NSString *)aName
 {
-    _name = aName;
-    _hasUnsavedChanges = YES;
+    name = [aName copy];
+    hasUnsavedChanges = YES;
 }
 
 /** \endcond */
 
+- (NSString *)name
+{
+    return name;
+}
+
 - (NSUInteger)count
 {
-    return _savedObjects.count + _unsavedObjects.count;
+    return savedObjects.count + unsavedObjects.count;
 }
 
 - (NSString *)description
@@ -134,13 +142,13 @@
     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]);
+    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]);
     
     return values;
 }
@@ -159,17 +167,17 @@
 {
     // Iterate the objects collecting the object keys
     NSMutableArray *objectKeys = [NSMutableArray new];
-    for (NSString *objectKey in _savedObjects) {
+    for (NSString *objectKey in self.savedObjects) {
         [objectKeys addObject:objectKey];
     }
-    for (NSString *objectKey in _unsavedObjects) {
+    for (NSString *objectKey in self.unsavedObjects) {
         [objectKeys addObject:objectKey];
     }
     
     NSMutableDictionary *info = [NSMutableDictionary dictionary];
     
-    if (nil != _name) {
-        [info setObject:_name forKey:NSF_Private_NSFNanoBag_Name];
+    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];
@@ -185,17 +193,17 @@
     
     BOOL success = YES;
     
-    NSArray *sortedArraySelf = [[_savedObjects allKeys]sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
+    NSArray *sortedArraySelf = [[[self savedObjects]allKeys]sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
     NSArray *sortedArrayOther = [[[otherNanoBag savedObjects]allKeys]sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
     if (NO == [sortedArraySelf isEqualToArray:sortedArrayOther]) {
         success = NO;
     } else {
-        sortedArraySelf = [[_unsavedObjects allKeys]sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
+        sortedArraySelf = [[[self unsavedObjects]allKeys]sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
         sortedArrayOther = [[[otherNanoBag unsavedObjects]allKeys]sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
         if (NO == [sortedArraySelf isEqualToArray:sortedArrayOther]) {
             success = NO;
         } else {
-            sortedArraySelf = [[_removedObjects allKeys]sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
+            sortedArraySelf = [[[self removedObjects]allKeys]sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
             sortedArrayOther = [[[otherNanoBag removedObjects]allKeys]sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
             if (NO == [sortedArraySelf isEqualToArray:sortedArrayOther]) {
                 success = NO;
@@ -220,10 +228,10 @@
     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)
@@ -273,20 +281,21 @@
 
 - (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];
+    [objects addEntriesFromDictionary:removedObjects];
+    
+    [savedObjects removeAllObjects];
+    [unsavedObjects removeAllObjects];
+    [removedObjects setDictionary:objects];
+    hasUnsavedChanges = YES;
     
-    [_savedObjects removeAllObjects];
-    [_unsavedObjects removeAllObjects];
-    [_removedObjects setDictionary:objects];
-    _hasUnsavedChanges = YES;
 }
 
 - (void)removeObjectsInArray:(NSArray *)someObjects
@@ -305,22 +314,22 @@
     }
     
     // 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;
     }
 }
 
@@ -337,7 +346,7 @@
         return YES;
     }
     
-    if (nil == _store) {
+    if (nil == store) {
         if (nil != outError) {
             *outError = [NSError errorWithDomain:NSFDomainKey
                                             code:NSFNanoStoreErrorKey
@@ -347,42 +356,42 @@
         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) {
@@ -399,11 +408,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];
 }
@@ -417,18 +426,18 @@
 - (id)initNanoObjectFromDictionaryRepresentation:(NSDictionary *)dictionary forKey:(NSString *)aKey store:(NSFNanoStore *)aStore
 {
     if ((self = [self init])) {
-        _name = [dictionary objectForKey:NSF_Private_NSFNanoBag_Name];
-        _store = aStore;
-        _key = aKey;
-        _savedObjects = [NSMutableDictionary new];
-        _unsavedObjects = [NSMutableDictionary new];
-        _removedObjects = [NSMutableDictionary new];
+        name = [[dictionary objectForKey:NSF_Private_NSFNanoBag_Name]copy];
+        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;
@@ -441,35 +450,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;
     }
@@ -480,14 +489,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, 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];
         }
     }
 }