Issue 1114: New datatype module

Current status:
- moved number(), float(), hexaDecimal(), boolean(), uuid() from random to datatype
- moved respective test from random.unit to datatype.unit
- tests of moved methods in random now check if DeprecationWarning is printed and respective method in datatype module is called
- adapted all lib files that use moved methods (mostly number)
- adapted tests of respective files to spy on the correct method
- adapted README in order to promote usage of method that logs a DeprecationWarning

1 files changed, 10 insertions, 10 deletions

diff --git a/lib/internet.js b/lib/internet.js
index c332dfcd..4cbf5a1f 100644
--- a/lib/internet.js
+++ b/lib/internet.js
@@ -77,15 +77,15 @@ var Internet = function (faker) {
       var result;
       firstName = firstName || faker.name.firstName();
       lastName = lastName || faker.name.lastName();
-      switch (faker.random.number(2)) {
+      switch (faker.datatype.number(2)) {
       case 0:
-          result = firstName + faker.random.number(99);
+          result = firstName + faker.datatype.number(99);
           break;
       case 1:
           result = firstName + faker.random.arrayElement([".", "_"]) + lastName;
           break;
       case 2:
-          result = firstName + faker.random.arrayElement([".", "_"]) + lastName + faker.random.number(99);
+          result = firstName + faker.random.arrayElement([".", "_"]) + lastName + faker.datatype.number(99);
           break;
       }
       result = result.toString().replace(/'/g, "");
@@ -212,7 +212,7 @@ var Internet = function (faker) {
    */
   self.ip = function () {
       var randNum = function () {
-          return (faker.random.number(255)).toFixed(0);
+          return (faker.datatype.number(255)).toFixed(0);
       };
 
       var result = [];
@@ -260,7 +260,7 @@ var Internet = function (faker) {
    * @method faker.internet.port
    */
   self.port = function() {
-    return faker.random.number({ min: 0, max: 65535 });
+    return faker.datatype.number({ min: 0, max: 65535 });
   };
 
   self.port.schema = {
@@ -295,9 +295,9 @@ var Internet = function (faker) {
       baseGreen255 = baseGreen255 || 0;
       baseBlue255 = baseBlue255 || 0;
       // 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) + baseGreen255) / 2);
-      var blue = Math.floor((faker.random.number(256) + baseBlue255) / 2);
+      var red = Math.floor((faker.datatype.number(256) + baseRed255) / 2);
+      var green = Math.floor((faker.datatype.number(256) + baseGreen255) / 2);
+      var blue = Math.floor((faker.datatype.number(256) + baseBlue255) / 2);
       var redStr = red.toString(16);
       var greenStr = green.toString(16);
       var blueStr = blue.toString(16);
@@ -348,7 +348,7 @@ var Internet = function (faker) {
       } 
 
       for (i=0; i < 12; i++) {
-          mac+= faker.random.number(15).toString(16);
+          mac+= faker.datatype.number(15).toString(16);
           if (i%2==1 && i != 11) {
               mac+=validSep;
           }
@@ -408,7 +408,7 @@ var Internet = function (faker) {
            pattern = consonant;
          }
        }
-       n = faker.random.number(94) + 33;
+       n = faker.datatype.number(94) + 33;
        char = String.fromCharCode(n);
        if (memorable) {
          char = char.toLowerCase();