fixing #10 with app.set('views') being an array

JacksonTian · Jun 8, 2015 · 4cbcb9b · 4cbcb9b
1 parent fdc74be
commit 4cbcb9b
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 5 deletions.
diff --git a/index.js b/index.js
@@ -115,7 +115,21 @@ var renderFile = module.exports = function(file, options, fn){
       delete options.filename;
 
       if (layout.length > 0) {
-        layout = join(options.settings.views, layout);
+        var views = options.settings.views;
+        var l = layout;
+
+        if (!Array.isArray(views)) {
+          views = [views];
+        }
+
+        for (var i = 0; i < views.length; i++) {
+          layout = join(views[i], l);
+
+          // use the first found layout
+          if (exists(layout)) {
+            break;
+          }
+        }
       }
 
       // now recurse and use the current result as `body` in the layout:

diff --git a/package.json b/package.json
@@ -20,7 +20,7 @@
     "ejs": "1.0.0"
   },
   "devDependencies": {
-    "express": "~3.0.0",
+    "express": "~4.10.0",
     "mocha": "*",
     "should": "~3.0.0",
     "methods": "0.0.1"

diff --git a/test/fixtures/thing/views-array.ejs b/test/fixtures/thing/views-array.ejs
@@ -0,0 +1 @@
+<h1>Views Array</h1>
diff --git a/test/test.partials.js b/test/test.partials.js
@@ -11,9 +11,7 @@ app.engine('ejs', engine);
 // if you want to load `layout.ejs` as the default layout
 // (this was the default in Express 2.0 so it's handy for
 // quick ports and upgrades)
-app.locals({
-  _layoutFile: true,
-})
+app.locals._layoutFile = true;
 
 app.locals.hello = 'there';
 

diff --git a/test/test.views-array.js b/test/test.views-array.js
@@ -0,0 +1,50 @@
+var express = require('express')
+  , request = require('./support/http')
+  , engine = require('../')
+  , ejs = require('ejs')
+
+var app = express();
+app.set('views',[__dirname + '/fixtures', __dirname + '/fixtures/thing']);
+app.engine('ejs', engine);
+
+// this is not the default behavior, but you can set this
+// if you want to load `layout.ejs` as the default layout
+// (this was the default in Express 2.0 so it's handy for
+// quick ports and upgrades)
+app.locals._layoutFile = true;
+
+app.get('/views-array',function(req,res,next){
+  res.render('index.ejs',{_layoutFile:false})
+})
+
+app.get('/views-array-thing',function(req,res,next){
+  res.render('views-array.ejs')
+})
+
+describe('app with views array',function(){
+
+  describe('GET /views-array', function(){
+    it('should render index.ejs from /fixtures',function(done){
+      request(app)
+        .get('/views-array')
+        .end(function(res){
+          res.should.have.status(200);
+          res.body.should.equal('<h1>Index</h1>');
+          done();
+        })
+    })
+  })
+
+  describe('GET /views-array-thing', function(){
+    it('should render views-array.ejs from /fixtures/thing',function(done){
+      request(app)
+        .get('/views-array-thing')
+        .end(function(res){
+          res.should.have.status(200);
+          res.body.should.equal('<html><head><title>ejs-locals</title></head><body><h1>Views Array</h1></body></html>');
+          done();
+        })
+    })
+  })
+
+})