From bc0bf3b6a89fe95eda63454c6cc276d6be040c62 Mon Sep 17 00:00:00 2001 From: Mikhail Fedosov Date: Fri, 15 Mar 2013 16:39:58 +0400 Subject: fix #42: Email has invalid characters --- examples/js/Faker.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'examples') diff --git a/examples/js/Faker.js b/examples/js/Faker.js index f2f38683..9913dafd 100644 --- a/examples/js/Faker.js +++ b/examples/js/Faker.js @@ -17,7 +17,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/*************** AUTOGENERATED @ 1357666531311 *************** +/*************** AUTOGENERATED @ 1363350933936 *************** WARNING: THIS FILE WAS AUTOGENERATED BY THE FAKER BUILD SCRIPT MODIFYING THIS FILE IS FINE, BUT YOU REALLY SHOULD BE MODIFYING THE LIBRARY DIRECTLY AND REGENERATING THIS FILE USING BUILD.js!!!! @@ -146,16 +146,20 @@ Faker.PhoneNumber.phoneNumberFormat = function (phoneFormatsArrayIndex) { Faker.Internet = {}; Faker.Internet.email = function () { - return this.userName() + "@" + this.domainName(); + return Faker.Helpers.slugify(this.userName()) + "@" + Faker.Helpers.slugify(this.domainName()); }; Faker.Internet.userName = function () { + var result; switch (Faker.random.number(2)) { case 0: - return Faker.random.first_name(); + result = Faker.random.first_name(); + break; case 1: - return Faker.random.first_name() + Faker.random.array_element([".", "_"]) + Faker.random.last_name(); + result = Faker.random.first_name() + Faker.random.array_element([".", "_"]) + Faker.random.last_name(); + break; } + return result; }; Faker.Internet.domainName = function () { @@ -258,6 +262,10 @@ Faker.Helpers.randomize = function (array) { return Faker.random.array_element(array); }; +Faker.Helpers.slugify = function (string) { + return string.replace(/ /g, '-').replace(/[^\w\.\-]+/g, ''); +}; + Faker.Helpers.replaceSymbolWithNumber = function (string, symbol) { // default symbol is '#' if (symbol === undefined) { -- cgit v1.2.3