100% test coverage.

4 files changed, 40 insertions, 40 deletions

diff --git a/lib/address.js b/lib/address.js
index f02d621c..936cbd47 100644
--- a/lib/address.js
+++ b/lib/address.js
@@ -4,7 +4,7 @@ var definitions = require('../lib/definitions');
 
 var address = {
     zipCode: function () {
-        return Helpers.replaceSymbolWithNumber(Helpers.randomize(["#####", '#####-####']));
+        return Helpers.replaceSymbolWithNumber(Faker.random.array_rand(["#####", '#####-####']));
     },
 
     zipCodeFormat: function (format) {
@@ -54,7 +54,7 @@ var address = {
     },
 
     secondaryAddress: function () {
-        return Helpers.replaceSymbolWithNumber(Helpers.randomize(
+        return Helpers.replaceSymbolWithNumber(Faker.random.array_rand(
             [
                 'Apt. ###',
                 'Suite ###'
diff --git a/lib/helpers.js b/lib/helpers.js
index ccfaf561..aa20ba4c 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -1,15 +1,5 @@
 var Faker = require('../index');
 
-// temporary backword-compatibility
-exports.randomNumber = function (range) {
-    return Faker.random.number(range);
-};
-
-// temporary backword-compatibility
-exports.randomize = function (array) {
-    return Faker.random.array_rand(array);
-};
-
 // parses string for a symbol and replace it with a random number from 1-10
 exports.replaceSymbolWithNumber = function (string, symbol) {
     // default symbol is '#'
@@ -102,8 +92,10 @@ exports.userCard = function () {
 };
 
 
+/*
 String.prototype.capitalize = function () { //v1.0
     return this.replace(/\w+/g, function (a) {
         return a.charAt(0).toUpperCase() + a.substr(1).toLowerCase();
     });
 };
+*/
diff --git a/lib/internet.js b/lib/internet.js
index 5efa37a0..022095e9 100644
--- a/lib/internet.js
+++ b/lib/internet.js
@@ -1,36 +1,39 @@
-var Helpers = require('./helpers');
-var definitions = require('./definitions');
+var Faker = require('../index');
 
-exports.email = function () {
-    return this.userName() + "@" + this.domainName();
-};
+var internet = {
+    email: function () {
+        return this.userName() + "@" + this.domainName();
+    },
 
-exports.userName = function () {
-    switch (Helpers.randomNumber(2)) {
-    case 0:
-        return Helpers.randomize(definitions.first_name());
-    case 1:
-        return Helpers.randomize(definitions.first_name()) + Helpers.randomize([".", "_"]) + Helpers.randomize(definitions.last_name());
-    }
-};
+    userName: function () {
+        switch (Faker.random.number(2)) {
+        case 0:
+            return Faker.random.first_name();
+        case 1:
+            return Faker.random.first_name() + Faker.random.array_rand([".", "_"]) + Faker.random.last_name();
+        }
+    },
 
-exports.domainName = function () {
-    return this.domainWord() + "." + Helpers.randomize(definitions.domain_suffix());
-};
+    domainName: function () {
+        return this.domainWord() + "." + Faker.random.domain_suffix();
+    },
 
-exports.domainWord = function () {
-    return Helpers.randomize(definitions.first_name()).toLowerCase();
-};
+    domainWord:  function () {
+        return Faker.random.first_name().toLowerCase();
+    },
 
-exports.ip = function () {
-    var randNum = function () {
-        return (Math.random() * 254 + 1).toFixed(0);
-    };
+    ip: function () {
+        var randNum = function () {
+            return (Math.random() * 254 + 1).toFixed(0);
+        };
 
-    var result = [];
-    for (var i = 0; i < 4; i++) {
-        result[i] = randNum();
-    }
+        var result = [];
+        for (var i = 0; i < 4; i++) {
+            result[i] = randNum();
+        }
 
-    return result.join(".");
+        return result.join(".");
+    }
 };
+
+module.exports = internet;
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;