Changeset 479 for Dev/trunk/src/server/util

Timestamp:

11/24/13 18:43:47 (11 years ago)

Author:

hendrikvanantwerpen

Message:

Changes for validation

• Split command line wrappers from processing logic.
• Created a JSON Schema for the database
• Allow off-line validation of database documents.

Location:

Dev/trunk/src/server/util

Files:

• couch.coffee (modified) (2 diffs)
• q-request.js (modified) (2 diffs)

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

@@ -3 +3 @@
 Q = require 'q'
 
+class CouchError extends Error
+ 
 class CouchDB
     constructor: (url) ->
@@ -29 +31 @@
             'accept': 'application/json'
         body: JSON.stringify (stringifyFunctions (data || {}))
-    request(url, options)
+    req = request(url, options)
+    req.response
     .then (res) =>
-        JSON.parse res
+        req.then (res) =>
+            JSON.parse res
+        , (err) =>
+            Q.reject (JSON.parse err)
     , (err) =>
-        Q.reject (JSON.parse err)
+        Q.reject err
 
 stringifyFunctions = (value) ->

Dev/trunk/src/server/util/q-request.js

@@ -6 +6 @@
 module.exports = function(url, options) {
 
-    var dfd = q.defer();
-    dfd.response = q.defer();
+    var dfd_body = q.defer();
+    var dfd_response = q.defer();
+    dfd_body.promise.response = dfd_response.promise;
     
     options = options ? _.clone(options) : {};
@@ -14 +15 @@
     request(options,function(err,res,body){
         if ( err ) {
-            dfd.response.reject(err);
+            dfd_response.reject(err);
         } else {
+            dfd_response.resolve(res);
             if ( res.statusCode >= 200 && res.statusCode < 300 ) {
-                dfd.resolve(body);
+                dfd_body.resolve(body);
             } else {
-                dfd.reject(body);
+                dfd_body.reject(body);
             }
         }
-        dfd.response.resolve(res);
     });
 
-    return dfd.promise;
+    return dfd_body.promise;
     
 };