make Date validator non-parsing by default

hudson-taylor · Jun 10, 2015 · 0b36592 · 0b36592
1 parent c10fa45
commit 0b36592
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 18 deletions.
diff --git a/test-src/date.js b/test-src/date.js
@@ -6,7 +6,6 @@ const s      = require("../");
 
 describe("Date validator", function() {
   let old       = new Date("1979");
-  let oldString = "1979";
   let older     = new Date("1970");
   let now       = new Date();
   let notADate  = { dinosaur: "rawwwr" };
@@ -43,11 +42,6 @@ describe("Date validator", function() {
     }, Error);
   });
 
-  it("should accept a valid Date as a string", function() {
-    let schema = s.Date({ opt: false });
-    assert.equal(schema.validate(oldString).getTime(), old.getTime());
-  });
-
   it("should reject a Date less than min", function() {
     let schema = s.Date({ min: old });
     assert.throws(function() {
@@ -61,4 +55,34 @@ describe("Date validator", function() {
       schema.validate(now);
     }, Error);
   });
+
+  it("should reject non-date if parse if not true", function() {
+
+    let schema = s.Date();
+
+    assert.throws(function() {
+      schema.validate("Wed Jun 10 2015 20:36:48 GMT+1000 (AEST)");
+    });
+
+  });
+
+  it("should accept non-date if parse is true", function() {
+
+    let schema = s.Date({ parse: true });
+    let date = schema.validate("Wed Jun 10 2015 20:36:48 GMT+1000 (AEST)");
+
+    assert.equal(date.getMinutes(), 36);
+
+  });
+
+  it("should reject non-date compatible string if parse is true", function() {
+
+    let schema = s.Date({ parse: true });
+
+    assert.throws(function() {
+      schema.validate("hello");
+    });
+
+  });
+
 });
diff --git a/test-src/fastDate.js b/test-src/fastDate.js
@@ -32,9 +32,4 @@ describe("FastDate validator", function() {
     }, Error);
   });
 
-  it("should accept a valid Date as a string", function() {
-    let schema = s.FastDate();
-    assert.equal(schema.validate(oldString).getTime(), old.getTime());
-  });
-
 });
diff --git a/validators-src/date.js b/validators-src/date.js
@@ -6,7 +6,7 @@ const DELETEKEY = require("../lib/deleteKey");
 
 function dateValidator(args, childValidators, data) {
 
-  args = merge(args, { min: null, max: null });
+  args = merge(args, { min: null, max: null, parse: false });
 
   if(data === undefined) {
     if(args.opt) {
@@ -15,18 +15,26 @@ function dateValidator(args, childValidators, data) {
     throw new Error("required Date");
   }
 
+  if(Object.prototype.toString.call(data) !== '[object Date]' && args.parse !== true) {
+    throw new Error("required date, received (" + typeof data + ") " + data.toString());
+  }
+
   let d = new Date(data);
 
-  if(!(d instanceof Date) || isNaN(d.getTime())) {
+  if(isNaN(d.getTime())) {
     throw new Error("required date or Date compatible string, received (" + typeof data + ") " + data.toString());
   }
+
   if(args.min && d.getTime() < new Date(args.min).getTime()) {
     throw new Error("must be greater than "+new Date(args.min));
   }
+
   if(args.max && d.getTime() > new Date(args.max).getTime()) {
     throw new Error("must be less than or equal to "+new Date(args.max));
   }
+
   return d;
+
 }
 
 export default {

diff --git a/validators-src/fastDate.js b/validators-src/fastDate.js
@@ -3,13 +3,11 @@
 
 function fastDateValidator(args, childValidators, data) {
 
-  let d = new Date(data);
-
-  if(!(d instanceof Date) || isNaN(d.getTime())) {
-    throw new Error("required date or Date compatible string, received (" + typeof data + ") " + data.toString());
+  if(Object.prototype.toString.call(data) !== '[object Date]') {
+    throw new Error("required date, received (" + typeof data + ") " + data.toString());
   }
 
-  return d;
+  return data;
 
 }