Merge 164b968 into 4c94141

lib/PluginError.js

@@ -1,5 +1,6 @@
 var util = require('util');
 var colors = require('./colors');
+var _ = require('lodash');
 
 // wow what a clusterfuck
 var parseOptions = function(plugin, message, opt) {
@@ -9,13 +10,25 @@ var parseOptions = function(plugin, message, opt) {
   } else if (message instanceof Error) {
     opt.error = message;
     opt.plugin = plugin;
+    if (!opt.properties) {
+      opt.properties = Object.keys(message);
+    }
   } else if (typeof message === 'object') {
     opt = message;
     opt.plugin = plugin;
   } else if (typeof opt === 'object') {
     opt.plugin = plugin;
     opt.message = message;
   }
+
+  var defaultProperties = ['name', 'message', 'fileName', 'lineNumber', 'stack'];
+
+  if (!opt.properties) {
+    opt.properties = [];
+  }
+
+  opt.properties = _.uniq(defaultProperties.concat(opt.properties));
+
   return opt;
 };
 
@@ -29,17 +42,15 @@ function PluginError(plugin, message, opt) {
   this.plugin = options.plugin;
   this.showStack = options.showStack === true;
 
-  var properties = ['name', 'message', 'fileName', 'lineNumber', 'stack'];
-
   // if options has an error, grab details from it
   if (options.error) {
-    properties.forEach(function(prop) {
+    options.properties.forEach(function(prop) {
       if (prop in options.error) this[prop] = options.error[prop];
     }, this);
   }
 
   // options object can override
-  properties.forEach(function(prop) {
+  options.properties.forEach(function(prop) {
     if (prop in options) this[prop] = options[prop];
   }, this);
 

package.json

@@ -14,7 +14,8 @@
     "through2": "^0.5.0",
     "dateformat": "^1.0.7-1.2.3",
     "multipipe": "^0.1.0",
-    "minimist": "^0.2.0"
+    "minimist": "^0.2.0",
+    "lodash": "~2.4.1"
   },
   "devDependencies": {
     "mocha": "^1.17.0",

test/PluginError.js

@@ -69,4 +69,24 @@ describe('PluginError()', function(){
     done();
   });
 
-});
+  it('should take properties from error by default', function() {
+    var realErr = new Error('something broke');
+    realErr.abstractProperty = 'abstract';
+    var err = new util.PluginError('test', realErr);
+    err.plugin.should.equal('test');
+    err.message.should.equal('something broke');
+    err.abstractProperty.should.equal('abstract');
+  });
+
+  it('should take properties from error unless overridden in options', function() {
+    var realErr = new Error('something broke');
+    realErr.abstractProperty = 'abstract';
+    realErr.notIncludedProperty = 'abstract';
+    var err = new util.PluginError('test', realErr, {properties: ['abstractProperty']});
+    err.plugin.should.equal('test');
+    err.message.should.equal('something broke');
+    err.abstractProperty.should.equal('abstract');
+    (err.notIncludedProperty === undefined).should.be.true;
+  });
+
+});