Make locals available in layouts. Fixes #3

Makefile

@@ -7,4 +7,4 @@ test:
 .PHONY: test
 
 watch: 
-	./node_modules/.bin/mocha --reporter min -w
+	./node_modules/.bin/mocha --reporter min -w --growl

lib/express-layouts.js

@@ -78,6 +78,12 @@ module.exports = exports = function(req, res, next) {
       }
 
       var locals = { body: str }
+      for (var l in options) {
+        if (options.hasOwnProperty(l)
+          && l != 'layout'
+          && l != 'contentFor')
+          locals[l] = options[l];
+      }
 
       if (options.extractScripts === true 
         || (options.extractScripts === undefined && app.get('layout extractScripts') === true))

package.json

@@ -3,7 +3,7 @@
   "name": "express-ejs-layouts",
   "description": "Layout support for ejs in express.",
   "keywords": ["express", "layout", "ejs"],
-  "version": "0.1.0",
+  "version": "0.2.0",
   "main": "lib/express-layouts.js",
   "dependencies": {},
   "devDependencies": {

test/ejs.js

@@ -137,5 +137,16 @@ describe('rendering contentFor', function() {
       done()
     })
   })
+
+  it ('should provide the locals to the layout aswell', function(done) {
+    app.use(function(req, res){
+      res.render(__dirname + '/fixtures/view.ejs', 
+        { layout: 'layoutWithMultipleContent', foo: 'oof', bar: 'rab' })
+    })
+    req(function(body){
+      body.should.equal('rab\\/oof\nhi')
+      done()
+    })
+  })
 })