Changeset 415 for Dev/branches/rest-dojo-ui/server/couchdb-admin/config/config.js

Timestamp:

12/04/12 16:29:49 (12 years ago)

Author:

hendrikvanantwerpen

Message:

Support data validation and increase dendency separation.

Added json-schema validation before documents are saved. Acts both as
a safe-guard and as a reference of the data model.

Added directory for server related material. For now it contains scripts
to configure CouchDB and check validity of documents against the schema.

Started separating out parts that depend on the data model from parts
that do not.

Location:

Dev/branches/rest-dojo-ui/server

Files:

• . (added)
• couchdb-admin (moved) (moved from Dev/branches/rest-dojo-ui/client/config)
• couchdb-admin/config (added)
• couchdb-admin/config/config.js (copied) (copied from Dev/branches/rest-dojo-ui/client/config/db.js) (6 diffs)

Dev/branches/rest-dojo-ui/server/couchdb-admin/config/config.js

@@ -2 +2 @@
      'dojo/_base/json',
      'dojo/_base/lang',
-     'dojo/Deferred',
-     'dojo/request',
      'dojox/lang/functional',
-     './docs'
-],function(json,lang,Deferred,request,func,docs){
-    var dbUrl = "http://localhost:5984/";
+     './util/async',
+     './util/db',
+     './data/design-docs'
+],function(json,lang,func,async,db,docs){
 
     function serializeFunctions(value) {
@@ -23 +22 @@
     }
 
-    function req(method,path,body) {
-        var args = {
-            contentType: 'application/json',
-            handleAs: 'json',
-            data: json.toJson(body || {})
-        };
-        return request[method](dbUrl+path,args);
-    }
-
-    function asyncSeq(functions) {
-        var d = new Deferred();
-        (function stepper(fs,arg) {
-            if ( fs.length > 0 ) {
-                try {
-                    var f = fs.shift();
-                    var ret = f(arg);
-                    if ( ret && ret.then ) {
-                        ret.then(function(ret){
-                            stepper(fs,ret);
-                        });
-                    } else {
-                        stepper(fs,ret);
-                    }
-                } catch(err) {
-                    d.reject(err);
-                }
-            } else {
-                d.resolve();
-            }
-        })(functions);
-        return d.promise;
-    }
-
-    function asyncFor(list,callback,ctx) {
-        var d = new Deferred();
-        (function stepper(list,idx){
-            if ( list.length > 0 ) {
-                var el = list.shift();
-                var ret = callback.call(ctx,el,idx);
-                if ( ret && ret.then ) {
-                    ret.then(function(){
-                        stepper(list,idx+1);
-                    });
-                } else {
-                    stepper(list,idx+1);
-                }
-            } else {
-                d.resolve();
-            }
-        })(list,0);
-        return d.promise;
-    }
-
-    asyncSeq([
+    async.seq([
         function(){
-            console.log("Configuring CouchDB for RFT:");
+            console.log("Configuring CouchDB for QED:");
         },
         function(){
             console.log("Checking CouchDB version");
-            return req('get','')
+            return db.req('get','')
             .then(function(res){
                 if (res.version !== "1.2.0" ) {
@@ -92 +38 @@
         },function(){
             console.log("Checking database 'qed'");
-            return req('get','qed')
+            return db.req('get','qed')
             .then(function(res){
                 if (res.error) {
                     console.log("Creating database 'qed'");
-                    return req('put','/qed');
+                    return db.req('put','/qed');
                 } else {
                     console.log("Database 'qed' found.");
@@ -102 +48 @@
             },function(res){
                 console.log("Creating database 'qed'");
-                return req('put','/qed');
+                return db.req('put','/qed');
             });
         },function(){
@@ -108 +54 @@
         },function(docs){
             console.log("Putting documents in database.");
-            return asyncFor(func.keys(docs),function(docUrl){
+            return async.forEach(func.keys(docs),function(docUrl){
                 var doc = docs[docUrl];
                 var configAction = doc.__configAction;
@@ -117 +63 @@
                     case "update":
                         console.log(docUrl+" updating.");
-                        return req('get',docUrl)
+                        return db.req('get',docUrl)
                         .then(function(oldDoc){
                             lang.mixin(oldDoc,doc);
-                            return req('put',docUrl,oldDoc);
+                            return db.req('put',docUrl,oldDoc);
                         },function(){
-                            return req('put',docUrl,doc);
+                            return db.req('put',docUrl,doc);
                         });
                     case "replace":
                     default:
                         console.log(docUrl+" replacing.");
-                        return req('get',docUrl)
+                        return db.req('get',docUrl)
                         .then(function(oldDoc){
                             doc['_rev'] = oldDoc['_rev'];
-                            return req('put',docUrl,doc);
+                            return db.req('put',docUrl,doc);
                         },function(){
-                            return req('put',docUrl,doc);
+                            return db.req('put',docUrl,doc);
                         });
                 }