Simplify for Butlersaurus

lib/document_handler.js

@@ -1,5 +1,5 @@
-var Winston = require('winston');
 var Busboy = require('busboy');
+var Winston = require('winston');
 
 // For handling serving stored documents
 

lib/document_store.js

@@ -33,7 +33,7 @@ FileDocumentStore.prototype.set = function(key, data, callback) {
 
 FileDocumentStore.prototype.get = function(key, callback) {
   var _this = this;
-  var fn = this.basePath + '/' + FileDocumentStore.md5(key);
+  var fn = _this.basePath + '/' + FileDocumentStore.md5(key);
   fs.readFile(fn, 'utf8', function(err, data) {
     if (err) {
       callback(false);

server.js

@@ -1,56 +1,39 @@
-var http = require('http');
+var Connect = require('connect');
-var fs = require('fs');
+var ConnectSt = require('st');
-
+var Fs = require('fs');
-var uglify = require('uglify-js');
+var Http = require('http');
-var winston = require('winston');
+var Route = require('connect-route');
-var connect = require('connect');
+var Winston = require('winston');
-var route = require('connect-route');
-var connect_st = require('st');
 
 var DocumentHandler = require('./lib/document_handler');
+var KeyGenerator = require('./lib/key_generator');
+var Store = require('./lib/document_store');
 
 // Load the configuration and set some defaults
-var config = JSON.parse(fs.readFileSync('./config.js', 'utf8'));
+var config = JSON.parse(Fs.readFileSync('./config.js', 'utf8'));
 config.host = config.host || '127.0.0.1';
 config.port = config.port || 7777;
 
 // Set up the logger
 if (config.logging) {
   try {
-    winston.remove(winston.transports.Console);
+    Winston.remove(Winston.transports.Console);
   } catch(e) {
-    /* was not present */
+    // This is fine
   }
-
   var detail, type;
   for (var i = 0; i < config.logging.length; i++) {
     detail = config.logging[i];
     type = detail.type;
     delete detail.type;
-    winston.add(winston.transports[type], detail);
+    Winston.add(Winston.transports[type], detail);
   }
 }
 
-var Store = require('./lib/document_store');
+// Configure the data store
 store = new Store();
 
-// Compress the static javascript assets
-if (config.recompressStaticAssets) {
-  var list = fs.readdirSync('./static');
-  for (var j = 0; j < list.length; j++) {
-    var item = list[j];
-    if ((item.indexOf('.js') === item.length - 3) && (item.indexOf('.min.js') === -1)) {
-      var dest = item.substring(0, item.length - 3) + '.min' + item.substring(item.length - 3);
-      var orig_code = fs.readFileSync('./static/' + item, 'utf8');
-
-      fs.writeFileSync('./static/' + dest, uglify.minify(orig_code).code, 'utf8');
-      winston.info('compressed ' + item + ' into ' + dest);
-    }
-  }
-}
-
 // Pick up a key generator
-var KeyGenerator = require('./lib/key_generator');
 var keyGenerator = new KeyGenerator();
 
 // Configure the document handler
@@ -61,50 +44,46 @@ var documentHandler = new DocumentHandler({
   keyGenerator: keyGenerator
 });
 
-var app = connect();
+var app = Connect();
 
-// first look at API calls
+// API
-app.use(route(function(router) {
+app.use(Route(function(router) {
-  // get raw documents - support getting with extension
   router.get('/raw/:id', function(request, response) {
     var key = request.params.id.split('.')[0];
     return documentHandler.handleRawGet(key, response);
   });
-  // add documents
   router.post('/documents', function(request, response) {
     return documentHandler.handlePost(request, response);
   });
-  // get documents
   router.get('/documents/:id', function(request, response) {
     var key = request.params.id.split('.')[0];
     return documentHandler.handleGet(key, response);
   });
 }));
 
-// Otherwise, try to match static files
+// Static files
-app.use(connect_st({
+app.use(ConnectSt({
   path: __dirname + '/static',
   content: { maxAge: config.staticMaxAge },
   passthrough: true,
   index: false
 }));
 
-// Then we can loop back - and everything else should be a token,
+// All the pastebin IDs
-// so route it back to /
+app.use(Route(function(router) {
-app.use(route(function(router) {
   router.get('/:id', function(request, response, next) {
     request.sturl = '/';
     next();
   });
 }));
 
-// And match index
+// Index
-app.use(connect_st({
+app.use(ConnectSt({
   path: __dirname + '/static',
   content: { maxAge: config.staticMaxAge },
   index: 'index.html'
 }));
 
-http.createServer(app).listen(config.port, config.host);
+Http.createServer(app).listen(config.port, config.host);
 
-winston.info('listening on ' + config.host + ':' + config.port);
+Winston.info('Listening on ' + config.host + ':' + config.port);