Merge lp:~jamesh/bindwood/refactor-desktopcouch-access into lp:bindwood

[James Henstridge]

Split DesktopCouch connection code out from Bindwood. Refactor Bindwood.Observer to make it instantiatable.

Currently, the code to connect to DesktopCouch is embedded in the Bindwood object. To make testing easier, it would be nice to be able to connect to DesktopCouch without messing with the state of the Bindwood object.

This branch splits out the DesktopCouch connection code into a separate module, and adds some simple mozmill tests to verify that it behaves correctly. I've also changed the way the OAuth authentication code is integrated. Previously there were some nasty cross-dependencies between the CouchDB and Bindwood objects. I've removed those hooks from couchdb.jsm, and made the desktopcouch.jsm code add the authentication handler to the new CouchDB instance it creates.

This branch also includes a simple refactoring of the Bindwood.Observer code so that multiple instances can be created. This is a first step towards making it easier to create multiple instances of the Bindwood object to aid testing (e.g. create new instance, substitute a few methods, run).

[Eric Casteleijn (thisfred)]

Awesome, +1

review: Approve

[Zachery Bir (urbanape)]

Perfect, this is exactly the direction I had intended to take Bindwood in the future. Abstracting out these services will make it easier to work with a variety of browsers.

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The prerequisite lp:~jamesh/bindwood/test-with-mozmill has not yet been merged into lp:bindwood.

=== modified file 'Makefile'
--- Makefile	2011-02-08 10:38:53 +0000
+++ Makefile	2011-02-08 10:38:53 +0000
@@ -5,3 +5,5 @@
 	BINDWOOD_DB=test_bookmarks mozmill \
 	 --addons=$(shell pwd) --app-arg=about:blank \
 	 --show-errors --test=mozmill/tests/
+
+.PHONY: build test

=== modified file 'modules/bindwood.jsm'
--- modules/bindwood.jsm	2010-04-14 17:56:54 +0000
+++ modules/bindwood.jsm	2011-02-08 10:38:53 +0000
@@ -16,7 +16,7 @@
 /* Lots and lots of debugging information */
 
 Components.utils.import("resource://gre/modules/utils.js");
-Components.utils.import("resource://bindwood/couch.jsm");
+Components.utils.import("resource://bindwood/desktopcouch.jsm");
 
 var EXPORTED_SYMBOLS = ["Bindwood"];
 
@@ -145,137 +145,39 @@
             Bindwood.writeMessage("Got our profile: " + Bindwood.currentProfile);
 
             Bindwood.running = true;
+            Bindwood.Observer = new BindwoodBookmarkObserver(this);
             bookmarksService.addObserver(Bindwood.Observer, false);
-            Bindwood.getCouchEnvironment();
+            Bindwood.connectToCouchDB();
         }
     },
 
