Adds the ability to require()

This makes it possible to import both other scripts, as well as single
functions (both named and anonymous) into the worker.

A path to a script given to require() is relative to the worker. This
means we have to use eval.js in order to have a fixed path to use as a
reference.

Author: Sebmaster

lib/parallel.js

@@ -77,13 +77,39 @@
 		this.options = extend(defaults, options);
 		this.operation = new Operation();
 		this.operation.resolve(null, this.data);
+		this.requiredScripts = [];
+		this.requiredFunctions = [];
 	}
 
 	Parallel.prototype.getWorkerSource = function (cb) {
+		var preStr = '';
+		var i = 0;
+		if (!isNode && this.requiredScripts.length !== 0) {
+			preStr += 'importScripts("' + this.requiredScripts.join('","') + '");\r\n';
+		}
+
+		for (i = 0; i < this.requiredFunctions.length; ++i) {
+			if (this.requiredFunctions[i].name) {
+				preStr += 'var ' + this.requiredFunctions[i].name + ' = ' + this.requiredFunctions[i].fn.toString() + ';';
+			} else {
+				preStr += this.requiredFunctions[i].fn.toString();
+			}
+		}
+
 		if (isNode) {
-			return 'process.on("message", function(e) {process.send(JSON.stringify((' + cb.toString() + ')(JSON.parse(e).data)))})';
+			return preStr + 'process.on("message", function(e) {process.send(JSON.stringify((' + cb.toString() + ')(JSON.parse(e).data)))})';
 		} else {
-			return 'self.onmessage = function(e) {self.postMessage((' + cb.toString() + ')(e.data))}';
+			return preStr + 'self.onmessage = function(e) {self.postMessage((' + cb.toString() + ')(e.data))}';
+		}
+	};
+
+	Parallel.prototype.require = function (func) {
+		if (typeof func === 'string') {
+			this.requiredScripts[this.requiredScripts.length] = func;
+		} else if (typeof func === 'function') {
+			this.requiredFunctions[this.requiredFunctions.length] = { fn: func };
+		} else if (typeof func === 'object') {
+			this.requiredFunctions[this.requiredFunctions.length] = func;
 		}
 	};
 
@@ -95,10 +121,19 @@
 			wrk.postMessage(src);
 		} else {
 			try {
-				var blob = new Blob([src], { type: 'text/javascript' });
-				var url = URL.createObjectURL(blob);
+				if (this.requiredScripts.length !== 0) {
+					if (this.options.ie10shim) {
+						wrk = new Worker(this.options.path);
+						wrk.postMessage(src);
+					} else {
+						throw new Error('Can\'t use required scripts without eval.js!');
+					}
+				} else {
+					var blob = new Blob([src], { type: 'text/javascript' });
+					var url = URL.createObjectURL(blob);
 
-				wrk = new Worker(url);
+					wrk = new Worker(url);
+				}
 			} catch (e) {
 				if (this.options.ie10shim) { // blob/url unsupported, cross-origin error
 					wrk = new Worker(this.options.path);

test/api.spec.js

@@ -16,6 +16,11 @@
 		expect(p.map).toEqual(jasmine.any(Function));
 	});
 
+	it('should define a require(string|function|{ name: string, fn: function }) function', function () {
+		var p = new Parallel([1, 2, 3]);
+		expect(p.require).toEqual(jasmine.any(Function));
+	});
+
 	it('should execute a .then function without an operation immediately', function () {
 		var p = new Parallel([1, 2, 3]);
 		expect(p.then).toEqual(jasmine.any(Function));
@@ -80,7 +85,7 @@
 	});
 
 	it('should queue map work correctly', function () {
-		var p = new Parallel([1, 2, 3], {maxWorkers: 2});
+		var p = new Parallel([1, 2, 3], { maxWorkers: 2 });
 
 		var done = false;
 		var result = null;
@@ -211,4 +216,59 @@
 			expect(result).toEqual(9);
 		});
 	});
+
+	if (!isNode) {
+		it('should work with require()d scripts (web-exclusive)', function () {
+			var p = new Parallel([1, 2, 3]);
+			p.require('../test/test.js'); // relative to eval.js
+
+			var done = false;
+			var result = null;
+
+			runs(function () {
+				p.map(function (el) {
+					return myCalc(el, 25);
+				}).then(function (data) {
+					result = data;
+					done = true;
+				});
+			});
+
+			waitsFor(function () {
+				return done;
+			}, "it should finish", 500);
+
+			runs(function () {
+				expect(result).toEqual([26, 27, 28]);
+			});
+		});
+	}
+
+	it('should work with require()d anonymous functions', function () {
+		var fn = function (el, amount) {
+			return el + amount;
+		};
+		var p = new Parallel([1, 2, 3]);
+		p.require({ name: 'fn', fn: fn });
+
+		var done = false;
+		var result = null;
+
+		runs(function () {
+			p.map(function (el) {
+				return fn(el, 25);
+			}).then(function (data) {
+				result = data;
+				done = true;
+			});
+		});
+
+		waitsFor(function () {
+			return done;
+		}, "it should finish", 500);
+
+		runs(function () {
+			expect(result).toEqual([26, 27, 28]);
+		});
+	});
 });

test/test.js

@@ -0,0 +1,3 @@
+function myCalc(el, amount) {
+	return el + amount;
+}