[api] Remove riak-js dependency until it is compatible with node 0.4.x

lib/winston/transports.js

@@ -11,4 +11,4 @@ var transports = exports;
 transports.Console = require('./transports/console').Console;
 transports.File    = require('./transports/file').File;
 transports.Loggly  = require('./transports/loggly').Loggly;
-transports.Riak    = require('./transports/riak').Riak;
+//transports.Riak    = require('./transports/riak').Riak;

lib/winston/transports/riak.js

@@ -7,41 +7,41 @@
  *
  */
 
-var riakjs = require('riak-js'),
-    utils = require('./../utils');
-
+//var riakjs = require('riak-js'),
+//    utils = require('./../utils');
+//
 //
 // function Riak (options)
 //   Constructor for the Riak transport object.
 //
-var Riak = exports.Riak = function (options) {
-  options = options || {};
-  options.debug = options.debug || false;
-
-  this.client = riakjs.getClient(options);
-
-  this.name = 'riak';
-  this.level = options.level || 'info';
-  this.bucket = options.bucket || Date.now();
-  this.generate = typeof this.bucket === 'function';
-};
-
+//var Riak = exports.Riak = function (options) {
+//  options = options || {};
+//  options.debug = options.debug || false;
+//  
+//  this.client = riakjs.getClient(options);
+//  
+//  this.name = 'riak';
+//  this.level = options.level || 'info';
+//  this.bucket = options.bucket || Date.now();
+//  this.generate = typeof this.bucket === 'function';
+//};
+//
 //
 // function log (level, msg, [meta], callback)
 //   Core logging method exposed to Winston. Metadata is optional.
 //
-Riak.prototype.log = function (level, msg, meta, callback) {
-  var bucketName = this.bucket, metac = utils.clone(meta);
-
-  // Deep clone the object for adding to Riak
-  metac.level = level;
-  metac.contentType = msg instanceof Object ? 'application/json' : 'text/plain';
-
-  if (this.generate) {
-    var nextBucket = this.bucket(level, msg, meta, Date.now());
-    if (this.lastBucket !== nextBucket) this.lastBucket = nextBucket;
-    bucketName = this.lastBucket;
-  }
-
-  this.client.save(bucketName, Date.now(), msg, metac, callback);
-};
+//Riak.prototype.log = function (level, msg, meta, callback) {
+//  var bucketName = this.bucket, metac = utils.clone(meta);
+//  
+//  // Deep clone the object for adding to Riak
+//  metac.level = level;
+//  metac.contentType = msg instanceof Object ? 'application/json' : 'text/plain';
+//  
+//  if (this.generate) {
+//    var nextBucket = this.bucket(level, msg, meta, Date.now());
+//    if (this.lastBucket !== nextBucket) this.lastBucket = nextBucket;
+//    bucketName = this.lastBucket;
+//  }
+//  
+//  this.client.save(bucketName, Date.now(), msg, metac, callback);
+//};

test/helpers.js

@@ -69,10 +69,10 @@ helpers.assertLoggly = function (transport) {
   assert.isFunction(transport.log);  
 };
 
-helpers.assertRiak = function (transport) {
-  assert.instanceOf(transport, winston.transports.Riak);
-  assert.isFunction(transport.log);
-};
+//helpers.assertRiak = function (transport) {
+//  assert.instanceOf(transport, winston.transports.Riak);
+//  assert.isFunction(transport.log);
+//};
 
 helpers.testNpmLevels = function (transport, assertMsg, assertFn) {
   return helpers.testLevels(winston.config.npm.levels, transport, assertMsg, assertFn);

test/logger-test.js

@@ -117,7 +117,7 @@ vows.describe('winton/logger').addBatch({
     topic: new (winston.Logger)({ 
       transports: [
         new (winston.transports.Console)(),
-        new (winston.transports.Riak)()
+        new (winston.transports.File)({ filename: path.join(__dirname, 'filelog.log' )})
       ] 
     }),
     "should return have two transports": function(logger) {
@@ -134,13 +134,13 @@ vows.describe('winton/logger').addBatch({
       },
       "should remove the Console transport from transports": function (logger) {
         assert.equal(helpers.size(logger.transports), 1);
-        helpers.assertRiak(logger.transports.riak);
+        helpers.assertFile(logger.transports.file);
       },
       "and removing an additional transport": {
         topic: function (logger) {
-           return logger.remove(winston.transports.Riak);  
+           return logger.remove(winston.transports.File);  
         },
-        "should remove Riak transport from transports": function (logger) {
+        "should remove File transport from transports": function (logger) {
           assert.equal(helpers.size(logger.transports), 0);
         }
       }

test/riak-test.js

@@ -6,26 +6,26 @@
  *
  */
 
-require.paths.unshift(require('path').join(__dirname, '..', 'lib'));
-
-var path = require('path'),
-    vows = require('vows'),
-    assert = require('assert'),
-    winston = require('winston'),
-    utils = require('winston/utils'),
-    helpers = require('./helpers');
-
-var config = helpers.loadConfig(),
-    transport = new (winston.transports.Riak)(config.transports.riak);
-
-vows.describe('winston/transports/riak').addBatch({
-  "An instance of the Riak Transport": {
-    "should have the proper methods defined": function () {
-      helpers.assertRiak(transport);
-    },
-    "the log() method": helpers.testNpmLevels(transport, "should log messages to riak", function (ign, err, meta, result) {
-      assert.isNull(err);
-      assert.isObject(result);
-    })
-  }
-}).export(module);
+//require.paths.unshift(require('path').join(__dirname, '..', 'lib'));
+//
+//var path = require('path'),
+//    vows = require('vows'),
+//    assert = require('assert'),
+//    winston = require('winston'),
+//    utils = require('winston/utils'),
+//    helpers = require('./helpers');
+//    
+//var config = helpers.loadConfig(),
+//    transport = new (winston.transports.Riak)(config.transports.riak);
+//
+//vows.describe('winston/transports/riak').addBatch({
+//  "An instance of the Riak Transport": {
+//    "should have the proper methods defined": function () {
+//      helpers.assertRiak(transport);
+//    },
+//    "the log() method": helpers.testNpmLevels(transport, "should log messages to riak", function (ign, err, meta, result) {
+//      assert.isNull(err);
+//      assert.isObject(result);
+//    })
+//  }
+//}).export(module);

test/winston-test.js

@@ -24,7 +24,7 @@ vows.describe('winston').addBatch({
       assert.isObject(winston.transports);
       assert.isFunction(winston.transports.Console);
       assert.isFunction(winston.transports.Loggly);
-      assert.isFunction(winston.transports.Riak);
+      //assert.isFunction(winston.transports.Riak);
       assert.isObject(winston.defaultTransports().console);
       assert.isFalse(winston.emitErrs);
       assert.isObject(winston.config);
@@ -61,7 +61,7 @@ vows.describe('winston').addBatch({
         assert.isObject(winston.transports);
         assert.isFunction(winston.transports.Console);
         assert.isFunction(winston.transports.Loggly);
-        assert.isFunction(winston.transports.Riak);
+        //assert.isFunction(winston.transports.Riak);
         assert.isObject(winston.defaultTransports().console);
         assert.isFalse(winston.emitErrs);
         assert.isObject(winston.config);