From faf4e1a9f81bd2c05effbef7439a74fa71048d64 Mon Sep 17 00:00:00 2001 From: Chad Johnson Date: Tue, 12 Sep 2017 14:49:05 -0500 Subject: [PATCH 1/4] Added "separator" option to generator options. --- Generator.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Generator.js b/Generator.js index b6c341e..83b843c 100644 --- a/Generator.js +++ b/Generator.js @@ -71,7 +71,7 @@ function parseId(id) { } } -function generateId(letters, numLetters, numbers, numNumbers) { +function generateId(letters, numLetters, numbers, numNumbers, separator) { if (numLetters > 0 && numNumbers <= 0) { var nextLetters = incrementLetters(letters); var id = fillLetters(nextLetters, numLetters); @@ -89,7 +89,7 @@ function generateId(letters, numLetters, numbers, numNumbers) { nextLetters = incrementLetters(letters); } var id = fillLetters(nextLetters, numLetters) - + " - " + fillZeros(nextNumber, numNumbers); + + separator + fillZeros(nextNumber, numNumbers); return {id: id, letters: nextLetters, numbers: nextNumber}; } } @@ -120,6 +120,7 @@ var Generator = (function() { this.keys[key].options = {}; this.keys[key].options.digits = int(options.digits, 6); this.keys[key].options.letters = int(options.letters, 3); + this.keys[key].options.separator = options.separator || " - "; this.keys[key].options.store = typeof(options.store) === "function" ? options.store : function() {} this.keys[key].options.store_freq = int(options.store_freq, 1); @@ -155,7 +156,7 @@ var Generator = (function() { this.add(key); } var _new = generateId(this.keys[key].letters, this.keys[key].options.letters, - this.keys[key].numbers, this.keys[key].options.digits); + this.keys[key].numbers, this.keys[key].options.digits, this.keys[key].options.separator); this.keys[key].letters = _new.letters; this.keys[key].numbers = _new.numbers; this.keys[key].generatedIds.push(_new.id); From 3cede8915a855327c2961abe199e6b3520db67b0 Mon Sep 17 00:00:00 2001 From: Chad Johnson Date: Tue, 12 Sep 2017 15:19:43 -0500 Subject: [PATCH 2/4] store() is now always called with key and unsavedIds. --- Generator.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Generator.js b/Generator.js index 83b843c..c51db74 100644 --- a/Generator.js +++ b/Generator.js @@ -162,7 +162,7 @@ var Generator = (function() { this.keys[key].generatedIds.push(_new.id); this.keys[key].unsavedIds.push(_new.id); if (this.keys[key].options.store_freq === this.keys[key].unsavedIds.length) { - this.keys[key].options.store(this.keys[key].unsavedIds); + this.keys[key].options.store(key, this.keys[key].unsavedIds); this.keys[key].unsavedIds = []; } return _new.id; @@ -190,13 +190,13 @@ var Generator = (function() { Generator.prototype.store = function(key) { if(!key){ key = '__default'; } - if (this.keys[key].unsavedIds.length > 0) this.keys[key].options.store(this.keys[key].unsavedIds); + if (this.keys[key].unsavedIds.length > 0) this.keys[key].options.store(key, this.keys[key].unsavedIds); }; Generator.prototype.stop = function() { if (! this._online) return; for(var key in this.keys){ - this.store(key); + this.store(key, this.keys[key].unsavedIds); } this.server.close(); this._online = false; From 67e4af04fabcecfc8cd26555c0ba6d98c67e713a Mon Sep 17 00:00:00 2001 From: Chad Johnson Date: Wed, 13 Sep 2017 23:49:19 -0500 Subject: [PATCH 3/4] Bumping up version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e5bef2b..e881c82 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sequential-ids", - "version": "0.0.0", + "version": "0.0.1", "description": "centralized generation of sequential, human-readable ids", "homepage": "https://github.com/forfuture-dev/node-sequential-ids", "license": "MIT", From 1c6a9ec2caaa62397012744dd35c3d4a6b39625b Mon Sep 17 00:00:00 2001 From: Chad Johnson Date: Wed, 13 Sep 2017 23:50:01 -0500 Subject: [PATCH 4/4] Revert "Bumping up version" This reverts commit 67e4af04fabcecfc8cd26555c0ba6d98c67e713a. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e881c82..e5bef2b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sequential-ids", - "version": "0.0.1", + "version": "0.0.0", "description": "centralized generation of sequential, human-readable ids", "homepage": "https://github.com/forfuture-dev/node-sequential-ids", "license": "MIT",