finished up name

3 files changed, 24 insertions, 6 deletions

diff --git a/index.js b/index.js
index 7de6acaa..8fe2f293 100644
--- a/index.js
+++ b/index.js
@@ -10,11 +10,12 @@ Faker.Address = require('./lib/address');
 var Helper = require('helper');;
 
 sys.puts(JSON.stringify(Faker.Name.first_name()));
+sys.puts(JSON.stringify(Faker.Name.findName()));
 sys.puts(JSON.stringify(Faker.Address.zip_code()));
 sys.puts(JSON.stringify(Faker.Address.secondaryAddress()));
 sys.puts(JSON.stringify(Faker.Address.city()));
-sys.puts(JSON.stringify(Faker.Address.street_name()));
-sys.puts(JSON.stringify(Faker.Address.street_address()));
+sys.puts(JSON.stringify(Faker.Address.streetName()));
+sys.puts(JSON.stringify(Faker.Address.streetAddress()));
 sys.puts(JSON.stringify(Faker.Address.street_address(true)));
 
 
diff --git a/lib/address.js b/lib/address.js
index d185ae3a..57de6b93 100644
--- a/lib/address.js
+++ b/lib/address.js
@@ -25,7 +25,7 @@ exports.city = function() {
 	}
 };
 
-exports.street_name = function() {
+exports.streetName = function() {
 	switch(Helper.randomNumber(1))
 	{
 	case 0:
@@ -37,7 +37,7 @@ exports.street_name = function() {
 	}
 };
 
-exports.street_address = function(i) {
+exports.streetAddress = function(i) {
 	if( typeof i == 'undefined'){ var i = false;}
 	var address = "";
 	switch(Helper.randomNumber(2))
diff --git a/lib/name.js b/lib/name.js
index dd564cd0..5389893d 100644
--- a/lib/name.js
+++ b/lib/name.js
@@ -1,8 +1,25 @@
+var Helper = require('../helper');
 var definitions = require('./definitions');
 
-var name = exports.first_name = function(){
+exports.first_name = function(){
   
   return definitions.first_name[0];
   //Math.floor(Math.random()*10);
   
-};
\ No newline at end of file
+};
+
+exports.findName = function() {
+	switch(Helper.randomNumber(8))
+	{
+	case 0:
+	 return Helper.randomize(definitions.name_prefix) + " " + Helper.randomize(definitions.first_name) + " " +  Helper.randomize(definitions.last_name);
+	 break;
+	case 1:
+	 return Helper.randomize(definitions.first_name) + " " + Helper.randomize(definitions.last_name); + " " + Helper.randomize(definitions.name_suffix);
+	  break;
+	case 2,3,4,5,6,7:
+		return Helper.randomize(definitions.first_name) + Helper.randomize(definitions.last_name);
+	  break;
+	}
+};
+    
\ No newline at end of file