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

1 files changed, 12 insertions, 8 deletions

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 () {