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

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/config

Files:

• check-couchdb.js (added)
• config-couchdb.js (modified) (4 diffs)
• couchdb-schema.json (added)

Dev/trunk/src/server/config/config-couchdb.js

@@ -1 +1 @@
 var Q = require('q')
-  , request = require('../util/q-request')
   , _ = require('underscore')
   , CouchDB = require('../util/couch').CouchDB
-  , util = require('util');
+  , util = require('util')
+  ;
 
 var designDocs = require('./couchdb-design-docs');
 
-module.exports = function(couchDbURL) {
-    var server = new CouchDB(couchDbURL);
+module.exports = function(couchServerURL) {
+    var server = new CouchDB(couchServerURL);
 
     console.log("Configuring CouchDB for QED");
@@ -31 +31 @@
         console.log("Putting documents in database.");
         return _.reduce(designDocs, function(memo, doc, docUrl) {
-            var configAction = doc.__configAction || "replace";
-            delete doc.__configAction;
-            switch (configAction) {
-            case "ignore":
-                console.log(docUrl+" ignored.");
-                return memo;
-            case "update":
-                console.log(docUrl+" updating.");
-                return memo.then(function(){
-                    server.get(docUrl)
+            return memo.then(function(){
+                var configAction = doc.__configAction || "replace";
+                delete doc.__configAction;
+                switch (configAction) {
+                case "ignore":
+                    console.log(docUrl+" ignored.");
+                    return null;
+                case "update":
+                    console.log(docUrl+" updating.");
+                    return server.get(docUrl)
                     .then(function(oldDoc){
                         _.extend(oldDoc,doc);
@@ -47 +47 @@
                         return server.put(docUrl,doc);
                     });
-                });
-            case "replace":
-                console.log(docUrl+" replacing.");
-                return memo.then(function(){
-                    server.get(docUrl)
+                case "replace":
+                    console.log(docUrl+" replacing.");
+                    return server.get(docUrl)
                     .then(function(oldDoc){
                         _.extend(doc,_.pick(oldDoc,'_id','_rev'));
@@ -58 +56 @@
                         return server.put(docUrl,doc);
                     });
-                });
-            default:
-                console.warn("Unknown action",configAction);
-                return memo;
-            }
+                default:
+                    console.warn("Unknown action",configAction);
+                    return null;
+                }
+            });
         }, Q.resolve());
-    }).then(function(results){
-        console.log("Done!", results);
-    },function(err){
-        console.error("ERROR",err,err.stack);
     });
-
 };