Kinda working

audiogram/index.js

@@ -12,12 +12,10 @@ var path = require("path"),
     combineFrames = require("./combine-frames.js"),
     trimAudio = require("./trim.js");
 
-function Audiogram(settings) {
+function Audiogram(id) {
 
   // Unique audiogram ID
-  this.id = settings.id;
-
-  this.settings = settings;
+  this.id = id;
 
   // File locations to use
   this.dir = path.join(serverSettings.workingDirectory, this.id);
@@ -66,7 +64,7 @@ Audiogram.prototype.getWaveform = function(cb) {
     samplesPerFrame: this.settings.samplesPerFrame
   }, function(err, waveform){
 
-    return cb(err, self.settings.waveform = waveform);
+    return cb(err, self.waveform = waveform);
 
   });
 
@@ -120,7 +118,7 @@ Audiogram.prototype.drawFrames = function(cb) {
       numFrames: self.numFrames,
       frameDir: self.frameDir,
       caption: self.settings.caption,
-      waveform: self.settings.waveform,
+      waveform: self.waveform,
       tick: function() {
         transports.incrementField(self.id, "framesComplete");
       }

bin/worker

@@ -30,7 +30,10 @@ function pluckJob(){
 
 function render(settings) {
 
-  var audiogram = new Audiogram(settings);
+  var audiogram = new Audiogram(settings.id);
+
+  // TODO rename to theme
+  audiogram.settings = settings;
 
   audiogram.render(function(err){
 

server/render.js

@@ -2,7 +2,6 @@ var serverSettings = require("../settings/"),
     spawn = require("child_process").spawn,
     path = require("path"),
     _ = require("underscore"),
-    Audiogram = require("../audiogram/"),
     logger = require("../lib/logger"),
     transports = require("../lib/transports");
 
@@ -22,8 +21,6 @@ function validate(req, res, next) {
     return res.status(500).send("No valid audio received.");
   }
 
-  req.body.settings.id = req.file.destination.split(path.sep).pop();
-
   // Start at the beginning, or specified time
   if (req.body.settings.start) {
     req.body.settings.start = +req.body.settings.start;
@@ -39,18 +36,22 @@ function validate(req, res, next) {
 
 function route(req, res) {
 
-  var audiogram = new Audiogram(req.body.settings);
+  var id = req.file.destination.split(path.sep).pop();
 
-  transports.uploadAudio(audiogram.audioPath, "audio/" + audiogram.id,function(err) {
+  transports.uploadAudio(path.join(req.file.destination, "audio"), "audio/" + id,function(err) {
 
     if (err) {
       throw err;
     }
 
     // Queue up the job with a timestamp
-    transports.addJob(_.extend({ created: (new Date()).getTime() }, req.body.settings));
+    transports.addJob({
+      created: (new Date()).getTime(),
+      settings: req.body.settings,
+      caption: req.body.caption
+    });
 
-    res.json({ id: req.body.settings.id });
+    res.json({ id: id });
 
     // If there's no separate worker, spawn one right away
     if (!serverSettings.worker) {

test/frame-test.js

@@ -25,9 +25,6 @@ tape.test("Draw frame", function(test){
   initializeCanvas(options, function(err, renderer){
 
     test.error(err);
-    test.assert(renderer.context.canvas instanceof Canvas);
-    test.assert(renderer.context.canvas.width === options.width);
-    test.assert(renderer.context.canvas.height === options.height);
 
     drawFrames(renderer, {
       numFrames: 2,
@@ -54,9 +51,6 @@ tape.test("Default colors", function(test){
   initializeCanvas(options, function(err, renderer){
 
     test.error(err);
-    test.assert(renderer.context.canvas instanceof Canvas);
-    test.assert(renderer.context.canvas.width === options.width);
-    test.assert(renderer.context.canvas.height === options.height);
 
     drawFrames(renderer, {
       numFrames: 2,
@@ -85,9 +79,6 @@ tape.test("Square frame", function(test){
   initializeCanvas(options, function(err, renderer){
 
     test.error(err);
-    test.assert(renderer.context.canvas instanceof Canvas);
-    test.assert(renderer.context.canvas.width === options.width);
-    test.assert(renderer.context.canvas.height === options.height);
 
     drawFrames(renderer, {
       numFrames: 2,