Changeset 525 for Dev/trunk/src/server/util/couch.js

Timestamp:

03/19/14 21:33:13 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Allow empty subcodes.
• Use HTTPResult exclusively on server (no more q).
• Set readonly & disabled on ourselves as well in _ComplexValueMixin
• Split server into several modules.
• Check codes on the variable level, not question level.
• We can add modules in design documents now.

File:

• Dev/trunk/src/server/util/couch.js (modified) (3 diffs)

Dev/trunk/src/server/util/couch.js

@@ -1 @@
-var CouchDB, _ref,
-  __hasProp = {}.hasOwnProperty;
-
-var request = require('./q-request')
+var request = require('./request')
   , _ = require('underscore')
-  , Q = require('q');
+  ;
 
 function CouchDB(url, db) {
@@ -58 +55 @@
         if (opts.headers) { _.extend(options.headers, opts.headers); }
     }
-    var req = request(url, options);
-    var res = req.response
-    .then(function(res) {
-        return req.then(function(res) {
-            return JSON.parse(res);
-        }, function(err) {
-            return Q.reject(JSON.parse(err));
+    return request(url, options)
+        .handle({
+            '-1': _.identity,
+            default: function(status,result) { return JSON.parse(result); }
         });
-    }, function(err) {
-        return Q.reject(err);
-    });
-    res.response = req.response
-    .then(function(res) {
-        return {
-            statusCode: res.statusCode,
-            headers: res.headers,
-            body: JSON.parse(res.body)
-        };
-    }, function(err) {
-        return Q.reject({error:err.message});
-    });
-    return res;
 }
 
@@ -108 +88 @@
 }
 
-exports.CouchDB = CouchDB;
+module.exports = CouchDB;