-    getCouchEnvironment: function() {
-        // find the desktop Couch port number by making a D-Bus call
-        // we call D-Bus by shelling out to a bash script which calls
-        // it for us, and writes the port number into a temp file
-
-        // find OS temp dir to put the tempfile in
-        // https://developer.mozilla.org/index.php?title=File_I%2F%2FO#Getting_special_files
-        var tmpdir = Cc["@mozilla.org/file/directory_service;1"]
-            .getService(Ci.nsIProperties).get("TmpD", Ci.nsIFile);
-        // create a randomly named tempfile in the tempdir
-        var tmpfile = Cc["@mozilla.org/file/local;1"]
-            .createInstance(Ci.nsILocalFile);
-        tmpfile.initWithPath(tmpdir.path + "/desktopcouch." + Math.random());
-        tmpfile.createUnique(tmpfile.NORMAL_FILE_TYPE, 0600);
-
-        // find the D-Bus bash script, which is in our extension folder
-        var MY_ID = "[e-mail]";
-        var em = Cc["@mozilla.org/extensions/manager;1"]
-            .getService(Ci.nsIExtensionManager);
-        var couchdb_env_script = em.getInstallLocation(MY_ID)
-            .getItemFile(MY_ID, "couchdb_env.sh");
-        // create an nsILocalFile for the executable
-        var nsifile = Cc["@mozilla.org/file/local;1"]
-            .createInstance(Ci.nsILocalFile);
-        nsifile.initWithPath(couchdb_env_script.path);
-        nsifile.permissions = 0755;
-
-        // create an nsIProcess2 to execute this bash script
-        var process = Cc["@mozilla.org/process/util;1"]
-            .createInstance(Ci.nsIProcess2 || Ci.nsIProcess);
-        process.init(nsifile);
-
-        // Run the process, passing the tmpfile path
-        var args = [tmpfile.path];
-        process.runAsync(args, args.length, {
-            observe: function(process, finishState, unused_data) {
-                // If the script exists cleanly, we should have a file
-                // containing the port couch is running on as well as
-                // the various OAuth tokens necessary to talk to it.
-                var shouldProceed = true;
-                if (finishState == "process-finished") {
-                    // read temp file to find couch environment
-                    // https://developer.mozilla.org/en/Code_snippets/File_I%2f%2fO#Reading_from_a_file
-                    var environment;
-                    var fstream = Cc["@mozilla.org/network/file-input-stream;1"]
-                        .createInstance(Ci.nsIFileInputStream);
-                    var cstream = Cc["@mozilla.org/intl/converter-input-stream;1"]
-                        .createInstance(Ci.nsIConverterInputStream);
-                    fstream.init(tmpfile, -1, 0, 0);
-                    cstream.init(fstream, "UTF-8", 0, 0);
-                    let (str = {}) {
-                        // read the whole file and put it in str.value
-                        cstream.readString(-1, str);
-                        environment = str.value;
-                    };
-                    cstream.close(); // this closes fstream
-                    environment = environment.replace(/^\s\s*/, '')
-                        .replace(/\s\s*$/, '');
-                } else {
-                    // If we fail, we should just return
-                    Bindwood.writeMessage("D-Bus port find failed");
-                    shouldProceed = false;
-                }
-                tmpfile.remove(false);
-
-                if (environment == 'ENOCOUCH') {
-                    // No Couch environment found. Just spit out a
-                    // message and return, stopping Bindwood from
-                    // doing anything further.
-                    Bindwood.writeError(
-                        "No suitable Couch environment found." +
-                            " Not proceeding.", e);
-                    shouldProceed = false;
-                }
-
-                if (shouldProceed && environment) {
-                    Bindwood.writeMessage("Got our environment, proceeding.");
-                    Bindwood.setUpEnvironment(environment);
-                } else {
-                    // Unregister our observer for bookmark events; we're done
-                    Bindwood.writeMessage("No environment. Unregistering observer.");
-                    bookmarksService.removeObserver(Bindwood.Observer);
-                }
-            }
-        });
-    },
-
-    setUpEnvironment: function(couchEnvironment) {
-        var env_array = couchEnvironment.split(':');
-        var port = env_array[0];
-        var consumer_key = env_array[1];
-        var consumer_secret = env_array[2];
-        var token = env_array[3];
-        var token_secret = env_array[4];
-
-        CouchDB.port = port;
-        CouchDB.accessor = {
-            consumerSecret: consumer_secret,
-            tokenSecret: token_secret
-        };
-        CouchDB.message = {
-            parameters: {
-                oauth_callback: "None",
-                oauth_consumer_key: consumer_key,
-                oauth_signature_method: "PLAINTEXT",
-                oauth_token: token,
-                oauth_verifier: "None",
-                oauth_version: "1.0"
-            }
-        };
-
+    connectToCouchDB: function() {
         var db_name = 'bookmarks';
         if (envService.exists('BINDWOOD_DB')) {
             db_name = envService.get('BINDWOOD_DB');
         }
 
-        Bindwood.writeMessage("Got our db name: " + db_name);
-        Bindwood.couch = new CouchDB(db_name);
+        connect_desktopcouch(
+            db_name,
+            function (database) {
+                if (database) {
+                    Bindwood.writeMessage("Got our db name: " + database.name);
+                    Bindwood.couch = database;
 
-        try {
-            Bindwood.startProcess();
-        } catch(e) {
-            Bindwood.writeError(
-                "Something wrong with the process, exiting.", e);
-            return;
-        }
+                    try {
+                        Bindwood.startProcess();
+                    } catch(e) {
+                        Bindwood.writeError(
+                            "Something wrong with the process, exiting.", e);
+                        return;
+                    }
+                } else {
+                    // Could not connect: disable our observer.
+                    bookmarksService.removeObserver(Bindwood.Observer);
+                }
+            }, function (message) {
+                Bindwood.writeMessage(message);
+            });
     },
 
     getLastSequence: function() {
@@ -1427,233 +1329,240 @@
         }
         return true;
     },
