[api] [minor] Added default values for more methods. Cleaned up image module. Use a less specific regex for usernames.

6 files changed, 29 insertions, 17 deletions

diff --git a/lib/helpers.js b/lib/helpers.js
index 91d73c86..99a02e27 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -107,7 +107,7 @@ exports.contextualCard = function () {
   return {
       "name": name,
       "username": userName,
-      "avatar": faker.internet.avatarUri(),
+      "avatar": faker.internet.avatar(),
       "email": faker.internet.email(userName),
       "dob": faker.date.past(50, new Date("Sat Sep 20 1992 21:35:02 GMT+0200 (CEST)")),
       "phone": faker.phone.phoneNumber(),
diff --git a/lib/image.js b/lib/image.js
index 522cc672..aa983139 100644
--- a/lib/image.js
+++ b/lib/image.js
@@ -1,8 +1,12 @@
 var faker = require('../index');
 
 var image = {
+  image: function () {
+    var categories = ["abstract", "animals", "business", "cats", "city", "food", "nightlife", "fashion", "people", "nature", "sports", "technics", "transport"];
+    return image[faker.random.array_element(categories)]();
+  },
   avatar: function () {
-    return faker.internet.avatarUri();
+    return faker.internet.avatar();
   },
   imageUrl: function (width, height, category) {
       var width = width || 640;
@@ -14,7 +18,7 @@ var image = {
       }
       return url;
   },
-  abstractImage: function (width, height) {
+  abstract: function (width, height) {
     return faker.image.imageUrl(width, height, 'abstract');
   },
   animals: function (width, height) {
diff --git a/lib/internet.js b/lib/internet.js
index 82a1d6ac..3ea64afb 100644
--- a/lib/internet.js
+++ b/lib/internet.js
@@ -4,29 +4,33 @@ var faker = require('../index'),
 
 var internet = {
 
-    avatarUri: function () {
+    avatar: function () {
         return faker.random.array_element(faker.definitions.internet.avatar_uri);
     },
 
-    email: function (username, provider) {
+    email: function (firstName, lastName, provider) {
         provider = provider || faker.random.array_element(faker.definitions.internet.free_email);
-        return (username || faker.helpers.slugify(faker.internet.userName())) + "@" + provider;
+        return  faker.helpers.slugify(faker.internet.userName(firstName, lastName)) + "@" + provider;
     },
 
-    userName: function (name) {
+    userName: function (firstName, lastName) {
         var result;
+        firstName = firstName || faker.name.firstName();
+        lastName = lastName || faker.name.lastName();
         switch (faker.random.number(2)) {
         case 0:
-            result = (name || faker.name.firstName()) + faker.random.number(99);
+            result = firstName + faker.random.number(99);
             break;
         case 1:
-            result = (name || faker.name.firstName()) + faker.random.array_element([".", "_"]) + faker.name.lastName();
+            result = firstName + faker.random.array_element([".", "_"]) + lastName;
             break;
         case 2:
-            result = (name || faker.name.firstName()) + faker.random.array_element([".", "_"]) + faker.name.lastName() + faker.random.number(99);
+            result = firstName + faker.random.array_element([".", "_"]) + lastName + faker.random.number(99);
             break;
         }
-        return result.replace(/([^A-Z0-9._%+-])/ig, '');
+        result = result.replace(/'/g, "");
+        result = result.replace(/ /g, "");
+        return result;
     },
 
     domainName: function () {
diff --git a/lib/name.js b/lib/name.js
index c697fe8d..a81f8ce1 100644
--- a/lib/name.js
+++ b/lib/name.js
@@ -9,16 +9,18 @@ var _name = {
       return faker.random.array_element(faker.definitions.name.last_name)
     },
 
-    findName: function (name) {
+    findName: function (firstName, lastName) {
         var r = faker.random.number(8);
+        firstName = firstName || faker.name.firstName();
+        lastName = lastName || faker.name.lastName();
         switch (r) {
         case 0:
-            return faker.name.prefix() + " " + (name || faker.name.firstName()) + " " + faker.name.lastName();
+            return faker.name.prefix() + " " + firstName + " " + lastName;
         case 1:
-            return (name || faker.name.firstName()) + " " + faker.name.lastName() + " " + faker.name.suffix();
+            return firstName + " " + lastName + " " + faker.name.suffix();
         }
 
-        return faker.name.firstName() + " " + faker.name.lastName();
+        return firstName + " " + lastName;
     },
 
     prefix: function () {
diff --git a/lib/phone_number.js b/lib/phone_number.js
index 29d4f161..500ade24 100644
--- a/lib/phone_number.js
+++ b/lib/phone_number.js
@@ -1,8 +1,9 @@
 var faker = require('../index');
 
 var phone = {
-    phoneNumber: function () {
-        return faker.helpers.replaceSymbolWithNumber(faker.phone.phoneFormats());
+    phoneNumber: function (format) {
+        format = format || faker.phone.phoneFormats();
+        return faker.helpers.replaceSymbolWithNumber(format);
     },
 
     // FIXME: this is strange passing in an array index.
diff --git a/lib/random.js b/lib/random.js
index ada5ed86..70bcaf04 100644
--- a/lib/random.js
+++ b/lib/random.js
@@ -44,6 +44,7 @@ var random = {
 
     // takes an object and returns the randomly key or value
     object_element: function (object, field) {
+        object = object || {};
         var array = Object.keys(object);
         var key = faker.random.array_element(array);