[fix] Prevented emails and userNames from including generally unacceptable characters such as apostrophes, which occur semi-regularly when Faker generates last names such as "o'hara".

Conflicts:
	Faker.js
	lib/internet.js

1 files changed, 4 insertions, 5 deletions

diff --git a/lib/internet.js b/lib/internet.js
index 942529fa..420471d4 100644
--- a/lib/internet.js
+++ b/lib/internet.js
@@ -21,7 +21,7 @@ var internet = {
             result = faker.name.firstName() + faker.random.array_element([".", "_"]) + faker.name.lastName();
             break;
         }
-        return result;
+        return result.replace(/([^A-Z0-9._%+-])/ig, '');
     },
 
     domainName: function () {
@@ -33,7 +33,7 @@ var internet = {
     },
 
     domainWord:  function () {
-        return faker.name.firstName().toLowerCase();
+        return faker.name.firstName().replace(/([^A-Z0-9._%+-])/ig, '').toLowerCase();
     },
 
     ip: function () {
@@ -54,14 +54,13 @@ var internet = {
     },
 
     color: function (baseRed255, baseGreen255, baseBlue255) {
-
         // based on awesome response : http://stackoverflow.com/questions/43044/algorithm-to-randomly-generate-an-aesthetically-pleasing-color-palette
         var red = Math.floor((faker.random.number(256) + baseRed255) / 2);
         var green = Math.floor((faker.random.number(256) + baseRed255) / 2);
         var blue = Math.floor((faker.random.number(256) + baseRed255) / 2);
-
         return '#' + red.toString(16) + green.toString(16) + blue.toString(16);
+
     }
 };
 
-module.exports = internet;
+module.exports = internet;
\ No newline at end of file