removing redis, improving reading of config file, deleted some unnecessary files

Author: anvarik

README.md

@@ -9,8 +9,8 @@ is currently busy to continue. I asked his permission, and will be copying his c
 
 ## Configuration
 Set MySql database and login information into the config.json under user/password.
-Set Admin module login information under login.user/login.password.
-Then run `node app.js` in order to start the server.
+Set Admin module login information under login.user/login.password. 
+First run `npm install` for dependencies, then run `node app.js` in order to start the server.
 
 ## Screenshots
 ![Admin](http://i.imgur.com/hfnm9.png)

app.js

@@ -4,10 +4,7 @@ var express = require('express'),
         posts = require('./lib/controllers/posts'),
         admin = require('./lib/controllers/admin'),
         h5bp = require('./lib/externals/h5bp-node'),
-        abstractModel = require('./lib/models/abstract');
-
-// https://github.com/LearnBoost/console-trace
-require('console-trace');
+        abstractModel = require('./lib/models/options');
 
 // Webserver configuration https://github.com/h5bp/server-configs
 var app = module.exports = h5bp.server(express, {
@@ -23,9 +20,8 @@ app.configure(function() {
     app.use(app.router);
     app.use(express.static(__dirname + '/public'));
 });
-
 // set env
-app.settings.env = abstractModel.config.env;
+app.settings.env = abstractModel.storageConfig.env;
 
 app.configure('dev', function() {
     app.use(express.errorHandler({dumpExceptions: true, showStack: true}));
@@ -52,6 +48,6 @@ app.get('/admin', secure, admin.index);
 app.get('/admin/login', admin.login);
 app.get('/admin/logout', admin.logout);
 app.post('/admin/login', admin.postLoginData);
-app.listen(abstractModel.config.PORT);
+app.listen(abstractModel.storageConfig.PORT);
 
-//console.t.log("Express server listening on port %d in %s mode", app.address().port, app.settings.env)
+console.log('Listening on port: ' + abstractModel.storageConfig.PORT);

lib/controllers/admin.js

@@ -1,7 +1,7 @@
 var storageClient = require('../models/mysql'),
         storage = new (storageClient.MySql)(),
         abstractController = require('./abstract'),
-        abstractModel = require('../models/abstract');
+        options = require('../models/options');
 
 // GET login page
 this.index = function(req, res, next) {
@@ -29,8 +29,8 @@ this.logout = function(req, res) {
 
 // POST login
 this.postLoginData = function(req, res) {
-    var usr = abstractModel.config.login.user,
-            pw = abstractModel.config.login.password;
+    var usr = options.storageConfig.login.user,
+            pw = options.storageConfig.login.password;
 
     if (req.param('username') === usr && req.param('password') === pw) {
         req.login();

lib/controllers/posts.js

@@ -3,7 +3,7 @@
 // var storage = new (require('../lib/storage/redis'))()
 var storageClient = require('../models/mysql'),
         storage = new (storageClient.MySql)(),
-        abstractModel = require('../models/abstract'),
+        options = require('../models/options'),
         flow = require('../externals/flow'),
         // source: https://github.com/chjj/marked
         marked = require('marked'),
@@ -22,7 +22,7 @@ this.index = function(req, res, next) {
         var pagingLeft = false,
         pagingRight = false,
         page = parseInt(req.param('count'), 10) || 1,
-        ppp = parseInt(abstractModel.config.postPerPage, 10),
+        ppp = parseInt(options.storageConfig.postPerPage, 10),
         articleCount = posts.publish.length,
         postsTmp = posts.publish;
 

lib/models/abstract.js

@@ -1,16 +1,14 @@
 // mysql implementation
-require('console-trace');
-
-var abstract = require('./abstract'),
+var options = require('./options'),
         mysql = require('mysql'),
-        DB = abstract.config.DB,
-        TABLE_POST = abstract.config.TABLE_POST,
-        TABLE_PUBLISH = abstract.config.TABLE_PUBLISH,
-        TABLE_COMMENT = abstract.config.TABLE_COMMENT,
+        DB = options.storageConfig.DB,
+        TABLE_POST = options.storageConfig.TABLE_POST,
+        TABLE_PUBLISH = options.storageConfig.TABLE_PUBLISH,
+        TABLE_COMMENT = options.storageConfig.TABLE_COMMENT,
         loginData = {
             host: 'localhost',
-            user: abstract.config.user,
-            password: abstract.config.password
+            user: options.storageConfig.user,
+            password: options.storageConfig.password
         },
         client = mysql.createConnection(loginData);
 

lib/models/fs.js

@@ -0,0 +1,5 @@
+var fs = require('fs'),
+	configPath = './config.json';
+
+var parsed = JSON.parse(fs.readFileSync(configPath, 'UTF-8'));
+exports.storageConfig=  parsed;

lib/models/mysql.js

@@ -7,7 +7,6 @@
         "marked": ">= 0.2.3",
         "redis": ">= 0.7.1",
         "callsite": ">= 0.0.1",
-        "console-trace": ">=0.2.1",
         "mysql": ">= 2.0.0-rc1"
     }
 }