Pull request flatiron#128

lib/cradle.js

@@ -87,6 +87,13 @@ cradle.Connection = function Connection(/* variable args */) {
         this.host     = this.host.replace(protocolPattern, '');
     }
 
+    if (this.host.indexOf('/') != -1) {
+        var tmp = this.host.split('/');
+        this.host = tmp.shift();
+        this.path_prefix = '/' + tmp.join('/');
+    }
+
+
     if (this.protocol === 'https') this.options.secure = true;
 
     if (!this.protocol) {
@@ -132,6 +139,7 @@ cradle.Connection.prototype.rawRequest = function (options, callback) {
     }
 
     // Set client-wide headers
+<<<<<<< HEAD
     Object.keys(this.options.headers).forEach(function (header) {
         options.headers[header] = self.options.headers[header];
     });
@@ -140,6 +148,20 @@ cradle.Connection.prototype.rawRequest = function (options, callback) {
         for (var k in options.query) {
             if (typeof(options.query[k]) === 'boolean') {
                 options.query[k] = String(options.query[k]);
+=======
+    for (var h in this.options.headers) {
+        headers[h] = this.options.headers[h];
+    }
+
+    path = (path || '/').replace(/https?:\/\//, '').replace(/\/{2,}/g, '/');
+    if (this.path_prefix) { path = this.path_prefix + path }
+    if (path.charAt(0) !== '/') { path = '/' + path }
+
+    if (options && Object.keys(options).length) {
+        for (var k in options) {
+            if (typeof(options[k]) === 'boolean') {
+                options[k] = String(options[k]);
+>>>>>>> f9d23f3... support for couchdb in a subdirectory
             }
         }
         options.path += '?' + querystring.stringify(options.query);
@@ -308,4 +330,10 @@ cradle.merge = function (target) {
         });
     });
     return target;
+<<<<<<< HEAD
 };
+=======
+}
+
+
+>>>>>>> f9d23f3... support for couchdb in a subdirectory