Bug fixes and latest version.

lib/date.js

@@ -1,4 +1,4 @@
-var faker = require('../index');
+var faker = require("../index");
 
 var date = {
 
@@ -7,16 +7,16 @@ 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();
     },
 
     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();
     }

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);
     },
 

package.json

@@ -1,7 +1,7 @@
 {
     "name": "faker",
     "description": "Generate massive amounts of fake contextual data",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "contributors": [
         "Marak Squires <[email protected]>",
         "Matthew Bergman <[email protected]>"

test/date.unit.js

@@ -31,6 +31,14 @@ describe("date.js", function () {
             assert.ok(Date.parse(date) > new Date());
         });
 
+        it("returns a future date when N = 0", function () {
+
+            var refDate = new Date();
+            var date = Date.parse(faker.Date.future(0), refDate.toJSON());
+
+            assert.ok(date > refDate); // date should be after the date given, but before the current time
+        });
+
         it("returns a date N years after the date given", function () {
 
             var refDate = new Date(1880, 11, 9, 10, 0, 0, 0); // set the date beyond the usual calculation (to make sure this is working correctly)
@@ -46,7 +54,7 @@ describe("date.js", function () {
 
             var date = faker.Date.recent(30);
 
-            assert.ok(Date.parse(date) < new Date());
+            assert.ok(Date.parse(date) <= new Date());
         });
 
     });

test/random.unit.js

@@ -0,0 +1,22 @@
+if (typeof module !== 'undefined') {
+    var assert = require('assert');
+    var sinon = require('sinon');
+    var faker = require('../index');
+}
+
+describe("random.js", function () {
+  describe("number", function() {
+    it("returns a random number given a maximum value", function() {
+      var max = 10;
+      assert.ok(faker.random.number(max) < max);
+    });
+    it("returns a random number between a range", function() {
+      var range = [1, 10];
+      var min = range[0];
+      var max = range[1]
+      var randomNumber = faker.random.number(range);
+      assert.ok( randomNumber >= min);
+      assert.ok( randomNumber <= max);
+    });
+  });
+});