Merge remote-tracking branch 'trollixx/dialect-http' into dialect-http

bin/dialect-http.js

@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 /*
  * dialect-http
  * Copyright(c) Pau Ramon <masylum@gmail.com>
@@ -6,7 +7,8 @@
 
 require('colors');
 
-var _lib_path = require('path').join(__dirname, '..', 'lib'),
+var path = require('path'),
+    _lib_path = path.join(__dirname, '..', 'lib'),
 
     _utils = require(_lib_path + '/utils'),
     _dialect_http = require(_lib_path + '/dialect_http'),
@@ -40,6 +42,9 @@ while (_args.length) {
   case '--config':
     arg = _args.shift();
     if (arg) {
+      if (arg[0] != '/') {
+        arg = path.normalize(path.join(process.cwd(), arg));
+      }
       _dialect_http.options = _utils.merge(_dialect_http.options, require(arg));
     } else {
       throw Error('--config requires an path');

lib/dialect_http.js

@@ -2,9 +2,6 @@ var DIALECT_HTTP = {},
     express = require('express'),
     connect_auth = require('connect-auth'),
 
-    // TODO: use npm instead
-    dialect = require('../../dialect'),
-
     _lib_path = require('path').join(__dirname, '..', 'lib'),
     _controllers_path = require('path').join(_lib_path, 'controllers'),
 
@@ -54,12 +51,12 @@ DIALECT_HTTP.options = {
   port: 3001,
   dialect: {
     locales: ['en', 'es', 'de', 'fr', 'pt'],
-    store: {mongodb: {dbname: 'dialect'}}
+    store: {mongodb: {database: 'dialect'}}
   }
 };
 
 DIALECT_HTTP.app = express.createServer();
-DIALECT_HTTP.dialect = dialect.dialect(DIALECT_HTTP.options.dialect);
+DIALECT_HTTP.dialect = {};
 
 DIALECT_HTTP.authenticate = function (req, res, next) {
   if (req.session.auth && req.session.auth.user) {
@@ -73,8 +70,8 @@ DIALECT_HTTP.authenticate = function (req, res, next) {
 
 DIALECT_HTTP.run = function () {
   var app = DIALECT_HTTP.app,
-      dialect = DIALECT_HTTP.dialect,
-      options = DIALECT_HTTP.options;
+      options = DIALECT_HTTP.options,
+      dialect = DIALECT_HTTP.dialect = require('dialect').dialect(options.dialect);
 
   app.configure(function () {
     app.use(express.favicon());
@@ -86,7 +83,7 @@ DIALECT_HTTP.run = function () {
     app.use(express.session({
       cookie: options.session.cookie,
       secret: options.session.secret,
-      store: require('connect-mongodb')(options.dialect.store.mongodb)
+      store: require('connect-mongodb')(options.sessions_db)
     }));
 
     app.use(express['static'](_lib_path + '/public'));

package.json

@@ -13,5 +13,5 @@
     "connect-i18n": "0.0.1"
   },
   "main": "./lib/express-dialect",
-  "engines": { "node": ">= 4.0" }
+  "engines": { "node": ">= 0.4.0" }
 }