rename some variables

server.coffee

@@ -5,13 +5,13 @@ do (setupLodash = this) ->
 
 express = require 'express'
 http = require 'http'
-winston = require 'winston'
+log = require 'winston'
 serverSetup = require './server_setup'
 
 module.exports.startServer = ->
   app = createAndConfigureApp()
   http.createServer(app).listen(app.get('port'))
-  winston.info("Express SSL server listening on port " + app.get('port'))
+  log.info("Express SSL server listening on port " + app.get('port'))
   return app
 
 createAndConfigureApp = ->

server/levels/thangs/thang_type_handler.coffee

@@ -1,5 +1,3 @@
-winston = require('winston')
-request = require('request')
 ThangType = require('./ThangType')
 Handler = require('../../commons/Handler')
 

server/routes/auth.coffee

@@ -1,5 +1,4 @@
-passport = require('passport')
-winston = require('winston')
+authentication = require('passport')
 LocalStrategy = require('passport-local').Strategy
 User = require('../users/User')
 UserHandler = require('../users/user_handler')
@@ -8,11 +7,11 @@ errors = require '../commons/errors'
 mail = require '../commons/mail'
 
 module.exports.setup = (app) ->
-  passport.serializeUser((user, done) -> done(null, user._id))
-  passport.deserializeUser((id, done) ->
+  authentication.serializeUser((user, done) -> done(null, user._id))
+  authentication.deserializeUser((id, done) ->
     User.findById(id, (err, user) -> done(err, user)))
 
-  passport.use(new LocalStrategy(
+  authentication.use(new LocalStrategy(
     (username, password, done) ->
       User.findOne({emailLower:username.toLowerCase()}).exec((err, user) ->
         return done(err) if err
@@ -30,7 +29,7 @@ module.exports.setup = (app) ->
   ))
 
   app.post('/auth/login', (req, res, next) ->
-    passport.authenticate('local', (err, user, info) ->
+    authentication.authenticate('local', (err, user, info) ->
       return next(err) if err
       if not user
         return errors.unauthorized(res, [{message:info.message, property:info.property}])

server/routes/base.coffee

@@ -1,4 +1,4 @@
-winston = require 'winston'
+log = require 'winston'
 routes = require('../commons/mapping').routes
 
 module.exports.setup = (app) ->
@@ -6,4 +6,4 @@ module.exports.setup = (app) ->
     do (route) ->
       module = require('../'+route)
       module.setup app
-      winston.info "route module #{route} setup"
+      log.debug "route module #{route} setup"

server/routes/contact.coffee

@@ -1,17 +1,17 @@
 config = require '../../server_config'
-winston = require 'winston'
+log = require 'winston'
 mail = require '../commons/mail'
 
 module.exports.setup = (app) ->
   app.post '/contact', (req, res) ->
-    winston.info "Sending mail from #{req.body.email} saying #{req.body.message}"
+    log.info "Sending mail from #{req.body.email} saying #{req.body.message}"
     if config.isProduction
       options = createMailOptions req.body.email, req.body.message, req.user
       mail.transport.sendMail options, (error, response) ->
         if error
-          winston.error "Error sending mail: #{error.message or error}"
+          log.error "Error sending mail: #{error.message or error}"
         else
-          winston.info "Mail sent successfully. Response: #{response.message}"
+          log.info "Mail sent successfully. Response: #{response.message}"
     return res.end()
 
 createMailOptions = (sender, message, user) ->

server/routes/db.coffee

@@ -1,4 +1,4 @@
-winston = require 'winston'
+log = require 'winston'
 errors = require '../commons/errors'
 handlers = require('../commons/mapping').handlers
 schemas = require('../commons/mapping').schemas
@@ -15,18 +15,18 @@ module.exports.setup = (app) ->
     try
       moduleName = module.replace '.', '_'
       name = handlers[moduleName]
-      module = require('../' + name)
-      return module.getLatestVersion(req, res, parts[1], parts[3]) if parts[2] is 'version'
-      return module.versions(req, res, parts[1]) if parts[2] is 'versions'
-      return module.files(req, res, parts[1]) if parts[2] is 'files'
-      return module.search(req, res) if req.route.method is 'get' and parts[1] is 'search'
-      return module.getByRelationship(req, res, parts[1..]...) if parts.length > 2
-      return module.getById(req, res, parts[1]) if req.route.method is 'get' and parts[1]?
-      return module.patch(req, res, parts[1]) if req.route.method is 'patch' and parts[1]?
-      module[req.route.method](req, res)
+      handler = require('../' + name)
+      return handler.getLatestVersion(req, res, parts[1], parts[3]) if parts[2] is 'version'
+      return handler.versions(req, res, parts[1]) if parts[2] is 'versions'
+      return handler.files(req, res, parts[1]) if parts[2] is 'files'
+      return handler.search(req, res) if req.route.method is 'get' and parts[1] is 'search'
+      return handler.getByRelationship(req, res, parts[1..]...) if parts.length > 2
+      return handler.getById(req, res, parts[1]) if req.route.method is 'get' and parts[1]?
+      return handler.patch(req, res, parts[1]) if req.route.method is 'patch' and parts[1]?
+      handler[req.route.method](req, res)
     catch error
-      winston.error("Error trying db method #{req.route.method} route #{parts} from #{name}: #{error}")
-      winston.error(error)
+      log.error("Error trying db method #{req.route.method} route #{parts} from #{name}: #{error}")
+      log.error(error)
       errors.notFound(res, "Route #{req.path} not found.")
 
 getSchema = (req, res, moduleName) ->
@@ -38,5 +38,5 @@ getSchema = (req, res, moduleName) ->
     res.end()
 
   catch error
-    winston.error("Error trying to grab schema from #{name}: #{error}")
+    log.error("Error trying to grab schema from #{name}: #{error}")
     errors.notFound(res, "Schema #{moduleName} not found.")

server/routes/file.coffee

@@ -1,4 +1,3 @@
-winston = require 'winston'
 Grid = require 'gridfs-stream'
 fs = require 'fs'
 request = require 'request'

server/routes/languages.coffee

@@ -1,11 +1,11 @@
 errors = require '../commons/errors'
-winston = require 'winston'
+log = require 'winston'
 locale = require '../../app/locale/locale'  # requiring from app; will break if we stop serving from where app lives
 
 module.exports.setup = (app) ->
   app.all '/languages/add/:lang/:namespace', (req, res) ->
     # Should probably store these somewhere
-    winston.info "#{req.params.lang}.#{req.params.namespace} missing an i18n key:", req.body
+    log.info "#{req.params.lang}.#{req.params.namespace} missing an i18n key:", req.body
     res.send('')
     res.end()
 

server_setup.coffee

@@ -1,6 +1,6 @@
 express = require 'express'
 path = require 'path'
-passport = require 'passport'
+authentication = require 'passport'
 useragent = require 'express-useragent'
 fs = require 'graceful-fs'
 
@@ -33,8 +33,8 @@ setupExpressMiddleware = (app) ->
   app.use(express.cookieSession({secret:'defenestrate'}))
 
 setupPassportMiddleware = (app) ->
-  app.use(passport.initialize())
-  app.use(passport.session())
+  app.use(authentication.initialize())
+  app.use(authentication.session())
 
 setupOneSecondDelayMiddlware = (app) ->
   if(config.slow_down)