Bug fixes and latest version.

2 files changed, 12 insertions, 8 deletions

diff --git a/lib/date.js b/lib/date.js
index a09895dd..c58a9af5 100644
--- a/lib/date.js
+++ b/lib/date.js
@@ -1,4 +1,4 @@
-var faker = require('../index');
+var faker = require("../index");
 
 var date = {
 
@@ -7,7 +7,7 @@ var date = {
 
         var past = date.getTime();
         past -= faker.random.number(years) * 365 * 3600 * 1000; // some time from now to N years ago, in milliseconds
-        date.setTime(past)
+        date.setTime(past);
 
         return date.toJSON();
     },
@@ -15,8 +15,8 @@ var date = {
     future: function (years, refDate) {
         var date = (refDate) ? new Date(Date.parse(refDate)) : new Date();
         var future = date.getTime();
-        future += faker.random.number(years) * 365 * 3600 * 1000; // some time from now to N years later, in milliseconds
-        date.setTime(future)
+        future += faker.random.number(years) * 365 * 3600 * 1000 + 1000; // some time from now to N years later, in milliseconds
+        date.setTime(future);
 
         return date.toJSON();
     },
@@ -33,8 +33,8 @@ var date = {
     recent: function (days) {
         var date = new Date();
         var future = date.getTime();
-        future -= faker.random.number(days) * 3600 * 1000; // some time from now to N days ago, in milliseconds
-        date.setTime(future)
+        future -= faker.random.number(days) * 24 * 60 * 60 * 1000; // some time from now to N days ago, in milliseconds
+        date.setTime(future);
 
         return date.toJSON();
     }
diff --git a/lib/random.js b/lib/random.js
index fcd451d7..63347278 100644
--- a/lib/random.js
+++ b/lib/random.js
@@ -1,8 +1,12 @@
 var definitions = require('./definitions');
-
 var random = {
-    // returns a single random number based on a range
+    // returns a single random number based on a max number or range
     number: function (range) {
+        if(Array.isArray(range)) {
+          var min = range[0];
+          var max = range[1];
+          return Math.floor((Math.random() * max) + min);
+        }
         return Math.floor(Math.random() * range);
     },