Refactored how sorting of collections works

bengotow · bengotow · commit dd422cb619b4 · 2013-07-15T01:07:50.000-06:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+/.DS_Store
diff --git a/MAPIClient.h b/MAPIClient.h
@@ -10,11 +10,9 @@
 
 #define NOTIF_USER_CHANGED          @"m_user_changed"
 #define NOTIF_COLLECTION_CHANGED    @"m_collection_changed"
+#define NOTIF_MODEL_CHANGED         @"m_model_changed"
 #define NOTIF_API_QUEUE_CHANGED     @"m_api_queue_changed"
 
-#define API_TIMESTAMP_FORMAT @"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"
-
-
 @interface MAPIClient : AFHTTPClient
 {
     NSMutableArray * _transactionsQueue;
@@ -37,8 +35,6 @@
 - (void)getCollectionAtPath:(NSString*)path userTriggered:(BOOL)triggered success:(void (^)(id responseObject))successCallback failure:(void (^)(NSError *err))failureCallback;
 - (void)requestPath:(NSString*)path withMethod:(NSString*)method withParameters: params userTriggered:(BOOL)triggered expectedClass:(Class)expectation success:(void (^)(id responseObject))successCallback failure:(void (^)(NSError *err))failureCallback;
 
-- (void)authenticateWithToken:(NSString*)accessToken;
-
 
 #pragma mark Tracking API Access and Recovering from Offline State
 
diff --git a/MAPIClient.m b/MAPIClient.m
@@ -19,7 +19,7 @@ + (MAPIClient *)shared
     static MAPIClient * sharedClient = nil;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
-        sharedClient = [[MAPIClient alloc] initWithBaseURL:[NSURL URLWithString: BASE_URL]];
+        sharedClient = [[MAPIClient alloc] initWithBaseURL:[NSURL URLWithString: API_ROOT]];
     });
     return sharedClient;
 }
@@ -236,6 +236,9 @@ - (void)criticalRequestFailed:(NSError*)err
         NSDictionary * json = [NSJSONSerialization JSONObjectWithData:jsonData options:NSJSONReadingAllowFragments error:NULL];
         if (json) message = [json objectForKey: @"error"];
     }
+    
+    if ([err code] == 401)
+        message = @"Please check your email address and password.";
 
     if (message)
         [[[UIAlertView alloc] initWithTitle:@"Error" message:message delegate:nil cancelButtonTitle:@"OK" otherButtonTitles:nil] show];
diff --git a/MModel.h b/MModel.h
@@ -37,6 +37,8 @@ typedef enum SaveState {
 
 - (void)setup;
 
+- (NSComparisonResult)sort:(MModel*)other;
+
 - (NSString*)ID;
 - (BOOL)isSaved;
 - (BOOL)isUnsaved;
diff --git a/MModel.m b/MModel.m
@@ -60,6 +60,11 @@ - (void)setup
     
 }
 
+- (NSComparisonResult)sort:(MModel*)other
+{
+    return [[self createdAt] compare: [other createdAt]];
+}
+
 - (BOOL)isSaved
 {
     return [self ID] != nil;
@@ -134,14 +139,16 @@ - (void)updateWithResourceJSON:(NSDictionary*)json
         
         } else if ([type isEqualToString: @"T@\"MModelCollection\""]) {
             MModelCollection * collection = (MModelCollection *)*value;
-            [collection updateWithResourceJSON: [json objectForKey: jsonKey]];
+            [collection updateWithResourceJSON: [json objectForKey: jsonKey] discardMissingModels: YES];
             [collection setRefreshDate: [NSDate date]];
             
         } else {
             *value = [json objectForKey: jsonKey];
         }
         return YES;
     }];
+
+    [[NSNotificationCenter defaultCenter] postNotificationName:NOTIF_MODEL_CHANGED object:self];
 }
 
 - (void)save:(MAPITransactionCallback)callback
@@ -204,6 +211,8 @@ - (void)setEachPropertyInSet:(NSArray*)properties withValueProvider:(BOOL (^)(id
             } else {
                 if ([type isEqualToString: @"T@\"NSString\""] && [value isKindOfClass: [NSNumber class]])
                     value = [(NSNumber*)value stringValue];
+                if ([type isEqualToString: @"Tc"] && [value isKindOfClass: [NSString class]])
+                    value = [NSNumber numberWithChar: [(NSString*)value characterAtIndex: 0]];
                 [self setValue:value forKey:key];
             }
         }
diff --git a/MModelCollection.h b/MModelCollection.h
@@ -15,6 +15,7 @@
 @interface MModelCollection : NSObject <NSCoding, MRestfulObject>
 {
     NSMutableArray * _cache;
+    BOOL _loadReturnedZero;
 }
 
 @property (nonatomic, strong) NSString * collectionName;
@@ -42,15 +43,15 @@
 - (void)removeItemAtIndex:(NSUInteger)i;
 - (void)removeItemWithID:(NSString*)ID;
 
