'vendorizing' canvas because it's impossible to install in cloud buil…

…d. Don't know how it ever worked...

audiogram/draw-frames.js

@@ -1,12 +1,11 @@
 var fs = require("fs"),
-    path = require("path"),
-    Canvas = require("canvas"),
-    queue = require("d3").queue;
+  path = require("path"),
+  Canvas = require("../vendor/canvas"),
+  queue = require("d3").queue;
 
 function drawFrames(renderer, options, cb) {
-
   var frameQueue = queue(10),
-      canvases = [];
+    canvases = [];
 
   for (var i = 0; i < 10; i++) {
     canvases.push(new Canvas(options.width, options.height));
@@ -19,9 +18,8 @@ function drawFrames(renderer, options, cb) {
   frameQueue.awaitAll(cb);
 
   function drawFrame(frameNumber, frameCallback) {
-
     var canvas = canvases.pop(),
-        context = canvas.getContext("2d");
+      context = canvas.getContext("2d");
 
     renderer.drawFrame(context, {
       caption: options.caption,
@@ -31,44 +29,40 @@ function drawFrames(renderer, options, cb) {
       frame: frameNumber
     });
 
-    canvas.toBuffer(function(err, buf){
-
+    canvas.toBuffer(function(err, buf) {
       if (err) {
         return cb(err);
       }
 
-      fs.writeFile(path.join(options.frameDir, zeropad(frameNumber + 1, 6) + ".png"), buf, function(writeErr) {
-
-        if (writeErr) {
-          return frameCallback(writeErr);
-        }
-
-        if (options.tick) {
-          options.tick();
-        }
+      fs.writeFile(
+        path.join(options.frameDir, zeropad(frameNumber + 1, 6) + ".png"),
+        buf,
+        function(writeErr) {
+          if (writeErr) {
+            return frameCallback(writeErr);
+          }
 
-        canvases.push(canvas);
+          if (options.tick) {
+            options.tick();
+          }
 
-        return frameCallback(null);
-
-      });
+          canvases.push(canvas);
 
+          return frameCallback(null);
+        }
+      );
     });
-
   }
-
 }
 
 function zeropad(str, len) {
-
   str = str.toString();
 
   while (str.length < len) {
     str = "0" + str;
   }
 
   return str;
-
 }
 
 module.exports = drawFrames;

audiogram/initialize-canvas.js

@@ -1,10 +1,9 @@
 var fs = require("fs"),
-    path = require("path"),
-    Canvas = require("canvas"),
-    getRenderer = require("../renderer/");
+  path = require("path"),
+  Canvas = require("../vendor/canvas"),
+  getRenderer = require("../renderer/");
 
 function initializeCanvas(theme, cb) {
-
   // Fonts pre-registered in bin/worker
   var renderer = getRenderer(theme);
 
@@ -13,20 +12,26 @@ function initializeCanvas(theme, cb) {
   }
 
   // Load background image from file (done separately so renderer code can work in browser too)
-  fs.readFile(path.join(__dirname, "..", "settings", "backgrounds", theme.backgroundImage), function(err, raw){
-
-    if (err) {
-      return cb(err);
+  fs.readFile(
+    path.join(
+      __dirname,
+      "..",
+      "settings",
+      "backgrounds",
+      theme.backgroundImage
+    ),
+    function(err, raw) {
+      if (err) {
+        return cb(err);
+      }
+
+      var bg = new Canvas.Image();
+      bg.src = raw;
+      renderer.backgroundImage(bg);
+
+      return cb(null, renderer);
     }
-
-    var bg = new Canvas.Image;
-    bg.src = raw;
-    renderer.backgroundImage(bg);
-
-    return cb(null, renderer);
-
-  });
-
+  );
 }
 
 module.exports = initializeCanvas;

docker-compose.yml

@@ -8,3 +8,4 @@ services:
       - "./settings:/usr/src/app/settings/"
       - "./lib:/usr/src/app/lib/"
       - "./server:/usr/src/app/server/"
+      - "./vendor:/usr/src/app/vendor/"

lib/register-fonts.js

@@ -1,10 +1,10 @@
 var fonts = require("./settings/").fonts,
-    _ = require("underscore"),
-    Canvas = require("canvas");
+  _ = require("underscore"),
+  Canvas = require("../vendor/canvas");
 
 // Register custom fonts one time
 if (Array.isArray(fonts)) {
-  fonts.forEach(function(font){
+  fonts.forEach(function(font) {
     Canvas.registerFont(font.file, _.pick(font, "family", "weight", "style"));
   });
 }

package.json

@@ -25,7 +25,6 @@
   "dependencies": {
     "aws-sdk": "^2.2.39",
     "browserify": "^13.0.0",
-    "canvas": "git+https://github.com/chearon/node-canvas.git#12971f64a66b",
     "compression": "^1.6.1",
     "d3": "^4.1.1",
     "dotenv": "^2.0.0",

settings/themes.json

@@ -74,7 +74,7 @@
     "labelText": "Dear Sugars"
   },
   "The Choice": {
-    "waveColor": "rgba(102, 102, 102, 0.25)",
+    "waveColor": "rgba(255, 255, 255, 0.50)",
     "foregroundColor": "#fff",
     "citationColor": "#fff",
     "backgroundColor": "#f4d7b9",