Merge pull request #165 from Medium/nick-soynode

upgrade soynode

package.json

@@ -1,7 +1,7 @@
 {
   "name": "matador",
   "description": "an MVC framework for Node",
-  "version": "2.0.0-alpha.10",
+  "version": "2.0.0-alpha.11",
   "homepage": "https://github.com/Medium/matador",
   "main": "src/matador.js",
   "authors": [
@@ -23,7 +23,7 @@
   "dependencies": {
     "connect": "2.3.3",
     "valentine": "1.8.0",
-    "soynode": "^0.7.0",
+    "soynode": "^1.0.0",
     "useragent": "~2.0.6"
   },
   "devDependencies": {

src/TemplateEngine.js

@@ -29,7 +29,10 @@ TemplateEngine.prototype.precompileTemplates = function (searchPaths, options, c
 
   var pathsLeft = searchPaths.length
 
-  function onPathDone(err) {
+  function onPathDone(dir, err) {
+    if (dir) {
+      console.log('Done compiling templates in', dir)
+    }
     pathsLeft--
 
     if (err) {
@@ -46,12 +49,12 @@ TemplateEngine.prototype.precompileTemplates = function (searchPaths, options, c
     dir = dir + '/views'
 
     if (!isDirectory(dir)) {
-      onPathDone(null)
+      onPathDone(null, null)
       return
     }
 
     console.log('Compiling Templates in', dir)
-    soynode.compileTemplates(dir, onPathDone)
+    soynode.compileTemplates(dir, onPathDone.bind(null, dir))
   })
 }
 

src/all/server.js

@@ -5,7 +5,12 @@ var matador = require('matador')
 
 app.useDevErrorHandler()
 app.useCommonMiddleware()
-app.start()
-app.listen(port)
-
-console.log('matador running on port ' + port)
+app.start(function (err) {
+  if (err) {
+    console.error('matador failed to boot')
+    console.error(err)
+  } else {
+    app.listen(port)
+    console.log('matador running on port ' + port)
+  }
+})

tests/integration/template_engine/afterBoot.sh

@@ -1,2 +1,2 @@
 # We need to wait for SoyNode to finish compiling
-sleep 2
+sleep 3