new Function generate country added

Prosen-Ghosh · Aug 29, 2017 · 2aa6dd8 · 2aa6dd8
1 parent 950718a
commit 2aa6dd8
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 36 deletions.
diff --git a/data/countryNames.js b/data/countryNames.js
diff --git a/index.js b/index.js
@@ -1,36 +1,17 @@
 var numberPro = require('./src/pro-number.js');
 var usersPro = require('./src/pro-users');
 var stringPro = require('./src/pro-string');
-
-(function(){
-    if(typeof module !== 'undefined' && module.exports){
-        module.exports = {
-            generateNumber : numberPro.randNumber,
-            generateEvenNumber : numberPro.randEvenNumber,
-            generateOddNumber : numberPro.randOddNumber,
-            generateName : usersPro.randGenerateUserName,
-            generateLastName : usersPro.randGenerateLastName,
-            generateFullName : usersPro.randGenerateFullName,
-            generateEmail : usersPro.randGenerateEmail,
-            generateString : stringPro.generateString,
-            generateToken : stringPro.generateToken,
-            generatePassword : usersPro.generatePassword,
-            generateBirthDate : usersPro.generateBirthDate
-        }
-    }
-    else {
-        window.rand = {
-            generateNumber : numberPro.randNumber,
-            generateEvenNumber : numberPro.randEvenNumber,
-            generateOddNumber : numberPro.randOddNumber,
-            generateName : usersPro.randGenerateUserName,
-            generateLastName : usersPro.randGenerateLastName,
-            generateFullName : usersPro.randGenerateFullName,
-            generateEmail : usersPro.randGenerateEmail,
-            generateString : stringPro.generateString,
-            generateToken : stringPro.generateToken,
-            generatePassword : usersPro.generatePassword,
-            generateBirthDate : usersPro.generateBirthDate
-        }
-    }
-})();
+module.exports = {
+    generateNumber : numberPro.randNumber,
+    generateEvenNumber : numberPro.randEvenNumber,
+    generateOddNumber : numberPro.randOddNumber,
+    generateName : usersPro.randGenerateUserName,
+    generateLastName : usersPro.randGenerateLastName,
+    generateFullName : usersPro.randGenerateFullName,
+    generateEmail : usersPro.randGenerateEmail,
+    generateString : stringPro.generateString,
+    generateToken : stringPro.generateToken,
+    generatePassword : usersPro.generatePassword,
+    generateBirthDate : usersPro.generateBirthDate,
+    generateCountry : usersPro.generateCountry
+}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "random-pro",
-  "version": "1.4.5",
+  "version": "1.5.6",
   "description": "A JavaScript package for random things.",
   "main": "index.js",
   "scripts": {

diff --git a/src/pro-users.js b/src/pro-users.js
@@ -1,4 +1,5 @@
-var names = require('./../data/names');
+const names = require('./../data/names');
+const country = require('./../data/countryNames');
 const rand = require('./pro-number').randNumber;
 
 var randGenerateUserName = (gender) => {
@@ -113,11 +114,16 @@ var generateBirthDate = (format = "DD-MM-YYYY") => {
 
     return res[res.length-1]  == "-" ? res.slice(0,-1) : res[res.length-1]  == "/" ? res[res.length-1]  == "-" : res;
 }
+
+var generateCountry = function(){
+    return country[Math.floor(Math.random() * (Math.length))];
+}
 module.exports = {
     randGenerateUserName,
     randGenerateLastName,
     randGenerateEmail,
     randGenerateFullName,
     generatePassword,
-    generateBirthDate
+    generateBirthDate,
+    generateCountry
 };