-- (void)updateWithResourceJSON:(NSArray*)jsons;
+- (void)updateWithResourceJSON:(NSArray*)jsons discardMissingModels:(BOOL)discardMissing;
+- (void)updateFromPath:(NSString*)path replaceExistingContents:(BOOL)replace;
 
 - (NSArray*)all;
 - (int)count;
 
 - (void)refresh;
 - (void)refreshIfOld;
 
-
-
+- (void)loadMore;
 
 @end
diff --git a/MModelCollection.m b/MModelCollection.m
@@ -119,12 +119,15 @@ - (void)removeItemWithID:(NSString*)ID
     [self removeItemAtIndex: [[self all] indexOfObject: [self objectWithID: ID]]];
 }
 
-- (void)updateWithResourceJSON:(NSArray*)jsons
+- (void)updateWithResourceJSON:(NSArray*)jsons discardMissingModels:(BOOL)discardMissing
 {
     NSMutableArray * unused = [NSMutableArray arrayWithArray: _cache];
     
     for (NSDictionary * json in jsons) {
-        NSString * ID = [[json objectForKey: @"id"] stringValue];
+        NSString * ID = [json objectForKey: @"id"];
+        if ([ID isKindOfClass: [NSString class]] == NO)
+            ID = [(NSNumber*)ID stringValue];
+
         MModel * existing = nil;
         for (MModel * obj in unused) {
             if ([[obj ID] isEqualToString: ID]) {
@@ -143,59 +146,70 @@ - (void)updateWithResourceJSON:(NSArray*)jsons
         }
     }
     
-    [unused makeObjectsPerformSelector:@selector(setParent:) withObject: nil];
-    [_cache removeObjectsInArray: unused];
-    
+    if (discardMissing) {
+        [unused makeObjectsPerformSelector:@selector(setParent:) withObject: nil];
+        [_cache removeObjectsInArray: unused];
+    }
     
-// sort the items using their createdAt date
-// TODO REVISIT AND MAKE A MODEL METHOD
-//            [__cache sortUsingComparator:^NSComparisonResult(id obj1, id obj2) {
-//                if ([obj1 displayOrder] < [obj2 displayOrder])
-//                    return NSOrderedAscending;
-//                else if ([obj1 displayOrder] > [obj2 displayOrder])
-//                    return NSOrderedDescending;
-//                return NSOrderedSame;
-//            }];
-}
-
-- (NSArray*)all
-{
-    [self refreshIfOld];
-    return _cache;
+    [_cache sortUsingSelector: @selector(sort:)];
 }
 
-- (int)count
-{
-    return [[self all] count];
-}
-
-- (void)refresh
+- (void)updateFromPath:(NSString*)path replaceExistingContents:(BOOL)replace
 {
     if (_refreshInProgress)
         return;
     
     _refreshInProgress = YES;
 
-    [[MAPIClient shared] getCollectionAtPath:[self resourcePath] userTriggered:NO success:^(id responseObject) {
-        [self updateWithResourceJSON: responseObject];
+    [[MAPIClient shared] getCollectionAtPath:path userTriggered:NO success:^(id responseObject) {
+        _loadReturnedZero = ([responseObject count] == 0);
+        [self updateWithResourceJSON: responseObject discardMissingModels: replace];
         [self setRefreshDate: [NSDate date]];
         [[MAPIClient shared] updateDiskCache: NO];
         _refreshInProgress = NO;
         [[NSNotificationCenter defaultCenter] postNotificationName:NOTIF_COLLECTION_CHANGED object:self];
-
+        
     } failure:^(NSError *err) {
         [self setRefreshDate: [NSDate date]];
         _refreshInProgress = NO;
+        _loadReturnedZero = NO;
         [[NSNotificationCenter defaultCenter] postNotificationName:NOTIF_COLLECTION_CHANGED object:self];
     }];
 }
 
+
+- (NSArray*)all
+{
+    [self refreshIfOld];
+    return _cache;
+}
+
+- (int)count
+{
+    return [[self all] count];
+}
+
+- (void)refresh
+{
+    [self updateFromPath:[self resourcePath] replaceExistingContents:YES];
+}
+
 - (void)refreshIfOld
 {
     BOOL expired = (!_refreshDate || ([_refreshDate timeIntervalSinceNow] > 5000));
     if (expired)
         [self refresh];
 }
 
+- (void)loadMore
+{
+    if (_loadReturnedZero)
+        return;
+    
+    int page = floorf([[self all] count] / 10.0) + 1;
+    NSString * path = [[self resourcePath] stringByAppendingFormat:@"?page=%d", page];
+    [self updateFromPath: path replaceExistingContents:NO];
+}
+
 
 @end
diff --git a/NSContainers+NullHandlers.h b/NSContainers+NullHandlers.h
@@ -0,0 +1,32 @@
+//
+//  NSDictionary+NullHandlers.h
+//  Wannado
+//
+//  Copyright 2013 PAR Works, Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface NSDictionary (NullHandlers)
+
+- (id)objectForKey:(id)aKey or:(id)ifNull;
+
+@end
+
+@interface NSArray (NullHandlers)
+
+- (id)objectAtIndex:(NSUInteger)index or:(id)ifNullOrOutOfBounds;
+
+@end
diff --git a/NSContainers+NullHandlers.m b/NSContainers+NullHandlers.m
@@ -0,0 +1,48 @@
+//
+//  NSDictionary+NullHandlers.m
+//  Wannado
+//
+//  Copyright 2013 PAR Works, Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+#import "NSContainers+NullHandlers.h"
+
+@implementation NSDictionary (NullHandlers)
+
+- (id)objectForKey:(id)aKey or:(id)ifNull
+{
+    id o = [self objectForKey: aKey];
+    if ((o == nil) || ([o isKindOfClass: [NSNull class]]))
+        return ifNull;
+    return o;
+}
+
+@end
+
+@implementation NSArray (NullHandlers)
+
+- (id)objectAtIndex:(NSUInteger)index or:(id)ifNullOrOutOfBounds
+{
+    if  (index >= [self count])
+        return ifNullOrOutOfBounds;
+        
+    id o = [self objectAtIndex: index];
+    if ([o isKindOfClass: [NSNull class]])
+        return ifNullOrOutOfBounds;
+
+    return o;
+}
+
+@end
diff --git a/NSObject+AssociatedObjects.h b/NSObject+AssociatedObjects.h
@@ -11,4 +11,7 @@
 - (void)associateValue:(id)value withKey:(void *)key; // Strong reference
 - (void)weaklyAssociateValue:(id)value withKey:(void *)key;
 - (id)associatedValueForKey:(void *)key;
+
+- (void)performSelectorOnMainThreadOnce:(SEL)selector;
+
 @end
diff --git a/NSObject+AssociatedObjects.m b/NSObject+AssociatedObjects.m
@@ -25,4 +25,16 @@ - (id)associatedValueForKey:(void *)key
 	return objc_getAssociatedObject(self, key);
 }
 
+- (void)performSelectorOnMainThreadOnce:(SEL)selector
+{
+    [self associateValue:[NSNumber numberWithBool: YES] withKey: (void*)selector];
+
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if ([self associatedValueForKey: (void*)selector]) {
+            [self performSelector: selector];
+            [self associateValue:nil withKey:(void*)selector];
+        }
+    });
+}
+
 @end
