Fixed #94 correctly specify the execution context

lib/ejs.js

@@ -122,7 +122,7 @@ exports.resolveInclude = function(name, filename) {
 function handleCache(options, template) {
   var fn
     , path = options.filename
-    , hasTemplate = template !== undefined;
+    , hasTemplate = arguments.length > 1;
 
   if (options.cache) {
     if (!path) {
@@ -312,8 +312,7 @@ exports.render = function (template, data, opts) {
     cpOptsInData(data, opts);
   }
 
-  fn = handleCache(opts, template);
-  return fn.call(opts.context, data);
+  return handleCache(opts, template)(data);
 };
 
 /**
@@ -337,6 +336,9 @@ exports.renderFile = function () {
     , opts = args.pop() || {}
     , result;
 
+  // Don't pollute passed in opts obj with new vals
+  opts = utils.shallowCopy({}, opts);
+
   // No options object -- if there are optiony names
   // in the data, copy them to options
   if (arguments.length == 3) {
@@ -378,6 +380,7 @@ function Template(text, opts) {
   options.filename = opts.filename;
   options.delimiter = opts.delimiter || exports.delimiter || _DEFAULT_DELIMITER;
   options._with = typeof opts._with != 'undefined' ? opts._with : true;
+  options.context = opts.context;
   options.cache = opts.cache || false;
   options.rmWhitespace = opts.rmWhitespace;
   this.opts = options;
@@ -474,6 +477,7 @@ Template.prototype = {
 
     // Return a callable function which will execute the function
     // created by the source-code, with the passed data as locals
+    // Adds a local `include` function which allows full recursive include
     var returnedFn = function (data) {
       var include = function (path, includeData) {
         var d = utils.shallowCopy({}, data);
@@ -482,7 +486,7 @@ Template.prototype = {
         }
         return includeFile(path, opts)(d);
       };
-      return fn(data || {}, escape, include, rethrow);
+      return fn.apply(opts.context, [data || {}, escape, include, rethrow]);
     };
     returnedFn.dependencies = this.dependencies;
     return returnedFn;

test/ejs.js

@@ -137,7 +137,7 @@ suite('ejs.compile(str, options)', function () {
   });
 });
 
-suite('ejs.render(str, data)', function () {
+suite('ejs.render(str, data, opts)', function () {
   test('render the template', function () {
     assert.equal(ejs.render('<p>yay</p>'), '<p>yay</p>');
   });
@@ -228,6 +228,11 @@ suite('ejs.render(str, data)', function () {
     ejs.cache = oldCache;
   });
 
+  test('opts.context', function () {
+    var ctxt = {foo: 'FOO'}
+      , out = ejs.render('<%= this.foo %>', {}, {context: ctxt});
+    assert.equal(out, ctxt.foo);
+  });
 });
 
 suite('ejs.renderFile(path, [data], [options], fn)', function () {
@@ -342,6 +347,18 @@ suite('ejs.renderFile(path, [data], [options], fn)', function () {
     });
   });
 
+  test('opts.context', function (done) {
+    var ctxt = {foo: 'FOO'};
+    ejs.renderFile('test/fixtures/with-context.ejs', {},
+          {context: ctxt}, function(err, html) {
+      if (err) {
+        return done(err);
+      }
+      assert.equal(html, ctxt.foo + '\n');
+      done();
+    });
+
+  });
 });
 
 suite('cache specific', function () {

test/fixtures/with-context.ejs

@@ -0,0 +1 @@
+<%= this.foo %>