Add functionality for dynamic includes #93

ejs.js

@@ -50,7 +50,6 @@ require.relative = function (parent) {
 
 
 require.register("ejs.js", function(module, exports, require){
-
 /*!
  * EJS
  * Copyright(c) 2012 TJ Holowaychuk <tj@vision-media.ca>
@@ -209,18 +208,34 @@ var parse = exports.parse = function(str, options){
         consumeEOL = true;
       }
 
-      if (0 == js.trim().indexOf('include')) {
-        var name = js.trim().slice(7).trim();
+       if (0 == js.trim().indexOf('include')) {
+        var optionName = js.trim().slice(7).trim();
         if (!filename) throw new Error('filename option is required for includes');
+
+        // If the options provided to include is a variable in scope
+        // use the value of that variable.
+        var name = options[optionName] || optionName;
         var path = resolveInclude(name, filename);
         include = read(path, 'utf8');
-        include = exports.parse(include, { filename: path, _with: false, open: open, close: close, compileDebug: compileDebug });
+        include = exports.parse(include, { filename: path, _with: false, open: open, close: close, compileDebug: compileDebug }); 
         buf += "' + (function(){" + include + "})() + '";
         js = '';
       }
 
       while (~(n = js.indexOf("\n", n))) n++, lineno++;
-      if (js.substr(0, 1) == ':') js = filtered(js);
+
+      switch(js.substr(0, 1)) {
+        case ':':
+          js = filtered(js);
+          break;
+        case '%':
+          js = " buf.push('<%" + js.substring(1).replace(/'/g, "\\'") + "%>');";
+          break;
+        case '#':
+          js = "";
+          break;
+      }
+
       if (js) {
         if (js.lastIndexOf('//') > js.lastIndexOf('\n')) js += '\n';
         buf += prefix;

lib/ejs.js

@@ -156,12 +156,16 @@ var parse = exports.parse = function(str, options){
         consumeEOL = true;
       }
 
-      if (0 == js.trim().indexOf('include')) {
-        var name = js.trim().slice(7).trim();
+       if (0 == js.trim().indexOf('include')) {
+        var optionName = js.trim().slice(7).trim();
         if (!filename) throw new Error('filename option is required for includes');
+
+        // If the options provided to include is a variable in scope
+        // use the value of that variable.
+        var name = options[optionName] || optionName;
         var path = resolveInclude(name, filename);
         include = read(path, 'utf8');
-        include = exports.parse(include, { filename: path, _with: false, open: open, close: close, compileDebug: compileDebug });
+        include = exports.parse(include, { filename: path, _with: false, open: open, close: close, compileDebug: compileDebug }); 
         buf += "' + (function(){" + include + "})() + '";
         js = '';
       }

test/ejs.js

@@ -301,6 +301,12 @@ describe('includes', function(){
       .should.equal(fixture('include.css.html'));
   })
 
+  it('should allow dynamic includes', function (){
+	var file = 'test/fixtures/dynamic1.ejs';
+	ejs.render(fixture('dynamic1.ejs'), {filename : file, dynamicTemplate : 'dynamic2'})
+	  .should.equal(fixture('dynamic.html'));
+  });
+
   it('should pass compileDebug to include', function(){
     var file = 'test/fixtures/include.ejs';
     var fn = ejs.compile(fixture('include.ejs'), { filename: file, open: '[[', close: ']]', compileDebug: false, client: true })

test/fixtures/dynamic.html

@@ -0,0 +1,3 @@
+<span>An ejs template generated this</span>
+<span>This was also generated by an ejs template</span>
+

test/fixtures/dynamic1.ejs

@@ -0,0 +1,2 @@
+<span>An ejs template generated this</span>
+<% include dynamicTemplate %>

test/fixtures/dynamic2.ejs

@@ -0,0 +1 @@
+<span>This was also generated by an ejs template</span>