Merge branch 'oscarotero-master'

examples/output-function.ejs

@@ -0,0 +1,18 @@
+<ul>
+<%
+    users.forEach(function (user) {
+        echo('<li>');
+            echo('<strong>' + user.name + '</strong>');
+            echo('is a ' + user.age + ' year old ' + user.species);
+        echo('</li>\n');
+    });
+-%>
+</ul>
+
+<ul>
+<%
+    users.forEach(function (user) {
+        echo(include('./partial.ejs', {user: user}));
+    });
+%>
+</ul>

examples/output-function.js

@@ -0,0 +1,22 @@
+/*
+ * Believe it or not, you can declare and use functions in EJS templates too.
+ */
+
+var ejs = require('../');
+var read = require('fs').readFileSync;
+var join = require('path').join;
+var path = join(__dirname, '/output-function.ejs');
+var data = {
+    users: [
+        { name: 'Tobi', age: 2, species: 'ferret' },
+        { name: 'Loki', age: 2, species: 'ferret' },
+        { name: 'Jane', age: 6, species: 'ferret' }
+      ]
+};
+
+var ret = ejs.compile(read(path, 'utf8'), {
+    filename: path,
+    outputFunctionName: 'echo'
+})(data);
+
+console.log(ret);

examples/partial.ejs

@@ -0,0 +1,4 @@
+<li>
+    <strong><%= user.name %></strong>
+    is a <%= user.age %> year old <%= user.species %>
+</li>

lib/ejs.js

@@ -509,6 +509,7 @@ function Template(text, opts) {
   options.cache = opts.cache || false;
   options.rmWhitespace = opts.rmWhitespace;
   options.root = opts.root;
+  options.outputFunctionName = opts.outputFunctionName;
   options.localsName = opts.localsName || exports.localsName || _DEFAULT_LOCALS_NAME;
   options.views = opts.views;
 
@@ -551,6 +552,9 @@ Template.prototype = {
     if (!this.source) {
       this.generateSource();
       prepended += '  var __output = [], __append = __output.push.bind(__output);' + '\n';
+      if (opts.outputFunctionName) {
+        prepended += '  var ' + opts.outputFunctionName + ' = __append;' + '\n';
+      }
       if (opts._with !== false) {
         prepended +=  '  with (' + opts.localsName + ' || {}) {' + '\n';
         appended += '  }' + '\n';