@@ -13,8 +13,6 @@ @interface DBTagProvider : TagProvider { LocalCache *local_cache_; - NSArray *tags_; - BOOL dirty_; } @end model/DBTagProvider.h @@ -23,24 +23,18 @@ { if (self = [super init]) { local_cache_ = [LocalCache sharedLocalCache]; - dirty_ = NO; } return self; } - (void) dealloc { - if (tags_) [tags_ release]; [super dealloc]; } - (NSArray *) tags { - if (dirty_ || ! tags_) { - [self loadTags]; - dirty_ = NO; - } - return tags_; + return [self loadTags]; } - (void) updateTaskSeriesID:(RTMTag *)tag tid:(NSNumber *)tid @@ -86,7 +80,7 @@ NSMutableArray *tags = [NSMutableArray array]; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - NSArray *tag_keys = [NSArray arrayWithObject:@"name"]; + NSArray *tag_keys = [NSArray arrayWithObject:@"tag.name"]; NSArray *join_keys = [NSArray arrayWithObjects:@"table", @"condition", nil]; NSArray *join_vals = [NSArray arrayWithObjects:@"task_tag", @"tag.id=task_tag.tag_id", nil]; NSDictionary *join_dict = [NSDictionary dictionaryWithObjects:join_vals forKeys:join_keys]; @@ -96,8 +90,13 @@ NSDictionary *tag_opts = [NSDictionary dictionaryWithObjects:tag_opt_vals forKeys:tag_opt_keys]; NSArray *tags_dict = [local_cache_ select:tag_keys from:@"tag" option:tag_opts]; - for (NSDictionary *tag in tags_dict) - [tags addObject:[tag objectForKey:@"name"]]; + for (NSDictionary *tag_dict in tags_dict) { + RTMTag *tag = [[RTMTag alloc] + initWithID:[tag_dict objectForKey:@"tag.id"] + forName:[tag_dict objectForKey:@"tag.name"]]; + [tags addObject:tag]; + [tag release]; + } [pool release]; return tags; @@ -112,23 +111,19 @@ NSMutableArray *tags = [NSMutableArray array]; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - NSArray *keys = [NSArray arrayWithObjects:@"id", @"name", nil]; + NSArray *keys = [NSArray arrayWithObjects:@"tag.id", @"tag.name", nil]; NSArray *tag_arr = option ? [local_cache_ select:keys from:@"tag" option:option] : [local_cache_ select:keys from:@"tag"]; for (NSDictionary *dict in tag_arr) { RTMTag *tag = [[RTMTag alloc] - initWithID:[dict objectForKey:@"id"] - forName:[dict objectForKey:@"name"]]; + initWithID:[dict objectForKey:@"tag.id"] + forName:[dict objectForKey:@"tag.name"]]; [tags addObject:tag]; [tag release]; } [pool release]; - - if (tags_) - [tags_ release]; - tags_ = [tags retain]; return tags; } @@ -141,7 +136,6 @@ - (void) erase { [local_cache_ delete:@"tag" condition:nil]; - dirty_ = YES; } - (void) remove:(RTMTag *) tag @@ -149,7 +143,6 @@ NSString *cond = [NSString stringWithFormat:@"WHERE id = %@", [[tag iD] stringValue]]; [local_cache_ delete:@"tag" condition:cond]; - dirty_ = YES; } - (void) create:(NSDictionary *)params @@ -176,8 +169,6 @@ NSMutableDictionary *task_tag = [NSDictionary dictionaryWithObjects:vals forKeys:keys]; [local_cache_ insert:task_tag into:@"task_tag"]; - - dirty_ = YES; } - (void) createRelation:(NSNumber *)task_id tag_id:(NSNumber *)tag_id @@ -187,7 +178,6 @@ NSDictionary *attrs = [NSDictionary dictionaryWithObjects:vals forKeys:keys]; [local_cache_ insert:attrs into:@"task_tag"]; - dirty_ = YES; } - (NSString *)nameForTagID:(NSNumber *)tag_id { model/DBTagProvider.m @@ -46,7 +46,6 @@ for (NSDictionary *dict in task_arr) { RTMTask *task = [[RTMTask alloc] initByAttributes:dict]; - [tasks addObject:task]; [task release]; } @@ -68,7 +67,7 @@ NSString *where = [NSString stringWithFormat:@"list_id=%d", list_id]; if (! sc) where = [where stringByAppendingString:@" AND completed IS NULL"]; - + NSArray *keys = [NSArray arrayWithObjects:@"WHERE", @"ORDER", nil]; NSArray *vals = [NSArray arrayWithObjects:where, [NSString stringWithFormat:@"priority ASC, due IS NULL ASC, due ASC"], @@ -82,7 +81,7 @@ { NSArray *join_keys = [NSArray arrayWithObjects:@"table", @"condition", nil]; NSArray *join_vals = [NSArray arrayWithObjects:@"task_tag", @"task.id=task_tag.task_id", nil]; - + NSString *where = [NSString stringWithFormat:@"task_tag.tag_id=%d", tag_id]; if (! sc) where = [where stringByAppendingString:@" AND completed IS NULL"]; @@ -99,18 +98,6 @@ return [self tasksWithCondition:cond]; } -- (NSArray *) completedTasks -{ - NSDictionary *cond = [NSDictionary dictionaryWithObject:@"completed IS NOT NULL" forKey:@"WHERE"]; - return [self tasksWithCondition:cond]; -} - -- (NSArray *) yetTasks -{ - NSDictionary *cond = [NSDictionary dictionaryWithObject:@"completed IS NOT NULL" forKey:@"WHERE"]; - return [self tasksWithCondition:cond]; -} - /* - (NSArray *) modifiedTasks { model/DBTaskProvider.m @@ -35,7 +35,7 @@ - (NSArray *) tasks { - return [[TaskProvider sharedTaskProvider] tasksInTag:[self.iD integerValue]]; + return [[TaskProvider sharedTaskProvider] tasksInTag:[self.iD integerValue] showCompleted:YES]; } - (id) copyWithZone:(NSZone *)zone model/RTMTag.m @@ -18,8 +18,6 @@ - (NSArray *) tasksInList:(NSInteger) list_id showCompleted:(BOOL) sc; - (NSArray *) tasksInTag: (NSInteger) tag_id showCompleted:(BOOL) sc; -- (NSArray *) completedTasks; - //- (NSArray *) modifiedTasks; //- (NSArray *) pendingTasks; //- (NSArray *) existingTasks; model/TaskProvider.h @@ -148,11 +148,6 @@ // return nil; //} -- (NSArray *) completedTasks -{ - NSAssert(NO, @"not reach here"); - return nil; -} + (TaskProvider *) sharedTaskProvider { model/TaskProvider.m @@ -9,6 +9,7 @@ #import <SenTestingKit/SenTestingKit.h> #import "RTMAPI.h" #import "RTMTask.h" +#import "RTMTag.h" #import "RTMNote.h" #import "TaskProvider.h" #import "MilponHelper.h" @@ -28,13 +29,13 @@ - (void) testTasks { - NSArray *tasks = [tp tasks]; + NSArray *tasks = [tp tasks:YES]; STAssertEquals(tasks.count, 3U, @"should have some task elements."); } - (void) testPriority { - NSArray *tasks = [tp tasks]; + NSArray *tasks = [tp tasks:YES]; RTMTask *taskOne = [tasks objectAtIndex:0]; STAssertEquals(taskOne.priority, [NSNumber numberWithInteger:0], @"priority check"); STAssertEquals(taskOne.edit_bits, 0, @"edit bits should flagged up"); @@ -46,7 +47,7 @@ - (void) testAttributes { - NSArray *tasks = [tp tasks]; + NSArray *tasks = [tp tasks:YES]; RTMTask *first_task = [tasks objectAtIndex:0]; STAssertEquals(first_task.iD, 1, @"check attr"); @@ -71,53 +72,57 @@ - (void) testTasksInList { - NSArray *tasks = [tp tasksInList:1]; + NSArray *tasks = [tp tasksInList:1 showCompleted:YES]; STAssertEquals([tasks count], 3U, @"3 tasks should exist in list_id=1."); } - (void) testTasksInTags { - NSArray *tasks = [tp tasksInTag:1]; + NSArray *tasks = [tp tasksInTag:1 showCompleted:YES]; STAssertEquals(tasks.count, 1U, @"should have some task elements in a index tag #1"); } - (void) testZZZComplete { - NSUInteger completedCountBefore = [tp completedTasks].count; - RTMTask *taskOne = [[tp tasks] objectAtIndex:0]; + NSUInteger completedCountBefore = [tp tasks:NO].count; + RTMTask *taskOne = [[tp tasks:YES] objectAtIndex:0]; [taskOne complete]; STAssertTrue([taskOne is_completed], @"should be completed"); - NSUInteger completedCountAfter = [tp completedTasks].count; + NSUInteger completedCountAfter = [tp tasks:NO].count; STAssertEquals(completedCountAfter, completedCountBefore-1, @"completion check"); } - (void) testZZZUncomplete { - NSUInteger completedCountBefore = [tp completedTasks].count; - RTMTask *taskTwo = [[tp tasks] objectAtIndex:1]; + NSUInteger completedCountBefore = [tp tasks:NO].count; + RTMTask *taskTwo = [[tp tasks:YES] objectAtIndex:1]; // complete first [taskTwo complete]; STAssertTrue([taskTwo is_completed], @"should be completed"); - NSUInteger completedCountMiddle = [tp completedTasks].count; + NSUInteger completedCountMiddle = [tp tasks:NO].count; STAssertEquals(completedCountMiddle, completedCountBefore-1, @"completion check"); // then uncomplete [taskTwo uncomplete]; STAssertFalse([taskTwo is_completed], @"should not be completed"); - NSUInteger completedCountFinally = [tp completedTasks].count; + NSUInteger completedCountFinally = [tp tasks:NO].count; STAssertEquals(completedCountFinally, completedCountMiddle+1, @"uncompletion check"); } - (void) testNotes { - RTMTask *first_task = [[tp tasks] objectAtIndex:0]; + RTMTask *first_task = [[tp tasks:YES] objectAtIndex:0]; NSArray *notes = first_task.notes; STAssertTrue(notes.count > 0, @"notes should be exist"); - for (RTMNote *note in notes) { - NSLog(@"note = (%@, %@)", note.title, note.text); - } } -@end \ No newline at end of file +- (void) testTags +{ + RTMTask *first_task = [[tp tasks:YES] objectAtIndex:0]; + NSArray *tags = first_task.tags; + STAssertTrue(tags.count > 0, @"tags should be exist"); +} + +@end test/TaskTest.m 32609a0325e011311507e18aafe46d8dd69da0a2 mootoh mootoh@gmail.com http://github.com/mootoh/milpon/commit/5154c1b6770f4d4886e21f38bb7dde1c23f32265 5154c1b6770f4d4886e21f38bb7dde1c23f32265 2009-05-01T09:53:49-07:00 2009-05-01T09:53:49-07:00 updated RTMTag model. f29a885bdb663b53b1d89edad2994cc73ab5dfbd mootoh mootoh@gmail.com