Merge pull request #906 from btd/master

Few updates to make kue a bit more up to date

lib/http/index.js

@@ -17,7 +17,7 @@ var app        = express()
   , provides   = require('./middleware/provides')
   , stylus     = require('stylus')
   , routes     = require('./routes')
-  , jade       = require('jade')
+  , pug       = require('pug')
   , json       = require('./routes/json')
   , util       = require('util')
   , nib        = require('nib');
@@ -37,8 +37,8 @@ function compile( str, path ) {
 // config
 
 app.set('view options', { doctype: 'html' });
-app.set('view engine', 'jade');
-app.engine('jade', jade.renderFile);
+app.set('view engine', 'pug');
+app.engine('pug', pug.renderFile);
 app.set('views', __dirname + '/views');
 app.set('title', 'Kue');
 app.locals     = { inspect: util.inspect };

lib/http/public/stylesheets/main.css

@@ -37,17 +37,17 @@ body {
   border-top: 1px solid #545454;
   border-bottom: 1px solid #333;
   font-size: 12px;
-  background: #3a3a3a;
+  background: #393939;
 }
 #menu li a:hover {
-  background: #444;
+  background: #434343;
 }
 #menu li a:active,
 #menu li a.active {
   background: #343434;
-  -webkit-box-shadow: inset 0 0 3px 2px #292929, inset 0 -5px 10px 2px #313131;
-  box-shadow: inset 0 0 3px 2px #292929, inset 0 -5px 10px 2px #313131;
-  border-bottom: 1px solid #232323;
+  -webkit-box-shadow: inset 0 0 3px 2px #282828, inset 0 -5px 10px 2px #303030;
+  box-shadow: inset 0 0 3px 2px #282828, inset 0 -5px 10px 2px #303030;
+  border-bottom: 1px solid #222;
 }
 .context-menu {
   display: none;

lib/http/views/_filter.pug

@@ -0,0 +1,4 @@
+select#filter
+    option(value='') filter by
+      each type in types
+        option(value=type)= type

package.json

@@ -27,15 +27,15 @@
   "dependencies": {
     "body-parser": "^1.12.2",
     "express": "^4.12.2",
-    "jade": "^1.11.0",
-    "lodash": "^3.10.1",
-    "lodash-deep": "^1.1.0",
+    "lodash": "^4.0.0",
+    "lodash-deep": "^2.0.0",
     "nib": "~1.1.0",
-    "node-redis-warlock": "~0.1.2",
+    "node-redis-warlock": "~0.2.0",
+    "pug": "^2.0.0-beta3",
     "redis": "~2.6.0-2",
     "reds": "~0.2.5",
     "stylus": "~0.52.4",
-    "yargs": "^3.31.0"
+    "yargs": "^4.0.0"
   },
   "devDependencies": {
     "async": "^1.4.2",
@@ -44,7 +44,7 @@
     "mocha": "^2.3.3",
     "should": "^3.1.0",
     "sinon": "^1.17.2",
-    "supertest": "~1.1.0"
+    "supertest": "^1.1.0"
   },
   "main": "index",
   "bin": {

test/test.coffee

@@ -2,6 +2,7 @@ _ = require 'lodash'
 async = require 'async'
 should = require 'should'
 kue = require '../'
+util = require 'util'
 
 describe 'Kue Tests', ->
 
@@ -313,31 +314,33 @@ describe 'Kue Tests', ->
     it 'should log objects, errors, arrays, numbers, etc', (done) ->
       jobs.create( 'log-job', { title: 'simple job' } ).save()
       jobs.process 'log-job', (job, jdone) ->
+        testErr = new Error('test error')# to compare the same stack
         job.log()
         job.log(undefined)
         job.log(null)
         job.log({test: 'some text'})
-        job.log(new Error('test error'))
+        job.log(testErr)
         job.log([1,2,3])
         job.log(123)
         job.log(1.23)
         job.log(0)
         job.log(NaN)
         job.log(true)
         job.log(false)
+
         Job.log job.id, (err,logs) ->
-          logs[0].should.be.equal('undefined');
-          logs[1].should.be.equal('undefined');
-          logs[2].should.be.equal('null');
-          logs[3].should.be.equal('{ test: \'some text\' }');
-          logs[4].should.be.equal('[Error: test error]');
-          logs[5].should.be.equal('[ 1, 2, 3 ]');
-          logs[6].should.be.equal('123');
-          logs[7].should.be.equal('1.23');
-          logs[8].should.be.equal('0');
-          logs[9].should.be.equal('NaN');
-          logs[10].should.be.equal('true');
-          logs[11].should.be.equal('false');
+          logs[0].should.be.equal(util.format(undefined));
+          logs[1].should.be.equal(util.format(undefined));
+          logs[2].should.be.equal(util.format(null));
+          logs[3].should.be.equal(util.format({ test: 'some text' }));
+          logs[4].should.be.equal(util.format(testErr));
+          logs[5].should.be.equal(util.format([ 1, 2, 3 ]));
+          logs[6].should.be.equal(util.format(123));
+          logs[7].should.be.equal(util.format(1.23));
+          logs[8].should.be.equal(util.format(0));
+          logs[9].should.be.equal(util.format(NaN));
+          logs[10].should.be.equal(util.format(true));
+          logs[11].should.be.equal(util.format(false));
           done()
         jdone()
 
@@ -449,4 +452,3 @@ describe 'Kue Tests', ->
         async.each(ids, (id, next) ->
           Job.remove(id, next)
         , done)
-