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, 7 insertions, 7 deletions

diff --git a/lib/helpers.js b/lib/helpers.js
index 3ab2e182..68e895e7 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -45,9 +45,9 @@ var Helpers = function (faker) {
       var str = '';
       for (var i = 0; i < string.length; i++) {
           if (string.charAt(i) == symbol) {
-              str += faker.random.number(9);
+              str += faker.datatype.number(9);
           } else if (string.charAt(i) == "!"){
-              str += faker.random.number({min: 2, max: 9});
+              str += faker.datatype.number({min: 2, max: 9});
           } else {
               str += string.charAt(i);
           }
@@ -69,11 +69,11 @@ var Helpers = function (faker) {
 
       for (var i = 0; i < string.length; i++) {
           if (string.charAt(i) == "#") {
-              str += faker.random.number(9);
+              str += faker.datatype.number(9);
           } else if (string.charAt(i) == "?") {
               str += faker.random.arrayElement(alpha);
           } else if (string.charAt(i) == "*") {
-            str += faker.random.boolean() ? faker.random.arrayElement(alpha) : faker.random.number(9);
+            str += faker.datatype.boolean() ? faker.random.arrayElement(alpha) : faker.datatype.number(9);
           } else {
               str += string.charAt(i);
           }
@@ -161,7 +161,7 @@ var Helpers = function (faker) {
          max = min;
          min = tmp;
        }
-       repetitions = faker.random.number({min:min,max:max});
+       repetitions = faker.datatype.number({min:min,max:max});
        string = string.slice(0,token.index) + faker.helpers.repeatString(token[1], repetitions) + string.slice(token.index+token[0].length);
        token = string.match(RANGE_REP_REG);
      }
@@ -186,7 +186,7 @@ var Helpers = function (faker) {
          min = tmp;
        }
         string = string.slice(0,token.index) +
-          faker.random.number({min:min, max:max}).toString() +
+          faker.datatype.number({min:min, max:max}).toString() +
           string.slice(token.index+token[0].length);
         token = string.match(RANGE_REG);
      }
@@ -207,7 +207,7 @@ var Helpers = function (faker) {
       }
       o = o || ["a", "b", "c"];
       for (var x, j, i = o.length - 1; i > 0; --i) {
-        j = faker.random.number(i);
+        j = faker.datatype.number(i);
         x = o[i];
         o[i] = o[j];
         o[j] = x;