node-schedule 1.3.0 → 1.3.1

package/README.md

@@ -165,13 +165,13 @@ var j = schedule.scheduleJob(rule, function(){
 
 #### RecurrenceRule properties
 
-- `second`
-- `minute`
-- `hour`
-- `date`
-- `month`
+- `second (0-59)`
+- `minute (0-59)`
+- `hour  (0-23)`
+- `date  (1-31)`
+- `month (0-11)`
 - `year`
-- `dayOfWeek`
+- `dayOfWeek (0-6) Starting with Sunday`
 
 > **Note**: It's worth noting that the default value of a component of a recurrence rule is
 > `null` (except for second, which is 0 for familiarity with cron). *If we did not
@@ -204,11 +204,11 @@ var j = schedule.scheduleJob({ start: startTime, end: endTime, rule: '*/1 * * *
 
 ### Handle Jobs and Job Invocations
 
-There are some function to get informations for a Job and to handle the Job and
+There are some function to get information for a Job and to handle the Job and
 Invocations.
 
 
-#### job.cancel(reshedule)
+#### job.cancel(reschedule)
 You can invalidate any job with the `cancel()` method:
 
 ```js
@@ -217,7 +217,7 @@ j.cancel();
 All planned invocations will be canceled. When you set the parameter ***reschedule***
 to true then the Job is newly scheduled afterwards.
 
-#### job.cancelNext(reshedule)
+#### job.cancelNext(reschedule)
 This method invalidates the next planned invocation or the job.
 When you set the parameter ***reschedule*** to true then the Job is newly scheduled
 afterwards.

package/lib/schedule.js

@@ -188,10 +188,14 @@ Job.prototype.schedule = function(spec) {
   var end;
   var tz;
 
+  // save passed-in value before 'spec' is replaced
+  if (typeof spec === 'object' && 'tz' in spec) {
+    tz = spec.tz;
+  }
+
   if (typeof spec === 'object' && spec.rule) {
     start = spec.start || undefined;
     end = spec.end || undefined;
-    tz = spec.tz;
     spec = spec.rule;
 
     if (start) {
@@ -398,6 +402,11 @@ RecurrenceRule.prototype.isValid = function() {
 };
 
 RecurrenceRule.prototype.nextInvocationDate = function(base) {
+  var next = this._nextInvocationDate(base);
+  return next ? next.toDate() : null;
+};
+
+RecurrenceRule.prototype._nextInvocationDate = function(base) {
   base = ((base instanceof CronDate) || (base instanceof Date)) ? base : (new Date());
   if (!this.recurs) {
     return null;
@@ -464,7 +473,7 @@ RecurrenceRule.prototype.nextInvocationDate = function(base) {
     break;
   }
 
-  return next ? next.toDate() : null;
+  return next;
 };
 
 function recurMatch(val, matcher) {
@@ -493,7 +502,7 @@ function recurMatch(val, matcher) {
 function runOnDate(date, job) {
   var now = Date.now();
   var then = date.getTime();
-  
+
   return lt.setTimeout(function() {
     if (then > Date.now())
       runOnDate(date, job);
@@ -574,7 +583,7 @@ function scheduleNextRecurrence(rule, job, prevDate, endDate) {
 
   prevDate = (prevDate instanceof CronDate) ? prevDate : new CronDate();
 
-  var date = (rule instanceof RecurrenceRule) ? rule.nextInvocationDate(prevDate) : rule.next();
+  var date = (rule instanceof RecurrenceRule) ? rule._nextInvocationDate(prevDate) : rule.next();
   if (date === null) {
     return null;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-schedule",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "A cron-like and not-cron-like job scheduler for Node.",
   "keywords": [
     "schedule",
@@ -24,7 +24,7 @@
     "url": "https://github.com/node-schedule/node-schedule.git"
   },
   "dependencies": {
-    "cron-parser": "^2.4.0",
+    "cron-parser": "^2.7.3",
     "long-timeout": "0.1.1",
     "sorted-array-functions": "^1.0.0"
   },