public/ajax.js @@ -1,5 +1,5 @@ Copyright (c) 2009 Jim Benton -microAjax Copyright (c) 2008 Stefan Lange-Hegermann +ajax.js is based on microAjax Copyright (c) 2008 Stefan Lange-Hegermann Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal MIT_LICENSE @@ -39,19 +39,28 @@ exports.diligence.Server = function(setupCallback) { function start() { var server = new node.http.Server(function (req, res) { - // puts(req.uri.path); - - if (req.uri.path == '/result') { - return result(req, res); - } else if (req.uri.path == '/tick') { - return code(req, res); - } else if (match = req.uri.path.match(/^\/static\/(.*)/)){ - return sendStaticFile(match[1], res); - } else { - return sendStaticFile('runner.html', res); - } + puts(req.uri.path); + + if (req.uri.path == '/result') { + req.setBodyEncoding('utf8'); + var body = ''; + req.onBody = function (chunk) { + body += chunk; + }; + req.onBodyComplete = function() { + return result(body, req, res); + }; + } else if (req.uri.path == '/tick') { + return tick(req, res); + } else if (match = req.uri.path.match(/^\/file/)){ + return sendFile(req.uri.params.path, res); + } else if (match = req.uri.path.match(/^\/static\/(.*)/)){ + return sendStaticFile(match[1], res); + } else { + return boot(req, res); + } - }).listen(config['port']); + }).listen(config['port']); if (server) { puts("diligence is running on port " + config['port'].toString() + "."); @@ -116,74 +125,71 @@ exports.diligence.Server = function(setupCallback) { res.finish(); } - function sendFile(data, contentType, res) { + function sendData(data, contentType, res) { res.sendHeader(200, [["Content-Type", contentType]]); res.sendBody(data); res.finish(); } function sendStaticFile(filename, res) { - puts("serving static file '" + publicPath(filename) + "'"); - var extension = filename.match(/[a-z0-9]*\.(js|html)/)[1]; + sendFile(publicPath(filename), res); + } + + function sendFile(path, res) { + puts("serving file '" + path + "'"); + var extension = path.match(/.*(js|html)$/)[1]; var contentType = extension == 'js' ? 'text/javascript' : 'text/html'; - loadUtfFile(publicPath(filename), function(data) { - sendFile(data, contentType, res); + loadUtfFile(path, function(data) { + sendData(data, contentType, res); }); } // actions - function result(req, res) { - config.process(req, JSON.parse(req.uri.params['payload'])); + function result(body, req, res) { + config.process(req, JSON.parse(body)); sendNothing(res); } - function code(req, res) { + function boot(req, res) { + + var browser = getBrowserState(req); + browser.lastSeenAt = new Date().getTime(); + + var html = loadUtfFile(publicPath('runner.html'), function(data) { + var scripts = ''; + var paths = expandPaths(config.testPaths); + for (var i=0,l=paths.length; i<l; i++) { + scripts += '<script type="text/javascript" src="/files?path=' + encodeURIComponent(paths[i]) + '"></script>' + "\n" + } + var page = data.replace('{{ scripts }}', scripts); + sendData(page, 'text/html', res); + }); + } + + function tick(req, res) { var paths = expandPaths(config.testPaths); - var i = 0; var fileContent = ''; var browser = getBrowserState(req); + var now = new Date().getTime(); function checkModTime(index) { - node.fs.stat(paths[i], function(status, stats) { + node.fs.stat(paths[index], function(status, stats) { if (typeof(browser.lastSeenAt) == 'undefined' || browser.lastSeenAt < stats['mtime'].getTime()) { - browser.lastSeenAt = new Date().getTime(); - debug("sending new code"); - i = 0; // reset loop so code loading starts at the top - loadFileAt(index); + browser.lastSeenAt = now; + sendData(JSON.stringify({reload: true}), 'text/javascript', res); } else { var nextIndex = index + 1; if (nextIndex < paths.length) { checkModTime(nextIndex); } else { - sendNothing(res); + sendData(JSON.stringify({reload: false}), 'text/javascript', res); } } }); } - - function loadFileAt(index) { - loadUtfFile(paths[index], function(data) { - fileContent += data; - var nextIndex = index + 1; - if (nextIndex < paths.length) { - loadFileAt(nextIndex); - } else { - respond(); - } - }); - } - - function respond() { - loadUtfFile(config.collectPath, function(collectCode) { - var data = {test: fileContent, collect: collectCode}; - sendFile(JSON.stringify(data), 'text/javascript', res); - }); - } - checkModTime(0); - } }; \ No newline at end of file diligence.js @@ -5,10 +5,11 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <title>runner</title> - <script src="/static/microajax.js" type="text/javascript" charset="utf-8"></script> + <script src="/static/ajax.js" type="text/javascript" charset="utf-8"></script> <script src="/static/json2.js" type="text/javascript" charset="utf-8"></script> <script src="/static/runner.js" type="text/javascript" charset="utf-8"></script> + {{ scripts }} </head> -<body onload="run();"> +<body> </body> </html> \ No newline at end of file public/runner.html @@ -1,29 +1,32 @@ -var interval; -function go() { - interval = setInterval(run, 1000); -}; +var diligence = (function() { -function run() { - microAjax('/tick', function(json){ - if (json != '') { - clearInterval(interval); - var response = JSON.parse(json); - try { - eval(response.test); - } catch(exception) { - var exception = { - message: exception.message - } - } finally { - var data = eval(response.collect); - if (exception) { - data.exception = exception; + var interval; + + function wait() { + interval = setInterval(tick, 1000); + } + + function tick() { + new ajax('/tick', function(request){ + var json = request.responseText; + if (json != '') { + response = JSON.parse(json); + if (response.reload) { + clearInterval(interval); + document.location.reload(); } - var payload = encodeURIComponent(JSON.stringify(data)); - microAjax('/result?payload=' + payload, function(data) { - go(); - }); } - } - }); -}; \ No newline at end of file + }); + }; + + function respond(result) { + var payload = JSON.stringify(result); + new ajax('/result', function(request) { + wait(); + }, payload); + } + + return { + respond: respond + } +})(); \ No newline at end of file public/runner.js public/microajax.js 99d27de2a2fe5d07a144b0ef5a63750a8b3929b3 Jim Benton jim@autonomousmachine.com http://github.com/jim/diligence/commit/795da08ee308f24bfe4397924edd558576eee4cd 795da08ee308f24bfe4397924edd558576eee4cd 2009-06-17T14:49:30-07:00 2009-06-17T14:49:30-07:00 Changed to a simpler strategy, and rewrote most of the library as a result 189f6aa864ef216a99605e29c918a77082351d87 Jim Benton jim@autonomousmachine.com