From 0b3cfbee64547e7a624c8d8f988c293ed463cf4b Mon Sep 17 00:00:00 2001 From: Bryan Donovan Date: Sat, 5 Jan 2013 19:54:21 -0800 Subject: refactoring so we do not need to use Helpers.randomize() everywhere --- lib/random.js | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 lib/random.js (limited to 'lib/random.js') diff --git a/lib/random.js b/lib/random.js new file mode 100644 index 00000000..abfba1a4 --- /dev/null +++ b/lib/random.js @@ -0,0 +1,34 @@ +var definitions = require('./definitions'); + +var random = { + // returns a single random number based on a range + number: function (range) { + var r = Math.floor(Math.random() * range); + console.log(r); + return r; + }, + + // takes an array and returns the array randomly sorted + array_rand: function (array) { + var r = Math.floor(Math.random() * array.length); + return array[r]; + } +}; + +var method_names = [ + 'catch_phrase_adjective', + 'catch_phrase_descriptor', + 'catch_phrase_noun', + 'bs_adjective', + 'bs_buzz', + 'bs_noun' +]; + +for (var i = 0; i < method_names.length; i++) { + var method_name = method_names[i]; + random[method_name] = function () { + return random.array_rand(definitions[method_name]()); + }; +} + +module.exports = random; -- cgit v1.2.3 From 71884c826400558d62e0b131b236b84c93f2889d Mon Sep 17 00:00:00 2001 From: Bryan Donovan Date: Sat, 5 Jan 2013 20:06:55 -0800 Subject: refactoring to use random.js --- lib/random.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'lib/random.js') diff --git a/lib/random.js b/lib/random.js index abfba1a4..a052ecc6 100644 --- a/lib/random.js +++ b/lib/random.js @@ -3,9 +3,7 @@ var definitions = require('./definitions'); var random = { // returns a single random number based on a range number: function (range) { - var r = Math.floor(Math.random() * range); - console.log(r); - return r; + return Math.floor(Math.random() * range); }, // takes an array and returns the array randomly sorted @@ -15,7 +13,17 @@ var random = { } }; +/** + * Generate methods that return random elements from definition arrays. + */ var method_names = [ + // Name + 'first_name', + 'last_name', + 'name_prefix', + 'name_suffix', + + // Company 'catch_phrase_adjective', 'catch_phrase_descriptor', 'catch_phrase_noun', -- cgit v1.2.3 From 1a635e01e7e4899b0fd8f1746259d4598103c2c3 Mon Sep 17 00:00:00 2001 From: Bryan Donovan Date: Sun, 6 Jan 2013 19:09:00 -0800 Subject: initial address.unit.js --- lib/random.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'lib/random.js') diff --git a/lib/random.js b/lib/random.js index a052ecc6..f1a4dfbd 100644 --- a/lib/random.js +++ b/lib/random.js @@ -17,6 +17,11 @@ var random = { * Generate methods that return random elements from definition arrays. */ var method_names = [ + // Address + 'city_prefix', + 'city_suffix', + 'street_suffix', + // Name 'first_name', 'last_name', @@ -32,11 +37,10 @@ var method_names = [ 'bs_noun' ]; -for (var i = 0; i < method_names.length; i++) { - var method_name = method_names[i]; +method_names.forEach(function (method_name) { random[method_name] = function () { return random.array_rand(definitions[method_name]()); }; -} +}); module.exports = random; -- cgit v1.2.3 From ee9c13d35ed0dbd67e4a27ed3d525fa5926929a5 Mon Sep 17 00:00:00 2001 From: Bryan Donovan Date: Mon, 7 Jan 2013 00:03:37 -0800 Subject: brState() tests --- lib/random.js | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lib/random.js') diff --git a/lib/random.js b/lib/random.js index f1a4dfbd..e7a9b667 100644 --- a/lib/random.js +++ b/lib/random.js @@ -21,6 +21,12 @@ var method_names = [ 'city_prefix', 'city_suffix', 'street_suffix', + 'br_state', + 'br_state_abbr', + 'us_state', + 'us_state_abbr', + 'uk_county', + 'uk_country', // Name 'first_name', -- cgit v1.2.3 From 9621b52573b83a70ee9543e67fd86a3dc8a75862 Mon Sep 17 00:00:00 2001 From: Bryan Donovan Date: Mon, 7 Jan 2013 09:37:13 -0800 Subject: working browser test --- lib/random.js | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) (limited to 'lib/random.js') diff --git a/lib/random.js b/lib/random.js index e7a9b667..698dd68a 100644 --- a/lib/random.js +++ b/lib/random.js @@ -10,6 +10,82 @@ var random = { array_rand: function (array) { var r = Math.floor(Math.random() * array.length); return array[r]; + }, + + city_prefix: function () { + return this.array_rand(definitions.city_prefix()); + }, + + city_suffix: function () { + return this.array_rand(definitions.city_suffix()); + }, + + street_suffix: function () { + return this.array_rand(definitions.street_suffix()); + }, + + br_state: function () { + return this.array_rand(definitions.br_state()); + }, + + br_state_abbr: function () { + return this.array_rand(definitions.br_state_abbr()); + }, + + us_state: function () { + return this.array_rand(definitions.us_state()); + }, + + us_state_abbr: function () { + return this.array_rand(definitions.us_state_abbr()); + }, + + uk_county: function () { + return this.array_rand(definitions.uk_county()); + }, + + uk_country: function () { + return this.array_rand(definitions.uk_country()); + }, + + first_name: function () { + return this.array_rand(definitions.first_name()); + }, + + last_name: function () { + return this.array_rand(definitions.last_name()); + }, + + name_prefix: function () { + return this.array_rand(definitions.name_prefix()); + }, + + name_suffix: function () { + return this.array_rand(definitions.name_suffix()); + }, + + catch_phrase_adjective: function () { + return this.array_rand(definitions.catch_phrase_adjective()); + }, + + catch_phrase_descriptor: function () { + return this.array_rand(definitions.catch_phrase_descriptor()); + }, + + catch_phrase_noun: function () { + return this.array_rand(definitions.catch_phrase_noun()); + }, + + bs_adjective: function () { + return this.array_rand(definitions.bs_adjective()); + }, + + bs_buzz: function () { + return this.array_rand(definitions.bs_buzz()); + }, + + bs_noun: function () { + return this.array_rand(definitions.bs_noun()); } }; @@ -43,10 +119,20 @@ var method_names = [ 'bs_noun' ]; +/* method_names.forEach(function (method_name) { random[method_name] = function () { return random.array_rand(definitions[method_name]()); }; }); +method_names.forEach(function (method_name) { + var str = method_name + ': function () {\n' + + ' return random.array_rand(definitions.' + method_name + '());\n' + + '},\n'; + console.log(str); +}); + +*/ + module.exports = random; -- cgit v1.2.3 From 43ae1edac54048522d8209a63674b04db8a3d8b8 Mon Sep 17 00:00:00 2001 From: Bryan Donovan Date: Mon, 7 Jan 2013 09:46:33 -0800 Subject: cleanup old code --- lib/random.js | 46 ---------------------------------------------- 1 file changed, 46 deletions(-) (limited to 'lib/random.js') diff --git a/lib/random.js b/lib/random.js index 698dd68a..5717a20a 100644 --- a/lib/random.js +++ b/lib/random.js @@ -89,50 +89,4 @@ var random = { } }; -/** - * Generate methods that return random elements from definition arrays. - */ -var method_names = [ - // Address - 'city_prefix', - 'city_suffix', - 'street_suffix', - 'br_state', - 'br_state_abbr', - 'us_state', - 'us_state_abbr', - 'uk_county', - 'uk_country', - - // Name - 'first_name', - 'last_name', - 'name_prefix', - 'name_suffix', - - // Company - 'catch_phrase_adjective', - 'catch_phrase_descriptor', - 'catch_phrase_noun', - 'bs_adjective', - 'bs_buzz', - 'bs_noun' -]; - -/* -method_names.forEach(function (method_name) { - random[method_name] = function () { - return random.array_rand(definitions[method_name]()); - }; -}); - -method_names.forEach(function (method_name) { - var str = method_name + ': function () {\n' + - ' return random.array_rand(definitions.' + method_name + '());\n' + - '},\n'; - console.log(str); -}); - -*/ - module.exports = random; -- cgit v1.2.3 From d3299b466fa0c6c4e755d2ce39fb8bec6d995bfa Mon Sep 17 00:00:00 2001 From: Bryan Donovan Date: Mon, 7 Jan 2013 11:26:53 -0800 Subject: phone number tests --- lib/random.js | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib/random.js') diff --git a/lib/random.js b/lib/random.js index 5717a20a..89dbd1fd 100644 --- a/lib/random.js +++ b/lib/random.js @@ -86,6 +86,10 @@ var random = { bs_noun: function () { return this.array_rand(definitions.bs_noun()); + }, + + phone_formats: function () { + return this.array_rand(definitions.phone_formats()); } }; -- cgit v1.2.3 From 0c8412564fc2dbd47f01e86f93198be390ef4335 Mon Sep 17 00:00:00 2001 From: Bryan Donovan Date: Mon, 7 Jan 2013 12:13:55 -0800 Subject: 100% test coverage. --- lib/random.js | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lib/random.js') diff --git a/lib/random.js b/lib/random.js index 89dbd1fd..6857240f 100644 --- a/lib/random.js +++ b/lib/random.js @@ -90,7 +90,12 @@ var random = { phone_formats: function () { return this.array_rand(definitions.phone_formats()); + }, + + domain_suffix: function () { + return this.array_rand(definitions.domain_suffix()); } + }; module.exports = random; -- cgit v1.2.3 From e483b72d3f1cb805fede585a71fa1e48ec568f12 Mon Sep 17 00:00:00 2001 From: Bryan Donovan Date: Mon, 7 Jan 2013 12:46:13 -0800 Subject: renaming array_rand to array_element --- lib/random.js | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'lib/random.js') diff --git a/lib/random.js b/lib/random.js index 6857240f..2a149ee0 100644 --- a/lib/random.js +++ b/lib/random.js @@ -7,93 +7,93 @@ var random = { }, // takes an array and returns the array randomly sorted - array_rand: function (array) { + array_element: function (array) { var r = Math.floor(Math.random() * array.length); return array[r]; }, city_prefix: function () { - return this.array_rand(definitions.city_prefix()); + return this.array_element(definitions.city_prefix()); }, city_suffix: function () { - return this.array_rand(definitions.city_suffix()); + return this.array_element(definitions.city_suffix()); }, street_suffix: function () { - return this.array_rand(definitions.street_suffix()); + return this.array_element(definitions.street_suffix()); }, br_state: function () { - return this.array_rand(definitions.br_state()); + return this.array_element(definitions.br_state()); }, br_state_abbr: function () { - return this.array_rand(definitions.br_state_abbr()); + return this.array_element(definitions.br_state_abbr()); }, us_state: function () { - return this.array_rand(definitions.us_state()); + return this.array_element(definitions.us_state()); }, us_state_abbr: function () { - return this.array_rand(definitions.us_state_abbr()); + return this.array_element(definitions.us_state_abbr()); }, uk_county: function () { - return this.array_rand(definitions.uk_county()); + return this.array_element(definitions.uk_county()); }, uk_country: function () { - return this.array_rand(definitions.uk_country()); + return this.array_element(definitions.uk_country()); }, first_name: function () { - return this.array_rand(definitions.first_name()); + return this.array_element(definitions.first_name()); }, last_name: function () { - return this.array_rand(definitions.last_name()); + return this.array_element(definitions.last_name()); }, name_prefix: function () { - return this.array_rand(definitions.name_prefix()); + return this.array_element(definitions.name_prefix()); }, name_suffix: function () { - return this.array_rand(definitions.name_suffix()); + return this.array_element(definitions.name_suffix()); }, catch_phrase_adjective: function () { - return this.array_rand(definitions.catch_phrase_adjective()); + return this.array_element(definitions.catch_phrase_adjective()); }, catch_phrase_descriptor: function () { - return this.array_rand(definitions.catch_phrase_descriptor()); + return this.array_element(definitions.catch_phrase_descriptor()); }, catch_phrase_noun: function () { - return this.array_rand(definitions.catch_phrase_noun()); + return this.array_element(definitions.catch_phrase_noun()); }, bs_adjective: function () { - return this.array_rand(definitions.bs_adjective()); + return this.array_element(definitions.bs_adjective()); }, bs_buzz: function () { - return this.array_rand(definitions.bs_buzz()); + return this.array_element(definitions.bs_buzz()); }, bs_noun: function () { - return this.array_rand(definitions.bs_noun()); + return this.array_element(definitions.bs_noun()); }, phone_formats: function () { - return this.array_rand(definitions.phone_formats()); + return this.array_element(definitions.phone_formats()); }, domain_suffix: function () { - return this.array_rand(definitions.domain_suffix()); + return this.array_element(definitions.domain_suffix()); } }; -- cgit v1.2.3 From a0d1eb56a3b8fe4bcc5ab4bf244b7cb8ee4b78d7 Mon Sep 17 00:00:00 2001 From: Joel Fillmore Date: Tue, 19 Mar 2013 22:48:39 -0700 Subject: Improve perf by declaring definitions as arrays --- lib/random.js | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'lib/random.js') diff --git a/lib/random.js b/lib/random.js index 2a149ee0..7d010109 100644 --- a/lib/random.js +++ b/lib/random.js @@ -13,87 +13,87 @@ var random = { }, city_prefix: function () { - return this.array_element(definitions.city_prefix()); + return this.array_element(definitions.city_prefix); }, city_suffix: function () { - return this.array_element(definitions.city_suffix()); + return this.array_element(definitions.city_suffix); }, street_suffix: function () { - return this.array_element(definitions.street_suffix()); + return this.array_element(definitions.street_suffix); }, br_state: function () { - return this.array_element(definitions.br_state()); + return this.array_element(definitions.br_state); }, br_state_abbr: function () { - return this.array_element(definitions.br_state_abbr()); + return this.array_element(definitions.br_state_abbr); }, us_state: function () { - return this.array_element(definitions.us_state()); + return this.array_element(definitions.us_state); }, us_state_abbr: function () { - return this.array_element(definitions.us_state_abbr()); + return this.array_element(definitions.us_state_abbr); }, uk_county: function () { - return this.array_element(definitions.uk_county()); + return this.array_element(definitions.uk_county); }, uk_country: function () { - return this.array_element(definitions.uk_country()); + return this.array_element(definitions.uk_country); }, first_name: function () { - return this.array_element(definitions.first_name()); + return this.array_element(definitions.first_name); }, last_name: function () { - return this.array_element(definitions.last_name()); + return this.array_element(definitions.last_name); }, name_prefix: function () { - return this.array_element(definitions.name_prefix()); + return this.array_element(definitions.name_prefix); }, name_suffix: function () { - return this.array_element(definitions.name_suffix()); + return this.array_element(definitions.name_suffix); }, catch_phrase_adjective: function () { - return this.array_element(definitions.catch_phrase_adjective()); + return this.array_element(definitions.catch_phrase_adjective); }, catch_phrase_descriptor: function () { - return this.array_element(definitions.catch_phrase_descriptor()); + return this.array_element(definitions.catch_phrase_descriptor); }, catch_phrase_noun: function () { - return this.array_element(definitions.catch_phrase_noun()); + return this.array_element(definitions.catch_phrase_noun); }, bs_adjective: function () { - return this.array_element(definitions.bs_adjective()); + return this.array_element(definitions.bs_adjective); }, bs_buzz: function () { - return this.array_element(definitions.bs_buzz()); + return this.array_element(definitions.bs_buzz); }, bs_noun: function () { - return this.array_element(definitions.bs_noun()); + return this.array_element(definitions.bs_noun); }, phone_formats: function () { - return this.array_element(definitions.phone_formats()); + return this.array_element(definitions.phone_formats); }, domain_suffix: function () { - return this.array_element(definitions.domain_suffix()); + return this.array_element(definitions.domain_suffix); } }; -- cgit v1.2.3 From dc8c70cb3ba5c886b8c65c887f729a7b31130390 Mon Sep 17 00:00:00 2001 From: Ryan Schmukler Date: Wed, 5 Jun 2013 18:17:08 -0500 Subject: Switched from this to var name to avoid context issues --- lib/random.js | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'lib/random.js') diff --git a/lib/random.js b/lib/random.js index 7d010109..8a3b3abe 100644 --- a/lib/random.js +++ b/lib/random.js @@ -13,87 +13,87 @@ var random = { }, city_prefix: function () { - return this.array_element(definitions.city_prefix); + return random.array_element(definitions.city_prefix); }, city_suffix: function () { - return this.array_element(definitions.city_suffix); + return random.array_element(definitions.city_suffix); }, street_suffix: function () { - return this.array_element(definitions.street_suffix); + return random.array_element(definitions.street_suffix); }, br_state: function () { - return this.array_element(definitions.br_state); + return random.array_element(definitions.br_state); }, br_state_abbr: function () { - return this.array_element(definitions.br_state_abbr); + return random.array_element(definitions.br_state_abbr); }, us_state: function () { - return this.array_element(definitions.us_state); + return random.array_element(definitions.us_state); }, us_state_abbr: function () { - return this.array_element(definitions.us_state_abbr); + return random.array_element(definitions.us_state_abbr); }, uk_county: function () { - return this.array_element(definitions.uk_county); + return random.array_element(definitions.uk_county); }, uk_country: function () { - return this.array_element(definitions.uk_country); + return random.array_element(definitions.uk_country); }, first_name: function () { - return this.array_element(definitions.first_name); + return random.array_element(definitions.first_name); }, last_name: function () { - return this.array_element(definitions.last_name); + return random.array_element(definitions.last_name); }, name_prefix: function () { - return this.array_element(definitions.name_prefix); + return random.array_element(definitions.name_prefix); }, name_suffix: function () { - return this.array_element(definitions.name_suffix); + return random.array_element(definitions.name_suffix); }, catch_phrase_adjective: function () { - return this.array_element(definitions.catch_phrase_adjective); + return random.array_element(definitions.catch_phrase_adjective); }, catch_phrase_descriptor: function () { - return this.array_element(definitions.catch_phrase_descriptor); + return random.array_element(definitions.catch_phrase_descriptor); }, catch_phrase_noun: function () { - return this.array_element(definitions.catch_phrase_noun); + return random.array_element(definitions.catch_phrase_noun); }, bs_adjective: function () { - return this.array_element(definitions.bs_adjective); + return random.array_element(definitions.bs_adjective); }, bs_buzz: function () { - return this.array_element(definitions.bs_buzz); + return random.array_element(definitions.bs_buzz); }, bs_noun: function () { - return this.array_element(definitions.bs_noun); + return random.array_element(definitions.bs_noun); }, phone_formats: function () { - return this.array_element(definitions.phone_formats); + return random.array_element(definitions.phone_formats); }, domain_suffix: function () { - return this.array_element(definitions.domain_suffix); + return random.array_element(definitions.domain_suffix); } }; -- cgit v1.2.3 From 2dd08617d9c26d545010e8c90080ba182b0ca47f Mon Sep 17 00:00:00 2001 From: FotoVerite Date: Wed, 12 Jun 2013 02:00:49 -0400 Subject: Revert "Merge pull request #59 from rschmukler/this-fix" This reverts commit dceaccf2ca2c2ff217436404c41f2bf69f7577f6, reversing changes made to 1d28802e388277a6b75efbaa1589027879df101f. --- lib/random.js | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'lib/random.js') diff --git a/lib/random.js b/lib/random.js index 8a3b3abe..7d010109 100644 --- a/lib/random.js +++ b/lib/random.js @@ -13,87 +13,87 @@ var random = { }, city_prefix: function () { - return random.array_element(definitions.city_prefix); + return this.array_element(definitions.city_prefix); }, city_suffix: function () { - return random.array_element(definitions.city_suffix); + return this.array_element(definitions.city_suffix); }, street_suffix: function () { - return random.array_element(definitions.street_suffix); + return this.array_element(definitions.street_suffix); }, br_state: function () { - return random.array_element(definitions.br_state); + return this.array_element(definitions.br_state); }, br_state_abbr: function () { - return random.array_element(definitions.br_state_abbr); + return this.array_element(definitions.br_state_abbr); }, us_state: function () { - return random.array_element(definitions.us_state); + return this.array_element(definitions.us_state); }, us_state_abbr: function () { - return random.array_element(definitions.us_state_abbr); + return this.array_element(definitions.us_state_abbr); }, uk_county: function () { - return random.array_element(definitions.uk_county); + return this.array_element(definitions.uk_county); }, uk_country: function () { - return random.array_element(definitions.uk_country); + return this.array_element(definitions.uk_country); }, first_name: function () { - return random.array_element(definitions.first_name); + return this.array_element(definitions.first_name); }, last_name: function () { - return random.array_element(definitions.last_name); + return this.array_element(definitions.last_name); }, name_prefix: function () { - return random.array_element(definitions.name_prefix); + return this.array_element(definitions.name_prefix); }, name_suffix: function () { - return random.array_element(definitions.name_suffix); + return this.array_element(definitions.name_suffix); }, catch_phrase_adjective: function () { - return random.array_element(definitions.catch_phrase_adjective); + return this.array_element(definitions.catch_phrase_adjective); }, catch_phrase_descriptor: function () { - return random.array_element(definitions.catch_phrase_descriptor); + return this.array_element(definitions.catch_phrase_descriptor); }, catch_phrase_noun: function () { - return random.array_element(definitions.catch_phrase_noun); + return this.array_element(definitions.catch_phrase_noun); }, bs_adjective: function () { - return random.array_element(definitions.bs_adjective); + return this.array_element(definitions.bs_adjective); }, bs_buzz: function () { - return random.array_element(definitions.bs_buzz); + return this.array_element(definitions.bs_buzz); }, bs_noun: function () { - return random.array_element(definitions.bs_noun); + return this.array_element(definitions.bs_noun); }, phone_formats: function () { - return random.array_element(definitions.phone_formats); + return this.array_element(definitions.phone_formats); }, domain_suffix: function () { - return random.array_element(definitions.domain_suffix); + return this.array_element(definitions.domain_suffix); } }; -- cgit v1.2.3