Merge pull request #4 from qubyte/chore/test-updates

Test updates and a minor API change to make add and remove methods return the relevant job.

Author: qubyte

README.md

@@ -90,7 +90,7 @@ Add a job. The `time` must be a date object or a timestamp integer (like `Date.n
 
 ### `var job = rb.remove(hash)`
 
-Remove a job from a Rubidium instance with the job hash. This function returns the job if it existed and was removed, and `undefined` if the job did not exist.
+Remove a job from a Rubidium instance with the job hash. This function returns a job if the job existed and was removed, or `undefined` if the job did not exist.
 
 ### `var job = rb.find(hash)`
 

examples/at-server.js

@@ -1,3 +1,5 @@
+'use strict'
+
 var express = require('express');
 var request = require('request');
 var Rubidium = require('../');
@@ -9,16 +11,12 @@ app.use(express.json());
 
 // In this case, the body is the message and it includes a callback URL.
 app.post('/add/:timestamp', function (req, res) {
-	'use strict';
-
 	rb.add(parseInt(req.params.timestamp, 10), req.body);
 	res.send(202);
 });
 
 // When the job is emitted, send it back to the callback URL.
 rb.on('job', function (job) {
-	'use strict';
-
 	var req;
 
 	// Protect against 'Invalid Request' errors.

index.js

@@ -1 +1,3 @@
+'use strict';
+
 module.exports = require('./lib/Rubidium');

lib/Job.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var crypto = require('crypto');
 var stringify = require('json-stable-stringify');
 
@@ -10,8 +12,6 @@ var stringify = require('json-stable-stringify');
  */
 
 function Job(time, message) {
-	'use strict';
-
 	if (!(this instanceof Job)) {
 		return new Job(time, message);
 	}
@@ -38,8 +38,6 @@ function Job(time, message) {
  */
 
 Job.prototype.stringify = function () {
-	'use strict';
-
 	return stringify({ time: this.time, message: this.message });
 };
 
@@ -52,8 +50,6 @@ Job.prototype.stringify = function () {
  */
 
 Job.fromList = function (specs) {
-	'use strict';
-
 	var jobs = [];
 
 	for (var i = 0, len = specs.length; i < len; i++) {

lib/Rubidium.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var EventEmitter = require('events').EventEmitter;
 var util = require('util');
 
@@ -11,8 +13,6 @@ var Job = require('./Job');
  */
 
 function makeTimeout(rubidium) {
-	'use strict';
-
 	// > 0 is in the future.
 	var dt = Math.max(rubidium.jobs[0].time - Date.now(), 0);
 
@@ -32,8 +32,6 @@ function makeTimeout(rubidium) {
  */
 
 function makeNext(rubidium) {
-	'use strict';
-
 	if (rubidium.jobs.length) {
 		return makeTimeout(rubidium);
 	}
@@ -49,9 +47,8 @@ function makeNext(rubidium) {
 /**
  * Sorting function for jobs.
  */
-function sortJobs(a, b) {
-	'use strict';
 
+function sortJobs(a, b) {
 	return a.time - b.time;
 }
 
@@ -63,8 +60,6 @@ function sortJobs(a, b) {
  */
 
 function Rubidium(jobs) {
-	'use strict';
-
 	var rubidium = this;
 
 	if (!(rubidium instanceof Rubidium)) {
@@ -98,8 +93,6 @@ util.inherits(Rubidium, EventEmitter);
  */
 
 Rubidium.prototype.add = function (time, message) {
-	'use strict';
-
 	var job = new Job(time, message);
 
 	this.emit('addJob', job);
@@ -139,8 +132,6 @@ Rubidium.prototype.add = function (time, message) {
  */
 
 function getIndex(rubidium, hash) {
-	'use strict';
-
 	var jobs = rubidium.jobs;
 
 	for (var i = 0, len = jobs.length; i < len; i++) {
@@ -161,8 +152,6 @@ function getIndex(rubidium, hash) {
  */
 
 Rubidium.prototype.find = function (hash) {
-	'use strict';
-
 	var index = getIndex(this, hash);
 
 	if (index !== -1) {
@@ -179,27 +168,25 @@ Rubidium.prototype.find = function (hash) {
  */
 
 Rubidium.prototype.remove = function (hash) {
-	'use strict';
-
 	var index =  getIndex(this, hash);
 	var job = this.jobs[index];
 
 	this.emit('removeJob', job);
 
 	if (!job) {
-		return false;
+		return;
 	}
 
 	if (job === this.jobs[0]) {
 		this.jobs.shift();
 		makeNext(this);
 
-		return true;
+		return job;
 	}
 
 	this.jobs.splice(index, 1);
 
-	return true;
+	return job;
 };
 
 module.exports = Rubidium;

package.json

@@ -4,23 +4,29 @@
   "description": "A small unique job scheduler.",
   "main": "index.js",
   "scripts": {
-    "test": "jshint *.js ./lib/*.js ./test/*.js && jscs *.js ./lib/*.js ./test/*.js && nodeunit test",
-    "coveralls": "istanbul cover nodeunit test && cat ./coverage/lcov.info | coveralls --verbose"
+    "test": "jshint *.js ./lib/*.js ./test/*.js && jscs *.js ./lib/*.js ./test/*.js && mocha test",
+    "coveralls": "istanbul cover _mocha --report lcovonly && cat ./coverage/lcov.info | coveralls --verbose"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/qubyte/rubidium"
   },
   "dependencies": {
-    "json-stable-stringify": "0.1.1"
+    "json-stable-stringify": "1.0.0"
   },
   "devDependencies": {
-    "nodeunit": "0.8.6",
-    "jshint": "2.4.4",
-    "jscs": "1.3.0",
-    "coveralls": "2.8.0",
-    "istanbul": "0.2.6"
+    "coveralls": "2.11.2",
+    "istanbul": "0.3.5",
+    "jscs": "1.10.0",
+    "jshint": "2.6.0",
+    "mocha": "2.1.0",
+    "mocha-lcov-reporter": "0.0.1",
+    "sinon": "1.12.2"
   },
+  "files": [
+    "index.js",
+    "lib"
+  ],
   "keywords": [
     "cron",
     "schedule",
@@ -55,6 +61,7 @@
     "maxlen": 100,
     "smarttabs": true,
     "node": true,
+    "mocha": true,
     "browser": true,
     "esnext": true
   },
@@ -98,40 +105,12 @@
     "disallowQuotedKeysInObjects": true,
     "disallowSpaceAfterObjectKeys": true,
     "requireCommaBeforeLineBreak": true,
-    "disallowLeftStickedOperators": [
-      "?",
-      "+",
-      "-",
-      "/",
-      "*",
-      "=",
-      "==",
-      "===",
-      "!=",
-      "!==",
-      ">",
-      ">=",
-      "<",
-      "<="
-    ],
-    "disallowRightStickedOperators": [
-      "?",
-      "+",
-      "/",
-      "*",
-      "=",
-      "==",
-      "===",
-      "!=",
-      "!==",
-      ">",
-      ">=",
-      "<",
-      "<="
-    ],
-    "requireLeftStickedOperators": [
+    "requireSpaceBeforeBinaryOperators": true,
+    "disallowSpaceBeforeBinaryOperators": [
       ","
     ],
+    "disallowSpaceBeforePostfixUnaryOperators": true,
+    "requireSpacesInConditionalExpression": true,
     "disallowSpaceAfterPrefixUnaryOperators": [
       "++",
       "--",