Remove redis from nodejs test (#2480)

frameworks/JavaScript/nodejs/handlers/redis.js

@@ -1,117 +0,0 @@
-var h = require('../helper');
-var async = require('async');
-// "If hiredis [pure C library] is installed, node_redis will use it by default.
-// Otherwise, a pure JavaScript parser will be used."
-// >> Previous versions of this project installed hiredis; however, hiredis now has
-// >> installation issues and redis is no longer tested, so the hiredis dependency was taken out.
-// >> If redis tests are re-instated, try to re-add hiredis dependency; however, if it does
-// >> not install correctly, the tests will still work with the redis default JS parser
-var redis = require('redis');
-var client = redis.createClient(6379, '127.0.0.1', {});
-
-client.on('error', function (err) {
-  console.log('Redis Error: ' + err);
-  // Do nothing further if Redis errors/is unavailable
-});
-
-function redisWorldId(id) {
-  return 'world:' + id;
-}
-
-function redisRandomWorld(callback) {
-  var id = h.randomTfbNumber();
-  var redisId = redisWorldId(id);
-  client.get(redisId, function (err, worldValue) {
-    var world = {
-      id: id,
-      randomNumber: worldValue
-    }
-    callback(err, world);
-  });
-}
-
-function redisSetWorld(world, callback) {
-  var redisId = redisWorldId(world.id);
-  client.set(redisId, world.randomNumber, function (err, result) {
-    callback(err, world);
-  });
-}
-
-function redisGetAllFortunes(callback) {
-  client.lrange('fortunes', 0, -1, function (err, fortuneMessages) {
-    if (err) { return process.exit(1); }
-
-    var fortunes = fortuneMessages.map(function (e, i) {
-      return { id: i + 1, message: e }
-    });
-
-    callback(err, fortunes)
-  });
-}
-
-
-module.exports = {
-  
-  SingleQuery: function(req, res) {
-    redisRandomWorld(function (err, world) {
-      if (err) { return process.exit(1); }
-
-      h.addTfbHeaders(res, 'json');
-      res.end(JSON.stringify(world));
-    })
-  },
-
-  MultipleQueries: function(queries, req, res) {
-    var queryFunctions = h.fillArray(redisRandomWorld, queries);
-
-    async.parallel(queryFunctions, function (err, worlds) {
-      if (err) { return process.exit(1); }
-
-      h.addTfbHeaders(res, 'json');
-      res.end(JSON.stringify(worlds));
-    })
-  },
-
-  Fortunes: function(req, res) {
-    redisGetAllFortunes(function (err, fortunes) {
-      if (err) { return process.exit(1); }
-
-      h.addTfbHeaders(res, 'html');
-      fortunes.push(h.ADDITIONAL_FORTUNE);
-      fortunes.sort(function (a, b) {
-        return a.message.localeCompare(b.message);
-      });
-      res.end(h.fortunesTemplate({
-        fortunes: fortunes
-      }));
-    });
-  },
-
-  Updates: function(queries, req, res) {
-    var getFunctions = h.fillArray(redisRandomWorld, queries);
-
-    async.parallel(getFunctions, function (err, worlds) {
-      if (err) { return process.exit(1); }
-
-      var updateFunctions = [];
-
-      worlds.forEach(function (w) {
-        w.id = h.randomTfbNumber();
-        updateFunctions.push(function (callback) {
-          if (err) { return process.exit(1); }
-
-          return redisSetWorld(w, callback);
-        });
-      });
-
-      async.parallel(updateFunctions, function (err, updated) {
-        if (err) { return process.exit(1); }
-
-        h.addTfbHeaders(res, 'json');
-        res.end(JSON.stringify(updated));
-      });
-    });
-
-  }
-
-};

frameworks/JavaScript/nodejs/package.json

@@ -12,7 +12,6 @@
     "parseurl": "1.3.1",
     "pg": "6.0.2",
     "pg-hstore": "2.3.2",
-    "redis": "2.6.2",
     "sequelize": "3.6.0"
   },
   "main": "app.js"

frameworks/JavaScript/nodejs/routing.js

@@ -1,12 +1,10 @@
 // Intialized database connections, one for each db config
 // * Mongoose is a popular Node/MongoDB driver
 // * Sequelize is a popular Node/SQL driver
-// * Node's redis package uses the C bindings of the hiredis library
 var MongodbRawHandler = require('./handlers/mongodb-raw');
 var MySQLRawHandler = require('./handlers/mysql-raw');
 var MongooseHandler = require('./handlers/mongoose');
 var SequelizeHandler = require('./handlers/sequelize');
-var HiredisHandler = require('./handlers/redis');
 var SequelizePgHandler = require('./handlers/sequelize-postgres');
 
 var h = require('./helper');
@@ -30,9 +28,6 @@ module.exports.BasicHandler = (function() {
     '/mysql/db':           MySQLRawHandler.SingleQuery,
     '/mysql/fortunes':     MySQLRawHandler.Fortunes,
 
-    '/hiredis/db':         HiredisHandler.SingleQuery,
-    '/hiredis/fortunes':   HiredisHandler.Fortunes,
-
     '/sequelize-pg/db':       SequelizePgHandler.SingleQuery,
     '/sequelize-pg/fortunes': SequelizePgHandler.Fortunes
   }
@@ -64,9 +59,6 @@ module.exports.QueryHandler = (function () {
     '/mysql/queries':     MySQLRawHandler.MultipleQueries,
     '/mysql/updates':     MySQLRawHandler.Updates,
 
-    '/hiredis/queries':   HiredisHandler.MultipleQueries,
-    '/hiredis/updates':   HiredisHandler.Updates,
-
     '/sequelize-pg/queries': SequelizePgHandler.MultipleQueries,
     '/sequelize-pg/updates': SequelizePgHandler.Updates
   }

frameworks/JavaScript/nodejs/setup.sh

@@ -5,7 +5,6 @@ fw_depends mongodb nodejs
 sed -i 's|127.0.0.1|'"${DBHOST}"'|g' handlers/mongodb-raw.js
 sed -i 's|127.0.0.1|'"${DBHOST}"'|g' handlers/mongoose.js
 sed -i 's|127.0.0.1|'"${DBHOST}"'|g' handlers/mysql-raw.js
-sed -i 's|127.0.0.1|'"${DBHOST}"'|g' handlers/redis.js
 sed -i 's|127.0.0.1|'"${DBHOST}"'|g' handlers/sequelize.js
 sed -i 's|127.0.0.1|'"${DBHOST}"'|g' handlers/sequelize-postgres.js