nano-store 0.6.2 → 0.6.3

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

@@ -27,16 +27,17 @@
 #import "NSFNanoResult.h"
 #import "NanoStore_Private.h"
 
-@implementation NSFNanoResult
-{
-@protected
-    /** \cond */
-    NSDictionary    *results;
-    /** \endcond */
-}
+@interface NSFNanoResult ()
+
+/** \cond */
+@property (nonatomic, assign, readwrite) NSUInteger numberOfRows;
+@property (nonatomic, strong, readwrite) NSError *error;
+@property (nonatomic) NSDictionary *results;
+/** \endcond */
 
-@synthesize numberOfRows;
-@synthesize error;
+@end
+
+@implementation NSFNanoResult
 
 /** \cond */
 
@@ -57,24 +58,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) {
@@ -105,11 +106,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;
             }
             
@@ -141,13 +142,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 {
@@ -156,11 +157,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
@@ -196,11 +197,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;
             }
             
@@ -251,17 +252,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];
@@ -271,22 +272,17 @@
 
 - (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
@@ -316,7 +312,7 @@
                                userInfo:nil]raise];
     
     if ((self = [self init])) {
-        results = theResults;
+        _results = theResults;
         [self _calculateNumberOfRows];
     }
     
@@ -336,36 +332,29 @@
                                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,16 +35,13 @@
 
 @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]];
@@ -76,8 +73,8 @@
     if ((self = [self init])) {
         [self addObjectsFromArray:someObjects error:nil];
         
-        name = [theName copy];
-        hasUnsavedChanges = YES;
+        _name = theName;
+        _hasUnsavedChanges = YES;
     }
     
     return self;
@@ -88,13 +85,13 @@
 - (id)init
 {
     if ((self = [super init])) {
-        store = nil;
-        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;
@@ -102,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;
 }
 
@@ -116,20 +113,15 @@
 
 - (void)setName:(NSString *)aName
 {
-    name = [aName copy];
-    hasUnsavedChanges = YES;
+    _name = aName;
+    _hasUnsavedChanges = YES;
 }
 
 /** \endcond */
 
-- (NSString *)name
-{
-    return name;
-}
-
 - (NSUInteger)count
 {
-    return savedObjects.count + unsavedObjects.count;
+    return _savedObjects.count + _unsavedObjects.count;
 }
 
 - (NSString *)description
@@ -142,13 +134,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;
 }
@@ -167,17 +159,17 @@
 {
     // Iterate the objects collecting the object keys
     NSMutableArray *objectKeys = [NSMutableArray new];
-    for (NSString *objectKey in self.savedObjects) {
+    for (NSString *objectKey in _savedObjects) {
         [objectKeys addObject:objectKey];
     }
-    for (NSString *objectKey in self.unsavedObjects) {
+    for (NSString *objectKey in _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];
@@ -193,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;
@@ -228,10 +220,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)
@@ -281,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
@@ -314,22 +305,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;
     }
 }
 
@@ -346,7 +337,7 @@
         return YES;
     }
     
-    if (nil == store) {
+    if (nil == _store) {
         if (nil != outError) {
             *outError = [NSError errorWithDomain:NSFDomainKey
                                             code:NSFNanoStoreErrorKey
@@ -356,42 +347,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) {
@@ -408,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];
 }
@@ -426,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;
@@ -450,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;
     }
@@ -489,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, 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];
         }
     }
 }