Pass in configuration rather than reading it from a default file, add…

… support for registering types

api/test/radar.test.js

@@ -17,7 +17,6 @@ var fs = require('fs'),
 var subdomain = 'support',
     frontend,
     backend,
-    config = require(__dirname + '/../../configuration.js'),
     routes;
 
 var Client = new ClientScope({

core/lib/persistence.js

@@ -1,6 +1,10 @@
 var redisLib = require('redis'),
     logging = require('minilog')('persistence'),
-    configuration = require('../../configuration');
+    // defaults
+    configuration = {
+      redis_host: 'localhost',
+      redis_port: 6379,
+    };
 
 var client, isConnecting = false;
 
@@ -22,6 +26,10 @@ function redis() {
 
 function Persistence() { };
 
+Persistence.setConfig = function(config) {
+  configuration = config;
+};
+
 Persistence.applyPolicy = function(multi, key, policy) {
   if(policy.maxCount) {
     multi.zremrangebyrank(key, 0, -policy.maxCount-1, function(err, res) {

core/lib/type.js

@@ -1,4 +1,3 @@
-
 var Types = {};
 
 function get(type) {
@@ -37,7 +36,9 @@ function getByExpression(name) {
 
 module.exports = {
   get: get,
-  getByExpression: getByExpression
+  getByExpression: getByExpression,
+  register: function(name, type) {
+    Types[name] = type;
+  }
 };
 
-

readme.md

@@ -7,3 +7,8 @@ Installing from scratch:
 - git clone git@github.com:zendesk/radar.git
 - npm install
 - npm start
+
+## Copyright and License
+
+Copyright 2012, Zendesk Inc.
+Licensed under the Apache License Version 2.0, http://www.apache.org/licenses/LICENSE-2.0

server.js

@@ -1,6 +1,10 @@
 var http = require('http'),
 
-    configuration = require('./configuration.js'),
+    configuration = {
+      redis_host: 'localhost',
+      redis_port: 6379,
+      port: 8000
+    },
     Radar = require('./server/server.js'),
     Api = require('./api/api.js'),
     Minilog = require('minilog');
@@ -30,6 +34,6 @@ server = http.createServer(p404);
 Api.attach(server);
 
 // Radar server
-Radar.attach(server, require('engine.io'));
+Radar.attach(server, configuration);
 
 server.listen(configuration.port);

server/server.js

@@ -8,8 +8,7 @@ var redis = require('redis'),
     PresenceMaintainer = require('../core').PresenceMaintainer,
     Heartbeat = require('heartbeat'),
     logging = require('minilog')('server'),
-    hostname = require('os').hostname(),
-    configuration = require('../configuration');
+    hostname = require('os').hostname();
 
 // Parse JSON
 function parseJSON(data) {
@@ -33,9 +32,10 @@ function Server() {
 MiniEventEmitter.mixin(Server);
 
 // Attach to a http server
-Server.prototype.attach = function(server) {
+Server.prototype.attach = function(server, configuration) {
   var self = this,
       engine = require('engine.io');
+  require('../core').Persistence.setConfig(configuration);
   this.subscriber = redis.createClient(configuration.redis_port, configuration.redis_host);
   this.subscriber.on('message', function(name, data) {
     logging.debug('#redis_in', name, data);