Skip to content

Commit

Permalink
fix testacular and ugly-blanket
Browse files Browse the repository at this point in the history
  • Loading branch information
jerfowler committed Apr 16, 2013
1 parent 56ab49f commit be5d80d
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 8 deletions.
7 changes: 6 additions & 1 deletion config.coffee
Expand Up @@ -6,13 +6,18 @@ exports.config =
indentation:
value: 4
level: "error"
plugins:
uglify:
pattern: /\.js$/

files:
javascripts:
joinTo:
'javascripts/app.js': /^app/
'javascripts/head.js': /^vendor(\/|\\)head/
'javascripts/vendor.js': /^vendor(\/|\\)(?!head|test)/
'test/javascripts/test-vendor.js': /^vendor(\/|\\)test/
'test/javascripts/test-vendor.js': /^vendor(\/|\\)test(\/|\\)scripts(\/|\\)(?!blanket|mocha-blanket)/
'test/javascripts/blanket.js': /^vendor(\/|\\)test(\/|\\)scripts(\/|\\)(blanket|mocha-blanket)/
'test/javascripts/test.js': /^test/
order:
# Files in `vendor` directories are compiled before other files
Expand Down
5 changes: 5 additions & 0 deletions express/index.coffee
Expand Up @@ -5,15 +5,20 @@ routes = require './routes'

app = express()

app.configure 'production', ->
app.use express.limit '5mb'

app.configure ->
app.set 'views', join __dirname, 'views'
app.set 'view engine', config.view.engine
app.use express.favicon()
app.use express.logger 'dev'
app.use express.bodyParser()
app.use express.methodOverride()
app.use express.compress()
app.use express.cookieParser(config.cookie.secret)
app.use express.session()
app.use express.csrf()
app.use app.router
app.use express.static join __dirname, '..', 'public'

Expand Down
10 changes: 6 additions & 4 deletions express/views/index.jade
Expand Up @@ -13,10 +13,12 @@ block content
.navbar.navbar-inverse
.navbar-inner
a.brand(href="https://github.com/jerfowler/ExpressBrunchJade", target="_blank") Express Brunch with Jade
ul.nav
li: a(href="http://expressjs.com/", target="_blank") Express
li: a(href="http://brunch.io", target="_blank") Brunch
li: a(href="http://jade-lang.com/", target="_blank") Jade
.nav-collapse.collapse
ul.nav
li: a(href="http://expressjs.com/", target="_blank") Express
li: a(href="http://brunch.io", target="_blank") Brunch
li: a(href="http://jade-lang.com/", target="_blank") Jade
#LoginView
.row
.span12
.hero-unit
Expand Down
4 changes: 3 additions & 1 deletion express/views/test.jade
Expand Up @@ -4,9 +4,11 @@ html
title= title
link(rel='stylesheet', href='/test/stylesheets/test.css')
script(src='/socket.io/socket.io.js')
script(src='/javascripts/head.js')
script(src='/javascripts/vendor.js')
script(src='/javascripts/app.js', data-cover)
script(src='/test/javascripts/test-vendor.js', data-cover-flags="commonJS")
script(src='/test/javascripts/test-vendor.js')
script(src='/test/javascripts/blanket.js', data-cover-flags="commonJS")
script(src='/test/javascripts/test.js')
script
$(function() {
Expand Down
4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -9,7 +9,7 @@
"url": ""
},
"engines": {
"node": "~0.6.10 || 0.8 || 0.9"
"node": "~0.6.10 || 0.8 || 0.9 || 0.10"
},
"scripts": {
"start": "brunch watch --server"
Expand All @@ -22,7 +22,7 @@
"jade-brunch": "> 1.0 < 1.5",
"clean-css-brunch": "> 1.0 < 1.5",
"coffeelint-brunch": "> 1.0 < 1.5",
"ugly-blanket-brunch": "~1.5.2",
"ugly-blanket-brunch": "~1.5.3",
"async": "*",
"socket.io": "*",
"express": "*",
Expand Down

0 comments on commit be5d80d

Please sign in to comment.