-
-    Observer: {
-        // An nsINavBookmarkObserver
-        onItemAdded: function(aItemId, aFolder, aIndex) {
-            Bindwood.writeMessage(
-                "onItemAdded: called when push is " + Bindwood.push);
-            // An item has been added, so we create a blank entry
-            // in Couch with our local itemId attached.
-            if (!Bindwood.itemWeCareAbout(aItemId)) {
-                Bindwood.writeMessage("Ignoring this add event");
-                return;
-            }
-
-            Bindwood.writeMessage(
-                "A new item was created. Its id is: " + aItemId +
-                    " at location: " + aIndex +
-                    " in folder: " + aFolder );
-
-            switch (Bindwood.push) {
-            case 'DISABLED':
-                Bindwood.writeMessage("Added, but not saving to Couch.");
-                break;
-            case 'ENABLED':
-                try {
-                    var doc = Bindwood.couchRecordForItemId(aItemId);
-                    var response = Bindwood.couch.save(doc);
-                    Bindwood.writeMessage("Saved new, bare record to Couch.");
-                    Bindwood.seen_revisions[response.rev] = true;
-                    Bindwood.pushFolderChildren(aFolder);
-                } catch(e) {
-                    Bindwood.writeError(
-                        "Problem saving new bookmark to Couch: ", e);
-                }
-                break;
-            default:
-                break;
-            }
-
-            Bindwood.setLatestModified(
-                bookmarksService.getItemLastModified(aItemId));
-        },
-        onBeforeItemRemoved: function(aItemId) {
-            Bindwood.writeMessage(
-                "onBeforeItemRemoved: called when push is " + Bindwood.push);
-            // A bookmark has been removed. This is called before it's
-            // been removed locally, though we're passed the itemId,
-            // which we use to delete from Couch.
-            var folderId = bookmarksService.getFolderIdForItem(aItemId);
-            if (!Bindwood.itemWeCareAbout(aItemId)) {
-                Bindwood.writeMessage("Ignoring this before remove event");
-                return;
-            }
-
-            Bindwood.writeMessage(
-                "Record " + aItemId + " is about to be removed locally.");
-            var uuid = Bindwood.uuidForItemId(aItemId);
-
-            switch (Bindwood.push) {
-            case 'DISABLED':
-                delete Bindwood.uuidItemIdMap[uuid];
-                Bindwood.writeMessage(
-                    "Deleted from local uuid map, but not saving back to Couch.");
-                break;
-            case 'ENABLED':
-
-                var doc = Bindwood.couch.open(uuid);
-                if (!doc.application_annotations) {
-                    doc.application_annotations = {};
-                }
-                if (!doc.application_annotations['Ubuntu One']) {
-                    doc.application_annotations['Ubuntu One'] = {};
-                }
-                if (!doc.application_annotations['Ubuntu One'].private_application_annotations) {
-                    doc.application_annotations['Ubuntu One'].private_application_annotations = {};
-                }
-                doc.application_annotations['Ubuntu One'].private_application_annotations.deleted = true;
-
-                try {
-                    // Also remove from our local cache and remove
-                    // annotation from service.
-                    var response = Bindwood.couch.save(doc);
-                    Bindwood.seen_revisions[response.rev] = true;
-                    delete Bindwood.uuidItemIdMap[uuid];
-                    Bindwood.writeMessage(
-                        "Deleted local reference in the" +
-                            " uuid-itemId mapping.");
-                    Bindwood.writeMessage(
-                        "Saved document back to Couch with deleted flag set.");
-                    var new_children = Bindwood.getUUIDsFromFolder(folderId);
-                    new_children.splice(new_children.indexOf(uuid), 1);
-                    Bindwood.pushFolderChildren(folderId, new_children);
-                } catch(e) {
-                    Bindwood.writeError(
-                        "Problem pushing deleted record to Couch: ", e);
-                }
-                break;
-            default:
-                break;
-            }
-        },
-        onItemRemoved: function(aItemId, aFolder, aIndex) {
-            Bindwood.writeMessage(
-                "onItemRemoved: called when push is " + Bindwood.push);
-            // This only happens locally, so there's never a need to push
-            if (!Bindwood.itemWeCareAbout(aItemId)) {
-                Bindwood.writeMessage("Ignoring this remove event");
-                return;
-            }
-
-            Bindwood.makeLocalChangeOnly(
-                function() {
-                    return annotationService.removeItemAnnotation(
-                        aItemId, Bindwood.annotationKey); });
-            Bindwood.writeMessage(
-                "Removed annotations from bookmark identified by: " + aItemId);
-        },
-        onItemChanged: function(aItemId, aProperty, aIsAnnotationProperty, aValue) {
-            Bindwood.writeMessage(
-                "onItemChanged: called when push is " + Bindwood.push);
-            // A property of a bookmark has changed. On multiple
-            // property updates, this will be called multiple times,
-            // once per property (i.e., for title and URI)
-            if (!Bindwood.itemWeCareAbout(aItemId)) {
-                Bindwood.writeMessage("Ignoring this change event");
-                return;
-            }
-
-            Bindwood.writeMessage(
-                "A property (" +
-                    aProperty +
-                    ") on item id: " + aItemId +
-                    " has been set to: " + aValue);
-            var uuid = Bindwood.uuidForItemId(aItemId);
-
-            switch (Bindwood.push) {
-            case 'DISABLED':
-                Bindwood.writeMessage(
-                    "Updated, but not saving back to Couch.");
-                break;
-            case 'ENABLED':
-                Bindwood.writeMessage(
-                    "We will push this change back to Couch.");
-                try {
-                    var result = Bindwood.updateDocAndSave(
-                        uuid, aProperty.toString(), aValue.toString(),
-                        function() {
-                            Bindwood.writeMessage(
-                                "Saved the document back to Couch"); });
-                } catch(e) {
-                    Bindwood.writeError(
-                        "Problem saving updated bookmark to Couch: ", e);
-                }
-                break;
-            default:
-                break;
-            }
-
-            Bindwood.setLatestModified(
-                bookmarksService.getItemLastModified(aItemId));
-        },
-
-        onItemMoved: function(aItemId, aOldParent, aOldIndex, aNewParent, aNewIndex) {
-            Bindwood.writeMessage(
-                "onItemMoved: called when push is " + Bindwood.push);
-            Bindwood.writeMessage(
-                "The item: " + aItemId + " was moved from (" +
-                aOldParent + ", " + aOldIndex +
-                ") to (" + aNewParent + ", " + aNewIndex + ")"
-            );
-            switch (Bindwood.push) {
-            case 'DISABLED':
-                Bindwood.writeMessage(
-                    "Moved, but not saving back to Couch.");
-                break;
-            case 'ENABLED':
-                var uuid = Bindwood.uuidForItemId(aItemId);
-                var old_parent_uuid = Bindwood.uuidForItemId(aOldParent);
-                var old_parent_doc = Bindwood.couch.open(old_parent_uuid);
-                old_parent_doc.children = Bindwood.getUUIDsFromFolder(
-                    aOldParent);
-                try {
-                    var response = Bindwood.couch.save(old_parent_doc);
-                    Bindwood.seen_revisions[response.rev] = true;
-                } catch(e) {
-                    Bindwood.writeError(
-                        "Problem saving updated old parent doc to Couch: ", e);
-                }
-                if (aOldParent != aNewParent) {
-                    var new_parent_uuid = Bindwood.uuidForItemId(aNewParent);
-                    var new_parent_doc = Bindwood.couch.open(new_parent_uuid);
-                    new_parent_doc.children = Bindwood.getUUIDsFromFolder(
-                        aNewParent);
-                    try {
-                        var response = Bindwood.couch.save(new_parent_doc);
-                        Bindwood.seen_revisions[response.rev] = true;
-                    } catch(e) {
-                        Bindwood.writeError(
-                            "Problem saving updated new parent doc to Couch: ",
-                            e);
-                    }
-                }
-                break;
-            default:
-                break;
-            }
-
-            // Set the latest modified to the greatest of aItemId,
-            // aOldParent, or aNewParent's last_modified
-            Bindwood.setLatestModified(
-                [bookmarksService.getItemLastModified(aItemId),
-                 bookmarksService.getItemLastModified(aOldParent),
-                 bookmarksService.getItemLastModified(aNewParent)].sort()[2]);
-        },
-
-        // Currently unhandled
-        onBeginUpdateBatch: function() {},
-        onEndUpdateBatch: function() {},
-        onItemVisited: function(aBookmarkId, aVisitID, time) {},
-
-        // Query Interface
-        QueryInterface: function(iid) {
-            if (iid.equals(Ci.nsINavBookmarkObserver) ||
-                iid.equals(Ci.nsINavBookmarkObserver_MOZILLA_1_9_1_ADDITIONS) ||
-                iid.equals(Ci.nsISupports)) {
-                return this;
-            }
-            throw Cr.NS_ERROR_NO_INTERFACE;
-        }
-    }
+};
+
+var BindwoodBookmarkObserver = function(bindwood) {
+    this.bw = bindwood;
+};
+BindwoodBookmarkObserver.prototype = {
+    // Query Interface
+    QueryInterface: function(iid) {
+        if (iid.equals(Ci.nsINavBookmarkObserver) ||
+            iid.equals(Ci.nsINavBookmarkObserver_MOZILLA_1_9_1_ADDITIONS) ||
+            iid.equals(Ci.nsISupports)) {
+            return this;
+        }
+        throw Cr.NS_ERROR_NO_INTERFACE;
+    },
+
+    // An nsINavBookmarkObserver
+    onItemAdded: function(aItemId, aFolder, aIndex) {
+        this.bw.writeMessage(
+            "onItemAdded: called when push is " + this.bw.push);
+        // An item has been added, so we create a blank entry
+        // in Couch with our local itemId attached.
+        if (!this.bw.itemWeCareAbout(aItemId)) {
+            this.bw.writeMessage("Ignoring this add event");
+            return;
+        }
+
+        this.bw.writeMessage(
+            "A new item was created. Its id is: " + aItemId +
+            " at location: " + aIndex +
+            " in folder: " + aFolder );
+
+        switch (this.bw.push) {
+        case 'DISABLED':
+            this.bw.writeMessage("Added, but not saving to Couch.");
+            break;
+        case 'ENABLED':
+            try {
+                var doc = this.bw.couchRecordForItemId(aItemId);
+                var response = this.bw.couch.save(doc);
+                this.bw.writeMessage("Saved new, bare record to Couch.");
+                this.bw.seen_revisions[response.rev] = true;
+                this.bw.pushFolderChildren(aFolder);
+            } catch(e) {
+                this.bw.writeError(
+                    "Problem saving new bookmark to Couch: ", e);
+            }
+            break;
+        default:
+            break;
+        }
+
+        this.bw.setLatestModified(
+            bookmarksService.getItemLastModified(aItemId));
+    },
+
+    onBeforeItemRemoved: function(aItemId) {
+        this.bw.writeMessage(
+            "onBeforeItemRemoved: called when push is " + this.bw.push);
+        // A bookmark has been removed. This is called before it's
+        // been removed locally, though we're passed the itemId,
+        // which we use to delete from Couch.
+        var folderId = bookmarksService.getFolderIdForItem(aItemId);
+        if (!this.bw.itemWeCareAbout(aItemId)) {
+            this.bw.writeMessage("Ignoring this before remove event");
+            return;
+        }
+
+        this.bw.writeMessage(
+            "Record " + aItemId + " is about to be removed locally.");
+        var uuid = this.bw.uuidForItemId(aItemId);
+
+        switch (this.bw.push) {
+        case 'DISABLED':
+            delete this.bw.uuidItemIdMap[uuid];
+            this.bw.writeMessage(
+                "Deleted from local uuid map, but not saving back to Couch.");
+            break;
+
+        case 'ENABLED':
+            var doc = this.bw.couch.open(uuid);
+            if (!doc.application_annotations) {
+                doc.application_annotations = {};
+            }
+            if (!doc.application_annotations['Ubuntu One']) {
+                doc.application_annotations['Ubuntu One'] = {};
+            }
+            if (!doc.application_annotations['Ubuntu One'].private_application_annotations) {
+                doc.application_annotations['Ubuntu One'].private_application_annotations = {};
+            }
+            doc.application_annotations['Ubuntu One'].private_application_annotations.deleted = true;
+
+            try {
+                // Also remove from our local cache and remove
+                // annotation from service.
+                var response = this.bw.couch.save(doc);
+                this.bw.seen_revisions[response.rev] = true;
+                delete this.bw.uuidItemIdMap[uuid];
+                this.bw.writeMessage(
+                    "Deleted local reference in the" +
+                    " uuid-itemId mapping.");
+                this.bw.writeMessage(
+                    "Saved document back to Couch with deleted flag set.");
+                var new_children = this.bw.getUUIDsFromFolder(folderId);
+                new_children.splice(new_children.indexOf(uuid), 1);
+                this.bw.pushFolderChildren(folderId, new_children);
+            } catch(e) {
+                this.bw.writeError(
+                    "Problem pushing deleted record to Couch: ", e);
+            }
+            break;
+        default:
+            break;
+        }
+    },
+
+    onItemRemoved: function(aItemId, aFolder, aIndex) {
+        this.bw.writeMessage(
+            "onItemRemoved: called when push is " + this,bw.push);
+        // This only happens locally, so there's never a need to push
+        if (!this.bw.itemWeCareAbout(aItemId)) {
+            this.bw.writeMessage("Ignoring this remove event");
+            return;
+        }
+
+        this.bw.makeLocalChangeOnly(
+            function() {
+                return annotationService.removeItemAnnotation(
+                    aItemId, this.bw.annotationKey); });
+        this.bw.writeMessage(
+            "Removed annotations from bookmark identified by: " + aItemId);
+    },
+
+    onItemChanged: function(aItemId, aProperty, aIsAnnotationProperty, aValue) {
+        this.bw.writeMessage(
+            "onItemChanged: called when push is " + this.bw.push);
+        // A property of a bookmark has changed. On multiple
+        // property updates, this will be called multiple times,
+        // once per property (i.e., for title and URI)
+        if (!this.bw.itemWeCareAbout(aItemId)) {
+            this.bw.writeMessage("Ignoring this change event");
+            return;
+        }
+
+        this.bw.writeMessage(
+            "A property (" +
+            aProperty +
+            ") on item id: " + aItemId +
+            " has been set to: " + aValue);
+        var uuid = this.bw.uuidForItemId(aItemId);
+
+        switch (this.bw.push) {
+        case 'DISABLED':
+            this.bw.writeMessage(
+                "Updated, but not saving back to Couch.");
+            break;
+        case 'ENABLED':
+            this.bw.writeMessage(
+                "We will push this change back to Couch.");
+            try {
+                var result = Bindwood.updateDocAndSave(
+                    uuid, aProperty.toString(), aValue.toString(),
+                    function() {
+                        this.bw.writeMessage(
+                            "Saved the document back to Couch");
+                    });
+            } catch(e) {
+                this.bw.writeError(
+                    "Problem saving updated bookmark to Couch: ", e);
+            }
+            break;
+        default:
+            break;
+        }
+
+        this.bw.setLatestModified(
+            bookmarksService.getItemLastModified(aItemId));
+    },
+
+    onItemMoved: function(aItemId, aOldParent, aOldIndex, aNewParent, aNewIndex) {
+        this.bw.writeMessage(
+            "onItemMoved: called when push is " + this.bw.push);
+        this.bw.writeMessage(
+            "The item: " + aItemId + " was moved from (" +
+            aOldParent + ", " + aOldIndex +
+            ") to (" + aNewParent + ", " + aNewIndex + ")"
+        );
+        switch (this.bw.push) {
+        case 'DISABLED':
+            this.bw.writeMessage(
+                "Moved, but not saving back to Couch.");
+            break;
+        case 'ENABLED':
+            var uuid = this.bw.uuidForItemId(aItemId);
+            var old_parent_uuid = this.bw.uuidForItemId(aOldParent);
+            var old_parent_doc = this.bw.couch.open(old_parent_uuid);
+            old_parent_doc.children = this.bw.getUUIDsFromFolder(
+                aOldParent);
+            try {
+                var response = this.bw.couch.save(old_parent_doc);
+                this.bw.seen_revisions[response.rev] = true;
+            } catch(e) {
+                this.bw.writeError(
+                    "Problem saving updated old parent doc to Couch: ", e);
+            }
+            if (aOldParent != aNewParent) {
+                var new_parent_uuid = this.bw.uuidForItemId(aNewParent);
+                var new_parent_doc = this.bw.couch.open(new_parent_uuid);
+                new_parent_doc.children = this.bw.getUUIDsFromFolder(
+                    aNewParent);
+                try {
+                    var response = this.bw.couch.save(new_parent_doc);
+                    this.bw.seen_revisions[response.rev] = true;
+                } catch(e) {
+                    this.bw.writeError(
+                        "Problem saving updated new parent doc to Couch: ",
+                        e);
+                }
+            }
+            break;
+        default:
+            break;
+        }
+
+        // Set the latest modified to the greatest of aItemId,
+        // aOldParent, or aNewParent's last_modified
+        this.bw.setLatestModified(
+            [bookmarksService.getItemLastModified(aItemId),
+             bookmarksService.getItemLastModified(aOldParent),
+             bookmarksService.getItemLastModified(aNewParent)].sort()[2]);
+    },
+
+    // Currently unhandled
+    onBeginUpdateBatch: function() {},
+    onEndUpdateBatch: function() {},
+    onItemVisited: function(aBookmarkId, aVisitID, time) {},
 };

