add 'current-date' as an option to the 'time-between' accessors

Author: danielcavanagh

lib/node-rules.js

@@ -85,6 +85,13 @@
             obj);
     };
 
+    var toDate = function (val) {
+        switch (val) {
+        case 'now': return moment.utc();
+        case 'current-date': return moment.utc().startOf('day');
+        default: return moment.utc(b);
+        }
+    }
 
     var compileValue = function (facts, value) {
         if (!_.isObject(value) || _.isArray(value)) return [true, value];
@@ -122,15 +129,14 @@
                 throw new Error('Invalid property for date diff: ' + key);
 
             var [isValid, a] = compileValue(facts, dates[0]);
-            if (!isValid || !(a === 'now' || moment(a).isValid()))
+            if (!isValid || !(['now', 'current-date'].includes(a) || moment(a).isValid()))
                 throw new Error('Invalid property for date diff: ' + key);
 
             var [isValid, b] = compileValue(facts, dates[1]);
-            if (!isValid || !(b === 'now' || moment(b).isValid()))
+            if (!isValid || !(['now', 'current-date'].includes(b) || moment(b).isValid()))
                 throw new Error('Invalid property for date diff: ' + key);
 
-            return [true, moment(a === 'now' ? undefined : a).diff(b === 'now' ? undefined : b, key.slice(1, -7), dates[2] === 'exact') +
-                (dates[2] === 'inclusive' ? 1 : 0)];
+            return [true, toDate(a).diff(toDate(b), key.slice(1, -7), dates[2] === 'exact') + (dates[2] === 'inclusive' ? 1 : 0)];
         }
 
         return [false];