nano-store 0.5.2 → 0.6.0

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

@@ -132,6 +132,11 @@
 
 - (NSString *)description;
 
+/** Returns a JSON representation of the result.
+ */
+
+- (NSString *)JSONDescription;
+
 //@}
 
 @end

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     : 0x%x\n", self]];
+    [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;
             }
             
@@ -118,7 +119,7 @@
                 for (j = 0; j < numberOfColumns; j++) {
                     NSString *columnName = [columns objectAtIndex:j];
                     const char *value = "<plist data>    ";
-                    if (NO == [columnName hasSuffix:@"NSFPlist"]) {
+                    if (NO == [columnName hasSuffix:@"NSFKeyedArchive"]) {
                         value = [[self valueAtIndex:i forColumn:columnName]UTF8String];
                     }
                     
@@ -139,21 +140,129 @@
     return description;
 }
 
+- (NSFOrderedDictionary *)dictionaryDescription
+{
+    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 ([[self columns]count] > 0) {
+            values[@"Columns"] = [[self columns]componentsJoinedByString:@", "];
+        } else {
+            values[@"Columns"] = @"()";
+        }
+    } else {
+        values[@"Columns"] = @"<column info not available>";
+    }
+    values[@"Number of rows"] = @(_numberOfRows);
+    if (nil == _error) {
+        values[@"Error"] = @"<nil>";
+    } else {
+        values[@"Error"] = [NSString stringWithFormat:@"%@", [_error localizedDescription]];
+    }
+    
+    // Print up to the first ten rows to help visualize the cursor
+    if (0 != numberOfColumns) {
+        NSUInteger i;
+        NSArray *columns = [self columns];
+        NSMutableString *contentString = [NSMutableString new];
+        NSMutableArray *printedContent = [NSMutableArray new];
+        
+        // Print the names of the columns
+        [contentString appendString:[NSString stringWithFormat:@"%-15@ | ", @"Row #          "]];
+        for (i = 0; i < numberOfColumns; i++) {
+            const char *value = [[columns objectAtIndex:i]UTF8String];
+            if (numberOfColumns - 1 > i) {
+                [contentString appendString:[NSString stringWithFormat:@"%-15s | ", value]];
+            } else {
+                [contentString appendString:[NSString stringWithFormat:@"%-15s", value]];
+            }
+        }
+        [printedContent addObject:[contentString copy]];
+        
+        // Print the underline
+        [contentString setString:@""];
+        const char *value = "===============";
+        [contentString appendString:[NSString stringWithFormat:@"%-15s | ", value]];
+        for (i = 0; i < numberOfColumns; i++) {
+            if (numberOfColumns - 1 > i) {
+                [contentString appendString:[NSString stringWithFormat:@"%-15s | ", value]];
+            } else {
+                [contentString appendString:[NSString stringWithFormat:@"%-15s", value]];
+            }
+        }
+        [printedContent addObject:[contentString copy]];
+
+        // Print the preview of the contents
+        if (_numberOfRows > 0) {
+            NSInteger numberOfRowsToPrint = _numberOfRows;
+            NSUInteger j;
+            
+            if (_numberOfRows > 100) {
+                numberOfRowsToPrint = 100;
+            }
+            
+            [contentString setString:@""];
+
+            for (i = 0; i < numberOfRowsToPrint; i++) {
+                [contentString appendString:[NSString stringWithFormat:@"%-15ld | ", i]];
+                for (j = 0; j < numberOfColumns; j++) {
+                    NSString *columnName = [columns objectAtIndex:j];
+                    const char *value = "<plist data>    ";
+                    if (NO == [columnName hasSuffix:@"NSFPlist"]) {
+                        value = [[self valueAtIndex:i forColumn:columnName]UTF8String];
+                    }
+                    
+                    if (numberOfColumns - 1 > j) {
+                        [contentString appendString:[NSString stringWithFormat:@"%-15s | ", value]];
+                    } else {
+                        [contentString appendString:[NSString stringWithFormat:@"%-15s", value]];
+                    }
+                }
+                
+                [printedContent addObject:[contentString copy]];
+            }
+        } else {
+            [printedContent addObject:@"<no data available>"];
+        }
+        
+        values[@"Preview of contents"] = printedContent;
+    }
+    
+    return values;
+}
+
+- (NSString *)JSONDescription
+{
+    NSFOrderedDictionary *values = [self dictionaryDescription];
+    
+    NSError *outError = nil;
+    NSString *description = [NSFNanoObject _NSObjectToJSONString:values error:&outError];
+    if (nil != outError) {
+        description = [outError localizedDescription];
+    }
+    
+    return description;
+}
+
 #pragma mark -
 
 - (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];