=== modified file 'modules/couch.jsm'
--- modules/couch.jsm	2010-03-24 19:34:01 +0000
+++ modules/couch.jsm	2011-02-08 10:38:53 +0000
@@ -10,8 +10,6 @@
 // License for the specific language governing permissions and limitations under
 // the License.
 
-Components.utils.import("resource://bindwood/oauth.jsm");
-
 var EXPORTED_SYMBOLS = ["CouchDB", "XMLHttpRequest"];
 
 var XMLHttpRequest = function () {
@@ -419,20 +417,9 @@
 };
 
 CouchDB.request = function(method, uri, options) {
-  CouchDB.message.action = uri;
-  CouchDB.message.method = method;
-  CouchDB.message.parameters.oauth_timestamp = null;
-  CouchDB.message.parameters.oauth_nonce = null;
-  OAuth.completeRequest(CouchDB.message, CouchDB.accessor);
-  var parameters = CouchDB.message.parameters;
-
   options = options || {};
-
-  options.headers = CouchDB.combine(options.headers, {Authorization: OAuth.getAuthorizationHeader('', parameters)});
-
   var req = CouchDB.newXhr();
-  var computed_uri = "http://localhost:" + CouchDB.port + uri;
-  req.open(method, computed_uri, false);
+  req.open(method, uri, false);
   if (options.headers) {
     var headers = options.headers;
     for (var headerName in headers) {

=== added file 'modules/desktopcouch.jsm'
--- modules/desktopcouch.jsm	1970-01-01 00:00:00 +0000
+++ modules/desktopcouch.jsm	2011-02-08 10:38:53 +0000
@@ -0,0 +1,202 @@
+/*
+ * Copyright 2009-2011 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+/* Utility functions to establish a connection to a DesktopCouch
+ * CouchDB instance.
+ */
+
+var Cc = Components.classes;
+var Ci = Components.interfaces;
+
+Components.utils.import("resource://bindwood/couch.jsm");
+Components.utils.import("resource://bindwood/oauth.jsm");
+
+var EXPORTED_SYMBOLS = [
+    "connect_desktopcouch", "_get_desktopcouch_environment"];
+
+/**
+ * Retrieve the DesktopCouch environment.
+ *
+ * @param callback
+ *     A callback that will be passed the environment on success, or
+ *     null on failure.
+ * @param log
+ *     A callback that will be called to log debug messages.
+ */
+function _get_desktopcouch_environment(callback, log) {
+    // find OS temp dir to put the tempfile in
+    // https://developer.mozilla.org/index.php?title=File_I%2F%2FO#Getting_special_files
+    var tmpdir = Cc["@mozilla.org/file/directory_service;1"]
+        .getService(Ci.nsIProperties).get("TmpD", Ci.nsIFile);
+    // create a randomly named tempfile in the tempdir
+    var tmpfile = Cc["@mozilla.org/file/local;1"]
+        .createInstance(Ci.nsILocalFile);
+    tmpfile.initWithPath(tmpdir.path + "/desktopcouch." + Math.random());
+    tmpfile.createUnique(tmpfile.NORMAL_FILE_TYPE, 0600);
+
+    // find the D-Bus bash script, which is in our extension folder
+    var MY_ID = "[e-mail]";
+    var em = Cc["@mozilla.org/extensions/manager;1"]
+        .getService(Ci.nsIExtensionManager);
+    var couchdb_env_script = em.getInstallLocation(MY_ID)
+        .getItemFile(MY_ID, "couchdb_env.sh");
+    // create an nsILocalFile for the executable
+    var nsifile = Cc["@mozilla.org/file/local;1"]
+        .createInstance(Ci.nsILocalFile);
+    nsifile.initWithPath(couchdb_env_script.path);
+    nsifile.permissions = 0755;
+
+    // create an nsIProcess2 to execute this bash script
+    var process = Cc["@mozilla.org/process/util;1"]
+        .createInstance(Ci.nsIProcess2 || Ci.nsIProcess);
+    process.init(nsifile);
+
+    // Run the process, passing the tmpfile path
+    var args = [tmpfile.path];
+    process.runAsync(args, args.length, {
+            observe: function(process, finishState, unused_data) {
+                // If the script exists cleanly, we should have a file
+                // containing the port couch is running on as well as
+                // the various OAuth tokens necessary to talk to it.
+                var shouldProceed = true;
+                if (finishState == "process-finished") {
+                    // read temp file to find couch environment
+                    // https://developer.mozilla.org/en/Code_snippets/File_I%2f%2fO#Reading_from_a_file
+                    var environment;
+                    var fstream = Cc["@mozilla.org/network/file-input-stream;1"]
+                        .createInstance(Ci.nsIFileInputStream);
+                    var cstream = Cc["@mozilla.org/intl/converter-input-stream;1"]
+                        .createInstance(Ci.nsIConverterInputStream);
+                    fstream.init(tmpfile, -1, 0, 0);
+                    cstream.init(fstream, "UTF-8", 0, 0);
+                    let (str = {}) {
+                        // read the whole file and put it in str.value
+                        cstream.readString(-1, str);
+                        environment = str.value;
+                    };
+                    cstream.close(); // this closes fstream
+                    environment = environment.replace(/^\s\s*/, '')
+                        .replace(/\s\s*$/, '');
+                } else {
+                    // If we fail, we should just return
+                    log("D-Bus port find failed");
+                    shouldProceed = false;
+                }
+                tmpfile.remove(false);
+
+                if (environment == 'ENOCOUCH') {
+                    // No Couch environment found. Just spit out a
+                    // message and return, stopping Bindwood from
+                    // doing anything further.
+                    log(
+                        "No suitable Couch environment found." +
+                            " Not proceeding.", e);
+                    shouldProceed = false;
+                }
+
+                if (shouldProceed && environment) {
+                    log("Got our environment, proceeding.");
+                    callback(environment);
+                } else {
+                    // Unregister our observer for bookmark events; we're done
+                    log("No environment. Unregistering observer.");
+                    callback(null);
+                }
+            }
+        });
+}
+
+/**
+ * Connect to the given database in DesktopCouch using the given environment.
+ *
+ * @param name
+ *     The name of the database in DesktopCouch
+ * @param environment
+ *     The DesktopCouch environment, as produced by
+ *     _get_desktopcouch_environment.
+ * @returns A new CouchDB instance configured to talk to DesktopCouch.
+ */
+function _connect(name, environment) {
+    var env_array = environment.split(":");
+    var host = "http://localhost:" + env_array[0];
+    var consumer_key = env_array[1];
+    var consumer_secret = env_array[2];
+    var token = env_array[3];
+    var token_secret = env_array[4];
+
+    var db = new CouchDB(name);
+    var accessor = {
+        consumerKey: consumer_key,
+        consumerSecret: consumer_secret,
+        token: token,
+        tokenSecret: token_secret,
+    };
+    db.request = function(method, uri, requestOptions) {
+        // prepend full host name to URI.
+        uri = host + uri;
+
+        // Construct OAuth signature, and add to request headers.
+        var message = {
+            method: method,
+            action: uri,
+            parameters: {
+                oauth_signature_method: "PLAINTEXT",
+                oauth_version: "1.0",
+            },
+        };
+        OAuth.setTimestampAndNonce(message);
+        OAuth.completeRequest(message, accessor);
+        var auth_header = OAuth.getAuthorizationHeader(
+            "desktopcouch", message.parameters);
+
+        requestOptions = requestOptions || {};
+        requestOptions.headers = CouchDB.combine(
+            requestOptions.headers, {Authorization: auth_header});
+
+        // Issue request.
+        return CouchDB.request(method, uri, requestOptions);
+    }
+    return db;
+}
+
+var _desktopcouch_environment = null;
+
+/**
+ * Connect to the given database in DesktopCouch.
+ *
+ * @param name
+ *     The name of the database in DesktopCouch
+ * @param callback
+ *     A callback called with the CouchDB instance on succes, or null
+ *     on failure.
+ * @param log
+ *     A callback that will be called to log debug messages.
+ */
+function connect_desktopcouch(name, callback, log) {
+    if (_desktopcouch_environment == null) {
+        _get_desktopcouch_environment(function(environment) {
+                _desktopcouch_environment = environment;
+                if (environment) {
+                    var db = _connect(name, environment);
+                } else {
+                    db = null;
+                }
+                callback(db);
+            }, log);
+        return;
+    }
+    log("Connecting to DesktopCouch using saved environment.");
+    callback(_connect(name, _desktopcouch_environment));
+}

=== added file 'mozmill/tests/test_desktopcouch.js'
--- mozmill/tests/test_desktopcouch.js	1970-01-01 00:00:00 +0000
+++ mozmill/tests/test_desktopcouch.js	2011-02-08 10:38:53 +0000
@@ -0,0 +1,64 @@
+const TIMEOUT = 5000;
+
+var setupModule = function(module) {
+  module.controller = mozmill.getBrowserController();
+  module.desktopcouch = {};
+  module.jum = {};
+  Components.utils.import("resource://bindwood/desktopcouch.jsm", module.desktopcouch);
+  Components.utils.import("resource://mozmill/modules/jum.js", module.jum);
+};
+
+var test_get_desktopcouch_environment = function() {
+    var log_messages = [];
+    var environment = null;
+    var done = false;
+
+    var callback = function(env) {
+        environment = env;
+        done = true;
+    };
+    var log = function(msg) {
+        log_messages.push(msg);
+    };
+    desktopcouch._get_desktopcouch_environment(
+        function(env) {
+            environment = env;
+            done = true;
+        }, function(message) {
+            log_messages.push(message);
+        });
+    controller.waitFor(
+        function() { return done;}, "Environment loaded", TIMEOUT);
+    jum.assertEquals(done, true);
+    jum.assertNotEquals(environment, null);
+    jum.assertEquals(log_messages.length, 1);
+    jum.assertEquals(log_messages[0], "Got our environment, proceeding.");
+};
+
+var test_connect_desktopcouch = function() {
+    var database = null;
+    var done = false;
+
+    desktopcouch.connect_desktopcouch(
+        "test_bookmarks",
+        function (db) {
+            database = db;
+            done = true;
+        }, function (message) { });
+    controller.waitFor(
+        function() { return done;}, "Connected to CouchDB", TIMEOUT);
+    jum.assertEquals(done, true);
+    jum.assertNotEquals(database, null);
+
+    // Ensure the database exists.
+    try {
+        database.createDb();
+    } catch (e) {
+        if (e.error != 'file_exists') {
+            throw(e);
+        }
+    }
+
+    var info = database.info();
+    jum.assertEquals(info.db_name, "test_bookmarks");
+};