Added and documented unique and singular features

Author: msavin

DOCUMENTATION.md

@@ -98,7 +98,8 @@ Jobs.run("sendReminder", "[email protected]", "The future is here!", {
         hour: 9,
         minute: 42
     },
-    priority: 9999999999
+    priority: 9999999999,
+    singular: true
 });
 ```
 
@@ -118,8 +119,12 @@ The configuration object supports the following inputs:
 	- If you set it to a positive integer, it will run ahead of other jobs.
 	- If you set it to a negative integer, it will only run after all the zero or positive jobs have completed.
 - **`date`** - Function
-	- Provide your own date. This stacks with the `in` and `on` operator, and will be applied before they run.
-- **callback** - Function
+	- Provide your own date. This stacks with the `in` and `on` operator, and will be applied before they perform their operations.
+* **`unique`** - Boolean
+	- If a job is marked as unique, it will only be scheduled if no other job exists with the same arguments
+* **`singular`** - Boolean
+	- If a job is marked as singular, it will only be scheduled if no other job is pending (or failed, which in effect, is the same as pending) with the same arguments
+- **`callback`** - Function
 	- Run a callback function after scheduling the job
 
 ### Jobs.execute

package/package.js

@@ -1,7 +1,7 @@
 Package.describe({
 	name:    "msavin:sjobs",
 	summary: "The simple jobs queue that just works [synced, schedule, tasks, background, later, worker, cron]",
-	version: "3.0.7",
+	version: "3.0.8",
 	documentation: "README.md",
 	git:     "https://github.com/msavin/SteveJobs.git",
 });

package/server/imports/actions/add/index.js

@@ -3,26 +3,44 @@ import { processArguments } from "./processArguments.js"
 
 var add = function () {
 	// 0. Prepare variables
-	var error, result, existingDoc;
+	var error, result, blockAdd;
 
 	// 1. Process arguments + prepare the data
 	var input = processArguments(arguments);
 
-	// 2-1. check if the job is singular
-	if (input.config && input.config.singular) {
-		existingDoc = Utilities.collection.findOne({
-			name: input.name,
-			arguments: input.arguments,
-			state: {
-				$in: ["pending", "failure"]
-			}
-		})
-	}
+	// 2 - check if job needs to blocked from being added
 
-	// 2-2. Cancel the job if it exists
-	if (existingDoc) {
-		return;
-	}
+		// 2-1. check if the job is singular
+		if (input.config && input.config.singular) {
+			var doc = Utilities.collection.findOne({
+				name: input.name,
+				arguments: input.arguments,
+				state: {
+					$in: ["pending", "failure"]
+				}
+			})
+
+			if (doc) blockAdd = true
+		}
+
+		// 2-2. check if job is unique
+		if (input.config && input.config.unique) {
+			var doc = Utilities.collection.findOne({
+				name: input.name,
+				arguments: input.arguments,
+			})
+
+			if (doc) blockAdd = true
+		}
+
+		// 2-3. Cancel the job if a block condition is met
+		if (blockAdd) {
+			error = true;
+			if (input.config && typeof input.config.callback === "function") {
+				return input.config.callback(error, result);
+			}
+			return result;
+		}
 
 	// 3. Generate job document
 	var jobDoc = Utilities.helpers.generateJobDoc(input);
@@ -40,7 +58,7 @@ var add = function () {
 	}
 
 	// 6. Mission accomplished
-	if (typeof input.config.callback === "function") {
+	if (input.config && typeof input.config.callback === "function") {
 		input.config.callback(error, result);
 	}
 

package/server/imports/actions/add/processArguments.js

@@ -1,7 +1,7 @@
 var checkConfig = function (input) {
 	var result = false,
 		lastArgument = input[input.length - 1],
-		keywords = ["in", "on", "priority", "date", "data", "callback", "singular"];
+		keywords = ["in", "on", "priority", "date", "data", "callback", "singular", "unique"];
 
 	if (typeof lastArgument === "object") {
 		keywords.forEach(function (keyword) {