Mac demo: enable continuous sync, use real view, set created_at.

Demo-Mac/DemoAppController.h

@@ -14,7 +14,7 @@
 //  and limitations under the License.
 
 #import <Cocoa/Cocoa.h>
-@class CouchDatabase, CouchReplication, DemoQuery, TDReplicator;
+@class CouchDatabase, CouchReplication, DemoQuery;
 
 
 /** Generic application delegate for simple Mac OS CouchDB demo apps.
@@ -30,8 +30,6 @@
     DemoQuery* _query;
     CouchReplication *_pull, *_push;
     BOOL _glowing;
-
-    TDReplicator* _puller, *_pusher;
 }
 
 @property (retain) DemoQuery* query;

Demo-Mac/DemoAppController.m

@@ -16,11 +16,7 @@
 #import "DemoAppController.h"
 #import "DemoQuery.h"
 #import "Test.h"
-#import "TDDatabase.h"
-#import "TDServer.h"
-#import "TDURLProtocol.h"
-#import "TDPuller.h"
-#import "TDPusher.h"
+#import "TouchDB.h"
 #import <CouchCocoa/CouchCocoa.h>
 
 
@@ -50,16 +46,13 @@ - (void) applicationDidFinishLaunching: (NSNotification*)n {
         exit(1);
     }
 
-#if 0
-    CouchServer *server = [[CouchServer alloc] init];
-#else
-    TDServer* tdServer = [[TDServer alloc] initWithDirectory: @"/tmp/ShoppingDemo" error: nil];
+    TDServer* tdServer = [[[TDServer alloc] initWithDirectory: @"/tmp/ShoppingDemo" error: nil] autorelease];
     NSAssert(tdServer, @"Couldn't create TDServer");
     [TDURLProtocol setServer: tdServer];
-    [tdServer release];
+
     NSURL* url = [NSURL URLWithString: @"touchdb:///"];
     CouchServer *server = [[CouchServer alloc] initWithURL: url];
-#endif
+
     _database = [[server databaseNamed: dbName] retain];
     [server release];
 
@@ -68,7 +61,29 @@ - (void) applicationDidFinishLaunching: (NSNotification*)n {
         NSAssert(op.error.code == 412, @"Error creating db: %@", op.error);
     }
 
-    CouchQuery* q = [_database getAllDocuments];
+
+    // Create a CouchDB 'view' containing list items sorted by date
+    TDDatabase* tdb = [tdServer existingDatabaseNamed: dbName];
+    [[tdb viewNamed: @"byDate"] setMapBlock: ^(NSDictionary* doc, TDMapEmitBlock emit) {
+        id date = [doc objectForKey: @"created_at"];
+        if (date) emit(date, doc);
+    } version: @"1"];
+
+    // ...and a validation function requiring parseable dates:
+    [tdb addValidation: ^(TDRevision* newRevision, id<TDValidationContext>context) {
+        if (newRevision.deleted)
+            return YES;
+        id date = [newRevision.properties objectForKey: @"created_at"];
+        if (date && ! [RESTBody dateWithJSONObject: date]) {
+            NSLog(@"Invalid date: %@", date);//TEMP
+            context.errorMessage = [@"invalid date " stringByAppendingString: date];
+            return NO;
+        }
+        return YES;
+    }];
+
+
+    CouchQuery* q = [[_database designDocumentWithName: @"default"] queryViewNamed: @"byDate"];
     q.descending = YES;
     self.query = [[[DemoQuery alloc] initWithQuery: q] autorelease];
     self.query.modelClass =_tableController.objectClass;
@@ -81,25 +96,17 @@ - (void) applicationDidFinishLaunching: (NSNotification*)n {
 
 
 - (void) startContinuousSyncWith: (NSURL*)otherDbURL {
-#if 1
-    TDDatabase* db = [[TDURLProtocol server] databaseNamed: _database.relativePath];
-    _puller = [[TDReplicator alloc] initWithDB: db remote: otherDbURL push: NO continuous: NO];
-    _pusher = [[TDReplicator alloc] initWithDB: db remote: otherDbURL push: YES continuous: NO];
-#else
-    _pull = [[_database pullFromDatabaseAtURL: otherDbURL
-                                      options: kCouchReplicationContinuous] retain];
-    _push = [[_database pushToDatabaseAtURL: otherDbURL
-                                    options: kCouchReplicationContinuous] retain];
-#endif
+    _pull = [[_database pullFromDatabaseAtURL: otherDbURL options: kCouchReplicationContinuous] retain];
+    _push = [[_database pushToDatabaseAtURL: otherDbURL options: kCouchReplicationContinuous] retain];
 }
 
 
 - (IBAction) pull:(id)sender {
-    [_puller start];
+    //[_puller start];
 }
 
 - (IBAction) push:(id)sender {
-    [_pusher start];
+    //[_pusher start];
 }
 
 

Demo-Mac/ShoppingDemo-Info.plist

@@ -27,6 +27,6 @@
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>SyncDatabaseURL</key>
-	<string>http://127.0.0.1:5984/demo-shopping</string>
+	<string>http://127.0.0.1:5984/grocery-sync</string>
 </dict>
 </plist>

Demo-Mac/ShoppingItem.h

@@ -12,5 +12,6 @@
 
 @property bool check;       // bool is better than BOOL: it maps to true/false in JSON, not 0/1.
 @property (copy) NSString* text;
+@property (retain) NSDate* created_at;
 
 @end

Demo-Mac/ShoppingItem.m

@@ -10,6 +10,12 @@
 
 @implementation ShoppingItem
 
-@dynamic check, text;
+@dynamic check, text, created_at;
+
+- (NSDictionary*) propertiesToSave {
+    if (self.created_at == nil)
+        self.created_at = [NSDate date];
+    return [super propertiesToSave];
+}
 
 @end