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

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.

Location:

Dev/trunk/src/server/config

Files:

• check-couchdb.js (modified) (3 diffs)
• config-couchdb.js (modified) (2 diffs)
• couchdb-design-docs.js (modified) (3 diffs)
• couchdb-schema.json (modified) (8 diffs)
• upgrade-couchdb.js (modified) (3 diffs)

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

@@ -1 @@
-var Q = require('q')
-  , _ = require('underscore')
+var _ = require('underscore')
+  , HTTPResult = require('../util/http-result')
   , validator = require('../util/validator')
-  , CouchDB = require('../util/couch').CouchDB
+  , CouchDB = require('../util/couch')
+  , objF = require('../util/object')
   ;
 
@@ -10 +11 @@
     var server = new CouchDB(couchServerURL,dbName);
     var designRe = /^_design\//;
-
-    var codes = {};
-    function codeUnique(code) {
-        if ( code in codes ) {
-            return false;
-        } else {
-            codes[code] = true;
-            return true;
-        }
-    }
 
     return server.get('/_all_docs')
@@ -32 +23 @@
                 .then(function(doc){
                     var valid = validator(doc,schema);
-                    if ( doc.type === "Question" && !codeUnique(doc.code) ) {
-                        valid.valid = false;
-                        valid.error = "Question code "+doc.code+" is not unique.";
-                    }
                     result[doc._id] = valid;
                     return result;
                 });
             });
-        }, Q.resolve({}))
+        }, new HTTPResult(200,{}))
         .value();
-    }).all();
+    }).then(function(result){
+        return server.get('_design/questions/_view/all_variables')
+        .then(function(variables){
+            var dups = objF.findDuplicates(
+                variables.rows,
+                function(row){ return row.key; });
+            result._duplicateVariables = _.groupBy(
+                dups,
+                function(dup){ return dup.key; });
+            return result;
+        });
+    });
 };

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

@@ -1 @@
-var Q = require('q')
+var HTTPResult = require('../util/http-result')
   , _ = require('underscore')
-  , CouchDB = require('../util/couch').CouchDB
+  , CouchDB = require('../util/couch')
   , util = require('util')
   ;
@@ -62 +62 @@
                 }
             });
-        }, Q.resolve());
+        }, new HTTPResult(200));
     });
 };

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

