Merge pr 24

klughammer · May 10, 2021 · a0840ed · a0840ed
2 parents 0475716 + e719fe7
commit a0840ed
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -54,6 +54,8 @@ randomstring.generate({
       - `alphabetic` - [a-z A-Z]
       - `numeric` - [0-9]
       - `hex` - [0-9 a-f]
+      - `binary` - [01]
+      - `octal` - [0-7]
       - `custom` - any given characters
     - `capitalization` - define whether the output should be lowercase / uppercase only. (default: null) [OPTIONAL]
       - `lowercase`
@@ -69,7 +71,7 @@ randomstring.generate({
 
     $ randomstring 7
     > CpMg433
-    
+
     $ randomstring length=24 charset=github readable
     > hthbtgiguihgbuttuutubugg
 

diff --git a/lib/charset.js b/lib/charset.js
@@ -6,12 +6,14 @@ function Charset() {
 
 Charset.prototype.setType = function(type) {
   var chars;
-
-  var numbers    = '0123456789';
-  var charsLower = 'abcdefghijklmnopqrstuvwxyz';
-  var charsUpper = charsLower.toUpperCase();
-  var hexChars   = 'abcdef';
-
+
+  var numbers     = '0123456789';
+  var charsLower  = 'abcdefghijklmnopqrstuvwxyz';
+  var charsUpper  = charsLower.toUpperCase();
+  var hexChars    = 'abcdef';
+  var binaryChars = '01';
+  var octalChars  = '01234567';
+
   if (type === 'alphanumeric') {
     chars = numbers + charsLower + charsUpper;
   }
@@ -24,10 +26,16 @@ Charset.prototype.setType = function(type) {
   else if (type === 'hex') {
     chars = numbers + hexChars;
   }
+  else if (type === 'binary') {
+    chars = binaryChars;
+  }
+  else if (type === 'octal') {
+    chars = octalChars;
+  }
   else {
     chars = type;
   }
-  
+
   this.chars = chars;
 }
 
@@ -51,4 +59,4 @@ Charset.prototype.removeDuplicates = function() {
   this.chars = charMap.join('');
 }
 
-module.exports = exports = Charset;
+module.exports = exports = Charset;
diff --git a/test/index.js b/test/index.js
@@ -37,12 +37,6 @@ describe("randomstring.generate(options)", function() {
     });
   });
 
-  it("accepts 'numeric' as charset option", function() {
-    var testData = random({ length: testLength, charset: 'numeric' });
-    var search = testData.search(/\D/ig);
-    assert.equal(search, -1);
-  });
-
   it("accepts 'numeric' as charset option async", function(done) {
     random({ length: testLength, charset: 'numeric' }, function(err, testData) {
       assert.equal(testData.length, testLength);
@@ -51,13 +45,7 @@ describe("randomstring.generate(options)", function() {
       done();
     });
   });
-
-  it("accepts 'alphabetic' as charset option", function() {
-    var testData = random({ length: testLength, charset: 'alphabetic' });
-    var search = testData.search(/\d/ig);
-    assert.equal(search, -1);
-  });
-
+
   it("accepts 'alphabetic' as charset option async", function(done) {
     var testData = random({ length: testLength, charset: 'alphabetic' }, function(err, testData) {
       var search = testData.search(/\d/ig);
@@ -71,6 +59,18 @@ describe("randomstring.generate(options)", function() {
     var search = testData.search(/[^0-9a-f]/ig);
     assert.equal(search, -1);
   });
+
+  it("accepts 'binary' as charset option", function() {
+    var testData = random({ length: testLength, charset: 'binary' });
+    var search = testData.search(/[^01]/ig);
+    assert.equal(search, -1);
+  });
+
+  it("accepts 'octal' as charset option", function() {
+    var testData = random({ length: testLength, charset: 'octal' });
+    var search = testData.search(/[^0-7]/ig);
+    assert.equal(search, -1);
+  });
 
   it("accepts custom charset", function() {
     var charset = "abc";
@@ -87,7 +87,7 @@ describe("randomstring.generate(options)", function() {
       done();
     });
   });
-
+  
   it("accepts readable option", function() {
     var testData = random({ length: testLength, readable: true });
     var search = testData.search(/[0OIl]/g);