Make parallel.js browser ready.

Author: Sebmaster

lib/parallel.js

@@ -3,9 +3,7 @@
 	var setImmediate = setImmediate || function (cb) {
 		setTimeout(cb, 0);
 	};
-	if (isNode) {
-		var Worker = require('./Worker.js');
-	}
+	var Worker = isNode ? require(__dirname + '/Worker.js') : self.Worker;
 
 	function extend(from, to) {
 		if (!to) to = {};

test/api.spec.js

@@ -1,23 +1,22 @@
 describe('API', function () {
+	var isNode = typeof module !== 'undefined' && module.exports;
+	var Parallel = isNode ? require('../lib/parallel.js') : self.Parallel;
+
 	it('should be a constructor', function () {
-		var Parallel = require('../lib/parallel.js');
 		expect(Parallel).toEqual(jasmine.any(Function));
 	});
 
 	it('should define a .then(cb) function', function () {
-		var Parallel = require('../lib/parallel.js');
 		var p = new Parallel([1, 2, 3]);
 		expect(p.then).toEqual(jasmine.any(Function));
 	});
 
 	it('should define a .map(cb) function', function () {
-		var Parallel = require('../lib/parallel.js');
 		var p = new Parallel([1, 2, 3]);
 		expect(p.map).toEqual(jasmine.any(Function));
 	});
 
 	it('should execute a .then function without an operation immediately', function () {
-		var Parallel = require('../lib/parallel.js');
 		var p = new Parallel([1, 2, 3]);
 		expect(p.then).toEqual(jasmine.any(Function));
 
@@ -33,7 +32,6 @@
 	});
 
 	it('should execute .spawn() correctly', function () {
-		var Parallel = require('../lib/parallel.js');
 		var p = new Parallel([1, 2, 3]);
 
 		var done = false;
@@ -58,7 +56,6 @@
 	});
 
 	it('should .map() correctly', function () {
-		var Parallel = require('../lib/parallel.js');
 		var p = new Parallel([1, 2, 3]);
 
 		var done = false;
@@ -83,7 +80,6 @@
 	});
 
 	it('should queue map work correctly', function () {
-		var Parallel = require('../lib/parallel.js');
 		var p = new Parallel([1, 2, 3], {maxWorkers: 2});
 
 		var done = false;
@@ -108,7 +104,6 @@
 	});
 
 	it('should chain .map() correctly', function () {
-		var Parallel = require('../lib/parallel.js');
 		var p = new Parallel([1, 2, 3]);
 
 		var done = false;
@@ -135,7 +130,6 @@
 	});
 
 	it('should mix .spawn and .map() correctly', function () {
-		var Parallel = require('../lib/parallel.js');
 		var p = new Parallel([1, 2, 3]);
 
 		var done = false;
@@ -166,7 +160,6 @@
 	});
 
 	it('should execute .reduce() correctly', function () {
-		var Parallel = require('../lib/parallel.js');
 		var p = new Parallel([1, 2, 3]);
 		var done = false;
 		var result = null;
@@ -190,7 +183,6 @@
 	});
 
 	it('should process data returned from .then()', function () {
-		var Parallel = require('../lib/parallel.js');
 		var p = new Parallel([1, 2, 3]);
 
 		var done = false;

test/eval.spec.js

@@ -1,13 +1,9 @@
-var isNode = module && module.exports;
-
-if (isNode) {
-	var Worker = require(__dirname + '/../lib/Worker.js');
-}
-
-describe('eval.js', function () {
+describe('eval.js', function () {
+	var isNode = typeof module !== 'undefined' && module.exports;
+	var Worker = isNode ? require(__dirname + '/../lib/Worker.js') : self.Worker;
 
 	it('should eval the given code', function () {
-		var wrk = new Worker(__dirname + '/../lib/eval.js');
+		var wrk = new Worker(isNode ? __dirname + '/../lib/eval.js' : 'lib/eval.js');
 
 		var result = null;
 		var done = false;
@@ -17,7 +13,7 @@ describe('eval.js', function () {
 				done = true;
 				wrk.terminate();
 			};
-			wrk.postMessage('process.send(JSON.stringify("abc"))');
+			wrk.postMessage(isNode ? 'process.send(JSON.stringify("abc"))' : 'self.postMessage("abc")');
 		});
 
 		waitsFor(function () {

test/performance.spec.js

@@ -1,5 +1,6 @@
 describe('Performance', function () {
 	var isNode = typeof module !== 'undefined' && module.exports;
+	var Parallel = isNode ? require('../lib/parallel.js') : self.Parallel;
 
 	it('.map() should be using multi-threading (could fail on single-core)', function () {
 		var slowSquare = function (n) {
@@ -8,7 +9,6 @@
 			return i;
 		};
 
-		var Parallel = require('../lib/parallel.js');
 		var p = new Parallel([10000, 20000, 30000]);
 		var p2 = new Parallel([10000, 20000, 30000]);
 

test/q-api.spec.js

@@ -1,5 +1,5 @@
 describe('Q-API', function () {
-	var isNode = module && module.exports;
+	var isNode = typeof module !== 'undefined' && module.exports;
 
 	if (isNode) {
 		var Q = require('q');

test/worker.spec.js

@@ -1,14 +1,10 @@
-var isNode = module && module.exports;
-
-if (isNode) {
-	var Worker = require(__dirname + '/../lib/Worker.js');
-}
-
-describe('WebWorker-API', function () {
+describe('WebWorker-API', function () {
+	var isNode = typeof module !== 'undefined' && module.exports;
+	var Worker = isNode ? require(__dirname + '/../lib/Worker.js') : self.Worker;
 
 	it('should define the used API', function () {
 		expect(Worker).toEqual(jasmine.any(Function));
-		var wrk = new Worker(__dirname + '/../lib/eval.js');
+		var wrk = new Worker(isNode ? __dirname + '/../lib/eval.js' : 'lib/eval.js');
 		expect(wrk.postMessage).toEqual(jasmine.any(Function));
 		expect(wrk.terminate).toEqual(jasmine.any(Function));
 		wrk.terminate();