Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions lib/prettyjson.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
'use strict';

// ### Module dependencies
require('colors');
var colors = require('colors');
var Utils = require('./utils');

exports.version = require('../package.json').version;

var supportedColors = (function(){
var validColors = colors.styles;
for(var key in colors.maps)
validColors[key] = colors.maps[key];
return validColors;
})();

// ### Render function
// *Parameters:*
//
Expand All @@ -27,13 +34,13 @@ exports.render = function render(data, options, indentation) {
indentation = indentation || 0;
options = options || {};
options.emptyArrayMsg = options.emptyArrayMsg || '(empty array)';
options.keysColor = options.keysColor || 'green';
options.dashColor = options.dashColor || 'green';
options.numberColor = options.numberColor || 'blue';
options.keysColor = supportedColors[options.keysColor] ? options.keysColor : 'green';
options.dashColor = supportedColors[options.dashColor] ? options.dashColor : 'green';
options.numberColor = supportedColors[options.numberColor] ? options.numberColor : 'blue';
options.defaultIndentation = options.defaultIndentation || 2;
options.noColor = !!options.noColor;

options.stringColor = options.stringColor || null;
options.stringColor = supportedColors[options.stringColor] ? options.stringColor : null;

var output = [];

Expand Down
30 changes: 30 additions & 0 deletions test/prettyjson_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -346,3 +346,33 @@ describe('prettyjson.renderString() method', function(){
output.should.equal('test: '.green + 'OK'.red);
});
});

describe('Colors Validation', function(){
it('should output the string with default scheme if invalid colors are provided', function(){
var input = {param1: 'first string', param2: 'second string'};
var output = prettyjson.render(input, {keysColor: 'orange', stringColor: 'pink'});

output.should.equal([
'param1: '.green + 'first string',
'param2: '.green + 'second string'
].join('\n'));
});

it('should output the number with default scheme if invalid colors are provided', function(){
var input = {param1: 17, param2: 22.3};
var output = prettyjson.render(input, {numberColor: 'pink'});

output.should.equal([
'param1: '.green + '17'.blue,
'param2: '.green + '22.3'.blue
].join('\n'));
});

it('should output the number with default scheme if invalid colors are provided', function(){
var input = {param1: ['pretty']};
var output = prettyjson.render(input, {dashColor: 'pink'});

output.should.equal('param1: '.green +'\n '+ '- '.green + 'pretty');

});
});