Removed jsdom dependency

sudsy · sudsy · commit 6fe68bd7478c · 2014-10-27T06:07:21.000+11:00
Simplified wrapper
diff --git a/lib/canvas.js b/lib/canvas.js
diff --git a/lib/patch.js b/lib/patch.js
@@ -1,28 +1,14 @@
-
-/**
- * Module dependencies.
- */
-
-var path = require('path');
-
-/**
- * Apply patching for Processing instance.
- *
- * @param {Processing} p5
- * @param {String} filePath
- * @return {Processing}
- */
-
-module.exports = function(p5, filePath) {
-  var loadImage = p5.loadImage;
-    
-  p5.loadImage = function(file, type, callback) {
-    console.log('IMG: ', file);
-    console.log('PJS: ', filePath);
-    return loadImage(file, type, callback);
-  };
-  
-  p5.canvas = p5.externals.canvas;  // add short-hand.
-  
-  return p5;
-};
+var noop = function(){};
+
+module.exports = function(processingConstructor){
+	//Wrap the Processing Constructor so we can augment node canvas as it is passed in
+	return function(aCanvas, aCode, aFunctions){
+		aCanvas.attachEvent = noop;
+		aCanvas.getAttribute = noop;
+		aCanvas.setAttribute = noop;
+		aCanvas.style = {
+			setProperty : noop
+		};
+		return new processingConstructor(aCanvas, aCode, aFunctions);
+	}
+}
diff --git a/lib/processing.js b/lib/processing.js
@@ -1,91 +1,8 @@
 
-/**
- * Module dependencies.
- */
+//Mock Browser used by Processing-js for their own tests
+var Browser = require('../deps/processing-js/lib/Browser');
+var patch = require("./patch");
 
-var fs = require('fs')
-  , util = require('util')
-  , jsdom = require('jsdom')
-  , pkg = require('../package')
-  , patch = require('./patch')
-  , XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest
-  , Canvas = require('./canvas')
-  , Image = Canvas.Image
-  , document = jsdom.jsdom('<!doctype html><html><head></head><body></body></html>')
-  , window = document.createWindow()
-  , navigator = window.navigator
-  , HTMLImageElement = window.HTMLImageElement
-  , noop = function() {}
-  , processing = fs.readFileSync(__dirname+'/../deps/processing-js/processing.js');
-
-/**
- * Expose `version`.
- */
-
-exports.version = pkg.version;
-
-/**
- * Expose `window`.
- */
-
-exports.window = window;
-
-/**
- * Expose `document`.
- */
-
-exports.document = document;
-
-/**
- * Make `Canvas` instance of `HTMLCanvasElement`.
- */
-
-function HTMLCanvasElement() {}
-Canvas.prototype.__proto__ = HTMLCanvasElement.prototype;
-
-/**
- * Evaluating Processing source code.
- *
- * FIXME: `Processing` leaks to global object.
- */
-
-eval('(function(window, document) {'
-  + processing.toString('utf-8')
-  + '})(window, document);');
-
-/**
- * Expose `Processing`.
- */
-
-exports.Processing = window.Processing;
-
-/**
- * Return processing instance.
- *
- * @param {Canvas} canvas
- * @param {String} path
- * @return {Processing}
- */
-
-exports.createInstance = function(canvas, path) {
-  var src;
- 
-  if (Buffer.isBuffer(canvas)) {
-    canvas = canvas.toString();
-  }
-
-  if (1 == arguments.length) {
-    path = canvas;
-    canvas = document.createElement('canvas');
-  } else if ('string' === typeof canvas) {
-    src = canvas;
-    canvas = document.createElement('canvas');
-  }
-    
-  if (!src) {
-    src = fs.readFileSync(path).toString();
-  }
- 
-  return patch(new window.Processing(canvas, src), path);
-};
+var Processing = require('../deps/processing-js/src/')(Browser);
 
+module.exports = patch(Processing);
diff --git a/package.json b/package.json
@@ -12,11 +12,9 @@
     "test": "make test"
   },
   "dependencies": {
-    "jsdom": "0.11.1",
-    "xmlhttprequest": "*",
-    "canvas": "*"
   },
   "devDependencies": {
+    "canvas": "*",
     "express": "*",
     "morgan" : "*",
     "serve-index" : "*",
