Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added "separator" option to generator options, and made store() always get called with expected arguments #2

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Added "separator" option to generator options, and made store() always get called with expected arguments #2

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
faf4e1a
Added "separator" option to generator options.
chaddjohnson Sep 12, 2017
3cede89
store() is now always called with key and unsavedIds.
chaddjohnson Sep 12, 2017
67e4af0
Bumping up version
chaddjohnson Sep 14, 2017
1c6a9ec
Revert "Bumping up version"
chaddjohnson Sep 14, 2017
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
13 changes: 7 additions & 6 deletions Generator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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};
}
}
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -155,13 +156,13 @@ 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);
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;
Expand Down Expand Up @@ -189,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;
Expand Down