working browser test

2 files changed, 93 insertions, 7 deletions

diff --git a/lib/address.js b/lib/address.js
index 852d50cb..abe041ba 100644
--- a/lib/address.js
+++ b/lib/address.js
@@ -1,13 +1,13 @@
-var helpers = require('./helpers');
+var Helpers = require('./Helpers');
 var Faker = require('../index');
 var definitions = require('../lib/definitions');
 
 exports.zipCode = function () {
-    return helpers.replaceSymbolWithNumber(helpers.randomize(["#####", '#####-####']));
+    return Helpers.replaceSymbolWithNumber(Helpers.randomize(["#####", '#####-####']));
 };
 
 exports.zipCodeFormat = function (format) {
-    return helpers.replaceSymbolWithNumber(["#####", '#####-####'][format]);
+    return Helpers.replaceSymbolWithNumber(["#####", '#####-####'][format]);
 };
 
 exports.city = function () {
@@ -40,20 +40,20 @@ exports.streetAddress = function (useFullAddress) {
     var address = "";
     switch (Faker.random.number(2)) {
     case 0:
-        address = helpers.replaceSymbolWithNumber("#####") + " " + this.streetName();
+        address = Helpers.replaceSymbolWithNumber("#####") + " " + this.streetName();
         break;
     case 1:
-        address = helpers.replaceSymbolWithNumber("####") +  " " + this.streetName();
+        address = Helpers.replaceSymbolWithNumber("####") +  " " + this.streetName();
         break;
     case 2:
-        address = helpers.replaceSymbolWithNumber("###") + " " + this.streetName();
+        address = Helpers.replaceSymbolWithNumber("###") + " " + this.streetName();
         break;
     }
     return useFullAddress ? (address + " " + this.secondaryAddress()) : address;
 };
 
 exports.secondaryAddress = function () {
-    return helpers.replaceSymbolWithNumber(helpers.randomize(
+    return Helpers.replaceSymbolWithNumber(Helpers.randomize(
         [
             'Apt. ###',
             'Suite ###'
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;