cleaned up helpers, added new method for doing symbol replacement

4 files changed, 24 insertions, 25 deletions

diff --git a/helper.js b/helper.js
index 5f01fa27..49086a6b 100644
--- a/helper.js
+++ b/helper.js
@@ -1,43 +1,43 @@
 (function (Helper) {
 
-Helper.randomNumber = function(number) {
-		r = Math.floor(Math.random()*number);
+// returns a single random number based on a range 
+Helper.randomNumber = function(range) {
+		r = Math.floor(Math.random()*range);
 		return r;
 };
-	
+
+// takes an array and returns the array randomly sorted
 Helper.randomize = function(array) {
 		r = Math.floor(Math.random()*array.length);
 		return array[r];
 };
 
-Helper.numerify = function(number_string){
+// parses string for a symbol and replace it with a random number from 1-10  
+Helper.replaceSymbolWithNumber = function(string, symbol){
+  
+  // default symbol is '#' 
+  if(typeof symbol == 'undefined'){
+    var symbol = '#';
+  }
+  
   var str = '';
-  for(var i = 0; i < number_string.length; i++){
-   if(number_string[i] == "#"){
+  for(var i = 0; i < string.length; i++){
+   if(string[i] == symbol){
      str += Math.floor(Math.random()*10);
    }
    else{
-     str += number_string[i];
+     str += string[i];
    }
   }
   return str;
 };
 
+// takes an array and returns it randomized 
 Helper.shuffle = function(o){ 
 	for(var j, x, i = o.length; i; j = parseInt(Math.random() * i), x = o[--i], o[i] = o[j], o[j] = x);
 	return o;
 };
 
-Helper.letterify = function(letter_string){
-  //return letter_string.gsub(/\?/) { ('a'..'z').to_a.rand }
-  return 'zzz';
-};
-Helper.bothify = function(string){
-  // self.letterify(self.numerify(string))
-  //letterify
-  return 'zz11zz';
-};
-
 })(
     // exports will be set in any commonjs platform; use it if it's available
     typeof exports !== "undefined" ?
diff --git a/lib/address.js b/lib/address.js
index 629750b1..4a88916a 100644
--- a/lib/address.js
+++ b/lib/address.js
@@ -2,7 +2,7 @@ var Helper = require('../helper');
 var definitions = require('../lib/definitions');
 
 exports.zip_code = function() {
-	return Helper.numerify(Helper.randomize(["#####", '#####-####']));
+	return Helper.replaceSymbolWithNumber(Helper.randomize(["#####", '#####-####']));
 };
 
 exports.city = function() {
@@ -41,22 +41,21 @@ exports.streetAddress = function(i) {
 	switch(Helper.randomNumber(2))
 		{
 		case 0:
-		 address =  Helper.numerify("#####") + " " + this.streetName();
+		 address =  Helper.replaceSymbolWithNumber("#####") + " " + this.streetName();
 		 break;
 		case 1:
-		 address = Helper.numerify("####") +  " " + this.streetName();
+		 address = Helper.replaceSymbolWithNumber("####") +  " " + this.streetName();
 		 break;
 		case 2:
-		 address = Helper.numerify("###") + " " + this.streetName();
+		 address = Helper.replaceSymbolWithNumber("###") + " " + this.streetName();
 		 break;
 		}
 	var full_address = i ?  address + " " + this.secondaryAddress() : address;
 	return full_address;
 };
 
-
 exports.secondaryAddress = function() {
-	 	return Helper.numerify(Helper.randomize(
+	 	return Helper.replaceSymbolWithNumber(Helper.randomize(
 		[
 			'Apt. ###',
     	'Suite ###'
diff --git a/lib/internet.js b/lib/internet.js
index 3333c5bf..9f81f27e 100644
--- a/lib/internet.js
+++ b/lib/internet.js
@@ -6,5 +6,5 @@ exports.email = function() {
 };
 
 exports.userName = function() {
-
+ 
 };
diff --git a/lib/phone_number.js b/lib/phone_number.js
index 2c514192..5537ff7e 100644
--- a/lib/phone_number.js
+++ b/lib/phone_number.js
@@ -3,7 +3,7 @@ var definitions = require('./definitions');
  
 exports.phoneNumber = function(){
   
-  return Helper.numerify(Helper.randomize(definitions.phone_formats));
+  return Helper.replaceSymbolWithNumber(Helper.randomize(definitions.phone_formats));
   
 };