From a3cef281679906c949e8bd5e2f8fa8a529f3752a Mon Sep 17 00:00:00 2001 From: s2 Date: Fri, 24 Nov 2017 09:47:48 +0100 Subject: [PATCH 1/2] add jscsrc file so it's easier to contribute code --- .jscsrc | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 .jscsrc diff --git a/.jscsrc b/.jscsrc new file mode 100644 index 0000000..004983c --- /dev/null +++ b/.jscsrc @@ -0,0 +1,69 @@ +{ + "requireCurlyBraces": [ + "if", + "else", + "for", + "while", + "do", + "try", + "catch" + ], + "requireSpaceAfterKeywords": [ + "if", + "else", + "for", + "while", + "do", + "switch", + "case", + "return", + "try", + "catch" + ], + "requireSpaceBeforeBlockStatements": true, + "requireParenthesesAroundIIFE": true, + "requireSpacesInConditionalExpression": true, + "disallowSpacesInNamedFunctionExpression": { + "beforeOpeningRoundBrace": true + }, + "disallowSpacesInFunctionDeclaration": { + "beforeOpeningRoundBrace": true + }, + "requireSpaceBetweenArguments": true, + "disallowMultipleVarDecl": true, + "requireVarDeclFirst": false, + "requireBlocksOnNewline": false, + "disallowEmptyBlocks": true, + "disallowSpacesInsideArrayBrackets": true, + "disallowSpacesInsideParentheses": true, + "disallowDanglingUnderscores": false, + "requireCommaBeforeLineBreak": true, + "disallowSpaceAfterPrefixUnaryOperators": true, + "disallowSpaceBeforePostfixUnaryOperators": true, + "disallowSpaceBeforeBinaryOperators": [ + "," + ], + "requireSpacesInForStatement": true, + "requireSpacesInAnonymousFunctionExpression": { + "beforeOpeningCurlyBrace": true + }, + "requireSpaceBeforeBinaryOperators": true, + "requireSpaceAfterBinaryOperators": true, + "disallowKeywords": [ + "with", + "continue" + ], + "validateIndentation": "\t", + "disallowMixedSpacesAndTabs": true, + "disallowTrailingWhitespace": true, + "disallowTrailingComma": true, + "disallowKeywordsOnNewLine": [ + "else" + ], + "requireLineFeedAtFileEnd": true, + "requireCapitalizedConstructors": true, + "requireDotNotation": false, + "disallowNewlineBeforeBlockStatements": true, + "disallowMultipleLineStrings": true, + "requireSpaceBeforeObjectValues": true +} From 468934748062519b830ac5a252bf9e743dc91966 Mon Sep 17 00:00:00 2001 From: s2 Date: Fri, 24 Nov 2017 09:48:03 +0100 Subject: [PATCH 2/2] fix source files to be compliant with .jscs rules --- lib/secure-random-string.js | 7 +++---- tests.js | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/secure-random-string.js b/lib/secure-random-string.js index 972e5f9..79d41b0 100644 --- a/lib/secure-random-string.js +++ b/lib/secure-random-string.js @@ -16,7 +16,7 @@ function srs(options, cb) { if (err) { return cb(err); } - return cb(null,_finish(buf)); + return cb(null, _finish(buf)); }); } // sync path @@ -24,12 +24,11 @@ function srs(options, cb) { return _finish(crypto.randomBytes(length)); } - function _finish (buf) { + function _finish(buf) { var string = buf.toString('base64'); - string = string.replace(/\//g,'_').replace(/\+/g,'-'); + string = string.replace(/\//g, '_').replace(/\+/g, '-'); return string.substr(0, length); } - }; diff --git a/tests.js b/tests.js index 630ba62..ee7796e 100644 --- a/tests.js +++ b/tests.js @@ -53,8 +53,8 @@ srs({length: 256}, function(err, sr) { // sync tests test('generate a random string 32 chars long (sync)', srs().length, 32); -test('generate a random string 1 chars long (sync)', srs({length:1}).length, 1); -test('generate a random string 256 chars long (sync)', srs({length:256}).length, 256); +test('generate a random string 1 chars long (sync)', srs({length: 1}).length, 1); +test('generate a random string 256 chars long (sync)', srs({length: 256}).length, 256); //in 2000 chars there should be at least one substitution