Merge branch 'master' of https://github.com/Marak/faker.js

3 files changed, 40 insertions, 3 deletions

diff --git a/examples/browser/index.html b/examples/browser/index.html
index 99a961dd..d5842bd2 100644
--- a/examples/browser/index.html
+++ b/examples/browser/index.html
@@ -121,6 +121,7 @@
               var dob = faker.date.past(50, new Date("Sat Sep 20 1992 21:35:02 GMT+0200 (CEST)"));
               dob = dob.getFullYear() + "-" + (dob.getMonth()+1) + "-" + dob.getDate();  // First month is "1"
               $('#inputName').attr("value", faker.name.findName(firstName, lastName));
+              // $('#inputGender').attr("value", faker.name.gender());
               $('#inputDob').attr("value", dob);
               $('#inputStreetAddress').attr("value", faker.address.streetAddress());
               $('#inputCityStateZip').attr("value", faker.address.city() + ", " + faker.address.stateAbbr() + " " + faker.address.zipCode());
@@ -189,7 +190,6 @@
             <button id="generateName" type="button" class="btn btn-primary">Generate New</button>
           </div>
         </div>
-        
         <div class="form-group">
           <label for="inputName" class="col-lg-2 control-label">Name:</label>
           <div class="col-lg-10">
@@ -259,6 +259,14 @@
             <img class="" id="imageAvatar"/>
           </div>
         </div>
+        <!--
+        <div class="form-group">
+          <label for="inputGender" class="col-lg-2 control-label">Gender:</label>
+          <div class="col-lg-10">
+            <input type="text" class="form-control" id="inputGender" placeholder="Gender">
+          </div>
+        </div>
+        -->
 
       </fieldset>
     </form>
diff --git a/examples/node/generateSet.js b/examples/node/generateSet.js
index 3bcd42ad..bd0be031 100644
--- a/examples/node/generateSet.js
+++ b/examples/node/generateSet.js
@@ -1,6 +1,6 @@
 var fs = require('fs');
 
-var faker= require('../../index');
+var faker = require('../../index');
 
 
 // generate dataSet as example
@@ -10,7 +10,7 @@ fs.writeFile(__dirname + '/dataSet.json',  JSON.stringify(faker.helpers.userCard
 // generate bigDataSet as example
 var bigSet = [];
 
-for(i = 20; i >= 0; i--){
+for(var i = 20; i >= 0; i--){
   bigSet.push(faker.helpers.userCard());
 };
 
diff --git a/examples/node/unique-values.js b/examples/node/unique-values.js
new file mode 100644
index 00000000..3c346612
--- /dev/null
+++ b/examples/node/unique-values.js
@@ -0,0 +1,29 @@
+var faker = require('../../index');
+
+var emails = {};
+var conflicts = 0;
+// emails estimated: 1,055,881
+// full names estimated: 1,185,139
+for (var i = 0; i < 100000; i++) {
+
+  // call function with no arguments
+  var email = faker.unique(faker.internet.email);
+
+  // or with function arguments as argument array
+    // var email = faker.unique(faker.internet.email, [null, null, 'marak.com']);
+
+  // or with custom options for maxTime as milliseconds or maxRetries
+    // var email = faker.unique(faker.internet.email, [null, null, 'marak.com'], { maxRetries: 1, maxTime: 50 });
+
+  if (typeof emails[email] === 'undefined') {
+    // found a unique new item
+    emails[email] = true;
+  } else {
+    // found a conflicting item ( should not happen using faker.unique() )
+    conflicts++;
+  }
+}
+console.log('total conflicts', conflicts); // should be zero using faker.unique()
+console.log('total uniques generated', Object.keys(emails).length);
+
+// console.log(emails);
\ No newline at end of file