Adding testing of default constructor/config chain - minimal config n…

…ow databases.defaultConnStr from env

.gitignore

@@ -7,6 +7,7 @@ lib-cov
 *.pid
 *.gz
 
+.idea
 pids
 logs
 results

Gruntfile.js

@@ -13,6 +13,13 @@ module.exports = function (grunt) {
                 },
                 src: ["test/**/*.js"]
             },
+            "test-x-unit": {
+                options: {
+                    reporter: "xunit",
+                    timeout: 10000
+                },
+                src: ["test/**/*.js"]
+            },
             filter: {
                 src: ["test/**/*_test.js"],
                 options: {
@@ -67,6 +74,7 @@ module.exports = function (grunt) {
 
     // Default task.
     grunt.registerTask('default', ['jshint', 'mochaTest:test']);
+    grunt.registerTask('bamboo', ['jshint', 'mochaTest:test-x-unit']);
     grunt.registerTask('clean', ['jshint', 'jsbeautifier:modify']);
     grunt.registerTask('verify', ['jshint', 'jsbeautifier:verify']);
     grunt.registerTask('filtertest', 'Runs tests based on pattern specified', function (taskName, pattern) {

lib/config.js

@@ -2,15 +2,19 @@ var loc = process.env.TRIPOD_CONFIG,
     fs    = require('fs'),
     conf = require('nconf');
 
-conf.file({ file: loc });
+conf.env()
+    .file({ file: loc });
 
 conf.defaults({
     "namespaces":{
-        "rdfs":"http://www.w3.org/2000/01/rdf-schema#"
+        "rdf":"http://www.w3.org/1999/02/22-rdf-syntax-ns#",
+        "rdfs":"http://www.w3.org/2000/01/rdf-schema#",
+        "changeset":"http://purl.org/vocab/changeset/schema#"
     },
     "defaultContext" : "http://talis.com/",
-    "view_specifications" : [],
-    "table_specifications" : []
+    "databases" : {
+        "defaultConnStr" : "mongodb://localhost"
+    }
 });
 
 exports = module.exports = conf;

lib/tripod.js

@@ -8,7 +8,11 @@ var TripleGraph = require('./graph');
  */
 var Tripod = function(dbName,collectionName) {
     this._config = config;
-    this._connStr = config.get("databases:"+dbName+":connStr")+"/"+dbName;
+    if (config.get("databases:"+dbName+":connStr")) {
+        this._connStr = config.get("databases:"+dbName+":connStr")+"/"+dbName;
+    } else {
+        this._connStr = config.get("databases:defaultConnStr")+"/"+dbName;
+    }
     this._collectionName = collectionName;
     this._collection = null;
     this._viewsCollection = null;

test/conf.js

@@ -0,0 +1,3 @@
+process.env.TRIPOD_CONFIG = './test/conf.json';
+process.env["databases:defaultConnStr"] = 'mongodb://foobarbaz';
+require("../lib/config");