Changeset 479 for Dev

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

Files:

• package.json (modified) (1 diff)
• src/.jshintrc-generated (modified) (3 diffs)
• src/Procfile (modified) (1 diff)
• src/package.json (modified) (1 diff)
• src/server/bin (added)
• src/server/bin/check-db.js (added)
• src/server/bin/config-db.js (added)
• src/server/bin/heroku.js (moved) (moved from Dev/trunk/src/server/heroku.js) (1 diff)
• src/server/config/check-couchdb.js (added)
• src/server/config/config-couchdb.js (modified) (4 diffs)
• src/server/config/couchdb-schema.json (added)
• src/server/env.js (added)
• src/server/util/couch.coffee (modified) (2 diffs)
• src/server/util/q-request.js (modified) (2 diffs)

Dev/trunk/package.json

@@ -16 +16 @@
     "grunt-coffeelint": "~0.0.6",
     "grunt-banner": "~0.1.4",
-    "grunt-amd-check": "~0.5.2"
-  }
+    "grunt-amd-check": "~0.5.2",
+    "mocha": "~1.14.0",
+    "should": "~2.1.0"
+  },
+  "dependencies": {}
 }

Dev/trunk/src/.jshintrc-generated

@@ -1 +1 @@
 {
     "bitwise": true,
-    "curly": true,
+    "curly": false,
     "eqeqeq": true,
     "forin": true,
@@ -7 +7 @@
     "indent": 2,
     "latedef": true,
-    "newcap": true,
+    "newcap": false,
     "noarg": true,
     "noempty": true,
@@ -16 +16 @@
 
     "loopfunc": true,
+    "shadow": true,
 
     "devel": true,

Dev/trunk/src/Procfile

@@ -1 @@
-web: node server/heroku.js
+web: node server/bin/heroku.js

Dev/trunk/src/package.json

@@ -10 +10 @@
     "q": "~0.9.6",
     "request": "~2.21.0",
-    "ya-csv": "~0.9.2"
+    "ya-csv": "~0.9.2",
+    "tv4": "~1.0.11"
   },
   "engines": {

Dev/trunk/src/server/bin/heroku.js

@@ -1 @@
-var port = process.env.PORT || 5000;
-var couchDbURL = (process.env.CLOUDANT_URL || 'http://localhost:5984')+'/';
+var env = require('../env');
+var configCouch = require('../config/config-couchdb');
 
-var configCouch = require('./config/config-couchdb');
+console.log("Running on",env.couchServerURL);
 
-console.log("Running on",couchDbURL);
-
-configCouch(couchDbURL)
+configCouch(env.couchServerURL)
 .then(function(){
-    var app = require('./app').App({
-        couchDbURL: couchDbURL+'qed'
+    var app = require('../app').App({
+        couchDbURL: env.couchDbURL
     });
 
-    app.listen(port, function() {
-        console.log('Listening on port',port);
+    app.listen(env.port, function() {
+        console.log('Listening on port',env.port);
     });
 }, function(error){

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);
     });
-
 };

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;
     
 };