refactored server.js to use tests in processing-js 1.4.8

sudsy · sudsy · commit f8498492725d · 2014-10-24T21:11:42.000+11:00
updated server.js to use express 3.0 and handlebars templates
diff --git a/package.json b/package.json
@@ -17,7 +17,10 @@
     "canvas": "*"
   },
   "devDependencies": {
-    "express": "*"
+    "express": "*",
+    "morgan" : "*",
+    "serve-index" : "*",
+    "express3-handlebars" : "*"
   },
   "optionalDependencies": {},
   "engines": {
diff --git a/test/home.handlebars b/test/home.handlebars
@@ -0,0 +1,8 @@
+<h1>Example App: Home</h1>
+
+
+  {{#each tests}}
+  	<a href="test/{{this.path}}" target="_blank"><img src="test/{{this.path}}"></a>
+	<p>{{this.path}}</p>
+   
+  {{/each}}
diff --git a/test/main.handlebars b/test/main.handlebars
@@ -0,0 +1,12 @@
+<!doctype html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>Test Server</title>
+</head>
+<body>
+
+    {{{body}}}
+
+</body>
+</html>
diff --git a/test/server.js b/test/server.js
@@ -4,27 +4,48 @@
  */
 
 var fs = require('fs')
+  , path = require("path")
   , extname = require('path').extname
   , jsdom = require('jsdom')
   , express = require('express')
   , processing = require('../')
-  , app = express();
+  , exphbs  = require('express3-handlebars')
+  , app = express()
+  , morgan = require('morgan')
+  , serveIndex = require('serve-index');
 
-app.use(express.logger('dev'));
-app.use('/processing-js', express.static(__dirname + '/../deps/processing-js'));
-app.use('/processing-js', express.directory(__dirname + '/../deps/processing-js'));
+// Set Handlebars to use the test directory
+app.engine('handlebars', exphbs({
+  layoutsDir: __dirname, 
+  defaultLayout: 'main'
+}));
+app.set('views',  __dirname);
+app.set('view engine', 'handlebars');
+
+//Set up Logging
+app.use(morgan('combined'));
+
+var pathToref = "../deps/processing-js/test/ref";
+
+//pull in list of test to merge with template
+filedata = fs.readFileSync(path.join(__dirname, pathToref, 'tests.js'),'utf8');
+eval(filedata);
 
 process.on('uncaughtException', function(){});
 
 app.get('/', function(req, res) {
-  res.sendfile(__dirname + '/index.html');
+  res.render('home', {"tests" : tests});
 });
 
 app.get('/test/:path(*)', function(req, res) {
-  var path = req.params.path
-    , file = '/../deps/processing-js/examples/' + path;
-  
-  fs.readFile(__dirname + file, function(err, data) {
+  var pdePath = req.params.path
+    , file = path.join(__dirname, pathToref, pdePath);
+  // console.log(file);
+  fs.readFile(file, function(err, data) {
+    if(err){
+      console.log(err);
+      res.send(err);
+    }
     try {
       if ('.html' === extname(path)) {
         var document = jsdom.jsdom(data + '')
@@ -38,7 +59,7 @@ app.get('/test/:path(*)', function(req, res) {
           p5.canvas.createPNGStream().pipe(res);
         }, 500);
       } else {
-        var p5 = processing.createInstance(__dirname + file);
+        var p5 = processing.createInstance(file);
         
         setTimeout(function() {
           p5.noLoop();