@@ +1 @@
+var fs = require('fs')
+  , path = require('path')
+  ;
+
+function readModule(name) {
+    var filename;
+    if ( name.indexOf('.') === 0 ) {
+        filename = path.join(path.dirname(module.filename),name+'.js');
+    } else {
+        var dirname = path.join(path.dirname(module.filename),
+                                '../../node_modules',name);
+        filename = path.join(dirname,name+'.js');
+        var pkgfile = path.join(dirname,'package.json');
+        if ( fs.exists(pkgfile) ) {
+            var pkg = require(pkgfile);
+            if ( pkg.main ) {
+                filename = path.join(dirname,pkg.main);
+            }
+        }
+    }
+    var src = fs.readFileSync(filename, 'utf8');
+    src = src.replace(/require\s*\(\s*(['\"])([^'"]*)(['\"])\s*\)/g,
+                      'require($1views/lib/$2$3)');
+    return src;
+}
+
 module.exports = {
 
@@ -80 +106 @@
                 reduce: function(key, values, rereduce) { return sum(values); }
             },
+            all_variables: {
+                map: function(doc) {
+                    if ( doc.type !== 'Question' ) { return; }
+                    var _ = require('views/lib/underscore');
+                    var objF = require('views/lib/object');
+                    _.chain(objF.collectFields('subcode',doc.content))
+                    .map(function(subcode){
+                        return doc.code+subcode;
+                    })
+                    .each(function(variable){
+                        emit(variable,doc._id);
+                    });
+                }
+            },
+            published_variables: {
+                map: function(doc) {
+                    if ( doc.type !== 'Question' || !doc.publicationDate ) { return; }
+                    var _ = require('views/lib/underscore');
+                    var objF = require('views/lib/object');
+                    _.chain(objF.collectFields('subcode',doc.content))
+                    .map(function(subcode){
+                        return doc.code+subcode;
+                    })
+                    .each(function(variable){
+                        emit(variable,doc._id);
+                    });
+                }
+            },
             all_by_code: {
                 map: function(doc){
@@ -91 +145 @@
                     emit(doc.code,doc);
                 }
+            },
+            lib: {
+                underscore: readModule('underscore'),
+                object: readModule('../util/object')
             }
         }

Dev/trunk/src/server/config/couchdb-schema.json

@@ -11 +11 @@
     "nonEmptyString": { "type": "string", "minLength": 1 },
     "codeString": { "type": "string", "pattern": "^[A-Za-z0-9]+$" },
+    "subcodeString": { "type": "string", "pattern": "^[A-Za-z0-9]*$" },
     "schemaInfo": {
       "type": "object",
@@ -148 +149 @@
         "properties": {
           "type": { "type": "string", "pattern": "^StringInput$" },
-          "subcode": { "$ref": "#/definitions/codeString" },
+          "subcode": { "$ref": "#/definitions/subcodeString" },
           "text": { "$ref": "#/definitions/nonEmptyString" }
         },
@@ -159 +160 @@
           "type": { "type": "string", "pattern": "^TextInput$" },
           "maxLength": { "type": "integer" },
-          "subcode": { "$ref": "#/definitions/codeString" },
+          "subcode": { "$ref": "#/definitions/subcodeString" },
           "text": { "$ref": "#/definitions/nonEmptyString" }
         },
@@ -172 +173 @@
           "max": { "type": "integer" },
           "places": { "type": "integer" },
-          "subcode": { "$ref": "#/definitions/codeString" },
+          "subcode": { "$ref": "#/definitions/subcodeString" },
           "text": { "$ref": "#/definitions/nonEmptyString" }
         },
@@ -192 +193 @@
               "minLabel": { "$ref": "#/definitions/nonEmptyString" },
               "maxLabel": { "$ref": "#/definitions/nonEmptyString" },
-              "subcode": { "$ref": "#/definitions/codeString" },
+              "subcode": { "$ref": "#/definitions/subcodeString" },
               "text": { "$ref": "#/definitions/nonEmptyString" }
             },
@@ -218 +219 @@
               "type": "object",
               "properties": {
-                  "subcode": { "$ref": "#/definitions/codeString" }
+                  "subcode": { "$ref": "#/definitions/subcodeString" }
               },
               "required": ["subcode"],
               "additionalProperties": false
           },
-          "subcode": { "$ref": "#/definitions/codeString" }
+          "subcode": { "$ref": "#/definitions/subcodeString" }
         },
         "required":["type","items","subcode"],
@@ -235 +236 @@
               "type": "object",
               "properties": {
-                "subcode": { "$ref": "#/definitions/codeString" },
+                "subcode": { "$ref": "#/definitions/subcodeString" },
                 "text": { "$ref": "#/definitions/nonEmptyString" }
               },
@@ -244 +245 @@
               "type": "object",
               "properties": {
-                "subcode": { "$ref": "#/definitions/codeString" }
+                "subcode": { "$ref": "#/definitions/subcodeString" }
               },
               "required": ["subcode"],

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

@@ -1 @@
-var Q = require('q')
+var HTTPResult = require('../util/http-result')
   , _ = require('underscore')
-  , CouchDB = require('../util/couch').CouchDB
+  , CouchDB = require('../util/couch')
   ;
 
@@ -19 +19 @@
                 return server.get(doc.id)
                 .then(function(doc){
-                    Q.when(upgrade(doc))
+                    HTTPResult.when(200,upgrade(doc))
                     .then(function(newDoc){
                         return server.put(doc._id,newDoc)
@@ -32 +32 @@
                 });
             });
-        }, Q.resolve({}))
+        }, new HTTPResult(200,{}))
         .value();
     }).all();