diff --git a/UIColor-Expanded.h b/UIColor-Expanded.h
diff --git a/UIColor-Expanded.m b/UIColor-Expanded.m

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,11 @@ - (void)setup`
`60`	`60`
`61`	`61`	`}`
`62`	`62`
	`63`	`+- (NSComparisonResult)sort:(MModel*)other`
	`64`	`+{`
	`65`	`+ return [[self createdAt] compare: [other createdAt]];`
	`66`	`+}`
	`67`	`+`
`63`	`68`	`- (BOOL)isSaved`
`64`	`69`	`{`
`65`	`70`	`return [self ID] != nil;`
`@@ -134,14 +139,16 @@ - (void)updateWithResourceJSON:(NSDictionary*)json`
`134`	`139`
`135`	`140`	`} else if ([type isEqualToString: @"T@\"MModelCollection\""]) {`
`136`	`141`	`MModelCollection * collection = (MModelCollection )value;`
`137`		`- [collection updateWithResourceJSON: [json objectForKey: jsonKey]];`
	`142`	`+ [collection updateWithResourceJSON: [json objectForKey: jsonKey] discardMissingModels: YES];`
`138`	`143`	`[collection setRefreshDate: [NSDate date]];`
`139`	`144`
`140`	`145`	`} else {`
`141`	`146`	`*value = [json objectForKey: jsonKey];`
`142`	`147`	`}`
`143`	`148`	`return YES;`
`144`	`149`	`}];`
	`150`	`+`
	`151`	`+ [[NSNotificationCenter defaultCenter] postNotificationName:NOTIF_MODEL_CHANGED object:self];`
`145`	`152`	`}`
`146`	`153`
`147`	`154`	`- (void)save:(MAPITransactionCallback)callback`
`@@ -204,6 +211,8 @@ - (void)setEachPropertyInSet:(NSArray*)properties withValueProvider:(BOOL (^)(id`
`204`	`211`	`} else {`
`205`	`212`	`if ([type isEqualToString: @"T@\"NSString\""] && [value isKindOfClass: [NSNumber class]])`
`206`	`213`	`value = [(NSNumber*)value stringValue];`
	`214`	`+ if ([type isEqualToString: @"Tc"] && [value isKindOfClass: [NSString class]])`
	`215`	`+ value = [NSNumber numberWithChar: [(NSString*)value characterAtIndex: 0]];`
`207`	`216`	`[self setValue:value forKey:key];`
`208`	`217`	`}`
`209`	`218`	`}`