@@ -163,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
@@ -199,16 +303,16 @@
 {
     if (nil == theResults)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: theResults is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: theResults is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     if ([theResults respondsToSelector:@selector(objectForKey:)] == NO)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: theResults is not of type NSDictionary.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: theResults is not of type NSDictionary.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     if ((self = [self init])) {
-        results = theResults;
+        _results = theResults;
         [self _calculateNumberOfRows];
     }
     
@@ -219,45 +323,38 @@
 {
     if (nil == theError)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: theError is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: theError is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     if ([theError respondsToSelector:@selector(localizedDescription)] == NO)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: theError is not of type NSError.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: theError is not of type NSError.", [self class], NSStringFromSelector(_cmd)]
                                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/Advanced/NSFOrderedDictionary.h

@@ -0,0 +1,33 @@
+//
+//  NSFOrderedDictionary.h
+//  OrderedDictionary
+//
+//  Created by Matt Gallagher on 19/12/08.
+//  Copyright 2008 Matt Gallagher. All rights reserved.
+//
+//  v2 - ARC-compliant (Tito Ciuro)
+//  v1 - Initial release (Matt Gallagher)
+//
+//  This software is provided 'as-is', without any express or implied
+//  warranty. In no event will the authors be held liable for any damages
+//  arising from the use of this software. Permission is granted to anyone to
+//  use this software for any purpose, including commercial applications, and to
+//  alter it and redistribute it freely, subject to the following restrictions:
+//
+//  1. The origin of this software must not be misrepresented; you must not
+//     claim that you wrote the original software. If you use this software
+//     in a product, an acknowledgment in the product documentation would be
+//     appreciated but is not required.
+//  2. Altered source versions must be plainly marked as such, and must not be
+//     misrepresented as being the original software.
+//  3. This notice may not be removed or altered from any source
+//     distribution.
+//
+
+@interface NSFOrderedDictionary : NSMutableDictionary
+
+- (void)insertObject:(id)anObject forKey:(id)aKey atIndex:(NSUInteger)anIndex;
+- (id)keyAtIndex:(NSUInteger)anIndex;
+- (NSEnumerator *)reverseKeyEnumerator;
+
+@end

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

@@ -0,0 +1,148 @@
+//
+//  NSFOrderedDictionary.m
+//  OrderedDictionary
+//
+//  Created by Matt Gallagher on 19/12/08.
+//  Copyright 2008 Matt Gallagher. All rights reserved.
+//
+//  v2 - ARC-compliant (Tito Ciuro)
+//  v1 - Initial release (Matt Gallagher)
+//
+//  This software is provided 'as-is', without any express or implied
+//  warranty. In no event will the authors be held liable for any damages
+//  arising from the use of this software. Permission is granted to anyone to
+//  use this software for any purpose, including commercial applications, and to
+//  alter it and redistribute it freely, subject to the following restrictions:
+//
+//  1. The origin of this software must not be misrepresented; you must not
+//     claim that you wrote the original software. If you use this software
+//     in a product, an acknowledgment in the product documentation would be
+//     appreciated but is not required.
+//  2. Altered source versions must be plainly marked as such, and must not be
+//     misrepresented as being the original software.
+//  3. This notice may not be removed or altered from any source
+//     distribution.
+//
+
+#import "NSFOrderedDictionary.h"
+
+@interface NSFOrderedDictionary ()
+@property (nonatomic) NSMutableDictionary *dictionary;
+@property (nonatomic) NSMutableArray *array;
+@end
+
+NSString *DescriptionForObject(NSObject *object, id locale, NSUInteger indent)
+{
+	NSString *objectString = nil;
+    
+	if ([object isKindOfClass:[NSString class]]) {
+		objectString = (NSString *)object;
+	} else if ([object respondsToSelector:@selector(descriptionWithLocale:indent:)]) {
+		objectString = [(NSDictionary *)object descriptionWithLocale:locale indent:indent];
+	} else if ([object respondsToSelector:@selector(descriptionWithLocale:)]) {
+		objectString = [(NSSet *)object descriptionWithLocale:locale];
+	} else {
+		objectString = [object description];
+	}
+    
+	return objectString;
+}
+
+@implementation NSFOrderedDictionary
+
+- (id)init
+{
+	return [self initWithCapacity:0];
+}
+
+- (id)initWithCapacity:(NSUInteger)capacity
+{
+	self = [super init];
+    
+	if (self != nil) {
+		_dictionary = [[NSMutableDictionary alloc] initWithCapacity:capacity];
+		_array = [[NSMutableArray alloc] initWithCapacity:capacity];
+	}
+    
+	return self;
+}
+
+- (id)copy
+{
+	return [self mutableCopy];
+}
+
+- (void)setObject:(id)anObject forKey:(id)aKey
+{
+	if (![_dictionary objectForKey:aKey]) {
+		[_array addObject:aKey];
+	}
+    
+	[_dictionary setObject:anObject forKey:aKey];
+}
+
+- (void)removeObjectForKey:(id)aKey
+{
+	[_dictionary removeObjectForKey:aKey];
+	[_array removeObject:aKey];
+}
+
+- (NSUInteger)count
+{
+	return [_dictionary count];
+}
+
+- (id)objectForKey:(id)aKey
+{
+	return [_dictionary objectForKey:aKey];
+}
+
+- (NSEnumerator *)keyEnumerator
+{
+	return [_array objectEnumerator];
+}
+
+- (NSEnumerator *)reverseKeyEnumerator
+{
+	return [_array reverseObjectEnumerator];
+}
+
+- (void)insertObject:(id)anObject forKey:(id)aKey atIndex:(NSUInteger)anIndex
+{
+	if ([_dictionary objectForKey:aKey]) {
+		[self removeObjectForKey:aKey];
+	}
+    
+	[_array insertObject:aKey atIndex:anIndex];
+	[_dictionary setObject:anObject forKey:aKey];
+}
+
+- (id)keyAtIndex:(NSUInteger)anIndex
+{
+	return [_array objectAtIndex:anIndex];
+}
+
+- (NSString *)descriptionWithLocale:(id)locale indent:(NSUInteger)level
+{
+	NSMutableString *indentString = [NSMutableString string];
+	NSUInteger i, count = level;
+    
+	for (i = 0; i < count; i++) {
+		[indentString appendFormat:@"    "];
+	}
+	
+	NSMutableString *description = [NSMutableString string];
+	[description appendFormat:@"%@{\n", indentString];
+    
+	for (NSObject *key in self) {
+		[description appendFormat:@"%@    %@ = %@;\n",
+			indentString,
+			DescriptionForObject(key, locale, level),
+			DescriptionForObject([self objectForKey:key], locale, level)];
+	}
+    
+	[description appendFormat:@"%@}\n", indentString];
+	return description;
+}
+
+@end