From 56a2dfc76dbc57713d05a135e031c6e73fd74657 Mon Sep 17 00:00:00 2001
From: Oskar Krawczyk <oskar.krawczyk@gmail.com>
Date: Sun, 19 Dec 2010 13:48:09 +0100
Subject: [PATCH 01/64] Added MooTools compat plugin

---
 mustache-mootools/mustache.js.tpl.post | 5 +++++
 mustache-mootools/mustache.js.tpl.pre  | 2 ++
 2 files changed, 7 insertions(+)
 create mode 100644 mustache-mootools/mustache.js.tpl.post
 create mode 100644 mustache-mootools/mustache.js.tpl.pre

diff --git a/mustache-mootools/mustache.js.tpl.post b/mustache-mootools/mustache.js.tpl.post
new file mode 100644
index 0000000..a1b1b43
--- /dev/null
+++ b/mustache-mootools/mustache.js.tpl.post
@@ -0,0 +1,5 @@
+
+    Object.implement('mustache', function(view, partials){
+        return Mustache.to_html(view, this, partials);
+    });
+})();
diff --git a/mustache-mootools/mustache.js.tpl.pre b/mustache-mootools/mustache.js.tpl.pre
new file mode 100644
index 0000000..9839f99
--- /dev/null
+++ b/mustache-mootools/mustache.js.tpl.pre
@@ -0,0 +1,2 @@
+(function(){
+

From deedba967ed3a19d7a3bfaa9882230b00dc8c0c6 Mon Sep 17 00:00:00 2001
From: Tom MacWright <tom@macwright.org>
Date: Thu, 13 Oct 2011 12:01:17 -0400
Subject: [PATCH 02/64] Condition module.exports to make commonjs version work
 in browsers and not throw an error.

---
 mustache-commonjs/mustache.js.tpl.post | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/mustache-commonjs/mustache.js.tpl.post b/mustache-commonjs/mustache.js.tpl.post
index 885803f..f566443 100644
--- a/mustache-commonjs/mustache.js.tpl.post
+++ b/mustache-commonjs/mustache.js.tpl.post
@@ -1,7 +1,8 @@
+if (typeof module !== 'undefined' && module.exports) {
+    exports.name = Mustache.name;
+    exports.version = Mustache.version;
 
-exports.name = Mustache.name;
-exports.version = Mustache.version;
-
-exports.to_html = function() {
-  return Mustache.to_html.apply(this, arguments);
-};
+    exports.to_html = function() {
+      return Mustache.to_html.apply(this, arguments);
+    };
+}

From ae5f8aded0caf984f42e4fb4faae2c6b237d5c54 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Mon, 5 Dec 2011 11:44:57 -0800
Subject: [PATCH 03/64] Ignore .rvmrc

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index a7ed15c..33f7857 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.DS_Store
+.rvmrc
 runner.js
 jquery.mustache.js
 dojox

From ff543bb74d0c1d8f5c85c2e274fbee396604110e Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Mon, 12 Dec 2011 16:48:26 -0800
Subject: [PATCH 04/64] Use native Array.isArray when available

---
 mustache.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/mustache.js b/mustache.js
index 5677871..038a9f7 100644
--- a/mustache.js
+++ b/mustache.js
@@ -8,6 +8,12 @@ var Mustache = function() {
   var regexCache = {};
   var Renderer = function() {};
 
+  var _toString = Object.prototype.toString;
+
+  Array.isArray = Array.isArray || function (obj) {
+    return _toString.call(obj) == "[object Array]";
+  }
+
   Renderer.prototype = {
     otag: "{{",
     ctag: "}}",
@@ -161,14 +167,14 @@ var Mustache = function() {
             value = that.find(name, context);
 
         if (type === "^") { // inverted section
-          if (!value || that.is_array(value) && value.length === 0) {
+          if (!value || Array.isArray(value) && value.length === 0) {
             // false or empty list, render it
             renderedContent = that.render(content, context, partials, true);
           } else {
             renderedContent = "";
           }
         } else if (type === "#") { // normal section
-          if (that.is_array(value)) { // Enumerable, Let's loop!
+          if (Array.isArray(value)) { // Enumerable, Let's loop!
             renderedContent = that.map(value, function(row) {
               return that.render(content, that.create_context(row), partials, true);
             }).join("");
@@ -269,7 +275,7 @@ var Mustache = function() {
       }
 
       var value;
-      
+
       // check for dot notation eg. foo.bar
       if(name.match(/([a-z_]+)\./ig)){
         var childValue = this.walk_context(name, context);
@@ -354,10 +360,6 @@ var Mustache = function() {
       return a && typeof a == "object";
     },
 
-    is_array: function(a) {
-      return Object.prototype.toString.call(a) === '[object Array]';
-    },
-
     /*
       Gets rid of leading and trailing whitespace
     */

From f44254cc7ea3a796bd00eab7d9ffade5ec96dacb Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Mon, 5 Dec 2011 12:02:21 -0800
Subject: [PATCH 05/64] Use native String#trim when available

Uses a method similar to jQuery.trim in jQuery 1.7.1.
---
 mustache.js | 41 +++++++++++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/mustache.js b/mustache.js
index 038a9f7..715422c 100644
--- a/mustache.js
+++ b/mustache.js
@@ -5,15 +5,39 @@
 */
 
 var Mustache = function() {
-  var regexCache = {};
-  var Renderer = function() {};
-
   var _toString = Object.prototype.toString;
 
   Array.isArray = Array.isArray || function (obj) {
     return _toString.call(obj) == "[object Array]";
   }
 
+  var _trim = String.prototype.trim, trim;
+
+  if (_trim) {
+    trim = function (text) {
+      return text == null ? "" : _trim.call(text);
+    }
+  } else {
+    var trimLeft, trimRight;
+
+    // IE doesn't match non-breaking spaces with \s.
+    if ((/\S/).test("\xA0")) {
+      trimLeft = /^[\s\xA0]+/;
+      trimRight = /[\s\xA0]+$/;
+    } else {
+      trimLeft = /^\s+/;
+      trimRight = /\s+$/;
+    }
+
+    trim = function (text) {
+      return text == null ? "" :
+        text.toString().replace(trimLeft, "").replace(trimRight, "");
+    }
+  }
+
+  var regexCache = {};
+  var Renderer = function () {};
+
   Renderer.prototype = {
     otag: "{{",
     ctag: "}}",
@@ -111,7 +135,7 @@ var Mustache = function() {
       Tries to find a partial in the curent scope and render it
     */
     render_partial: function(name, context, partials) {
-      name = this.trim(name);
+      name = trim(name);
       if(!partials || partials[name] === undefined) {
         throw({message: "unknown_partial '" + name + "'"});
       }
@@ -267,7 +291,7 @@ var Mustache = function() {
       from the view object
     */
     find: function(name, context) {
-      name = this.trim(name);
+      name = trim(name);
 
       // Checks whether a value is thruthy or false or 0
       function is_kinda_truthy(bool) {
@@ -360,13 +384,6 @@ var Mustache = function() {
       return a && typeof a == "object";
     },
 
-    /*
-      Gets rid of leading and trailing whitespace
-    */
-    trim: function(s) {
-      return s.replace(/^\s*|\s*$/g, "");
-    },
-
     /*
       Why, why, why? Because IE. Cry, cry cry.
     */

From a20cf0032b60950a5fba361dcc172304e7f0e90c Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Mon, 12 Dec 2011 17:01:27 -0800
Subject: [PATCH 06/64] Consistent spacing

---
 mustache.js | 111 ++++++++++++++++++++++++++--------------------------
 1 file changed, 55 insertions(+), 56 deletions(-)

diff --git a/mustache.js b/mustache.js
index 715422c..374c818 100644
--- a/mustache.js
+++ b/mustache.js
@@ -4,7 +4,7 @@
   See http://mustache.github.com/ for more info.
 */
 
-var Mustache = function() {
+var Mustache = function () {
   var _toString = Object.prototype.toString;
 
   Array.isArray = Array.isArray || function (obj) {
@@ -48,16 +48,16 @@ var Mustache = function() {
     },
     context: {},
 
-    render: function(template, context, partials, in_recursion) {
+    render: function (template, context, partials, in_recursion) {
       // reset buffer & set context
-      if(!in_recursion) {
+      if (!in_recursion) {
         this.context = context;
         this.buffer = []; // TODO: make this non-lazy
       }
 
       // fail fast
-      if(!this.includes("", template)) {
-        if(in_recursion) {
+      if (!this.includes("", template)) {
+        if (in_recursion) {
           return template;
         } else {
           this.send(template);
@@ -86,13 +86,13 @@ var Mustache = function() {
     /*
       Sends parsed lines
     */
-    send: function(line) {
-      if(line !== "") {
+    send: function (line) {
+      if (line !== "") {
         this.buffer.push(line);
       }
     },
 
-    sendLines: function(text) {
+    sendLines: function (text) {
       if (text) {
         var lines = text.split("\n");
         for (var i = 0; i < lines.length; i++) {
@@ -104,25 +104,25 @@ var Mustache = function() {
     /*
       Looks for %PRAGMAS
     */
-    render_pragmas: function(template) {
+    render_pragmas: function (template) {
       // no pragmas
-      if(!this.includes("%", template)) {
+      if (!this.includes("%", template)) {
         return template;
       }
 
       var that = this;
-      var regex = this.getCachedRegex("render_pragmas", function(otag, ctag) {
+      var regex = this.getCachedRegex("render_pragmas", function (otag, ctag) {
         return new RegExp(otag + "%([\\w-]+) ?([\\w]+=[\\w]+)?" + ctag, "g");
       });
 
-      return template.replace(regex, function(match, pragma, options) {
-        if(!that.pragmas_implemented[pragma]) {
+      return template.replace(regex, function (match, pragma, options) {
+        if (!that.pragmas_implemented[pragma]) {
           throw({message:
             "This implementation of mustache doesn't understand the '" +
             pragma + "' pragma"});
         }
         that.pragmas[pragma] = {};
-        if(options) {
+        if (options) {
           var opts = options.split("=");
           that.pragmas[pragma][opts[0]] = opts[1];
         }
@@ -134,12 +134,12 @@ var Mustache = function() {
     /*
       Tries to find a partial in the curent scope and render it
     */
-    render_partial: function(name, context, partials) {
+    render_partial: function (name, context, partials) {
       name = trim(name);
-      if(!partials || partials[name] === undefined) {
+      if (!partials || partials[name] === undefined) {
         throw({message: "unknown_partial '" + name + "'"});
       }
-      if(typeof(context[name]) != "object") {
+      if (typeof(context[name]) != "object") {
         return this.render(partials[name], context, partials, true);
       }
       return this.render(partials[name], context[name], partials, true);
@@ -148,15 +148,15 @@ var Mustache = function() {
     /*
       Renders inverted (^) and normal (#) sections
     */
-    render_section: function(template, context, partials) {
-      if(!this.includes("#", template) && !this.includes("^", template)) {
+    render_section: function (template, context, partials) {
+      if (!this.includes("#", template) && !this.includes("^", template)) {
         // did not render anything, there were no sections
         return false;
       }
 
       var that = this;
 
-      var regex = this.getCachedRegex("render_section", function(otag, ctag) {
+      var regex = this.getCachedRegex("render_section", function (otag, ctag) {
         // This regex matches _the first_ section ({{#foo}}{{/foo}}), and captures the remainder
         return new RegExp(
           "^([\\s\\S]*?)" +         // all the crap at the beginning that is not {{*}} ($1)
@@ -178,7 +178,7 @@ var Mustache = function() {
 
 
       // for each {{#foo}}{{/foo}} section do...
-      return template.replace(regex, function(match, before, type, name, content, after) {
+      return template.replace(regex, function (match, before, type, name, content, after) {
         // before contains only tags, no sections
         var renderedBefore = before ? that.render_tags(before, context, partials, true) : "",
 
@@ -199,7 +199,7 @@ var Mustache = function() {
           }
         } else if (type === "#") { // normal section
           if (Array.isArray(value)) { // Enumerable, Let's loop!
-            renderedContent = that.map(value, function(row) {
+            renderedContent = that.map(value, function (row) {
               return that.render(content, that.create_context(row), partials, true);
             }).join("");
           } else if (that.is_object(value)) { // Object, Use it as subcontext!
@@ -207,7 +207,7 @@ var Mustache = function() {
               partials, true);
           } else if (typeof value === "function") {
             // higher order section
-            renderedContent = value.call(context, content, function(text) {
+            renderedContent = value.call(context, content, function (text) {
               return that.render(text, context, partials, true);
             });
           } else if (value) { // boolean section
@@ -224,20 +224,20 @@ var Mustache = function() {
     /*
       Replace {{foo}} and friends with values from our view
     */
-    render_tags: function(template, context, partials, in_recursion) {
+    render_tags: function (template, context, partials, in_recursion) {
       // tit for tat
       var that = this;
 
 
 
-      var new_regex = function() {
-        return that.getCachedRegex("render_tags", function(otag, ctag) {
+      var new_regex = function () {
+        return that.getCachedRegex("render_tags", function (otag, ctag) {
           return new RegExp(otag + "(=|!|>|\\{|%)?([^\\/#\\^]+?)\\1?" + ctag + "+", "g");
         });
       };
 
       var regex = new_regex();
-      var tag_replace_callback = function(match, operator, name) {
+      var tag_replace_callback = function (match, operator, name) {
         switch(operator) {
         case "!": // ignore comments
           return "";
@@ -256,25 +256,25 @@ var Mustache = function() {
       var lines = template.split("\n");
       for(var i = 0; i < lines.length; i++) {
         lines[i] = lines[i].replace(regex, tag_replace_callback, this);
-        if(!in_recursion) {
+        if (!in_recursion) {
           this.send(lines[i]);
         }
       }
 
-      if(in_recursion) {
+      if (in_recursion) {
         return lines.join("\n");
       }
     },
 
-    set_delimiters: function(delimiters) {
+    set_delimiters: function (delimiters) {
       var dels = delimiters.split(" ");
       this.otag = this.escape_regex(dels[0]);
       this.ctag = this.escape_regex(dels[1]);
     },
 
-    escape_regex: function(text) {
+    escape_regex: function (text) {
       // thank you Simon Willison
-      if(!arguments.callee.sRE) {
+      if (!arguments.callee.sRE) {
         var specials = [
           '/', '.', '*', '+', '?', '|',
           '(', ')', '[', ']', '{', '}', '\\'
@@ -290,7 +290,7 @@ var Mustache = function() {
       find `name` in current `context`. That is find me a value
       from the view object
     */
-    find: function(name, context) {
+    find: function (name, context) {
       name = trim(name);
 
       // Checks whether a value is thruthy or false or 0
@@ -301,41 +301,40 @@ var Mustache = function() {
       var value;
 
       // check for dot notation eg. foo.bar
-      if(name.match(/([a-z_]+)\./ig)){
+      if (name.match(/([a-z_]+)\./ig)) {
         var childValue = this.walk_context(name, context);
-        if(is_kinda_truthy(childValue)) {
+        if (is_kinda_truthy(childValue)) {
           value = childValue;
         }
-      }
-      else{
-        if(is_kinda_truthy(context[name])) {
+      } else {
+        if (is_kinda_truthy(context[name])) {
           value = context[name];
-        } else if(is_kinda_truthy(this.context[name])) {
+        } else if (is_kinda_truthy(this.context[name])) {
           value = this.context[name];
         }
       }
 
-      if(typeof value === "function") {
+      if (typeof value === "function") {
         return value.apply(context);
       }
-      if(value !== undefined) {
+      if (value !== undefined) {
         return value;
       }
       // silently ignore unkown variables
       return "";
     },
 
-    walk_context: function(name, context){
+    walk_context: function (name, context) {
       var path = name.split('.');
       // if the var doesn't exist in current context, check the top level context
       var value_context = (context[path[0]] != undefined) ? context : this.context;
       var value = value_context[path.shift()];
-      while(value != undefined && path.length > 0){
+      while (value != undefined && path.length > 0) {
         value_context = value;
         value = value[path.shift()];
       }
       // if the value is a function, call it, binding the correct context
-      if(typeof value === "function") {
+      if (typeof value === "function") {
         return value.apply(value_context);
       }
       return value;
@@ -344,16 +343,16 @@ var Mustache = function() {
     // Utility methods
 
     /* includes tag */
-    includes: function(needle, haystack) {
+    includes: function (needle, haystack) {
       return haystack.indexOf(this.otag + needle) != -1;
     },
 
     /*
       Does away with nasty characters
     */
-    escape: function(s) {
+    escape: function (s) {
       s = String(s === null ? "" : s);
-      return s.replace(/&(?!\w+;)|["'<>\\]/g, function(s) {
+      return s.replace(/&(?!\w+;)|["'<>\\]/g, function (s) {
         switch(s) {
         case "&": return "&amp;";
         case '"': return '&quot;';
@@ -366,12 +365,12 @@ var Mustache = function() {
     },
 
     // by @langalex, support for arrays of strings
-    create_context: function(_context) {
-      if(this.is_object(_context)) {
+    create_context: function (_context) {
+      if (this.is_object(_context)) {
         return _context;
       } else {
         var iterator = ".";
-        if(this.pragmas["IMPLICIT-ITERATOR"]) {
+        if (this.pragmas["IMPLICIT-ITERATOR"]) {
           iterator = this.pragmas["IMPLICIT-ITERATOR"].iterator;
         }
         var ctx = {};
@@ -380,14 +379,14 @@ var Mustache = function() {
       }
     },
 
-    is_object: function(a) {
+    is_object: function (a) {
       return a && typeof a == "object";
     },
 
     /*
       Why, why, why? Because IE. Cry, cry cry.
     */
-    map: function(array, fn) {
+    map: function (array, fn) {
       if (typeof array.map == "function") {
         return array.map(fn);
       } else {
@@ -400,7 +399,7 @@ var Mustache = function() {
       }
     },
 
-    getCachedRegex: function(name, generator) {
+    getCachedRegex: function (name, generator) {
       var byOtag = regexCache[this.otag];
       if (!byOtag) {
         byOtag = regexCache[this.otag] = {};
@@ -427,13 +426,13 @@ var Mustache = function() {
     /*
       Turns a template and view into HTML
     */
-    to_html: function(template, view, partials, send_fun) {
+    to_html: function (template, view, partials, send_fun) {
       var renderer = new Renderer();
-      if(send_fun) {
+      if (send_fun) {
         renderer.send = send_fun;
       }
       renderer.render(template, view || {}, partials);
-      if(!send_fun) {
+      if (!send_fun) {
         return renderer.buffer.join("\n");
       }
     }

From 93dd0ddb91159e60da314b3b06b7d78e01672ccf Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Mon, 12 Dec 2011 17:02:16 -0800
Subject: [PATCH 07/64] Consistent use of typeof

---
 mustache.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mustache.js b/mustache.js
index 374c818..9d5fd01 100644
--- a/mustache.js
+++ b/mustache.js
@@ -139,7 +139,7 @@ var Mustache = function () {
       if (!partials || partials[name] === undefined) {
         throw({message: "unknown_partial '" + name + "'"});
       }
-      if (typeof(context[name]) != "object") {
+      if (typeof context[name] != "object") {
         return this.render(partials[name], context, partials, true);
       }
       return this.render(partials[name], context[name], partials, true);
@@ -205,7 +205,7 @@ var Mustache = function () {
           } else if (that.is_object(value)) { // Object, Use it as subcontext!
             renderedContent = that.render(content, that.create_context(value),
               partials, true);
-          } else if (typeof value === "function") {
+          } else if (typeof value == "function") {
             // higher order section
             renderedContent = value.call(context, content, function (text) {
               return that.render(text, context, partials, true);
@@ -314,7 +314,7 @@ var Mustache = function () {
         }
       }
 
-      if (typeof value === "function") {
+      if (typeof value == "function") {
         return value.apply(context);
       }
       if (value !== undefined) {
@@ -334,7 +334,7 @@ var Mustache = function () {
         value = value[path.shift()];
       }
       // if the value is a function, call it, binding the correct context
-      if (typeof value === "function") {
+      if (typeof value == "function") {
         return value.apply(value_context);
       }
       return value;

From 3bbe1ab9d80854386e774047c16a18f89d3cb60e Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Tue, 13 Dec 2011 21:24:28 -0800
Subject: [PATCH 08/64] Fix rendering partials w/o data

Thanks drobbins (see https://github.com/janl/mustache.js/pull/113)
---
 mustache.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mustache.js b/mustache.js
index 9d5fd01..3db6154 100644
--- a/mustache.js
+++ b/mustache.js
@@ -139,7 +139,7 @@ var Mustache = function () {
       if (!partials || partials[name] === undefined) {
         throw({message: "unknown_partial '" + name + "'"});
       }
-      if (typeof context[name] != "object") {
+      if (!context || typeof context[name] != "object") {
         return this.render(partials[name], context, partials, true);
       }
       return this.render(partials[name], context[name], partials, true);

From 65eb4220ca866442317750142029cb0892885d24 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Mon, 5 Dec 2011 13:33:58 -0800
Subject: [PATCH 09/64] Fix indentation

---
 Rakefile | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/Rakefile b/Rakefile
index a19c5ea..f72af2a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -11,6 +11,10 @@ task :spec do
   end
 end
 
+def version
+  File.read("mustache.js").match('version: "([^\"]+)",$')[1]
+end
+
 def templated_build(name, opts={})
   # Create a rule that uses the .tmpl.{pre,post} stuff to make a final,
   # wrapped, output file.
@@ -25,7 +29,7 @@ def templated_build(name, opts={})
     target_js = opts[:location] ? "mustache.js" : "#{short}.mustache.js"
 
     puts "Packaging for #{name}"
-    sh "mkdir -p #{opts[:location]}" if opts[:location]
+    mkdir_p opts[:location] if opts[:location]
     sh "cat #{source}/#{target_js}.tpl.pre mustache.js \
      #{source}/#{target_js}.tpl.post > #{opts[:location] || '.'}/#{target_js}"
 
@@ -33,10 +37,9 @@ def templated_build(name, opts={})
     if opts[:extra]
       sh "sed -e 's/{{version}}/#{version}/' #{source}/#{opts[:extra]} \
             > #{opts[:location]}/#{opts[:extra]}"
-     end
-
-   puts "Done, see #{opts[:location] || '.'}/#{target_js}"
+    end
 
+    puts "Done, see #{opts[:location] || '.'}/#{target_js}"
   end
 end
 
@@ -47,12 +50,6 @@ templated_build "Dojo", :location => "dojox/string"
 templated_build "YUI3", :location => "yui3/mustache"
 templated_build "requirejs"
 
-
-def version
-  File.read("mustache.js").match('version: "([^\"]+)",$')[1]
-end
-
-
 desc "Remove temporary files."
 task :clean do
   sh "git clean -fdx"

From 89863d714b7e52833418e655fb6991987be8febe Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Mon, 5 Dec 2011 14:15:51 -0800
Subject: [PATCH 10/64] Use rake/clean

---
 Rakefile              | 16 +++++++++-------
 test/mustache_spec.rb |  5 ++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Rakefile b/Rakefile
index f72af2a..81dbccc 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,4 +1,8 @@
 require 'rake'
+require 'rake/clean'
+
+# See mustache_spec.rb
+CLOBBER.include('runner.js')
 
 task :default => :spec
 
@@ -23,13 +27,16 @@ def templated_build(name, opts={})
   short = name.downcase
   source = "mustache-#{short}"
   dependencies = ["mustache.js"] + Dir.glob("#{source}/*.tpl.*")
+  target_js = opts[:location] ? "mustache.js" : "#{short}.mustache.js"
+
+  CLEAN.include(opts[:location] ? opts[:location] : target_js)
 
   desc "Package for #{name}"
   task short.to_sym => dependencies do
-    target_js = opts[:location] ? "mustache.js" : "#{short}.mustache.js"
-
     puts "Packaging for #{name}"
+
     mkdir_p opts[:location] if opts[:location]
+
     sh "cat #{source}/#{target_js}.tpl.pre mustache.js \
      #{source}/#{target_js}.tpl.post > #{opts[:location] || '.'}/#{target_js}"
 
@@ -49,8 +56,3 @@ templated_build "qooxdoo"
 templated_build "Dojo", :location => "dojox/string"
 templated_build "YUI3", :location => "yui3/mustache"
 templated_build "requirejs"
-
-desc "Remove temporary files."
-task :clean do
-  sh "git clean -fdx"
-end
diff --git a/test/mustache_spec.rb b/test/mustache_spec.rb
index 5ce8bea..2205882 100644
--- a/test/mustache_spec.rb
+++ b/test/mustache_spec.rb
@@ -175,8 +175,7 @@ describe "mustache" do
   end
 
   context "running in SpiderMonkey (Mozilla, Firefox)" do
-    p JS_PATH
-    if !JS_PATH.empty?
+    if File.exist?(JS_PATH)
       before(:each) do
         @run_js = :run_js_js
       end
@@ -196,7 +195,7 @@ describe "mustache" do
   end
 
   context "running in JavaScriptCore (WebKit, Safari)" do
-    if File.exists?(JSC_PATH)
+    if File.exist?(JSC_PATH)
       before(:each) do
         @run_js = :run_js_jsc
       end

From 9867b8d9172f951abbed30ea8798e26f42a0b860 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Mon, 5 Dec 2011 14:31:23 -0800
Subject: [PATCH 11/64] Clean up runner.js

---
 Rakefile              |  3 ---
 test/mustache_spec.rb | 29 +++++++++++++----------------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/Rakefile b/Rakefile
index 81dbccc..3dd5750 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,9 +1,6 @@
 require 'rake'
 require 'rake/clean'
 
-# See mustache_spec.rb
-CLOBBER.include('runner.js')
-
 task :default => :spec
 
 desc "Run all specs"
diff --git a/test/mustache_spec.rb b/test/mustache_spec.rb
index 2205882..5e94cf9 100644
--- a/test/mustache_spec.rb
+++ b/test/mustache_spec.rb
@@ -249,22 +249,19 @@ describe "mustache" do
   end
 
   def run_js(runner, js)
-    send(runner, js)
-  end
-
-  def run_js_js(js)
-    File.open("runner.js", 'w') {|f| f << js}
-    `#{JS_PATH} runner.js`
-  end
-
-  def run_js_jsc(js)
-    File.open("runner.js", 'w') {|f| f << js}
-    `#{JSC_PATH} runner.js`
-  end
+    cmd = case runner
+    when :run_js_js
+      JS_PATH
+    when :run_js_jsc
+      JSC_PATH
+    when :run_js_rhino
+      "java #{RHINO_JAR}"
+    end
 
-  def run_js_rhino(js)
-    File.open("runner.js", 'w') {|f| f << js}
-    `java #{RHINO_JAR} runner.js`
+    runner_file = "runner.js"
+    File.open(runner_file, 'w') {|f| f << js}
+    `#{cmd} #{runner_file}`
+  ensure
+    FileUtils.rm_r(runner_file)
   end
 end
-

From ff40abbbbc73661f4696296b57f3c089dfb0d237 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Mon, 5 Dec 2011 14:34:09 -0800
Subject: [PATCH 12/64] Format comment

---
 Rakefile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Rakefile b/Rakefile
index 3dd5750..cc2830e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -16,11 +16,10 @@ def version
   File.read("mustache.js").match('version: "([^\"]+)",$')[1]
 end
 
+# Creates a rule that uses the .tmpl.{pre,post} stuff to make a final,
+# wrapped, output file. There is some extra complexity because Dojo and YUI3
+# use different template files and final locations.
 def templated_build(name, opts={})
-  # Create a rule that uses the .tmpl.{pre,post} stuff to make a final,
-  # wrapped, output file.
-  # There is some extra complexity because Dojo and YUI3 use different
-  # template files and final locations.
   short = name.downcase
   source = "mustache-#{short}"
   dependencies = ["mustache.js"] + Dir.glob("#{source}/*.tpl.*")

From f6273dd6245d6df737753cbce5d2d9a6163987f2 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Mon, 5 Dec 2011 13:47:18 -0800
Subject: [PATCH 13/64] Move templates to wrappers directory

---
 .gitignore                                                 | 5 ++++-
 Rakefile                                                   | 6 +++---
 mustache-commonjs/package.json                             | 7 -------
 .../commonjs}/mustache.js.tpl.post                         | 0
 .../commonjs}/mustache.js.tpl.pre                          | 0
 {lib => wrappers/commonjs}/package.json                    | 4 ++--
 {mustache-dojo => wrappers/dojo}/mustache.js.tpl.post      | 0
 {mustache-dojo => wrappers/dojo}/mustache.js.tpl.pre       | 0
 .../jquery}/jquery.mustache.js.tpl.post                    | 0
 .../jquery}/jquery.mustache.js.tpl.pre                     | 0
 .../qooxdoo}/qooxdoo.mustache.js.tpl.post                  | 0
 .../qooxdoo}/qooxdoo.mustache.js.tpl.pre                   | 0
 .../requirejs}/requirejs.mustache.js.tpl.post              | 0
 .../requirejs}/requirejs.mustache.js.tpl.pre               | 0
 {mustache-yui3 => wrappers/yui3}/mustache.js.tpl.post      | 0
 {mustache-yui3 => wrappers/yui3}/mustache.js.tpl.pre       | 0
 16 files changed, 9 insertions(+), 13 deletions(-)
 delete mode 100644 mustache-commonjs/package.json
 rename {mustache-commonjs => wrappers/commonjs}/mustache.js.tpl.post (100%)
 rename {mustache-commonjs => wrappers/commonjs}/mustache.js.tpl.pre (100%)
 rename {lib => wrappers/commonjs}/package.json (53%)
 rename {mustache-dojo => wrappers/dojo}/mustache.js.tpl.post (100%)
 rename {mustache-dojo => wrappers/dojo}/mustache.js.tpl.pre (100%)
 rename {mustache-jquery => wrappers/jquery}/jquery.mustache.js.tpl.post (100%)
 rename {mustache-jquery => wrappers/jquery}/jquery.mustache.js.tpl.pre (100%)
 rename {mustache-qooxdoo => wrappers/qooxdoo}/qooxdoo.mustache.js.tpl.post (100%)
 rename {mustache-qooxdoo => wrappers/qooxdoo}/qooxdoo.mustache.js.tpl.pre (100%)
 rename {mustache-requirejs => wrappers/requirejs}/requirejs.mustache.js.tpl.post (100%)
 rename {mustache-requirejs => wrappers/requirejs}/requirejs.mustache.js.tpl.pre (100%)
 rename {mustache-yui3 => wrappers/yui3}/mustache.js.tpl.post (100%)
 rename {mustache-yui3 => wrappers/yui3}/mustache.js.tpl.pre (100%)

diff --git a/.gitignore b/.gitignore
index 33f7857..c44d96c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,10 @@
 .DS_Store
 .rvmrc
 runner.js
+lib
 jquery.mustache.js
+qooxdoo.mustache.js
 dojox
 yui3
-commonjs.mustache.js
+requirejs.mustache.js
+
diff --git a/Rakefile b/Rakefile
index cc2830e..fb306f7 100644
--- a/Rakefile
+++ b/Rakefile
@@ -21,7 +21,7 @@ end
 # use different template files and final locations.
 def templated_build(name, opts={})
   short = name.downcase
-  source = "mustache-#{short}"
+  source = File.join("wrappers", short)
   dependencies = ["mustache.js"] + Dir.glob("#{source}/*.tpl.*")
   target_js = opts[:location] ? "mustache.js" : "#{short}.mustache.js"
 
@@ -34,12 +34,12 @@ def templated_build(name, opts={})
     mkdir_p opts[:location] if opts[:location]
 
     sh "cat #{source}/#{target_js}.tpl.pre mustache.js \
-     #{source}/#{target_js}.tpl.post > #{opts[:location] || '.'}/#{target_js}"
+      #{source}/#{target_js}.tpl.post > #{opts[:location] || '.'}/#{target_js}"
 
     # extra
     if opts[:extra]
       sh "sed -e 's/{{version}}/#{version}/' #{source}/#{opts[:extra]} \
-            > #{opts[:location]}/#{opts[:extra]}"
+        > #{opts[:location]}/#{opts[:extra]}"
     end
 
     puts "Done, see #{opts[:location] || '.'}/#{target_js}"
diff --git a/mustache-commonjs/package.json b/mustache-commonjs/package.json
deleted file mode 100644
index 74d3aba..0000000
--- a/mustache-commonjs/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "name": "mustache",
-    "author": "http://mustache.github.com/",
-    "description": "{{ mustache }} in JavaScript — Logic-less templates.",
-    "keywords": ["template"],
-    "version": "{{version}}"
-}
diff --git a/mustache-commonjs/mustache.js.tpl.post b/wrappers/commonjs/mustache.js.tpl.post
similarity index 100%
rename from mustache-commonjs/mustache.js.tpl.post
rename to wrappers/commonjs/mustache.js.tpl.post
diff --git a/mustache-commonjs/mustache.js.tpl.pre b/wrappers/commonjs/mustache.js.tpl.pre
similarity index 100%
rename from mustache-commonjs/mustache.js.tpl.pre
rename to wrappers/commonjs/mustache.js.tpl.pre
diff --git a/lib/package.json b/wrappers/commonjs/package.json
similarity index 53%
rename from lib/package.json
rename to wrappers/commonjs/package.json
index 4a4cbb1..ebd7b6f 100644
--- a/lib/package.json
+++ b/wrappers/commonjs/package.json
@@ -1,8 +1,8 @@
 {
     "name": "mustache",
     "author": "http://mustache.github.com/",
-    "description": "{{ mustache }} in JavaScript — Logic-less templates.",
+    "description": "Logic-less {{mustache}} templates in JavaScript",
     "keywords": ["template"],
-    "version": "0.3.1-dev-twitter",
+    "version": "{{version}}",
     "main": "./mustache"
 }
diff --git a/mustache-dojo/mustache.js.tpl.post b/wrappers/dojo/mustache.js.tpl.post
similarity index 100%
rename from mustache-dojo/mustache.js.tpl.post
rename to wrappers/dojo/mustache.js.tpl.post
diff --git a/mustache-dojo/mustache.js.tpl.pre b/wrappers/dojo/mustache.js.tpl.pre
similarity index 100%
rename from mustache-dojo/mustache.js.tpl.pre
rename to wrappers/dojo/mustache.js.tpl.pre
diff --git a/mustache-jquery/jquery.mustache.js.tpl.post b/wrappers/jquery/jquery.mustache.js.tpl.post
similarity index 100%
rename from mustache-jquery/jquery.mustache.js.tpl.post
rename to wrappers/jquery/jquery.mustache.js.tpl.post
diff --git a/mustache-jquery/jquery.mustache.js.tpl.pre b/wrappers/jquery/jquery.mustache.js.tpl.pre
similarity index 100%
rename from mustache-jquery/jquery.mustache.js.tpl.pre
rename to wrappers/jquery/jquery.mustache.js.tpl.pre
diff --git a/mustache-qooxdoo/qooxdoo.mustache.js.tpl.post b/wrappers/qooxdoo/qooxdoo.mustache.js.tpl.post
similarity index 100%
rename from mustache-qooxdoo/qooxdoo.mustache.js.tpl.post
rename to wrappers/qooxdoo/qooxdoo.mustache.js.tpl.post
diff --git a/mustache-qooxdoo/qooxdoo.mustache.js.tpl.pre b/wrappers/qooxdoo/qooxdoo.mustache.js.tpl.pre
similarity index 100%
rename from mustache-qooxdoo/qooxdoo.mustache.js.tpl.pre
rename to wrappers/qooxdoo/qooxdoo.mustache.js.tpl.pre
diff --git a/mustache-requirejs/requirejs.mustache.js.tpl.post b/wrappers/requirejs/requirejs.mustache.js.tpl.post
similarity index 100%
rename from mustache-requirejs/requirejs.mustache.js.tpl.post
rename to wrappers/requirejs/requirejs.mustache.js.tpl.post
diff --git a/mustache-requirejs/requirejs.mustache.js.tpl.pre b/wrappers/requirejs/requirejs.mustache.js.tpl.pre
similarity index 100%
rename from mustache-requirejs/requirejs.mustache.js.tpl.pre
rename to wrappers/requirejs/requirejs.mustache.js.tpl.pre
diff --git a/mustache-yui3/mustache.js.tpl.post b/wrappers/yui3/mustache.js.tpl.post
similarity index 100%
rename from mustache-yui3/mustache.js.tpl.post
rename to wrappers/yui3/mustache.js.tpl.post
diff --git a/mustache-yui3/mustache.js.tpl.pre b/wrappers/yui3/mustache.js.tpl.pre
similarity index 100%
rename from mustache-yui3/mustache.js.tpl.pre
rename to wrappers/yui3/mustache.js.tpl.pre

From 0e490020877c9bf41e32b9d39b132381ff233e95 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Wed, 14 Dec 2011 09:42:54 -0800
Subject: [PATCH 14/64] Add node to test suite

---
 Rakefile              |   2 +-
 test/mustache_spec.rb | 227 ++++++++++++++++++++++--------------------
 2 files changed, 118 insertions(+), 111 deletions(-)

diff --git a/Rakefile b/Rakefile
index fb306f7..442e151 100644
--- a/Rakefile
+++ b/Rakefile
@@ -51,4 +51,4 @@ templated_build "jQuery"
 templated_build "qooxdoo"
 templated_build "Dojo", :location => "dojox/string"
 templated_build "YUI3", :location => "yui3/mustache"
-templated_build "requirejs"
+templated_build "RequireJS"
diff --git a/test/mustache_spec.rb b/test/mustache_spec.rb
index 5e94cf9..f89f27c 100644
--- a/test/mustache_spec.rb
+++ b/test/mustache_spec.rb
@@ -1,55 +1,61 @@
 require 'rubygems'
 require 'json'
 
-__DIR__ = File.dirname(__FILE__)
+ROOT = File.expand_path("../..", __FILE__)
 
-testnames = Dir.glob(__DIR__ + '/../examples/*.js').map do |name|
+MUSTACHE = File.read(File.join(ROOT, "mustache.js"))
+
+TESTS = Dir.glob(File.join(ROOT, 'examples', '*.js')).map do |name|
   File.basename name, '.js'
 end
 
-non_partials = testnames.select{|t| not t.include? "partial"}
-partials = testnames.select{|t| t.include? "partial"}
-
-def load_test(dir, name, partial=false)
-  view = File.read(dir + "/../examples/#{name}.js")
-  template = File.read(dir + "/../examples/#{name}.html").to_json
-  expect = File.read(dir + "/../examples/#{name}.txt")
-  if not partial
-    [view, template, expect]
-  else
-    partial = File.read(dir + "/../examples/#{name}.2.html").to_json
-    [view, template, partial, expect]
-  end
-end
+PARTIALS = TESTS.select {|t| t.include? "partial" }
+NON_PARTIALS = TESTS.select {|t| not t.include? "partial" }
 
-JS_PATH = `which js`.strip()
+NODE_PATH = `which node`.strip
+JS_PATH = `which js`.strip
 JSC_PATH = "/System/Library/Frameworks/JavaScriptCore.framework/Versions/A/Resources/jsc"
 RHINO_JAR = "org.mozilla.javascript.tools.shell.Main"
 
-engines_run = 0
+def load_test(name, is_partial=false)
+  view = File.read(File.join(ROOT, "examples", "#{name}.js"))
+  template = File.read(File.join(ROOT, "examples", "#{name}.html")).to_json
+  expect = File.read(File.join(ROOT, "examples", "#{name}.txt"))
 
-describe "mustache" do
+  test = [view, template, expect]
 
-  shared_examples_for "Mustache rendering" do
+  if is_partial
+    test << File.read(File.join(ROOT, "examples", "#{name}.2.html")).to_json
+  end
 
-    before(:all) do
-      engines_run += 1
-      mustache = File.read(__DIR__ + "/../mustache.js")
-      stubbed_gettext = <<-JS
-        // Stubbed gettext translation method for {{_i}}{{/i}} tags in Mustache.
-        function _(params) {
-          if (typeof params === "string") {
-            return params
-          }
-
-          return params.text;
-        }
-      JS
+  test
+end
 
-      @boilerplate = <<-JS
-        #{mustache}
-        #{stubbed_gettext}
-      JS
+def run_js(runner, js)
+  cmd = case runner
+    when :spidermonkey
+      JS_PATH
+    when :jsc
+      JSC_PATH
+    when :rhino
+      "java #{RHINO_JAR}"
+    when :node
+      NODE_PATH
+    end
+
+  runner_file = "runner.js"
+  File.open(runner_file, 'w') {|file| file.write(js) }
+  `#{cmd} #{runner_file}`
+ensure
+  FileUtils.rm_r(runner_file)
+end
+
+$engines_run = 0
+
+describe "mustache" do
+  shared_examples_for "mustache rendering" do
+    before(:all) do
+      $engines_run += 1
     end
 
     it "should return the same when invoked multiple times" do
@@ -58,8 +64,8 @@ describe "mustache" do
         Mustache.to_html("x")
         print(Mustache.to_html("x"));
       JS
-      run_js(@run_js, js).should == "x\n"
 
+      run_js(@runner, js).should == "x\n"
     end
 
     it "should clear the context after each run" do
@@ -72,34 +78,34 @@ describe "mustache" do
           print('ERROR: ' + e.message);
         }
       JS
-      run_js(@run_js, js).should == "\n"
+
+      run_js(@runner, js).should == "\n"
     end
 
-    non_partials.each do |testname|
-      describe testname do
+    NON_PARTIALS.each do |test|
+      describe test do
         it "should generate the correct html" do
+          view, template, expect = load_test(test)
 
-          view, template, expect = load_test(__DIR__, testname)
-
-          runner = <<-JS
+          js = <<-JS
             try {
               #{@boilerplate}
               #{view}
               var template = #{template};
-              var result = Mustache.to_html(template, #{testname});
+              var result = Mustache.to_html(template, #{test});
               print(result);
             } catch(e) {
               print('ERROR: ' + e.message);
             }
           JS
 
-          run_js(@run_js, runner).should == expect
+          run_js(@runner, js).should == expect
         end
-        it "should sendFun the correct html" do
 
-          view, template, expect = load_test(__DIR__, testname)
+        it "should sendFun the correct html" do
+          view, template, expect = load_test(test)
 
-          runner = <<-JS
+          js = <<-JS
             try {
               #{@boilerplate}
               #{view}
@@ -110,26 +116,24 @@ describe "mustache" do
                 }
               }
               var template = #{template};
-              Mustache.to_html(template, #{testname}, null, sendFun);
+              Mustache.to_html(template, #{test}, null, sendFun);
               print(chunks.join("\\n"));
             } catch(e) {
               print('ERROR: ' + e.message);
             }
           JS
 
-          run_js(@run_js, runner).strip.should == expect.strip
+          run_js(@runner, js).strip.should == expect.strip
         end
       end
     end
 
-    partials.each do |testname|
-      describe testname do
+    PARTIALS.each do |test|
+      describe test do
         it "should generate the correct html" do
+          view, template, expect, partial = load_test(test, true)
 
-          view, template, partial, expect =
-                load_test(__DIR__, testname, true)
-
-          runner = <<-JS
+          js = <<-JS
             try {
               #{@boilerplate}
               #{view}
@@ -142,14 +146,13 @@ describe "mustache" do
             }
           JS
 
-          run_js(@run_js, runner).should == expect
+          run_js(@runner, js).should == expect
         end
-        it "should sendFun the correct html" do
 
-          view, template, partial, expect =
-                load_test(__DIR__, testname, true)
+        it "should sendFun the correct html" do
+          view, template, expect, partial = load_test(test, true)
 
-          runner = <<-JS
+          js = <<-JS
             try {
               #{@boilerplate}
               #{view};
@@ -168,100 +171,104 @@ describe "mustache" do
             }
           JS
 
-          run_js(@run_js, runner).strip.should == expect.strip
+          run_js(@runner, js).strip.should == expect.strip
         end
       end
     end
   end
 
-  context "running in SpiderMonkey (Mozilla, Firefox)" do
-    if File.exist?(JS_PATH)
-      before(:each) do
-        @run_js = :run_js_js
+  context "running in node" do
+    if File.exist?(NODE_PATH)
+      before(:all) do
+        $stdout.write "Testing in node "
+        @runner = :node
+        @boilerplate = MUSTACHE.dup
+        @boilerplate << <<-JS
+        function print(message) {
+          console.log(message);
+        }
+        JS
+      end
+
+      after(:all) do
+        puts " Done!"
       end
 
+      it_should_behave_like "mustache rendering"
+    else
+      puts "Skipping tests in node (node not found)"
+    end
+  end
+
+  context "running in SpiderMonkey (Mozilla, Firefox)" do
+    if File.exist?(JS_PATH)
       before(:all) do
-        puts "\nTesting mustache.js in SpiderMonkey:\n"
+        $stdout.write "Testing in SpiderMonkey "
+        @runner = :spidermonkey
+        @boilerplate = MUSTACHE.dup
       end
 
       after(:all) do
-        puts "\nDone\n"
+        puts " Done!"
       end
 
-      it_should_behave_like "Mustache rendering"
+      it_should_behave_like "mustache rendering"
     else
-      puts "\nSkipping tests in SpiderMonkey (js not found)\n"
+      puts "Skipping tests in SpiderMonkey (js not found)"
     end
   end
 
   context "running in JavaScriptCore (WebKit, Safari)" do
     if File.exist?(JSC_PATH)
-      before(:each) do
-        @run_js = :run_js_jsc
-      end
-
       before(:all) do
-        puts "\nTesting mustache.js in JavaScriptCore:\n"
+        $stdout.write "Testing in JavaScriptCore "
+        @runner = :jsc
+        @boilerplate = MUSTACHE.dup
       end
 
       after(:all) do
-        puts "\nDone\n"
+        puts " Done!"
       end
 
-      it_should_behave_like "Mustache rendering"
+      it_should_behave_like "mustache rendering"
     else
-      puts "\nSkipping tests in JavaScriptCore (jsc not found)\n"
+      puts "Skipping tests in JavaScriptCore (jsc not found)"
     end
   end
 
   context "running in Rhino (Mozilla)" do
-    if !`java #{RHINO_JAR} 'foo' 2>&1`.match(/ClassNotFoundException/)
-      before(:each) do
-        @run_js = :run_js_rhino
-      end
-
+    if `java #{RHINO_JAR} 'foo' 2>&1` !~ /ClassNotFoundException/
       before(:all) do
-        puts "\nTesting mustache.js in Rhino:\n"
+        $stdout.write "Testing in Rhino "
+        @runner = :rhino
+        @boilerplate = MUSTACHE.dup
       end
 
       after(:all) do
-        puts "\nDone\n"
+        puts " Done!"
       end
 
-      it_should_behave_like "Mustache rendering"
+      it_should_behave_like "mustache rendering"
     else
-      puts "\nSkipping tests in Rhino (JAR #{RHINO_JAR} was not found)\n"
+      puts "Skipping tests in Rhino (JAR #{RHINO_JAR} was not found)"
     end
   end
 
   context "suite" do
-    before(:all) do
-      puts "\nVerifying that we ran at the tests in at least one engine\n"
+    before(:each) do
+      $stdout.write "Verifying that we ran at the tests in at least one engine ... "
     end
 
-    after(:all) do
-      puts "\nDone\n"
+    after(:each) do
+      if @exception.nil?
+        puts "OK"
+      else
+        puts "ERROR!"
+      end
     end
 
     it "should have run at least one time" do
-      engines_run.should > 0
+      $engines_run.should > 0
     end
   end
-
-  def run_js(runner, js)
-    cmd = case runner
-    when :run_js_js
-      JS_PATH
-    when :run_js_jsc
-      JSC_PATH
-    when :run_js_rhino
-      "java #{RHINO_JAR}"
-    end
-
-    runner_file = "runner.js"
-    File.open(runner_file, 'w') {|f| f << js}
-    `#{cmd} #{runner_file}`
-  ensure
-    FileUtils.rm_r(runner_file)
-  end
 end

From f127f48bf4adb5b159d5c36ee6079d2dd8a1fd57 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Wed, 14 Dec 2011 09:59:26 -0800
Subject: [PATCH 15/64] Move all tests to spec directory

---
 Rakefile                                           |  2 +-
 {examples => spec/_files}/apostrophe.html          |  0
 {examples => spec/_files}/apostrophe.js            |  0
 {examples => spec/_files}/apostrophe.txt           |  0
 .../array_of_partials_implicit_partial.2.html      |  0
 .../array_of_partials_implicit_partial.html        |  0
 .../_files}/array_of_partials_implicit_partial.js  |  0
 .../_files}/array_of_partials_implicit_partial.txt |  0
 .../_files}/array_of_partials_partial.2.html       |  0
 .../_files}/array_of_partials_partial.html         |  0
 .../_files}/array_of_partials_partial.js           |  0
 .../_files}/array_of_partials_partial.txt          |  0
 {examples => spec/_files}/array_of_strings.html    |  0
 {examples => spec/_files}/array_of_strings.js      |  0
 {examples => spec/_files}/array_of_strings.txt     |  0
 .../_files}/array_of_strings_options.html          |  0
 .../_files}/array_of_strings_options.js            |  0
 .../_files}/array_of_strings_options.txt           |  0
 {examples => spec/_files}/array_partial.2.html     |  0
 {examples => spec/_files}/array_partial.html       |  0
 {examples => spec/_files}/array_partial.js         |  0
 {examples => spec/_files}/array_partial.txt        |  0
 .../_files}/bug_11_eating_whitespace.html          |  0
 .../_files}/bug_11_eating_whitespace.js            |  0
 .../_files}/bug_11_eating_whitespace.txt           |  0
 {examples => spec/_files}/comments.html            |  0
 {examples => spec/_files}/comments.js              |  0
 {examples => spec/_files}/comments.txt             |  0
 {examples => spec/_files}/complex.html             |  0
 {examples => spec/_files}/complex.js               |  0
 {examples => spec/_files}/complex.txt              |  0
 {examples => spec/_files}/delimiters.html          |  0
 {examples => spec/_files}/delimiters.js            |  0
 {examples => spec/_files}/delimiters.txt           |  0
 {examples => spec/_files}/dot_notation.html        |  0
 {examples => spec/_files}/dot_notation.js          |  0
 {examples => spec/_files}/dot_notation.txt         |  0
 {examples => spec/_files}/double_render.html       |  0
 {examples => spec/_files}/double_render.js         |  0
 {examples => spec/_files}/double_render.txt        |  0
 {examples => spec/_files}/empty_partial.2.html     |  0
 {examples => spec/_files}/empty_partial.html       |  0
 {examples => spec/_files}/empty_partial.js         |  0
 {examples => spec/_files}/empty_partial.txt        |  0
 {examples => spec/_files}/empty_sections.html      |  0
 {examples => spec/_files}/empty_sections.js        |  0
 {examples => spec/_files}/empty_sections.txt       |  0
 {examples => spec/_files}/empty_template.html      |  0
 {examples => spec/_files}/empty_template.js        |  0
 {examples => spec/_files}/empty_template.txt       |  0
 {examples => spec/_files}/error_not_found.html     |  0
 {examples => spec/_files}/error_not_found.js       |  0
 {examples => spec/_files}/error_not_found.txt      |  0
 {examples => spec/_files}/escaped.html             |  0
 {examples => spec/_files}/escaped.js               |  0
 {examples => spec/_files}/escaped.txt              |  0
 .../_files}/higher_order_sections.html             |  0
 {examples => spec/_files}/higher_order_sections.js |  0
 .../_files}/higher_order_sections.txt              |  0
 {examples => spec/_files}/inverted_section.html    |  0
 {examples => spec/_files}/inverted_section.js      |  0
 {examples => spec/_files}/inverted_section.txt     |  0
 .../_files}/keys_with_questionmarks.html           |  0
 .../_files}/keys_with_questionmarks.js             |  0
 .../_files}/keys_with_questionmarks.txt            |  0
 {examples => spec/_files}/nesting.html             |  0
 {examples => spec/_files}/nesting.js               |  0
 {examples => spec/_files}/nesting.txt              |  0
 {examples => spec/_files}/null_string.html         |  0
 {examples => spec/_files}/null_string.js           |  0
 {examples => spec/_files}/null_string.txt          |  0
 {examples => spec/_files}/partial_recursion.2.html |  0
 {examples => spec/_files}/partial_recursion.html   |  0
 {examples => spec/_files}/partial_recursion.js     |  0
 {examples => spec/_files}/partial_recursion.txt    |  0
 .../_files}/recursion_with_same_names.html         |  0
 .../_files}/recursion_with_same_names.js           |  0
 .../_files}/recursion_with_same_names.txt          |  0
 .../_files}/reuse_of_enumerables.html              |  0
 {examples => spec/_files}/reuse_of_enumerables.js  |  0
 {examples => spec/_files}/reuse_of_enumerables.txt |  0
 {examples => spec/_files}/section_as_context.html  |  0
 {examples => spec/_files}/section_as_context.js    |  0
 {examples => spec/_files}/section_as_context.txt   |  0
 {examples => spec/_files}/simple.html              |  0
 {examples => spec/_files}/simple.js                |  0
 {examples => spec/_files}/simple.txt               |  0
 {examples => spec/_files}/template_partial.2.html  |  0
 {examples => spec/_files}/template_partial.html    |  0
 {examples => spec/_files}/template_partial.js      |  0
 {examples => spec/_files}/template_partial.txt     |  0
 {examples => spec/_files}/two_in_a_row.html        |  0
 {examples => spec/_files}/two_in_a_row.js          |  0
 {examples => spec/_files}/two_in_a_row.txt         |  0
 {examples => spec/_files}/two_sections.html        |  0
 {examples => spec/_files}/two_sections.js          |  0
 {examples => spec/_files}/two_sections.txt         |  0
 {examples => spec/_files}/unescaped.html           |  0
 {examples => spec/_files}/unescaped.js             |  0
 {examples => spec/_files}/unescaped.txt            |  0
 {examples => spec/_files}/unknown_pragma.html      |  0
 {examples => spec/_files}/unknown_pragma.js        |  0
 {examples => spec/_files}/unknown_pragma.txt       |  0
 {examples => spec/_files}/view_partial.2.html      |  0
 {examples => spec/_files}/view_partial.html        |  0
 {examples => spec/_files}/view_partial.js          |  0
 {examples => spec/_files}/view_partial.txt         |  0
 .../_files}/whitespace_partial.2.html              |  0
 {examples => spec/_files}/whitespace_partial.html  |  0
 {examples => spec/_files}/whitespace_partial.js    |  0
 {examples => spec/_files}/whitespace_partial.txt   |  0
 {test => spec}/mustache_spec.rb                    | 14 ++++++++------
 112 files changed, 9 insertions(+), 7 deletions(-)
 rename {examples => spec/_files}/apostrophe.html (100%)
 rename {examples => spec/_files}/apostrophe.js (100%)
 rename {examples => spec/_files}/apostrophe.txt (100%)
 rename {examples => spec/_files}/array_of_partials_implicit_partial.2.html (100%)
 rename {examples => spec/_files}/array_of_partials_implicit_partial.html (100%)
 rename {examples => spec/_files}/array_of_partials_implicit_partial.js (100%)
 rename {examples => spec/_files}/array_of_partials_implicit_partial.txt (100%)
 rename {examples => spec/_files}/array_of_partials_partial.2.html (100%)
 rename {examples => spec/_files}/array_of_partials_partial.html (100%)
 rename {examples => spec/_files}/array_of_partials_partial.js (100%)
 rename {examples => spec/_files}/array_of_partials_partial.txt (100%)
 rename {examples => spec/_files}/array_of_strings.html (100%)
 rename {examples => spec/_files}/array_of_strings.js (100%)
 rename {examples => spec/_files}/array_of_strings.txt (100%)
 rename {examples => spec/_files}/array_of_strings_options.html (100%)
 rename {examples => spec/_files}/array_of_strings_options.js (100%)
 rename {examples => spec/_files}/array_of_strings_options.txt (100%)
 rename {examples => spec/_files}/array_partial.2.html (100%)
 rename {examples => spec/_files}/array_partial.html (100%)
 rename {examples => spec/_files}/array_partial.js (100%)
 rename {examples => spec/_files}/array_partial.txt (100%)
 rename {examples => spec/_files}/bug_11_eating_whitespace.html (100%)
 rename {examples => spec/_files}/bug_11_eating_whitespace.js (100%)
 rename {examples => spec/_files}/bug_11_eating_whitespace.txt (100%)
 rename {examples => spec/_files}/comments.html (100%)
 rename {examples => spec/_files}/comments.js (100%)
 rename {examples => spec/_files}/comments.txt (100%)
 rename {examples => spec/_files}/complex.html (100%)
 rename {examples => spec/_files}/complex.js (100%)
 rename {examples => spec/_files}/complex.txt (100%)
 rename {examples => spec/_files}/delimiters.html (100%)
 rename {examples => spec/_files}/delimiters.js (100%)
 rename {examples => spec/_files}/delimiters.txt (100%)
 rename {examples => spec/_files}/dot_notation.html (100%)
 rename {examples => spec/_files}/dot_notation.js (100%)
 rename {examples => spec/_files}/dot_notation.txt (100%)
 rename {examples => spec/_files}/double_render.html (100%)
 rename {examples => spec/_files}/double_render.js (100%)
 rename {examples => spec/_files}/double_render.txt (100%)
 rename {examples => spec/_files}/empty_partial.2.html (100%)
 rename {examples => spec/_files}/empty_partial.html (100%)
 rename {examples => spec/_files}/empty_partial.js (100%)
 rename {examples => spec/_files}/empty_partial.txt (100%)
 rename {examples => spec/_files}/empty_sections.html (100%)
 rename {examples => spec/_files}/empty_sections.js (100%)
 rename {examples => spec/_files}/empty_sections.txt (100%)
 rename {examples => spec/_files}/empty_template.html (100%)
 rename {examples => spec/_files}/empty_template.js (100%)
 rename {examples => spec/_files}/empty_template.txt (100%)
 rename {examples => spec/_files}/error_not_found.html (100%)
 rename {examples => spec/_files}/error_not_found.js (100%)
 rename {examples => spec/_files}/error_not_found.txt (100%)
 rename {examples => spec/_files}/escaped.html (100%)
 rename {examples => spec/_files}/escaped.js (100%)
 rename {examples => spec/_files}/escaped.txt (100%)
 rename {examples => spec/_files}/higher_order_sections.html (100%)
 rename {examples => spec/_files}/higher_order_sections.js (100%)
 rename {examples => spec/_files}/higher_order_sections.txt (100%)
 rename {examples => spec/_files}/inverted_section.html (100%)
 rename {examples => spec/_files}/inverted_section.js (100%)
 rename {examples => spec/_files}/inverted_section.txt (100%)
 rename {examples => spec/_files}/keys_with_questionmarks.html (100%)
 rename {examples => spec/_files}/keys_with_questionmarks.js (100%)
 rename {examples => spec/_files}/keys_with_questionmarks.txt (100%)
 rename {examples => spec/_files}/nesting.html (100%)
 rename {examples => spec/_files}/nesting.js (100%)
 rename {examples => spec/_files}/nesting.txt (100%)
 rename {examples => spec/_files}/null_string.html (100%)
 rename {examples => spec/_files}/null_string.js (100%)
 rename {examples => spec/_files}/null_string.txt (100%)
 rename {examples => spec/_files}/partial_recursion.2.html (100%)
 rename {examples => spec/_files}/partial_recursion.html (100%)
 rename {examples => spec/_files}/partial_recursion.js (100%)
 rename {examples => spec/_files}/partial_recursion.txt (100%)
 rename {examples => spec/_files}/recursion_with_same_names.html (100%)
 rename {examples => spec/_files}/recursion_with_same_names.js (100%)
 rename {examples => spec/_files}/recursion_with_same_names.txt (100%)
 rename {examples => spec/_files}/reuse_of_enumerables.html (100%)
 rename {examples => spec/_files}/reuse_of_enumerables.js (100%)
 rename {examples => spec/_files}/reuse_of_enumerables.txt (100%)
 rename {examples => spec/_files}/section_as_context.html (100%)
 rename {examples => spec/_files}/section_as_context.js (100%)
 rename {examples => spec/_files}/section_as_context.txt (100%)
 rename {examples => spec/_files}/simple.html (100%)
 rename {examples => spec/_files}/simple.js (100%)
 rename {examples => spec/_files}/simple.txt (100%)
 rename {examples => spec/_files}/template_partial.2.html (100%)
 rename {examples => spec/_files}/template_partial.html (100%)
 rename {examples => spec/_files}/template_partial.js (100%)
 rename {examples => spec/_files}/template_partial.txt (100%)
 rename {examples => spec/_files}/two_in_a_row.html (100%)
 rename {examples => spec/_files}/two_in_a_row.js (100%)
 rename {examples => spec/_files}/two_in_a_row.txt (100%)
 rename {examples => spec/_files}/two_sections.html (100%)
 rename {examples => spec/_files}/two_sections.js (100%)
 rename {examples => spec/_files}/two_sections.txt (100%)
 rename {examples => spec/_files}/unescaped.html (100%)
 rename {examples => spec/_files}/unescaped.js (100%)
 rename {examples => spec/_files}/unescaped.txt (100%)
 rename {examples => spec/_files}/unknown_pragma.html (100%)
 rename {examples => spec/_files}/unknown_pragma.js (100%)
 rename {examples => spec/_files}/unknown_pragma.txt (100%)
 rename {examples => spec/_files}/view_partial.2.html (100%)
 rename {examples => spec/_files}/view_partial.html (100%)
 rename {examples => spec/_files}/view_partial.js (100%)
 rename {examples => spec/_files}/view_partial.txt (100%)
 rename {examples => spec/_files}/whitespace_partial.2.html (100%)
 rename {examples => spec/_files}/whitespace_partial.html (100%)
 rename {examples => spec/_files}/whitespace_partial.js (100%)
 rename {examples => spec/_files}/whitespace_partial.txt (100%)
 rename {test => spec}/mustache_spec.rb (94%)

diff --git a/Rakefile b/Rakefile
index 442e151..035c467 100644
--- a/Rakefile
+++ b/Rakefile
@@ -8,7 +8,7 @@ task :spec do
   require 'rspec/core/rake_task'
   RSpec::Core::RakeTask.new(:spec) do |t|
     #t.spec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
-    t.pattern = 'test/*_spec.rb'
+    t.pattern = 'spec/*_spec.rb'
   end
 end
 
diff --git a/examples/apostrophe.html b/spec/_files/apostrophe.html
similarity index 100%
rename from examples/apostrophe.html
rename to spec/_files/apostrophe.html
diff --git a/examples/apostrophe.js b/spec/_files/apostrophe.js
similarity index 100%
rename from examples/apostrophe.js
rename to spec/_files/apostrophe.js
diff --git a/examples/apostrophe.txt b/spec/_files/apostrophe.txt
similarity index 100%
rename from examples/apostrophe.txt
rename to spec/_files/apostrophe.txt
diff --git a/examples/array_of_partials_implicit_partial.2.html b/spec/_files/array_of_partials_implicit_partial.2.html
similarity index 100%
rename from examples/array_of_partials_implicit_partial.2.html
rename to spec/_files/array_of_partials_implicit_partial.2.html
diff --git a/examples/array_of_partials_implicit_partial.html b/spec/_files/array_of_partials_implicit_partial.html
similarity index 100%
rename from examples/array_of_partials_implicit_partial.html
rename to spec/_files/array_of_partials_implicit_partial.html
diff --git a/examples/array_of_partials_implicit_partial.js b/spec/_files/array_of_partials_implicit_partial.js
similarity index 100%
rename from examples/array_of_partials_implicit_partial.js
rename to spec/_files/array_of_partials_implicit_partial.js
diff --git a/examples/array_of_partials_implicit_partial.txt b/spec/_files/array_of_partials_implicit_partial.txt
similarity index 100%
rename from examples/array_of_partials_implicit_partial.txt
rename to spec/_files/array_of_partials_implicit_partial.txt
diff --git a/examples/array_of_partials_partial.2.html b/spec/_files/array_of_partials_partial.2.html
similarity index 100%
rename from examples/array_of_partials_partial.2.html
rename to spec/_files/array_of_partials_partial.2.html
diff --git a/examples/array_of_partials_partial.html b/spec/_files/array_of_partials_partial.html
similarity index 100%
rename from examples/array_of_partials_partial.html
rename to spec/_files/array_of_partials_partial.html
diff --git a/examples/array_of_partials_partial.js b/spec/_files/array_of_partials_partial.js
similarity index 100%
rename from examples/array_of_partials_partial.js
rename to spec/_files/array_of_partials_partial.js
diff --git a/examples/array_of_partials_partial.txt b/spec/_files/array_of_partials_partial.txt
similarity index 100%
rename from examples/array_of_partials_partial.txt
rename to spec/_files/array_of_partials_partial.txt
diff --git a/examples/array_of_strings.html b/spec/_files/array_of_strings.html
similarity index 100%
rename from examples/array_of_strings.html
rename to spec/_files/array_of_strings.html
diff --git a/examples/array_of_strings.js b/spec/_files/array_of_strings.js
similarity index 100%
rename from examples/array_of_strings.js
rename to spec/_files/array_of_strings.js
diff --git a/examples/array_of_strings.txt b/spec/_files/array_of_strings.txt
similarity index 100%
rename from examples/array_of_strings.txt
rename to spec/_files/array_of_strings.txt
diff --git a/examples/array_of_strings_options.html b/spec/_files/array_of_strings_options.html
similarity index 100%
rename from examples/array_of_strings_options.html
rename to spec/_files/array_of_strings_options.html
diff --git a/examples/array_of_strings_options.js b/spec/_files/array_of_strings_options.js
similarity index 100%
rename from examples/array_of_strings_options.js
rename to spec/_files/array_of_strings_options.js
diff --git a/examples/array_of_strings_options.txt b/spec/_files/array_of_strings_options.txt
similarity index 100%
rename from examples/array_of_strings_options.txt
rename to spec/_files/array_of_strings_options.txt
diff --git a/examples/array_partial.2.html b/spec/_files/array_partial.2.html
similarity index 100%
rename from examples/array_partial.2.html
rename to spec/_files/array_partial.2.html
diff --git a/examples/array_partial.html b/spec/_files/array_partial.html
similarity index 100%
rename from examples/array_partial.html
rename to spec/_files/array_partial.html
diff --git a/examples/array_partial.js b/spec/_files/array_partial.js
similarity index 100%
rename from examples/array_partial.js
rename to spec/_files/array_partial.js
diff --git a/examples/array_partial.txt b/spec/_files/array_partial.txt
similarity index 100%
rename from examples/array_partial.txt
rename to spec/_files/array_partial.txt
diff --git a/examples/bug_11_eating_whitespace.html b/spec/_files/bug_11_eating_whitespace.html
similarity index 100%
rename from examples/bug_11_eating_whitespace.html
rename to spec/_files/bug_11_eating_whitespace.html
diff --git a/examples/bug_11_eating_whitespace.js b/spec/_files/bug_11_eating_whitespace.js
similarity index 100%
rename from examples/bug_11_eating_whitespace.js
rename to spec/_files/bug_11_eating_whitespace.js
diff --git a/examples/bug_11_eating_whitespace.txt b/spec/_files/bug_11_eating_whitespace.txt
similarity index 100%
rename from examples/bug_11_eating_whitespace.txt
rename to spec/_files/bug_11_eating_whitespace.txt
diff --git a/examples/comments.html b/spec/_files/comments.html
similarity index 100%
rename from examples/comments.html
rename to spec/_files/comments.html
diff --git a/examples/comments.js b/spec/_files/comments.js
similarity index 100%
rename from examples/comments.js
rename to spec/_files/comments.js
diff --git a/examples/comments.txt b/spec/_files/comments.txt
similarity index 100%
rename from examples/comments.txt
rename to spec/_files/comments.txt
diff --git a/examples/complex.html b/spec/_files/complex.html
similarity index 100%
rename from examples/complex.html
rename to spec/_files/complex.html
diff --git a/examples/complex.js b/spec/_files/complex.js
similarity index 100%
rename from examples/complex.js
rename to spec/_files/complex.js
diff --git a/examples/complex.txt b/spec/_files/complex.txt
similarity index 100%
rename from examples/complex.txt
rename to spec/_files/complex.txt
diff --git a/examples/delimiters.html b/spec/_files/delimiters.html
similarity index 100%
rename from examples/delimiters.html
rename to spec/_files/delimiters.html
diff --git a/examples/delimiters.js b/spec/_files/delimiters.js
similarity index 100%
rename from examples/delimiters.js
rename to spec/_files/delimiters.js
diff --git a/examples/delimiters.txt b/spec/_files/delimiters.txt
similarity index 100%
rename from examples/delimiters.txt
rename to spec/_files/delimiters.txt
diff --git a/examples/dot_notation.html b/spec/_files/dot_notation.html
similarity index 100%
rename from examples/dot_notation.html
rename to spec/_files/dot_notation.html
diff --git a/examples/dot_notation.js b/spec/_files/dot_notation.js
similarity index 100%
rename from examples/dot_notation.js
rename to spec/_files/dot_notation.js
diff --git a/examples/dot_notation.txt b/spec/_files/dot_notation.txt
similarity index 100%
rename from examples/dot_notation.txt
rename to spec/_files/dot_notation.txt
diff --git a/examples/double_render.html b/spec/_files/double_render.html
similarity index 100%
rename from examples/double_render.html
rename to spec/_files/double_render.html
diff --git a/examples/double_render.js b/spec/_files/double_render.js
similarity index 100%
rename from examples/double_render.js
rename to spec/_files/double_render.js
diff --git a/examples/double_render.txt b/spec/_files/double_render.txt
similarity index 100%
rename from examples/double_render.txt
rename to spec/_files/double_render.txt
diff --git a/examples/empty_partial.2.html b/spec/_files/empty_partial.2.html
similarity index 100%
rename from examples/empty_partial.2.html
rename to spec/_files/empty_partial.2.html
diff --git a/examples/empty_partial.html b/spec/_files/empty_partial.html
similarity index 100%
rename from examples/empty_partial.html
rename to spec/_files/empty_partial.html
diff --git a/examples/empty_partial.js b/spec/_files/empty_partial.js
similarity index 100%
rename from examples/empty_partial.js
rename to spec/_files/empty_partial.js
diff --git a/examples/empty_partial.txt b/spec/_files/empty_partial.txt
similarity index 100%
rename from examples/empty_partial.txt
rename to spec/_files/empty_partial.txt
diff --git a/examples/empty_sections.html b/spec/_files/empty_sections.html
similarity index 100%
rename from examples/empty_sections.html
rename to spec/_files/empty_sections.html
diff --git a/examples/empty_sections.js b/spec/_files/empty_sections.js
similarity index 100%
rename from examples/empty_sections.js
rename to spec/_files/empty_sections.js
diff --git a/examples/empty_sections.txt b/spec/_files/empty_sections.txt
similarity index 100%
rename from examples/empty_sections.txt
rename to spec/_files/empty_sections.txt
diff --git a/examples/empty_template.html b/spec/_files/empty_template.html
similarity index 100%
rename from examples/empty_template.html
rename to spec/_files/empty_template.html
diff --git a/examples/empty_template.js b/spec/_files/empty_template.js
similarity index 100%
rename from examples/empty_template.js
rename to spec/_files/empty_template.js
diff --git a/examples/empty_template.txt b/spec/_files/empty_template.txt
similarity index 100%
rename from examples/empty_template.txt
rename to spec/_files/empty_template.txt
diff --git a/examples/error_not_found.html b/spec/_files/error_not_found.html
similarity index 100%
rename from examples/error_not_found.html
rename to spec/_files/error_not_found.html
diff --git a/examples/error_not_found.js b/spec/_files/error_not_found.js
similarity index 100%
rename from examples/error_not_found.js
rename to spec/_files/error_not_found.js
diff --git a/examples/error_not_found.txt b/spec/_files/error_not_found.txt
similarity index 100%
rename from examples/error_not_found.txt
rename to spec/_files/error_not_found.txt
diff --git a/examples/escaped.html b/spec/_files/escaped.html
similarity index 100%
rename from examples/escaped.html
rename to spec/_files/escaped.html
diff --git a/examples/escaped.js b/spec/_files/escaped.js
similarity index 100%
rename from examples/escaped.js
rename to spec/_files/escaped.js
diff --git a/examples/escaped.txt b/spec/_files/escaped.txt
similarity index 100%
rename from examples/escaped.txt
rename to spec/_files/escaped.txt
diff --git a/examples/higher_order_sections.html b/spec/_files/higher_order_sections.html
similarity index 100%
rename from examples/higher_order_sections.html
rename to spec/_files/higher_order_sections.html
diff --git a/examples/higher_order_sections.js b/spec/_files/higher_order_sections.js
similarity index 100%
rename from examples/higher_order_sections.js
rename to spec/_files/higher_order_sections.js
diff --git a/examples/higher_order_sections.txt b/spec/_files/higher_order_sections.txt
similarity index 100%
rename from examples/higher_order_sections.txt
rename to spec/_files/higher_order_sections.txt
diff --git a/examples/inverted_section.html b/spec/_files/inverted_section.html
similarity index 100%
rename from examples/inverted_section.html
rename to spec/_files/inverted_section.html
diff --git a/examples/inverted_section.js b/spec/_files/inverted_section.js
similarity index 100%
rename from examples/inverted_section.js
rename to spec/_files/inverted_section.js
diff --git a/examples/inverted_section.txt b/spec/_files/inverted_section.txt
similarity index 100%
rename from examples/inverted_section.txt
rename to spec/_files/inverted_section.txt
diff --git a/examples/keys_with_questionmarks.html b/spec/_files/keys_with_questionmarks.html
similarity index 100%
rename from examples/keys_with_questionmarks.html
rename to spec/_files/keys_with_questionmarks.html
diff --git a/examples/keys_with_questionmarks.js b/spec/_files/keys_with_questionmarks.js
similarity index 100%
rename from examples/keys_with_questionmarks.js
rename to spec/_files/keys_with_questionmarks.js
diff --git a/examples/keys_with_questionmarks.txt b/spec/_files/keys_with_questionmarks.txt
similarity index 100%
rename from examples/keys_with_questionmarks.txt
rename to spec/_files/keys_with_questionmarks.txt
diff --git a/examples/nesting.html b/spec/_files/nesting.html
similarity index 100%
rename from examples/nesting.html
rename to spec/_files/nesting.html
diff --git a/examples/nesting.js b/spec/_files/nesting.js
similarity index 100%
rename from examples/nesting.js
rename to spec/_files/nesting.js
diff --git a/examples/nesting.txt b/spec/_files/nesting.txt
similarity index 100%
rename from examples/nesting.txt
rename to spec/_files/nesting.txt
diff --git a/examples/null_string.html b/spec/_files/null_string.html
similarity index 100%
rename from examples/null_string.html
rename to spec/_files/null_string.html
diff --git a/examples/null_string.js b/spec/_files/null_string.js
similarity index 100%
rename from examples/null_string.js
rename to spec/_files/null_string.js
diff --git a/examples/null_string.txt b/spec/_files/null_string.txt
similarity index 100%
rename from examples/null_string.txt
rename to spec/_files/null_string.txt
diff --git a/examples/partial_recursion.2.html b/spec/_files/partial_recursion.2.html
similarity index 100%
rename from examples/partial_recursion.2.html
rename to spec/_files/partial_recursion.2.html
diff --git a/examples/partial_recursion.html b/spec/_files/partial_recursion.html
similarity index 100%
rename from examples/partial_recursion.html
rename to spec/_files/partial_recursion.html
diff --git a/examples/partial_recursion.js b/spec/_files/partial_recursion.js
similarity index 100%
rename from examples/partial_recursion.js
rename to spec/_files/partial_recursion.js
diff --git a/examples/partial_recursion.txt b/spec/_files/partial_recursion.txt
similarity index 100%
rename from examples/partial_recursion.txt
rename to spec/_files/partial_recursion.txt
diff --git a/examples/recursion_with_same_names.html b/spec/_files/recursion_with_same_names.html
similarity index 100%
rename from examples/recursion_with_same_names.html
rename to spec/_files/recursion_with_same_names.html
diff --git a/examples/recursion_with_same_names.js b/spec/_files/recursion_with_same_names.js
similarity index 100%
rename from examples/recursion_with_same_names.js
rename to spec/_files/recursion_with_same_names.js
diff --git a/examples/recursion_with_same_names.txt b/spec/_files/recursion_with_same_names.txt
similarity index 100%
rename from examples/recursion_with_same_names.txt
rename to spec/_files/recursion_with_same_names.txt
diff --git a/examples/reuse_of_enumerables.html b/spec/_files/reuse_of_enumerables.html
similarity index 100%
rename from examples/reuse_of_enumerables.html
rename to spec/_files/reuse_of_enumerables.html
diff --git a/examples/reuse_of_enumerables.js b/spec/_files/reuse_of_enumerables.js
similarity index 100%
rename from examples/reuse_of_enumerables.js
rename to spec/_files/reuse_of_enumerables.js
diff --git a/examples/reuse_of_enumerables.txt b/spec/_files/reuse_of_enumerables.txt
similarity index 100%
rename from examples/reuse_of_enumerables.txt
rename to spec/_files/reuse_of_enumerables.txt
diff --git a/examples/section_as_context.html b/spec/_files/section_as_context.html
similarity index 100%
rename from examples/section_as_context.html
rename to spec/_files/section_as_context.html
diff --git a/examples/section_as_context.js b/spec/_files/section_as_context.js
similarity index 100%
rename from examples/section_as_context.js
rename to spec/_files/section_as_context.js
diff --git a/examples/section_as_context.txt b/spec/_files/section_as_context.txt
similarity index 100%
rename from examples/section_as_context.txt
rename to spec/_files/section_as_context.txt
diff --git a/examples/simple.html b/spec/_files/simple.html
similarity index 100%
rename from examples/simple.html
rename to spec/_files/simple.html
diff --git a/examples/simple.js b/spec/_files/simple.js
similarity index 100%
rename from examples/simple.js
rename to spec/_files/simple.js
diff --git a/examples/simple.txt b/spec/_files/simple.txt
similarity index 100%
rename from examples/simple.txt
rename to spec/_files/simple.txt
diff --git a/examples/template_partial.2.html b/spec/_files/template_partial.2.html
similarity index 100%
rename from examples/template_partial.2.html
rename to spec/_files/template_partial.2.html
diff --git a/examples/template_partial.html b/spec/_files/template_partial.html
similarity index 100%
rename from examples/template_partial.html
rename to spec/_files/template_partial.html
diff --git a/examples/template_partial.js b/spec/_files/template_partial.js
similarity index 100%
rename from examples/template_partial.js
rename to spec/_files/template_partial.js
diff --git a/examples/template_partial.txt b/spec/_files/template_partial.txt
similarity index 100%
rename from examples/template_partial.txt
rename to spec/_files/template_partial.txt
diff --git a/examples/two_in_a_row.html b/spec/_files/two_in_a_row.html
similarity index 100%
rename from examples/two_in_a_row.html
rename to spec/_files/two_in_a_row.html
diff --git a/examples/two_in_a_row.js b/spec/_files/two_in_a_row.js
similarity index 100%
rename from examples/two_in_a_row.js
rename to spec/_files/two_in_a_row.js
diff --git a/examples/two_in_a_row.txt b/spec/_files/two_in_a_row.txt
similarity index 100%
rename from examples/two_in_a_row.txt
rename to spec/_files/two_in_a_row.txt
diff --git a/examples/two_sections.html b/spec/_files/two_sections.html
similarity index 100%
rename from examples/two_sections.html
rename to spec/_files/two_sections.html
diff --git a/examples/two_sections.js b/spec/_files/two_sections.js
similarity index 100%
rename from examples/two_sections.js
rename to spec/_files/two_sections.js
diff --git a/examples/two_sections.txt b/spec/_files/two_sections.txt
similarity index 100%
rename from examples/two_sections.txt
rename to spec/_files/two_sections.txt
diff --git a/examples/unescaped.html b/spec/_files/unescaped.html
similarity index 100%
rename from examples/unescaped.html
rename to spec/_files/unescaped.html
diff --git a/examples/unescaped.js b/spec/_files/unescaped.js
similarity index 100%
rename from examples/unescaped.js
rename to spec/_files/unescaped.js
diff --git a/examples/unescaped.txt b/spec/_files/unescaped.txt
similarity index 100%
rename from examples/unescaped.txt
rename to spec/_files/unescaped.txt
diff --git a/examples/unknown_pragma.html b/spec/_files/unknown_pragma.html
similarity index 100%
rename from examples/unknown_pragma.html
rename to spec/_files/unknown_pragma.html
diff --git a/examples/unknown_pragma.js b/spec/_files/unknown_pragma.js
similarity index 100%
rename from examples/unknown_pragma.js
rename to spec/_files/unknown_pragma.js
diff --git a/examples/unknown_pragma.txt b/spec/_files/unknown_pragma.txt
similarity index 100%
rename from examples/unknown_pragma.txt
rename to spec/_files/unknown_pragma.txt
diff --git a/examples/view_partial.2.html b/spec/_files/view_partial.2.html
similarity index 100%
rename from examples/view_partial.2.html
rename to spec/_files/view_partial.2.html
diff --git a/examples/view_partial.html b/spec/_files/view_partial.html
similarity index 100%
rename from examples/view_partial.html
rename to spec/_files/view_partial.html
diff --git a/examples/view_partial.js b/spec/_files/view_partial.js
similarity index 100%
rename from examples/view_partial.js
rename to spec/_files/view_partial.js
diff --git a/examples/view_partial.txt b/spec/_files/view_partial.txt
similarity index 100%
rename from examples/view_partial.txt
rename to spec/_files/view_partial.txt
diff --git a/examples/whitespace_partial.2.html b/spec/_files/whitespace_partial.2.html
similarity index 100%
rename from examples/whitespace_partial.2.html
rename to spec/_files/whitespace_partial.2.html
diff --git a/examples/whitespace_partial.html b/spec/_files/whitespace_partial.html
similarity index 100%
rename from examples/whitespace_partial.html
rename to spec/_files/whitespace_partial.html
diff --git a/examples/whitespace_partial.js b/spec/_files/whitespace_partial.js
similarity index 100%
rename from examples/whitespace_partial.js
rename to spec/_files/whitespace_partial.js
diff --git a/examples/whitespace_partial.txt b/spec/_files/whitespace_partial.txt
similarity index 100%
rename from examples/whitespace_partial.txt
rename to spec/_files/whitespace_partial.txt
diff --git a/test/mustache_spec.rb b/spec/mustache_spec.rb
similarity index 94%
rename from test/mustache_spec.rb
rename to spec/mustache_spec.rb
index f89f27c..7edc071 100644
--- a/test/mustache_spec.rb
+++ b/spec/mustache_spec.rb
@@ -1,11 +1,13 @@
 require 'rubygems'
 require 'json'
 
-ROOT = File.expand_path("../..", __FILE__)
+ROOT = File.expand_path('../..', __FILE__)
+SPEC = File.join(ROOT, 'spec')
+FILES = File.join(SPEC, '_files')
 
 MUSTACHE = File.read(File.join(ROOT, "mustache.js"))
 
-TESTS = Dir.glob(File.join(ROOT, 'examples', '*.js')).map do |name|
+TESTS = Dir.glob(File.join(FILES, '*.js')).map do |name|
   File.basename name, '.js'
 end
 
@@ -18,14 +20,14 @@ JSC_PATH = "/System/Library/Frameworks/JavaScriptCore.framework/Versions/A/Resou
 RHINO_JAR = "org.mozilla.javascript.tools.shell.Main"
 
 def load_test(name, is_partial=false)
-  view = File.read(File.join(ROOT, "examples", "#{name}.js"))
-  template = File.read(File.join(ROOT, "examples", "#{name}.html")).to_json
-  expect = File.read(File.join(ROOT, "examples", "#{name}.txt"))
+  view = File.read(File.join(FILES, "#{name}.js"))
+  template = File.read(File.join(FILES, "#{name}.html")).to_json
+  expect = File.read(File.join(FILES, "#{name}.txt"))
 
   test = [view, template, expect]
 
   if is_partial
-    test << File.read(File.join(ROOT, "examples", "#{name}.2.html")).to_json
+    test << File.read(File.join(FILES, "#{name}.2.html")).to_json
   end
 
   test

From 3ac02f342a8cd68a8a56530a794120a57014298c Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Wed, 14 Dec 2011 10:26:13 -0800
Subject: [PATCH 16/64] Use .mustache file extension

---
 spec/_files/{apostrophe.html => apostrophe.mustache}        | 0
 ...2.html => array_of_partials_implicit_partial.2.mustache} | 0
 ...ial.html => array_of_partials_implicit_partial.mustache} | 0
 ..._partial.2.html => array_of_partials_partial.2.mustache} | 0
 ...ials_partial.html => array_of_partials_partial.mustache} | 0
 .../{array_of_strings.html => array_of_strings.mustache}    | 0
 ...rings_options.html => array_of_strings_options.mustache} | 0
 .../{array_partial.2.html => array_partial.2.mustache}      | 0
 spec/_files/{array_partial.html => array_partial.mustache}  | 0
 ...ng_whitespace.html => bug_11_eating_whitespace.mustache} | 0
 spec/_files/{comments.html => comments.mustache}            | 0
 spec/_files/{complex.html => complex.mustache}              | 0
 spec/_files/{delimiters.html => delimiters.mustache}        | 0
 spec/_files/{dot_notation.html => dot_notation.mustache}    | 0
 spec/_files/{double_render.html => double_render.mustache}  | 0
 .../{empty_partial.2.html => empty_partial.2.mustache}      | 0
 spec/_files/{empty_partial.html => empty_partial.mustache}  | 0
 .../_files/{empty_sections.html => empty_sections.mustache} | 0
 .../_files/{empty_template.html => empty_template.mustache} | 0
 .../{error_not_found.html => error_not_found.mustache}      | 0
 spec/_files/{escaped.html => escaped.mustache}              | 0
 ...r_order_sections.html => higher_order_sections.mustache} | 0
 .../{inverted_section.html => inverted_section.mustache}    | 0
 ..._questionmarks.html => keys_with_questionmarks.mustache} | 0
 spec/_files/{nesting.html => nesting.mustache}              | 0
 spec/_files/{null_string.html => null_string.mustache}      | 0
 ...artial_recursion.2.html => partial_recursion.2.mustache} | 0
 .../{partial_recursion.html => partial_recursion.mustache}  | 0
 ...h_same_names.html => recursion_with_same_names.mustache} | 0
 ...se_of_enumerables.html => reuse_of_enumerables.mustache} | 0
 ...{section_as_context.html => section_as_context.mustache} | 0
 spec/_files/{simple.html => simple.mustache}                | 0
 ...{template_partial.2.html => template_partial.2.mustache} | 0
 .../{template_partial.html => template_partial.mustache}    | 0
 spec/_files/{two_in_a_row.html => two_in_a_row.mustache}    | 0
 spec/_files/{two_sections.html => two_sections.mustache}    | 0
 spec/_files/{unescaped.html => unescaped.mustache}          | 0
 .../_files/{unknown_pragma.html => unknown_pragma.mustache} | 0
 .../_files/{view_partial.2.html => view_partial.2.mustache} | 0
 spec/_files/{view_partial.html => view_partial.mustache}    | 0
 ...tespace_partial.2.html => whitespace_partial.2.mustache} | 0
 ...{whitespace_partial.html => whitespace_partial.mustache} | 0
 spec/mustache_spec.rb                                       | 6 +++---
 43 files changed, 3 insertions(+), 3 deletions(-)
 rename spec/_files/{apostrophe.html => apostrophe.mustache} (100%)
 rename spec/_files/{array_of_partials_implicit_partial.2.html => array_of_partials_implicit_partial.2.mustache} (100%)
 rename spec/_files/{array_of_partials_implicit_partial.html => array_of_partials_implicit_partial.mustache} (100%)
 rename spec/_files/{array_of_partials_partial.2.html => array_of_partials_partial.2.mustache} (100%)
 rename spec/_files/{array_of_partials_partial.html => array_of_partials_partial.mustache} (100%)
 rename spec/_files/{array_of_strings.html => array_of_strings.mustache} (100%)
 rename spec/_files/{array_of_strings_options.html => array_of_strings_options.mustache} (100%)
 rename spec/_files/{array_partial.2.html => array_partial.2.mustache} (100%)
 rename spec/_files/{array_partial.html => array_partial.mustache} (100%)
 rename spec/_files/{bug_11_eating_whitespace.html => bug_11_eating_whitespace.mustache} (100%)
 rename spec/_files/{comments.html => comments.mustache} (100%)
 rename spec/_files/{complex.html => complex.mustache} (100%)
 rename spec/_files/{delimiters.html => delimiters.mustache} (100%)
 rename spec/_files/{dot_notation.html => dot_notation.mustache} (100%)
 rename spec/_files/{double_render.html => double_render.mustache} (100%)
 rename spec/_files/{empty_partial.2.html => empty_partial.2.mustache} (100%)
 rename spec/_files/{empty_partial.html => empty_partial.mustache} (100%)
 rename spec/_files/{empty_sections.html => empty_sections.mustache} (100%)
 rename spec/_files/{empty_template.html => empty_template.mustache} (100%)
 rename spec/_files/{error_not_found.html => error_not_found.mustache} (100%)
 rename spec/_files/{escaped.html => escaped.mustache} (100%)
 rename spec/_files/{higher_order_sections.html => higher_order_sections.mustache} (100%)
 rename spec/_files/{inverted_section.html => inverted_section.mustache} (100%)
 rename spec/_files/{keys_with_questionmarks.html => keys_with_questionmarks.mustache} (100%)
 rename spec/_files/{nesting.html => nesting.mustache} (100%)
 rename spec/_files/{null_string.html => null_string.mustache} (100%)
 rename spec/_files/{partial_recursion.2.html => partial_recursion.2.mustache} (100%)
 rename spec/_files/{partial_recursion.html => partial_recursion.mustache} (100%)
 rename spec/_files/{recursion_with_same_names.html => recursion_with_same_names.mustache} (100%)
 rename spec/_files/{reuse_of_enumerables.html => reuse_of_enumerables.mustache} (100%)
 rename spec/_files/{section_as_context.html => section_as_context.mustache} (100%)
 rename spec/_files/{simple.html => simple.mustache} (100%)
 rename spec/_files/{template_partial.2.html => template_partial.2.mustache} (100%)
 rename spec/_files/{template_partial.html => template_partial.mustache} (100%)
 rename spec/_files/{two_in_a_row.html => two_in_a_row.mustache} (100%)
 rename spec/_files/{two_sections.html => two_sections.mustache} (100%)
 rename spec/_files/{unescaped.html => unescaped.mustache} (100%)
 rename spec/_files/{unknown_pragma.html => unknown_pragma.mustache} (100%)
 rename spec/_files/{view_partial.2.html => view_partial.2.mustache} (100%)
 rename spec/_files/{view_partial.html => view_partial.mustache} (100%)
 rename spec/_files/{whitespace_partial.2.html => whitespace_partial.2.mustache} (100%)
 rename spec/_files/{whitespace_partial.html => whitespace_partial.mustache} (100%)

diff --git a/spec/_files/apostrophe.html b/spec/_files/apostrophe.mustache
similarity index 100%
rename from spec/_files/apostrophe.html
rename to spec/_files/apostrophe.mustache
diff --git a/spec/_files/array_of_partials_implicit_partial.2.html b/spec/_files/array_of_partials_implicit_partial.2.mustache
similarity index 100%
rename from spec/_files/array_of_partials_implicit_partial.2.html
rename to spec/_files/array_of_partials_implicit_partial.2.mustache
diff --git a/spec/_files/array_of_partials_implicit_partial.html b/spec/_files/array_of_partials_implicit_partial.mustache
similarity index 100%
rename from spec/_files/array_of_partials_implicit_partial.html
rename to spec/_files/array_of_partials_implicit_partial.mustache
diff --git a/spec/_files/array_of_partials_partial.2.html b/spec/_files/array_of_partials_partial.2.mustache
similarity index 100%
rename from spec/_files/array_of_partials_partial.2.html
rename to spec/_files/array_of_partials_partial.2.mustache
diff --git a/spec/_files/array_of_partials_partial.html b/spec/_files/array_of_partials_partial.mustache
similarity index 100%
rename from spec/_files/array_of_partials_partial.html
rename to spec/_files/array_of_partials_partial.mustache
diff --git a/spec/_files/array_of_strings.html b/spec/_files/array_of_strings.mustache
similarity index 100%
rename from spec/_files/array_of_strings.html
rename to spec/_files/array_of_strings.mustache
diff --git a/spec/_files/array_of_strings_options.html b/spec/_files/array_of_strings_options.mustache
similarity index 100%
rename from spec/_files/array_of_strings_options.html
rename to spec/_files/array_of_strings_options.mustache
diff --git a/spec/_files/array_partial.2.html b/spec/_files/array_partial.2.mustache
similarity index 100%
rename from spec/_files/array_partial.2.html
rename to spec/_files/array_partial.2.mustache
diff --git a/spec/_files/array_partial.html b/spec/_files/array_partial.mustache
similarity index 100%
rename from spec/_files/array_partial.html
rename to spec/_files/array_partial.mustache
diff --git a/spec/_files/bug_11_eating_whitespace.html b/spec/_files/bug_11_eating_whitespace.mustache
similarity index 100%
rename from spec/_files/bug_11_eating_whitespace.html
rename to spec/_files/bug_11_eating_whitespace.mustache
diff --git a/spec/_files/comments.html b/spec/_files/comments.mustache
similarity index 100%
rename from spec/_files/comments.html
rename to spec/_files/comments.mustache
diff --git a/spec/_files/complex.html b/spec/_files/complex.mustache
similarity index 100%
rename from spec/_files/complex.html
rename to spec/_files/complex.mustache
diff --git a/spec/_files/delimiters.html b/spec/_files/delimiters.mustache
similarity index 100%
rename from spec/_files/delimiters.html
rename to spec/_files/delimiters.mustache
diff --git a/spec/_files/dot_notation.html b/spec/_files/dot_notation.mustache
similarity index 100%
rename from spec/_files/dot_notation.html
rename to spec/_files/dot_notation.mustache
diff --git a/spec/_files/double_render.html b/spec/_files/double_render.mustache
similarity index 100%
rename from spec/_files/double_render.html
rename to spec/_files/double_render.mustache
diff --git a/spec/_files/empty_partial.2.html b/spec/_files/empty_partial.2.mustache
similarity index 100%
rename from spec/_files/empty_partial.2.html
rename to spec/_files/empty_partial.2.mustache
diff --git a/spec/_files/empty_partial.html b/spec/_files/empty_partial.mustache
similarity index 100%
rename from spec/_files/empty_partial.html
rename to spec/_files/empty_partial.mustache
diff --git a/spec/_files/empty_sections.html b/spec/_files/empty_sections.mustache
similarity index 100%
rename from spec/_files/empty_sections.html
rename to spec/_files/empty_sections.mustache
diff --git a/spec/_files/empty_template.html b/spec/_files/empty_template.mustache
similarity index 100%
rename from spec/_files/empty_template.html
rename to spec/_files/empty_template.mustache
diff --git a/spec/_files/error_not_found.html b/spec/_files/error_not_found.mustache
similarity index 100%
rename from spec/_files/error_not_found.html
rename to spec/_files/error_not_found.mustache
diff --git a/spec/_files/escaped.html b/spec/_files/escaped.mustache
similarity index 100%
rename from spec/_files/escaped.html
rename to spec/_files/escaped.mustache
diff --git a/spec/_files/higher_order_sections.html b/spec/_files/higher_order_sections.mustache
similarity index 100%
rename from spec/_files/higher_order_sections.html
rename to spec/_files/higher_order_sections.mustache
diff --git a/spec/_files/inverted_section.html b/spec/_files/inverted_section.mustache
similarity index 100%
rename from spec/_files/inverted_section.html
rename to spec/_files/inverted_section.mustache
diff --git a/spec/_files/keys_with_questionmarks.html b/spec/_files/keys_with_questionmarks.mustache
similarity index 100%
rename from spec/_files/keys_with_questionmarks.html
rename to spec/_files/keys_with_questionmarks.mustache
diff --git a/spec/_files/nesting.html b/spec/_files/nesting.mustache
similarity index 100%
rename from spec/_files/nesting.html
rename to spec/_files/nesting.mustache
diff --git a/spec/_files/null_string.html b/spec/_files/null_string.mustache
similarity index 100%
rename from spec/_files/null_string.html
rename to spec/_files/null_string.mustache
diff --git a/spec/_files/partial_recursion.2.html b/spec/_files/partial_recursion.2.mustache
similarity index 100%
rename from spec/_files/partial_recursion.2.html
rename to spec/_files/partial_recursion.2.mustache
diff --git a/spec/_files/partial_recursion.html b/spec/_files/partial_recursion.mustache
similarity index 100%
rename from spec/_files/partial_recursion.html
rename to spec/_files/partial_recursion.mustache
diff --git a/spec/_files/recursion_with_same_names.html b/spec/_files/recursion_with_same_names.mustache
similarity index 100%
rename from spec/_files/recursion_with_same_names.html
rename to spec/_files/recursion_with_same_names.mustache
diff --git a/spec/_files/reuse_of_enumerables.html b/spec/_files/reuse_of_enumerables.mustache
similarity index 100%
rename from spec/_files/reuse_of_enumerables.html
rename to spec/_files/reuse_of_enumerables.mustache
diff --git a/spec/_files/section_as_context.html b/spec/_files/section_as_context.mustache
similarity index 100%
rename from spec/_files/section_as_context.html
rename to spec/_files/section_as_context.mustache
diff --git a/spec/_files/simple.html b/spec/_files/simple.mustache
similarity index 100%
rename from spec/_files/simple.html
rename to spec/_files/simple.mustache
diff --git a/spec/_files/template_partial.2.html b/spec/_files/template_partial.2.mustache
similarity index 100%
rename from spec/_files/template_partial.2.html
rename to spec/_files/template_partial.2.mustache
diff --git a/spec/_files/template_partial.html b/spec/_files/template_partial.mustache
similarity index 100%
rename from spec/_files/template_partial.html
rename to spec/_files/template_partial.mustache
diff --git a/spec/_files/two_in_a_row.html b/spec/_files/two_in_a_row.mustache
similarity index 100%
rename from spec/_files/two_in_a_row.html
rename to spec/_files/two_in_a_row.mustache
diff --git a/spec/_files/two_sections.html b/spec/_files/two_sections.mustache
similarity index 100%
rename from spec/_files/two_sections.html
rename to spec/_files/two_sections.mustache
diff --git a/spec/_files/unescaped.html b/spec/_files/unescaped.mustache
similarity index 100%
rename from spec/_files/unescaped.html
rename to spec/_files/unescaped.mustache
diff --git a/spec/_files/unknown_pragma.html b/spec/_files/unknown_pragma.mustache
similarity index 100%
rename from spec/_files/unknown_pragma.html
rename to spec/_files/unknown_pragma.mustache
diff --git a/spec/_files/view_partial.2.html b/spec/_files/view_partial.2.mustache
similarity index 100%
rename from spec/_files/view_partial.2.html
rename to spec/_files/view_partial.2.mustache
diff --git a/spec/_files/view_partial.html b/spec/_files/view_partial.mustache
similarity index 100%
rename from spec/_files/view_partial.html
rename to spec/_files/view_partial.mustache
diff --git a/spec/_files/whitespace_partial.2.html b/spec/_files/whitespace_partial.2.mustache
similarity index 100%
rename from spec/_files/whitespace_partial.2.html
rename to spec/_files/whitespace_partial.2.mustache
diff --git a/spec/_files/whitespace_partial.html b/spec/_files/whitespace_partial.mustache
similarity index 100%
rename from spec/_files/whitespace_partial.html
rename to spec/_files/whitespace_partial.mustache
diff --git a/spec/mustache_spec.rb b/spec/mustache_spec.rb
index 7edc071..e04bec1 100644
--- a/spec/mustache_spec.rb
+++ b/spec/mustache_spec.rb
@@ -21,13 +21,13 @@ RHINO_JAR = "org.mozilla.javascript.tools.shell.Main"
 
 def load_test(name, is_partial=false)
   view = File.read(File.join(FILES, "#{name}.js"))
-  template = File.read(File.join(FILES, "#{name}.html")).to_json
+  template = File.read(File.join(FILES, "#{name}.mustache")).to_json
   expect = File.read(File.join(FILES, "#{name}.txt"))
 
   test = [view, template, expect]
 
   if is_partial
-    test << File.read(File.join(FILES, "#{name}.2.html")).to_json
+    test << File.read(File.join(FILES, "#{name}.2.mustache")).to_json
   end
 
   test
@@ -238,7 +238,7 @@ describe "mustache" do
     end
   end
 
-  context "running in Rhino (Mozilla)" do
+  context "running in Rhino (Mozilla, Java)" do
     if `java #{RHINO_JAR} 'foo' 2>&1` !~ /ClassNotFoundException/
       before(:all) do
         $stdout.write "Testing in Rhino "

From 846d1d349827a03dbd65465a12fd937b3cf9a819 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Wed, 14 Dec 2011 10:27:01 -0800
Subject: [PATCH 17/64] Update testing instructions

---
 TESTING.md    | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++
 TESTS_HELP.md | 54 --------------------------------------------
 2 files changed, 62 insertions(+), 54 deletions(-)
 create mode 100644 TESTING.md
 delete mode 100644 TESTS_HELP.md

diff --git a/TESTING.md b/TESTING.md
new file mode 100644
index 0000000..6abec93
--- /dev/null
+++ b/TESTING.md
@@ -0,0 +1,62 @@
+## Running the mustache.js Test Suite
+
+The mustache.js test suite uses the [RSpec](http://rspec.info/) testing
+framework. In order to run the tests you'll need to install [Ruby](http://ruby-lang.org/)
+as well as the `rake`, `rspec` (>=2), and `json` [RubyGems](http://rubygems.org/).
+
+### How to install Ruby and the required gems from source
+
+Make sure you have the required tools to compile it:
+
+    $ apt-get install build-essential libssl-dev libreadline5-dev zlib1g-dev
+
+Download and extract the Ruby source, and install it:
+
+    $ wget ftp://ftp.ruby-lang.org/pub/ruby/stable-snapshot.tar.gz
+    $ tar xvzf stable-snapshot.tar.gz
+    $ cd ruby
+    $ ./configure && make && make install
+
+Download and extract RubyGems, and install it:
+
+    $ wget http://production.cf.rubygems.org/rubygems/rubygems-1.8.12.tgz
+    $ tar xzvf rubygems-1.8.12.tgz
+    $ cd rubygems-1.8.12
+    $ ruby setup.rb
+
+If you want to update RubyGems:
+
+    $ gem update --system
+
+Install the required gems:
+
+    $ gem install rake rspec json
+
+That's it!
+
+### How to run the tests
+
+The mustache.js test suite currently uses 4 different JavaScript runtime engines
+to maximize portability across platforms and browsers. They are:
+
+  * node
+  * SpiderMonkey (Mozilla, Firefox)
+  * JavaScriptCore (WebKit, Safari)
+  * Rhino (Mozilla, Java)
+
+When the test suite runs it will automatically determine which platforms are
+available on your machine and run on all of them. The suite must run on at least
+one platform in order to succeed.
+
+Once you have at least one JavaScript platform installed, you can run the test
+suite with the following command:
+
+    $ rake
+
+### How to create a test
+
+All test files live in the spec/_files directory. To create a new test:
+
+  * Create a template file `somename.mustache`
+  * Create a javascript file with data and functions `somename.js`
+  * Create a file the expected result `somename.txt`
diff --git a/TESTS_HELP.md b/TESTS_HELP.md
deleted file mode 100644
index 82a03e5..0000000
--- a/TESTS_HELP.md
+++ /dev/null
@@ -1,54 +0,0 @@
-## How to run the tests
-
-To run the test, you need ruby and the following gems installed : rake, rspec (>=2), json
-
-### How to install ruby and the required gems from source
-
-Make sure you have the required tools to compile it
-
-    # apt-get install build-essential libssl-dev libreadline5-dev zlib1g-dev
-
-Download ruby source and extract the source
-
-    $ cd ~/
-    $ wget ftp://ftp.ruby-lang.org/pub/ruby/stable-snapshot.tar.gz  
-    $ tar xvzf stable-snapshot.tar.gz
-
-Install it
-
-    $ ./configure && make
-    # make install
-
-download the last version of RubyGems from here
-http://rubyforge.org/frs/?group_id=126
-
-Extract the source
-
-    $ tar xzvf rubygems-1.8.4.tgz
-
-Install it
-
-    $ cd rubygems-1.8.4
-    # ruby setup.rb
-
-If you want to update RubyGems
-
-    # gem update --system
-
-Install the required gems
-
-    # gem install rake rspec json
-
-That's it!
-
-### How to run the tests
-
-    $ rake
-
-### How to create a test
-
-- Create a template file `somename.html`
-- Create a javascript file with data and functions `somename.js`
-- Create a file the expected result `somename.txt`
-
-Done!

From 2f4ccb950f064d56b473f184b5d5a7986b85e40d Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Wed, 14 Dec 2011 10:59:51 -0800
Subject: [PATCH 18/64] Update README

---
 README.md                      | 169 ++++++++++++++-------------------
 Rakefile                       |   2 +-
 THANKS.md                      |  22 -----
 wrappers/commonjs/package.json |   4 +-
 4 files changed, 73 insertions(+), 124 deletions(-)
 delete mode 100644 THANKS.md

diff --git a/README.md b/README.md
index f86e7fd..578df7c 100644
--- a/README.md
+++ b/README.md
@@ -1,50 +1,55 @@
-# mustache.js — Logic-less templates with JavaScript
+# mustache.js — Logic-less {{mustache}} templates with JavaScript
 
 > What could be more logical awesome than no logic at all?
 
-For a list of implementations (other than JavaScript) and editor
-plugins, see <http://mustache.github.com/>.
+[mustache.js](http://github.com/janl/mustache.js) is an implementation of the
+[Mustache](http://mustache.github.com/) templating system in JavaScript.
 
+[Mustache](http://mustache.github.com/) is a logic-less template syntax. It can
+be used for HTML, config files, source code - anything. It works by expanding
+tags in a template using values provided in a hash or object.
 
-## Where to Use?
+We call it "logic-less" because there are no if statements, else clauses, or for
+loops. Instead there are only tags. Some tags are replaced with a value, some
+nothing, and others a series of values.
 
-You can use mustache.js rendering stuff in various scenarios. E.g. you can
-render templates in your browser, or rendering server-side stuff with
-[node.js][node.js], use it for rendering stuff in [CouchDB][couchdb]’s views.
+For a language-agnostic overview of Mustache's template syntax, see the
+`mustache(5)` [manpage](http://mustache.github.com/mustache.5.html).
 
+## Where to use mustache.js?
 
-## Who Uses Mustache?
+You can use mustache.js to render templates in many various scenarios where you
+can use JavaScript. For example, you can render templates in a browser,
+server-side using [node](http://nodejs.org/), in [CouchDB](http://couchdb.apache.org/)
+views, or in almost any other environment where you can use JavaScript.
 
-An updated list is kept on the Github wiki. Add yourself, if you use
-mustache.js: <http://wiki.github.com/janl/mustache.js/beard-competition>
+## Who uses mustache.js?
 
+An updated list of mustache.js users is kept [on the Github wiki](http://wiki.github.com/janl/mustache.js/beard-competition).
+Add yourself or your company if you use mustache.js!
 
 ## Usage
 
-A quick example how to use mustache.js:
+Below is quick example how to use mustache.js:
 
     var view = {
       title: "Joe",
       calc: function() {
         return 2 + 4;
       }
-    }
-
-    var template = "{{title}} spends {{calc}}";
+    };
 
-    var html = Mustache.to_html(template, view);
+    var html = Mustache.to_html("{{title}} spends {{calc}}", view);
 
-`template` is a simple string with mustache tags and `view` is a JavaScript
-object containing the data and any code to render the template.
+In this example, the `Mustache.to_html` function takes two parameters: 1) the
+[mustache](http://mustache.github.com/) template and 2) a `view` object that
+contains the data and code needed to render the template.
 
 
 ## Template Tag Types
 
 There are several types of tags currently implemented in mustache.js.
 
-For a language-agnostic overview of Mustache’s template syntax, see the
-`mustache(5)` manpage or <http://mustache.github.com/mustache.5.html>.
-
 ### Simple Tags
 
 Tags are always surrounded by mustaches like this `{{foobar}}`.
@@ -267,82 +272,48 @@ own iteration marker:
       {{bob}}
     {{/foo}}
 
-## More Examples and Documentation
-
-See `examples/` for more goodies and read the [original mustache docs][m]
-
-## Command Line
-
-See `mustache(1)` man page or
-<http://defunkt.github.com/mustache/mustache.1.html>
-for command line docs.
-
-Or just install it as a RubyGem:
-
-    $ gem install mustache
-    $ mustache -h
-
-[m]: http://github.com/defunkt/mustache/#readme
-[node.js]: http://nodejs.org
-[couchdb]: http://couchdb.apache.org
-
-
-## Plugins for jQuery, Dojo, Yui, CommonJS, qooxdoo
-
-This repository lets you build modules for [jQuery][], [Dojo][], [Yui][] and
-[CommonJS][] / [Node.js][] with the help of `rake`.
-
-NOTE: The default `rake` task is only used for testing and require rspec to be
-installed (see below).
-
-Run `rake jquery` to get a jQuery compatible plugin file in the
-`mustache-jquery/` directory.
-
-Run `rake dojo` to get a Dojo compatible plugin file in the `mustache-dojo/`
-directory.
-
-Run `rake yui` to get a Yui compatible plugin file in the `mustache-yui/`
-directory.
-
-Run `rake commonjs` to get a CommonJS compatible plugin file in the
-`mustache-commonjs/` directory which you can also use with [Node.js][].
-
-Run `rake qooxdoo` to get a qooxdoo compatible file named `qooxdoo.mustache.js`.
-
-## Testing
-
-NOTE: You will need to install rspec first by running `gem install rspec`.
-
-To run the mustache.js test suite, run `rake spec`.  All specs will be run first with JavaScriptCore (using `jsc`)
-and again with Rhino, using `java org.mozilla.javascript.tools.shell.Main`.
-
-JavaScriptCore is used from the OSX default location:
-
-    /System/Library/Frameworks/JavaScriptCore.framework/Versions/A/Resources/jsc
-
-To install Rhino on OSX, follow [these instructions](Rhino Install).
-
-### Adding Tests
-
-Tests are located in the `examples/` directory.  Adding a new test requires three files.  Here's an example to add a test named "foo":
-
-`examples/foo.html` (the template):
-
-    foo {{bar}}
-
-`examples/foo.js` (the view context):
-
-    var foo = {
-      bar: "baz"
-    };
-
-`examples/foo.txt` (the expected output):
-
-    foo baz
-
-[jQuery]: http://jquery.com/
-[Dojo]: http://www.dojotoolkit.org/
-[Yui]: http://developer.yahoo.com/yui/
-[CommonJS]: http://www.commonjs.org/
-[Node.js]: http://nodejs.org/
-[Rhino Install]: http://michaux.ca/articles/installing-rhino-on-os-x
+## Plugins for JavaScript Libraries
+
+mustache.js may be built specifically for several different client libraries
+and platforms, including the following:
+
+  - [node](http://nodejs.org/) (or other CommonJS platforms)
+  - [jQuery](http://jquery.com/)
+  - [Dojo](http://www.dojotoolkit.org/)
+  - [YUI](http://developer.yahoo.com/yui/)
+  - [RequireJS](http://requirejs.org/)
+  - [qooxdoo](http://qooxdoo.org/)
+
+These may be built using [Rake](http://rake.rubyforge.org/) and one of the
+following commands:
+
+    $ rake commonjs
+    $ rake jquery
+    $ rake dojo
+    $ rake yui
+    $ rake requirejs
+    $ rake qooxdoo
+
+## Thanks
+
+Mustache.js wouldn't kick ass if it weren't for these fine souls:
+
+  * Chris Wanstrath / defunkt
+  * Alexander Lang / langalex
+  * Sebastian Cohnen / tisba
+  * J Chris Anderson / jchris
+  * Tom Robinson / tlrobinson
+  * Aaron Quint / quirkey
+  * Douglas Crockford
+  * Nikita Vasilyev / NV
+  * Elise Wood / glytch
+  * Damien Mathieu / dmathieu
+  * Jakub Kuźma / qoobaa
+  * Will Leinweber / will
+  * dpree
+  * Jason Smith / jhs
+  * Aaron Gibralter / agibralter
+  * Ross Boucher / boucher
+  * Matt Sanford / mzsanford
+  * Ben Cherry / bcherry
+  * Michael Jackson / mjijackson
diff --git a/Rakefile b/Rakefile
index 035c467..16bc724 100644
--- a/Rakefile
+++ b/Rakefile
@@ -48,7 +48,7 @@ end
 
 templated_build "CommonJS", :location => "lib", :extra => "package.json"
 templated_build "jQuery"
-templated_build "qooxdoo"
 templated_build "Dojo", :location => "dojox/string"
 templated_build "YUI3", :location => "yui3/mustache"
 templated_build "RequireJS"
+templated_build "qooxdoo"
diff --git a/THANKS.md b/THANKS.md
deleted file mode 100644
index 22418c8..0000000
--- a/THANKS.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Thanks
-
-Mustache.js wouldn't kick ass if it weren't for these fine souls:
-
- * Chris Wanstrath / defunkt
- * Alexander Lang / langalex
- * Sebastian Cohnen / tisba
- * J Chris Anderson / jchris
- * Tom Robinson / tlrobinson
- * Aaron Quint / quirkey
- * Douglas Crockford
- * Nikita Vasilyev / NV
- * Elise Wood / glytch
- * Damien Mathieu / dmathieu
- * Jakub Kuźma / qoobaa
- * Will Leinweber / will
- * dpree
- * Jason Smith / jhs
- * Aaron Gibralter / agibralter
- * Ross Boucher / boucher
- * Matt Sanford / mzsanford
- * Ben Cherry / bcherry
diff --git a/wrappers/commonjs/package.json b/wrappers/commonjs/package.json
index ebd7b6f..8e13993 100644
--- a/wrappers/commonjs/package.json
+++ b/wrappers/commonjs/package.json
@@ -1,8 +1,8 @@
 {
     "name": "mustache",
     "author": "http://mustache.github.com/",
-    "description": "Logic-less {{mustache}} templates in JavaScript",
-    "keywords": ["template"],
+    "description": "Logic-less {{mustache}} templates with JavaScript",
+    "keywords": ["template", "templates", "mustache"],
     "version": "{{version}}",
     "main": "./mustache"
 }

From 9a8ff7638ac7cabe1513378423b4c567029ebc21 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Wed, 14 Dec 2011 11:10:56 -0800
Subject: [PATCH 19/64] Refactor escapeHTML

---
 mustache.js | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/mustache.js b/mustache.js
index 3db6154..47def07 100644
--- a/mustache.js
+++ b/mustache.js
@@ -35,6 +35,15 @@ var Mustache = function () {
     }
   }
 
+  function escapeHTML(string) {
+    return String(string)
+      .replace(/&(?!\w+;)/g, "&amp;")
+      .replace(/</g, "&lt;")
+      .replace(/>/g, "&gt;")
+      .replace(/"/g, "&quot;")
+      .replace(/'/g, "&#39;");
+  }
+
   var regexCache = {};
   var Renderer = function () {};
 
@@ -228,8 +237,6 @@ var Mustache = function () {
       // tit for tat
       var that = this;
 
-
-
       var new_regex = function () {
         return that.getCachedRegex("render_tags", function (otag, ctag) {
           return new RegExp(otag + "(=|!|>|\\{|%)?([^\\/#\\^]+?)\\1?" + ctag + "+", "g");
@@ -250,7 +257,7 @@ var Mustache = function () {
         case "{": // the triple mustache is unescaped
           return that.find(name, context);
         default: // escape the value
-          return that.escape(that.find(name, context));
+          return escapeHTML(that.find(name, context));
         }
       };
       var lines = template.split("\n");
@@ -347,23 +354,6 @@ var Mustache = function () {
       return haystack.indexOf(this.otag + needle) != -1;
     },
 
-    /*
-      Does away with nasty characters
-    */
-    escape: function (s) {
-      s = String(s === null ? "" : s);
-      return s.replace(/&(?!\w+;)|["'<>\\]/g, function (s) {
-        switch(s) {
-        case "&": return "&amp;";
-        case '"': return '&quot;';
-        case "'": return '&#39;';
-        case "<": return "&lt;";
-        case ">": return "&gt;";
-        default: return s;
-        }
-      });
-    },
-
     // by @langalex, support for arrays of strings
     create_context: function (_context) {
       if (this.is_object(_context)) {

From ceafe886cb187960f467dbe7e7859259a77d5ad4 Mon Sep 17 00:00:00 2001
From: Jan Lehnardt <jan@apache.org>
Date: Mon, 19 Dec 2011 11:52:49 +0100
Subject: [PATCH 20/64] Travis builders are now on Ubuntu 11.04 "Natty". The
 xulrunner package name is now "xulrunner-2.0". We need this to run our tests
 in SpiderMonkey.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d599f87..af073a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 rvm:
   - 1.9.2
 before_script:
-  - sudo apt-get install xulrunner-1.9
+  - sudo apt-get install xulrunner-2.0
   - gem install rspec

From 99b5aa1a3df92733db8384796a01f8a99eee1408 Mon Sep 17 00:00:00 2001
From: Jan Lehnardt <jan@apache.org>
Date: Mon, 19 Dec 2011 15:36:25 +0100
Subject: [PATCH 21/64] -y oh -y

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index af073a3..b52599e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 rvm:
   - 1.9.2
 before_script:
-  - sudo apt-get install xulrunner-2.0
+  - sudo apt-get -y install xulrunner-2.0
   - gem install rspec

From db5f5ece0b6c87bbb2d0584010b97f8723dde69d Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Mon, 19 Dec 2011 16:39:47 -0800
Subject: [PATCH 22/64] Faster escapeHTML

See http://jsperf.com/string-replace-function
---
 mustache.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/mustache.js b/mustache.js
index 47def07..cc42f3d 100644
--- a/mustache.js
+++ b/mustache.js
@@ -35,13 +35,18 @@ var Mustache = function () {
     }
   }
 
+  var escapeMap = {
+    "&": "&amp;",
+    "<": "&lt;",
+    ">": "&gt;",
+    '"': '&quot;',
+    "'": '&#39;'
+  };
+
   function escapeHTML(string) {
-    return String(string)
-      .replace(/&(?!\w+;)/g, "&amp;")
-      .replace(/</g, "&lt;")
-      .replace(/>/g, "&gt;")
-      .replace(/"/g, "&quot;")
-      .replace(/'/g, "&#39;");
+    return String(string).replace(/&(?!\w+;)|[<>"']/g, function (s) {
+      return escapeMap[s] || s;
+    });
   }
 
   var regexCache = {};

From bf95689f4282d0a60162e8e093933c8cd07c73f1 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Wed, 28 Dec 2011 12:31:16 -0800
Subject: [PATCH 23/64] Support for partial paths (fixes #91)

Uses the work done by @nateware in pull request 92. Thanks!
---
 mustache.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mustache.js b/mustache.js
index cc42f3d..1ff6d08 100644
--- a/mustache.js
+++ b/mustache.js
@@ -244,7 +244,7 @@ var Mustache = function () {
 
       var new_regex = function () {
         return that.getCachedRegex("render_tags", function (otag, ctag) {
-          return new RegExp(otag + "(=|!|>|\\{|%)?([^\\/#\\^]+?)\\1?" + ctag + "+", "g");
+          return new RegExp(otag + "(=|!|>|\\{|%)?([^#\\^]+?)\\1?" + ctag + "+", "g");
         });
       };
 

From 634b29d27528f40bb33748302bc8d7377977270c Mon Sep 17 00:00:00 2001
From: Don Brown <mrdon@twdata.org>
Date: Tue, 1 Mar 2011 11:28:41 +1100
Subject: [PATCH 24/64] 83: Add support for & operator for unescaping

Conflicts:

	mustache.js
---
 mustache.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mustache.js b/mustache.js
index 1ff6d08..977c3c1 100644
--- a/mustache.js
+++ b/mustache.js
@@ -244,7 +244,7 @@ var Mustache = function () {
 
       var new_regex = function () {
         return that.getCachedRegex("render_tags", function (otag, ctag) {
-          return new RegExp(otag + "(=|!|>|\\{|%)?([^#\\^]+?)\\1?" + ctag + "+", "g");
+          return new RegExp(otag + "(=|!|>|&|\\{|%)?([^#\\^]+?)\\1?" + ctag + "+", "g");
         });
       };
 
@@ -260,6 +260,7 @@ var Mustache = function () {
         case ">": // render partial
           return that.render_partial(name, context, partials);
         case "{": // the triple mustache is unescaped
+        case "&": // & operator is an alternative unescape method
           return that.find(name, context);
         default: // escape the value
           return escapeHTML(that.find(name, context));

From def81a0700cc22fbf03025e38e3ae52cf6d18c21 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Wed, 28 Dec 2011 12:43:25 -0800
Subject: [PATCH 25/64] Add spec for & tags (fixes #83)

---
 spec/_files/ampersand_escape.js       | 3 +++
 spec/_files/ampersand_escape.mustache | 1 +
 spec/_files/ampersand_escape.txt      | 1 +
 3 files changed, 5 insertions(+)
 create mode 100644 spec/_files/ampersand_escape.js
 create mode 100644 spec/_files/ampersand_escape.mustache
 create mode 100644 spec/_files/ampersand_escape.txt

diff --git a/spec/_files/ampersand_escape.js b/spec/_files/ampersand_escape.js
new file mode 100644
index 0000000..645efe1
--- /dev/null
+++ b/spec/_files/ampersand_escape.js
@@ -0,0 +1,3 @@
+var ampersand_escape = {
+  message: "Some <code>"
+};
diff --git a/spec/_files/ampersand_escape.mustache b/spec/_files/ampersand_escape.mustache
new file mode 100644
index 0000000..6501a48
--- /dev/null
+++ b/spec/_files/ampersand_escape.mustache
@@ -0,0 +1 @@
+{{&message}}
diff --git a/spec/_files/ampersand_escape.txt b/spec/_files/ampersand_escape.txt
new file mode 100644
index 0000000..2ed3fd3
--- /dev/null
+++ b/spec/_files/ampersand_escape.txt
@@ -0,0 +1 @@
+Some <code>

From 3f15f72fbf87bbcacf8754cee1fae8fb92eb3cf8 Mon Sep 17 00:00:00 2001
From: Jan Lehnardt <jan@apache.org>
Date: Wed, 4 Jan 2012 20:05:46 +0100
Subject: [PATCH 26/64] 0.4.0

---
 mustache.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mustache.js b/mustache.js
index 977c3c1..91ec828 100644
--- a/mustache.js
+++ b/mustache.js
@@ -417,7 +417,7 @@ var Mustache = function () {
 
   return({
     name: "mustache.js",
-    version: "0.4.0-dev",
+    version: "0.4.0",
 
     /*
       Turns a template and view into HTML

From 5df7be5ae7bea92ef723a8d6c26f45d43400eec8 Mon Sep 17 00:00:00 2001
From: Jan Lehnardt <jan@apache.org>
Date: Wed, 4 Jan 2012 20:07:28 +0100
Subject: [PATCH 27/64] master is now 0.5.0

---
 mustache.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mustache.js b/mustache.js
index 91ec828..da2c410 100644
--- a/mustache.js
+++ b/mustache.js
@@ -417,7 +417,7 @@ var Mustache = function () {
 
   return({
     name: "mustache.js",
-    version: "0.4.0",
+    version: "0.5.0-dev",
 
     /*
       Turns a template and view into HTML

From eb01be04702388fd3cf98e509d3d14f1f9243f09 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Fri, 16 Dec 2011 22:42:48 -0800
Subject: [PATCH 28/64] Parser rewrite

This commit is a complete rewrite of the core mustache.js file with two
main goals: 1) a major performance boost and 2) better compliance with
the mustache spec.

In order to improve performance templates are pre-compiled to JavaScript
functions. These compiled functions take a view, a partials object, and
an optional callback as arguments. They are cached to prevent
unnecessary re-compilation of an already compiled template. Both of
these enhancements facilitate a generous boost in performance.

A few other notes:

- The mustache.js file is now both browser and CommonJS ready without
  any modification.
- The API exposes two main methods: Mustache.compile and
  Mustache.render. The former is used to generate a function for a given
  template, while the latter is a higher-level function that is used to
  compile and render a template in one shot. Mustache.to_html is still
  available for backwards compatibility.
- The concept of pragmas is removed to conform more closely to the
  original mustache spec. The dot symbol still works to reference the
  current item in an array.
- The parser is much more strict about whitespace than it was before. The
  rule is simple: if a line contains only a non-variable tag (i.e. not
  {{tag}} or {{{tag}}}) and whitespace, that line is ignored in the
  output. Users may use the "space" option when compiling templates to
  preserve every whitespace character in the original template.
- The parser is able to provide detailed information about where errors
  occur when parsing and rendering templates, including the line number
  and surrounding code context.
---
 .gitignore                                    |   1 -
 README.md                                     |  10 +-
 Rakefile                                      |   9 +-
 TESTING.md                                    |   8 +-
 mustache.js                                   | 816 ++++++++++--------
 package.json                                  |   8 +
 .../array_of_partials_implicit_partial.js     |   3 -
 spec/_files/array_of_strings.mustache         |   2 +-
 spec/_files/array_of_strings_options.js       |   1 -
 spec/_files/array_of_strings_options.mustache |   2 -
 spec/_files/array_of_strings_options.txt      |   1 -
 spec/_files/array_partial.js                  |   5 -
 spec/_files/complex.mustache                  |   2 +-
 spec/_files/complex.txt                       |   6 +-
 spec/_files/delimiters.mustache               |   2 +-
 spec/_files/empty_partial.2.mustache          |   1 -
 spec/_files/empty_partial.js                  |   3 -
 spec/_files/empty_template.txt                |   2 +-
 spec/_files/error_not_found.txt               |   1 -
 spec/_files/inverted_section.txt              |   1 +
 spec/_files/nesting.txt                       |   7 +-
 spec/_files/null_string.js                    |   1 +
 spec/_files/null_string.mustache              |   3 +-
 spec/_files/null_string.txt                   |   1 +
 spec/_files/partial_array.js                  |   3 +
 ...artial.mustache => partial_array.mustache} |   0
 ...rtial.2.mustache => partial_array.partial} |   2 +-
 .../{array_partial.txt => partial_array.txt}  |   1 -
 ...artial.js => partial_array_of_partials.js} |   2 +-
 ...che => partial_array_of_partials.mustache} |   0
 ...ache => partial_array_of_partials.partial} |   0
 ...tial.txt => partial_array_of_partials.txt} |   0
 .../partial_array_of_partials_implicit.js     |   3 +
 ...rtial_array_of_partials_implicit.mustache} |   0
 ...artial_array_of_partials_implicit.partial} |   0
 ...=> partial_array_of_partials_implicit.txt} |   0
 spec/_files/partial_empty.js                  |   3 +
 ...artial.mustache => partial_empty.mustache} |   0
 spec/_files/partial_empty.partial             |   1 +
 .../{empty_partial.txt => partial_empty.txt}  |   0
 spec/_files/partial_recursion.js              |   2 +-
 spec/_files/partial_recursion.mustache        |   2 +-
 ...n.2.mustache => partial_recursion.partial} |   2 +-
 spec/_files/partial_template.js               |   6 +
 ...ial.mustache => partial_template.mustache} |   2 +-
 spec/_files/partial_template.partial          |   1 +
 ...plate_partial.txt => partial_template.txt} |   0
 spec/_files/partial_view.js                   |  16 +
 ...partial.mustache => partial_view.mustache} |   2 +-
 ...artial.2.mustache => partial_view.partial} |   0
 .../{view_partial.txt => partial_view.txt}    |   1 -
 spec/_files/partial_whitespace.js             |  17 +
 ...l.mustache => partial_whitespace.mustache} |   2 +-
 ....2.mustache => partial_whitespace.partial} |   0
 ...ace_partial.txt => partial_whitespace.txt} |   1 -
 spec/_files/reuse_of_enumerables.js           |   2 +-
 spec/_files/section_as_context.txt            |   6 +-
 spec/_files/simple.mustache                   |   2 +-
 spec/_files/template_partial.2.mustache       |   1 -
 spec/_files/template_partial.js               |   8 -
 spec/_files/two_in_a_row.mustache             |   2 +-
 spec/_files/two_sections.txt                  |   1 -
 spec/_files/unescaped.mustache                |   2 +-
 spec/_files/unknown_pragma.js                 |   1 -
 spec/_files/unknown_pragma.mustache           |   1 -
 spec/_files/unknown_pragma.txt                |   1 -
 spec/_files/view_partial.js                   |  19 -
 spec/_files/whitespace_partial.js             |  19 -
 spec/mustache_spec.rb                         | 138 +--
 wrappers/commonjs/mustache.js.tpl.post        |   8 -
 wrappers/commonjs/mustache.js.tpl.pre         |   6 -
 wrappers/commonjs/package.json                |   8 -
 72 files changed, 596 insertions(+), 594 deletions(-)
 create mode 100644 package.json
 delete mode 100644 spec/_files/array_of_partials_implicit_partial.js
 delete mode 100644 spec/_files/array_of_strings_options.js
 delete mode 100644 spec/_files/array_of_strings_options.mustache
 delete mode 100644 spec/_files/array_of_strings_options.txt
 delete mode 100644 spec/_files/array_partial.js
 delete mode 100644 spec/_files/empty_partial.2.mustache
 delete mode 100644 spec/_files/empty_partial.js
 create mode 100644 spec/_files/partial_array.js
 rename spec/_files/{array_partial.mustache => partial_array.mustache} (100%)
 rename spec/_files/{array_partial.2.mustache => partial_array.partial} (83%)
 rename spec/_files/{array_partial.txt => partial_array.txt} (98%)
 rename spec/_files/{array_of_partials_partial.js => partial_array_of_partials.js} (61%)
 rename spec/_files/{array_of_partials_implicit_partial.mustache => partial_array_of_partials.mustache} (100%)
 rename spec/_files/{array_of_partials_partial.2.mustache => partial_array_of_partials.partial} (100%)
 rename spec/_files/{array_of_partials_implicit_partial.txt => partial_array_of_partials.txt} (100%)
 create mode 100644 spec/_files/partial_array_of_partials_implicit.js
 rename spec/_files/{array_of_partials_partial.mustache => partial_array_of_partials_implicit.mustache} (100%)
 rename spec/_files/{array_of_partials_implicit_partial.2.mustache => partial_array_of_partials_implicit.partial} (100%)
 rename spec/_files/{array_of_partials_partial.txt => partial_array_of_partials_implicit.txt} (100%)
 create mode 100644 spec/_files/partial_empty.js
 rename spec/_files/{empty_partial.mustache => partial_empty.mustache} (100%)
 create mode 100644 spec/_files/partial_empty.partial
 rename spec/_files/{empty_partial.txt => partial_empty.txt} (100%)
 rename spec/_files/{partial_recursion.2.mustache => partial_recursion.partial} (72%)
 create mode 100644 spec/_files/partial_template.js
 rename spec/_files/{template_partial.mustache => partial_template.mustache} (59%)
 create mode 100644 spec/_files/partial_template.partial
 rename spec/_files/{template_partial.txt => partial_template.txt} (100%)
 create mode 100644 spec/_files/partial_view.js
 rename spec/_files/{view_partial.mustache => partial_view.mustache} (61%)
 rename spec/_files/{view_partial.2.mustache => partial_view.partial} (100%)
 rename spec/_files/{view_partial.txt => partial_view.txt} (99%)
 create mode 100644 spec/_files/partial_whitespace.js
 rename spec/_files/{whitespace_partial.mustache => partial_whitespace.mustache} (63%)
 rename spec/_files/{whitespace_partial.2.mustache => partial_whitespace.partial} (100%)
 rename spec/_files/{whitespace_partial.txt => partial_whitespace.txt} (99%)
 delete mode 100644 spec/_files/template_partial.2.mustache
 delete mode 100644 spec/_files/template_partial.js
 delete mode 100644 spec/_files/unknown_pragma.js
 delete mode 100644 spec/_files/unknown_pragma.mustache
 delete mode 100644 spec/_files/unknown_pragma.txt
 delete mode 100644 spec/_files/view_partial.js
 delete mode 100644 spec/_files/whitespace_partial.js
 delete mode 100644 wrappers/commonjs/mustache.js.tpl.post
 delete mode 100644 wrappers/commonjs/mustache.js.tpl.pre
 delete mode 100644 wrappers/commonjs/package.json

diff --git a/.gitignore b/.gitignore
index c44d96c..bd08399 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 .DS_Store
 .rvmrc
 runner.js
-lib
 jquery.mustache.js
 qooxdoo.mustache.js
 dojox
diff --git a/README.md b/README.md
index 578df7c..7d941df 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 > What could be more logical awesome than no logic at all?
 
 [mustache.js](http://github.com/janl/mustache.js) is an implementation of the
-[Mustache](http://mustache.github.com/) templating system in JavaScript.
+[Mustache](http://mustache.github.com/) template system in JavaScript.
 
 [Mustache](http://mustache.github.com/) is a logic-less template syntax. It can
 be used for HTML, config files, source code - anything. It works by expanding
@@ -274,10 +274,11 @@ own iteration marker:
 
 ## Plugins for JavaScript Libraries
 
-mustache.js may be built specifically for several different client libraries
-and platforms, including the following:
+By default mustache.js may be used in a browser or any [CommonJS](http://www.commonjs.org/)
+environment, including [node](http://nodejs.org/). Additionally, mustache.js may
+be built specifically for several different client libraries and platforms,
+including the following:
 
-  - [node](http://nodejs.org/) (or other CommonJS platforms)
   - [jQuery](http://jquery.com/)
   - [Dojo](http://www.dojotoolkit.org/)
   - [YUI](http://developer.yahoo.com/yui/)
@@ -287,7 +288,6 @@ and platforms, including the following:
 These may be built using [Rake](http://rake.rubyforge.org/) and one of the
 following commands:
 
-    $ rake commonjs
     $ rake jquery
     $ rake dojo
     $ rake yui
diff --git a/Rakefile b/Rakefile
index 16bc724..b2a83b9 100644
--- a/Rakefile
+++ b/Rakefile
@@ -13,7 +13,7 @@ task :spec do
 end
 
 def version
-  File.read("mustache.js").match('version: "([^\"]+)",$')[1]
+  File.read("mustache.js").match('version = "([^\"]+)";$')[1]
 end
 
 # Creates a rule that uses the .tmpl.{pre,post} stuff to make a final,
@@ -36,17 +36,10 @@ def templated_build(name, opts={})
     sh "cat #{source}/#{target_js}.tpl.pre mustache.js \
       #{source}/#{target_js}.tpl.post > #{opts[:location] || '.'}/#{target_js}"
 
-    # extra
-    if opts[:extra]
-      sh "sed -e 's/{{version}}/#{version}/' #{source}/#{opts[:extra]} \
-        > #{opts[:location]}/#{opts[:extra]}"
-    end
-
     puts "Done, see #{opts[:location] || '.'}/#{target_js}"
   end
 end
 
-templated_build "CommonJS", :location => "lib", :extra => "package.json"
 templated_build "jQuery"
 templated_build "Dojo", :location => "dojox/string"
 templated_build "YUI3", :location => "yui3/mustache"
diff --git a/TESTING.md b/TESTING.md
index 6abec93..47d15e4 100644
--- a/TESTING.md
+++ b/TESTING.md
@@ -1,4 +1,4 @@
-## Running the mustache.js Test Suite
+## Running the mustache.js test suite
 
 The mustache.js test suite uses the [RSpec](http://rspec.info/) testing
 framework. In order to run the tests you'll need to install [Ruby](http://ruby-lang.org/)
@@ -57,6 +57,6 @@ suite with the following command:
 
 All test files live in the spec/_files directory. To create a new test:
 
-  * Create a template file `somename.mustache`
-  * Create a javascript file with data and functions `somename.js`
-  * Create a file the expected result `somename.txt`
+  * Create a template file called `somename.mustache`
+  * Create a JavaScript file containing the view called `somename.js`
+  * Create a text file with the expected result called `somename.txt`
diff --git a/mustache.js b/mustache.js
index da2c410..0121abc 100644
--- a/mustache.js
+++ b/mustache.js
@@ -1,38 +1,75 @@
-/*
-  mustache.js — Logic-less templates in JavaScript
+/*!
+ * mustache.js - Logic-less {{mustache}} templates with JavaScript
+ * http://github.com/janl/mustache.js
+ */
+var Mustache = (typeof module !== "undefined" && module.exports) || {};
 
-  See http://mustache.github.com/ for more info.
-*/
+(function (exports) {
+
+  exports.name = "mustache.js";
+  exports.version = "0.5.0-dev";
+  exports.tags = ["{{", "}}"];
+  exports.parse = parse;
+  exports.compile = compile;
+  exports.render = render;
+  exports.clearCache = clearCache;
+
+  exports.to_html = render; // keep backwards compatibility
 
-var Mustache = function () {
   var _toString = Object.prototype.toString;
+  var _isArray = Array.isArray;
+  var _forEach = Array.prototype.forEach;
+  var _trim = String.prototype.trim;
 
-  Array.isArray = Array.isArray || function (obj) {
-    return _toString.call(obj) == "[object Array]";
+  var isArray;
+  if (_isArray) {
+    isArray = _isArray;
+  } else {
+    isArray = function (obj) {
+      return _toString.call(obj) === "[object Array]";
+    };
+  }
+
+  var forEach;
+  if (_forEach) {
+    forEach = function (obj, callback, scope) {
+      return _forEach.call(obj, callback, scope);
+    };
+  } else {
+    forEach = function (obj, callback, scope) {
+      for (var i = 0, len = obj.length; i < len; ++i) {
+        callback.call(scope, obj[i], i, obj);
+      }
+    };
   }
 
-  var _trim = String.prototype.trim, trim;
+  var spaceRe = /^\s*$/;
 
+  function isWhitespace(string) {
+    return spaceRe.test(string);
+  }
+
+  var trim;
   if (_trim) {
-    trim = function (text) {
-      return text == null ? "" : _trim.call(text);
-    }
+    trim = function (string) {
+      return string == null ? "" : _trim.call(string);
+    };
   } else {
     var trimLeft, trimRight;
 
-    // IE doesn't match non-breaking spaces with \s.
-    if ((/\S/).test("\xA0")) {
-      trimLeft = /^[\s\xA0]+/;
-      trimRight = /[\s\xA0]+$/;
-    } else {
+    if (isWhitespace("\xA0")) {
       trimLeft = /^\s+/;
       trimRight = /\s+$/;
+    } else {
+      // IE doesn't match non-breaking spaces with \s, thanks jQuery.
+      trimLeft = /^[\s\xA0]+/;
+      trimRight = /[\s\xA0]+$/;
     }
 
-    trim = function (text) {
-      return text == null ? "" :
-        text.toString().replace(trimLeft, "").replace(trimRight, "");
-    }
+    trim = function (string) {
+      return string == null ? "" :
+        String(string).replace(trimLeft, "").replace(trimRight, "");
+    };
   }
 
   var escapeMap = {
@@ -49,388 +86,451 @@ var Mustache = function () {
     });
   }
 
-  var regexCache = {};
-  var Renderer = function () {};
-
-  Renderer.prototype = {
-    otag: "{{",
-    ctag: "}}",
-    pragmas: {},
-    buffer: [],
-    pragmas_implemented: {
-      "IMPLICIT-ITERATOR": true
-    },
-    context: {},
-
-    render: function (template, context, partials, in_recursion) {
-      // reset buffer & set context
-      if (!in_recursion) {
-        this.context = context;
-        this.buffer = []; // TODO: make this non-lazy
-      }
+  /**
+   * Adds the `template`, `line`, and `file` properties to the given error
+   * object and alters the message to provide more useful debugging information.
+   */
+  function debug(e, template, line, file) {
+    file = file || "<template>";
+
+    var lines = template.split("\n"),
+        start = Math.max(line - 3, 0),
+        end = Math.min(lines.length, line + 3),
+        context = lines.slice(start, end);
+
+    var c;
+    for (var i = 0, len = context.length; i < len; ++i) {
+      c = i + start + 1;
+      context[i] = (c === line ? " >> " : "    ") + context[i];
+    }
 
-      // fail fast
-      if (!this.includes("", template)) {
-        if (in_recursion) {
-          return template;
-        } else {
-          this.send(template);
-          return;
-        }
-      }
+    e.template = template;
+    e.line = line;
+    e.file = file;
+    e.message = [file + ":" + line, context.join("\n"), "", e.message].join("\n");
 
-      // get the pragmas together
-      template = this.render_pragmas(template);
+    return e;
+  }
 
-      // render the template
-      var html = this.render_section(template, context, partials);
+  /**
+   * Looks up the value of the given `name` in the given context `stack`.
+   */
+  function findName(name, stack) {
+    var names = name.split(".");
+    var lastIndex = names.length - 1;
+    var target = names[lastIndex];
+
+    var value, context, i = stack.length, j, localStack;
+    while (i) {
+      localStack = stack.slice(0);
+      context = stack[--i];
+
+      j = 0;
+      while (j < lastIndex) {
+        context = context[names[j++]];
+
+        if (context == null) {
+          break;
+        }
 
-      // render_section did not find any sections, we still need to render the tags
-      if (html === false) {
-        html = this.render_tags(template, context, partials, in_recursion);
+        localStack.push(context);
       }
 
-      if (in_recursion) {
-        return html;
-      } else {
-        this.sendLines(html);
-      }
-    },
-
-    /*
-      Sends parsed lines
-    */
-    send: function (line) {
-      if (line !== "") {
-        this.buffer.push(line);
+      if (context && target in context) {
+        value = context[target];
+        break;
       }
-    },
+    }
 
-    sendLines: function (text) {
-      if (text) {
-        var lines = text.split("\n");
-        for (var i = 0; i < lines.length; i++) {
-          this.send(lines[i]);
-        }
-      }
-    },
-
-    /*
-      Looks for %PRAGMAS
-    */
-    render_pragmas: function (template) {
-      // no pragmas
-      if (!this.includes("%", template)) {
-        return template;
-      }
+    // If the value is a function, call it in the current context.
+    if (typeof value === "function") {
+      value = value.call(localStack[localStack.length - 1]);
+    }
+
+    return value == null ? "" : value;
+  }
 
-      var that = this;
-      var regex = this.getCachedRegex("render_pragmas", function (otag, ctag) {
-        return new RegExp(otag + "%([\\w-]+) ?([\\w]+=[\\w]+)?" + ctag, "g");
+  function sendSection(send, value, callback, stack, inverted) {
+    if (inverted) {
+      // From the spec: inverted sections may render text once based on the
+      // inverse value of the key. That is, they will be rendered if the key
+      // doesn't exist, is false, or is an empty list.
+      if (value == null || value === false || (isArray(value) && value.length === 0)) {
+        send(callback());
+      }
+    } else if (isArray(value)) {
+      forEach(value, function (value) {
+        stack.push(value);
+        send(callback());
+        stack.pop();
       });
+    } else if (typeof value === "object") {
+      stack.push(value);
+      send(callback());
+      stack.pop();
+    } else if (typeof value === "function") {
+      var scope = stack[stack.length - 1];
+      var scopedRender = function (template) {
+        return render(template, scope);
+      };
+      send(value.call(scope, callback(), scopedRender) || "");
+    } else if (value) {
+      send(callback());
+    }
+  }
 
-      return template.replace(regex, function (match, pragma, options) {
-        if (!that.pragmas_implemented[pragma]) {
-          throw({message:
-            "This implementation of mustache doesn't understand the '" +
-            pragma + "' pragma"});
-        }
-        that.pragmas[pragma] = {};
-        if (options) {
-          var opts = options.split("=");
-          that.pragmas[pragma][opts[0]] = opts[1];
+  /**
+   * Parses the given `template` and returns the source of a function that,
+   * with the proper arguments, will render the template. Recognized options
+   * include the following:
+   *
+   *   - file     The name of the file the template comes from (displayed in
+   *              error messages)
+   *   - tags     An array of open and close tags the `template` uses. Defaults
+   *              to the value of Mustache.tags
+   *   - debug    Set `true` to log the body of the generated function to the
+   *              console
+   *   - space    Set `true` to preserve whitespace from lines that otherwise
+   *              contain only a {{tag}}. Defaults to `false`
+   */
+  function parse(template, options) {
+    options = options || {};
+
+    var tags = options.tags || exports.tags,
+        openTag = tags[0],
+        closeTag = tags[tags.length - 1];
+
+    var code = [
+      "var line = 1;", // keep track of source line number
+      "\ntry {",
+      '\nsend("'
+    ];
+
+    var spaces = [],      // indices of whitespace in code for the current line
+        nonSpace = false; // is there a non-space char on the current line?
+
+    // Strips all space characters from the code array for the current line
+    // if there was a {{tag}} on it and otherwise only spaces.
+    var stripSpace = function () {
+      if (!nonSpace && !options.space) {
+        while (spaces.length) {
+          code.splice(spaces.pop(), 1);
         }
-        return "";
-        // ignore unknown pragmas silently
-      });
-    },
-
-    /*
-      Tries to find a partial in the curent scope and render it
-    */
-    render_partial: function (name, context, partials) {
-      name = trim(name);
-      if (!partials || partials[name] === undefined) {
-        throw({message: "unknown_partial '" + name + "'"});
-      }
-      if (!context || typeof context[name] != "object") {
-        return this.render(partials[name], context, partials, true);
-      }
-      return this.render(partials[name], context[name], partials, true);
-    },
-
-    /*
-      Renders inverted (^) and normal (#) sections
-    */
-    render_section: function (template, context, partials) {
-      if (!this.includes("#", template) && !this.includes("^", template)) {
-        // did not render anything, there were no sections
-        return false;
+      } else {
+        spaces = [];
       }
 
-      var that = this;
-
-      var regex = this.getCachedRegex("render_section", function (otag, ctag) {
-        // This regex matches _the first_ section ({{#foo}}{{/foo}}), and captures the remainder
-        return new RegExp(
-          "^([\\s\\S]*?)" +         // all the crap at the beginning that is not {{*}} ($1)
+      nonSpace = false;
+    };
+
+    // Returns a bit of code that can be used to find the given `name`.
+    var findFor = function (name) {
+      return name === "." ? "stack[stack.length - 1]" : 'find("' + name + '")';
+    };
+
+    var sectionStack = [], updateLine, nextOpenTag, nextCloseTag;
+
+    var setTags = function (source) {
+      tags = trim(source).split(/\s+/);
+      nextOpenTag = tags[0];
+      nextCloseTag = tags[tags.length - 1];
+    };
+
+    var includePartial = function (source) {
+      code.push(
+        '");',
+        updateLine,
+        '\nvar partial = partials["' + trim(source) + '"];',
+        '\nif (partial) {',
+        '\n  send(render(partial, stack[stack.length - 1], partials));',
+        '\n}',
+        '\nsend("'
+      );
+    };
+
+    var openSection = function (source, inverted) {
+      var name = trim(source);
+
+      if (name === "") {
+        throw debug(new Error("Section name may not be empty"), template, line, options.file);
+      }
 
-          otag +                    // {{
-          "(\\^|\\#)\\s*(.+)\\s*" + //  #foo (# == $2, foo == $3)
-          ctag +                    // }}
+      sectionStack.push({name: name, inverted: inverted});
+
+      code.push(
+        '");',
+        updateLine,
+        '\nvar value = ' + findFor(name) + ';',
+        '\nvar callback = (function () {',
+        '\n  var buffer, send = function (chunk) { buffer.push(chunk); };',
+        '\n  return function () {',
+        '\n    buffer = [];',
+        '\nsend("'
+      );
+    };
+
+    var openInvertedSection = function (source) {
+      openSection(source, true);
+    };
+
+    var closeSection = function (source) {
+      var name = trim(source);
+      var openName = sectionStack.length != 0 && sectionStack[sectionStack.length - 1].name;
+
+      if (!openName || name != openName) {
+        throw debug(new Error('Section named "' + name + '" was never opened'), template, line, file);
+      }
 
-          "\n*([\\s\\S]*?)" +       // between the tag ($2). leading newlines are dropped
+      var section = sectionStack.pop();
 
-          otag +                    // {{
-          "\\/\\s*\\3\\s*" +        //  /foo (backreference to the opening tag).
-          ctag +                    // }}
+      code.push(
+        '");',
+        '\n    return buffer.join("");',
+        '\n  };',
+        '\n})();'
+      );
 
-          "\\s*([\\s\\S]*)$",       // everything else in the string ($4). leading whitespace is dropped.
+      if (section.inverted) {
+        code.push("\nsendSection(send,value,callback,stack,true);");
+      } else {
+        code.push("\nsendSection(send,value,callback,stack);");
+      }
 
-        "g");
-      });
+      code.push('\nsend("');
+    };
+
+    var sendPlain = function (source) {
+      code.push(
+        '");',
+        updateLine,
+        '\nsend(' + findFor(trim(source)) + ');',
+        '\nsend("'
+      );
+    };
+
+    var sendEscaped = function (source) {
+      code.push(
+        '");',
+        updateLine,
+        '\nsend(escapeHTML(' + findFor(trim(source)) + '));',
+        '\nsend("'
+      );
+    };
+
+    var line = 1, c, callback;
+    for (var i = 0, len = template.length; i < len; ++i) {
+      if (template.slice(i, i + openTag.length) === openTag) {
+        i += openTag.length;
+        c = template.substr(i, 1);
+        updateLine = '\nline = ' + line + ';';
+        nextOpenTag = openTag;
+        nextCloseTag = closeTag;
+
+        switch (c) {
+        case "!": // comment
+          i++;
+          callback = null;
+          break;
+        case "=": // change open/close tags, e.g. {{=<% %>=}}
+          i++;
+          closeTag = "=" + closeTag;
+          callback = setTags;
+          break;
+        case ">": // include partial
+          i++;
+          callback = includePartial;
+          break;
+        case "#": // start section
+          i++;
+          callback = openSection;
+          break;
+        case "^": // start inverted section
+          i++;
+          callback = openInvertedSection;
+          break;
+        case "/": // end section
+          i++;
+          callback = closeSection;
+          break;
+        case "{": // plain variable
+          closeTag = "}" + closeTag;
+          // fall through
+        case "&": // plain variable
+          i++;
+          nonSpace = true;
+          callback = sendPlain;
+          break;
+        default: // escaped variable
+          nonSpace = true;
+          callback = sendEscaped;
+        }
 
+        var end = template.indexOf(closeTag, i);
 
-      // for each {{#foo}}{{/foo}} section do...
-      return template.replace(regex, function (match, before, type, name, content, after) {
-        // before contains only tags, no sections
-        var renderedBefore = before ? that.render_tags(before, context, partials, true) : "",
+        if (end === -1) {
+          throw debug(new Error('Tag "' + openTag + '" was not closed properly'), template, line, options.file);
+        }
 
-        // after may contain both sections and tags, so use full rendering function
-            renderedAfter = after ? that.render(after, context, partials, true) : "",
+        var source = template.substring(i, end);
 
-        // will be computed below
-            renderedContent,
+        if (callback) {
+          callback(source);
+        }
 
-            value = that.find(name, context);
+        // Maintain line count for \n in source.
+        var n = 0;
+        while (~(n = source.indexOf("\n", n))) {
+          line++;
+          n++;
+        }
 
-        if (type === "^") { // inverted section
-          if (!value || Array.isArray(value) && value.length === 0) {
-            // false or empty list, render it
-            renderedContent = that.render(content, context, partials, true);
-          } else {
-            renderedContent = "";
-          }
-        } else if (type === "#") { // normal section
-          if (Array.isArray(value)) { // Enumerable, Let's loop!
-            renderedContent = that.map(value, function (row) {
-              return that.render(content, that.create_context(row), partials, true);
-            }).join("");
-          } else if (that.is_object(value)) { // Object, Use it as subcontext!
-            renderedContent = that.render(content, that.create_context(value),
-              partials, true);
-          } else if (typeof value == "function") {
-            // higher order section
-            renderedContent = value.call(context, content, function (text) {
-              return that.render(text, context, partials, true);
-            });
-          } else if (value) { // boolean section
-            renderedContent = that.render(content, context, partials, true);
+        i = end + closeTag.length - 1;
+        openTag = nextOpenTag;
+        closeTag = nextCloseTag;
+      } else {
+        c = template.substr(i, 1);
+
+        switch (c) {
+        case '"':
+        case "\\":
+          nonSpace = true;
+          code.push("\\" + c);
+          break;
+        case "\n":
+          spaces.push(code.length);
+          code.push("\\n");
+          stripSpace(); // Check for whitespace on the current line.
+          line++;
+          break;
+        default:
+          if (isWhitespace(c)) {
+            spaces.push(code.length);
           } else {
-            renderedContent = "";
+            nonSpace = true;
           }
-        }
 
-        return renderedBefore + renderedContent + renderedAfter;
-      });
-    },
-
-    /*
-      Replace {{foo}} and friends with values from our view
-    */
-    render_tags: function (template, context, partials, in_recursion) {
-      // tit for tat
-      var that = this;
-
-      var new_regex = function () {
-        return that.getCachedRegex("render_tags", function (otag, ctag) {
-          return new RegExp(otag + "(=|!|>|&|\\{|%)?([^#\\^]+?)\\1?" + ctag + "+", "g");
-        });
-      };
-
-      var regex = new_regex();
-      var tag_replace_callback = function (match, operator, name) {
-        switch(operator) {
-        case "!": // ignore comments
-          return "";
-        case "=": // set new delimiters, rebuild the replace regexp
-          that.set_delimiters(name);
-          regex = new_regex();
-          return "";
-        case ">": // render partial
-          return that.render_partial(name, context, partials);
-        case "{": // the triple mustache is unescaped
-        case "&": // & operator is an alternative unescape method
-          return that.find(name, context);
-        default: // escape the value
-          return escapeHTML(that.find(name, context));
-        }
-      };
-      var lines = template.split("\n");
-      for(var i = 0; i < lines.length; i++) {
-        lines[i] = lines[i].replace(regex, tag_replace_callback, this);
-        if (!in_recursion) {
-          this.send(lines[i]);
+          code.push(c);
         }
       }
+    }
 
-      if (in_recursion) {
-        return lines.join("\n");
-      }
-    },
-
-    set_delimiters: function (delimiters) {
-      var dels = delimiters.split(" ");
-      this.otag = this.escape_regex(dels[0]);
-      this.ctag = this.escape_regex(dels[1]);
-    },
-
-    escape_regex: function (text) {
-      // thank you Simon Willison
-      if (!arguments.callee.sRE) {
-        var specials = [
-          '/', '.', '*', '+', '?', '|',
-          '(', ')', '[', ']', '{', '}', '\\'
-        ];
-        arguments.callee.sRE = new RegExp(
-          '(\\' + specials.join('|\\') + ')', 'g'
-        );
-      }
-      return text.replace(arguments.callee.sRE, '\\$1');
-    },
-
-    /*
-      find `name` in current `context`. That is find me a value
-      from the view object
-    */
-    find: function (name, context) {
-      name = trim(name);
-
-      // Checks whether a value is thruthy or false or 0
-      function is_kinda_truthy(bool) {
-        return bool === false || bool === 0 || bool;
-      }
+    if (sectionStack.length != 0) {
+      throw debug(new Error('Section "' + sectionStack[sectionStack.length - 1].name + '" was not closed properly'), template, line, options.file);
+    }
 
-      var value;
+    // Clean up any whitespace from a closing {{tag}} that was at the end
+    // of the template without a trailing \n.
+    stripSpace();
 
-      // check for dot notation eg. foo.bar
-      if (name.match(/([a-z_]+)\./ig)) {
-        var childValue = this.walk_context(name, context);
-        if (is_kinda_truthy(childValue)) {
-          value = childValue;
-        }
-      } else {
-        if (is_kinda_truthy(context[name])) {
-          value = context[name];
-        } else if (is_kinda_truthy(this.context[name])) {
-          value = this.context[name];
-        }
-      }
+    code.push(
+      '");',
+      "\nsend(null);", // Send null as the last operation.
+      "\n} catch (e) { throw {error: e, line: line}; }"
+    );
 
-      if (typeof value == "function") {
-        return value.apply(context);
-      }
-      if (value !== undefined) {
-        return value;
-      }
-      // silently ignore unkown variables
-      return "";
-    },
-
-    walk_context: function (name, context) {
-      var path = name.split('.');
-      // if the var doesn't exist in current context, check the top level context
-      var value_context = (context[path[0]] != undefined) ? context : this.context;
-      var value = value_context[path.shift()];
-      while (value != undefined && path.length > 0) {
-        value_context = value;
-        value = value[path.shift()];
+    // Ignore empty send("") statements.
+    var body = code.join("").replace(/send\(""\);\n/g, "");
+
+    if (options.debug) {
+      if (typeof console != "undefined" && console.log) {
+        console.log(body);
+      } else if (typeof print === "function") {
+        print(body);
       }
-      // if the value is a function, call it, binding the correct context
-      if (typeof value == "function") {
-        return value.apply(value_context);
+    }
+
+    return body;
+  }
+
+  /**
+   * Used by `compile` to generate a reusable function for the given `template`.
+   */
+  function _compile(template, options) {
+    var args = "view,partials,send,stack,find,escapeHTML,sendSection,render";
+    var body = parse(template, options);
+    var fn = new Function(args, body);
+
+    // This anonymous function wraps the generated function so we can do
+    // argument coercion, setup some variables, and handle any errors
+    // encountered while executing it.
+    return function (view, partials, callback) {
+      if (typeof partials === "function") {
+        callback = partials;
+        partials = {};
       }
-      return value;
-    },
 
-    // Utility methods
+      partials = partials || {};
 
-    /* includes tag */
-    includes: function (needle, haystack) {
-      return haystack.indexOf(this.otag + needle) != -1;
-    },
+      var buffer = []; // output buffer
 
-    // by @langalex, support for arrays of strings
-    create_context: function (_context) {
-      if (this.is_object(_context)) {
-        return _context;
-      } else {
-        var iterator = ".";
-        if (this.pragmas["IMPLICIT-ITERATOR"]) {
-          iterator = this.pragmas["IMPLICIT-ITERATOR"].iterator;
-        }
-        var ctx = {};
-        ctx[iterator] = _context;
-        return ctx;
-      }
-    },
-
-    is_object: function (a) {
-      return a && typeof a == "object";
-    },
-
-    /*
-      Why, why, why? Because IE. Cry, cry cry.
-    */
-    map: function (array, fn) {
-      if (typeof array.map == "function") {
-        return array.map(fn);
-      } else {
-        var r = [];
-        var l = array.length;
-        for(var i = 0; i < l; i++) {
-          r.push(fn(array[i]));
-        }
-        return r;
-      }
-    },
+      var send = callback || function (chunk) {
+        buffer.push(chunk);
+      };
 
-    getCachedRegex: function (name, generator) {
-      var byOtag = regexCache[this.otag];
-      if (!byOtag) {
-        byOtag = regexCache[this.otag] = {};
-      }
+      var stack = [view]; // context stack
 
-      var byCtag = byOtag[this.ctag];
-      if (!byCtag) {
-        byCtag = byOtag[this.ctag] = {};
-      }
+      var find = function (name) {
+        return findName(name, stack);
+      };
 
-      var regex = byCtag[name];
-      if (!regex) {
-        regex = byCtag[name] = generator(this.otag, this.ctag);
+      try {
+        fn(view, partials, send, stack, find, escapeHTML, sendSection, render);
+      } catch (e) {
+        throw debug(e.error, template, e.line, options.file);
       }
 
-      return regex;
-    }
-  };
+      return buffer.join("");
+    };
+  }
 
-  return({
-    name: "mustache.js",
-    version: "0.5.0-dev",
-
-    /*
-      Turns a template and view into HTML
-    */
-    to_html: function (template, view, partials, send_fun) {
-      var renderer = new Renderer();
-      if (send_fun) {
-        renderer.send = send_fun;
-      }
-      renderer.render(template, view || {}, partials);
-      if (!send_fun) {
-        return renderer.buffer.join("\n");
+  // Cache of pre-compiled templates.
+  var _cache = {};
+
+  /**
+   * Clear the cache of compiled templates.
+   */
+  function clearCache() {
+    _cache = {};
+  }
+
+  /**
+   * Compiles the given `template` into a reusable function using the given
+   * `options`. In addition to the options accepted by Mustache.parse,
+   * recognized options include the following:
+   *
+   *   - cache    Set `false` to bypass any pre-compiled version of the given
+   *              template. Otherwise, a given `template` string will be cached
+   *              the first time it is parsed
+   */
+  function compile(template, options) {
+    options = options || {};
+
+    // Use a pre-compiled version from the cache if we have one.
+    if (options.cache !== false) {
+      if (!_cache[template]) {
+        _cache[template] = _compile(template, options);
       }
+
+      return _cache[template];
     }
-  });
-}();
+
+    return _compile(template, options);
+  }
+
+  /**
+   * High-level function that renders the given `template` using the given
+   * `view`, `partials`, and `callback`. The `callback` is used to return the
+   * output piece by piece, as it is rendered. When finished, the callback will
+   * receive `null` as its argument, after which it will not be called any more.
+   * If no callback is given, the complete rendered template will be used as the
+   * return value for the function.
+   *
+   * Note: If no partials are needed, the third argument may be the callback.
+   * If you need to use any of the template options (see `compile` above), you
+   * must compile in a separate step, and then call that compiled function.
+   */
+  function render(template, view, partials, callback) {
+    return compile(template)(view, partials, callback);
+  }
+
+})(Mustache);
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..874404b
--- /dev/null
+++ b/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "mustache",
+  "version": "0.4.0",
+  "description": "Logic-less {{mustache}} templates with JavaScript",
+  "author": "mustache.js Authors <http://github.com/janl/mustache.js>",
+  "keywords": ["mustache", "template", "templates", "ejs"],
+  "main": "./mustache"
+}
diff --git a/spec/_files/array_of_partials_implicit_partial.js b/spec/_files/array_of_partials_implicit_partial.js
deleted file mode 100644
index fcdf3b0..0000000
--- a/spec/_files/array_of_partials_implicit_partial.js
+++ /dev/null
@@ -1,3 +0,0 @@
-var partial_context = { 
-  numbers: ['1', '2', '3', '4']
-};
diff --git a/spec/_files/array_of_strings.mustache b/spec/_files/array_of_strings.mustache
index 2898705..4d65738 100644
--- a/spec/_files/array_of_strings.mustache
+++ b/spec/_files/array_of_strings.mustache
@@ -1 +1 @@
-{{#array_of_strings}}{{.}} {{/array_of_strings}}
\ No newline at end of file
+{{#array_of_strings}}{{.}} {{/array_of_strings}}
diff --git a/spec/_files/array_of_strings_options.js b/spec/_files/array_of_strings_options.js
deleted file mode 100644
index 2e29adf..0000000
--- a/spec/_files/array_of_strings_options.js
+++ /dev/null
@@ -1 +0,0 @@
-var array_of_strings_options = {array_of_strings_options: ['hello', 'world']};
diff --git a/spec/_files/array_of_strings_options.mustache b/spec/_files/array_of_strings_options.mustache
deleted file mode 100644
index 6b28278..0000000
--- a/spec/_files/array_of_strings_options.mustache
+++ /dev/null
@@ -1,2 +0,0 @@
-{{%IMPLICIT-ITERATOR iterator=rob}}
-{{#array_of_strings_options}}{{rob}} {{/array_of_strings_options}}
\ No newline at end of file
diff --git a/spec/_files/array_of_strings_options.txt b/spec/_files/array_of_strings_options.txt
deleted file mode 100644
index 4a1f475..0000000
--- a/spec/_files/array_of_strings_options.txt
+++ /dev/null
@@ -1 +0,0 @@
-hello world 
diff --git a/spec/_files/array_partial.js b/spec/_files/array_partial.js
deleted file mode 100644
index 88d7592..0000000
--- a/spec/_files/array_partial.js
+++ /dev/null
@@ -1,5 +0,0 @@
-var partial_context = { 
-  partial: {
-    array: ['1', '2', '3', '4']
-  }
-};
\ No newline at end of file
diff --git a/spec/_files/complex.mustache b/spec/_files/complex.mustache
index 23bec3c..869a4f0 100644
--- a/spec/_files/complex.mustache
+++ b/spec/_files/complex.mustache
@@ -13,4 +13,4 @@
 {{/list}}
 {{#empty}}
   <p>The list is empty.</p>
-{{/empty}}
\ No newline at end of file
+{{/empty}}
diff --git a/spec/_files/complex.txt b/spec/_files/complex.txt
index b51ca10..596d3f6 100644
--- a/spec/_files/complex.txt
+++ b/spec/_files/complex.txt
@@ -1,6 +1,6 @@
 <h1>Colors</h1>
   <ul>
-      <li><strong>red</strong></li>
-      <li><a href="#Green">green</a></li>
-      <li><a href="#Blue">blue</a></li>
+  <li><strong>red</strong></li>
+  <li><a href="#Green">green</a></li>
+  <li><a href="#Blue">blue</a></li>
   </ul>
diff --git a/spec/_files/delimiters.mustache b/spec/_files/delimiters.mustache
index a73e061..7fac846 100644
--- a/spec/_files/delimiters.mustache
+++ b/spec/_files/delimiters.mustache
@@ -4,4 +4,4 @@
 <%=| |=%>
 * | third |
 |={{ }}=|
-* {{ fourth }}
\ No newline at end of file
+* {{ fourth }}
diff --git a/spec/_files/empty_partial.2.mustache b/spec/_files/empty_partial.2.mustache
deleted file mode 100644
index b920295..0000000
--- a/spec/_files/empty_partial.2.mustache
+++ /dev/null
@@ -1 +0,0 @@
-yo
\ No newline at end of file
diff --git a/spec/_files/empty_partial.js b/spec/_files/empty_partial.js
deleted file mode 100644
index 9cc53c6..0000000
--- a/spec/_files/empty_partial.js
+++ /dev/null
@@ -1,3 +0,0 @@
-var partial_context = {
-  foo: 1
-};
diff --git a/spec/_files/empty_template.txt b/spec/_files/empty_template.txt
index 60652b6..bb2367a 100644
--- a/spec/_files/empty_template.txt
+++ b/spec/_files/empty_template.txt
@@ -1 +1 @@
-<html><head></head><body><h1>Test</h1></body></html>
+<html><head></head><body><h1>Test</h1></body></html>
\ No newline at end of file
diff --git a/spec/_files/error_not_found.txt b/spec/_files/error_not_found.txt
index 8b13789..e69de29 100644
--- a/spec/_files/error_not_found.txt
+++ b/spec/_files/error_not_found.txt
@@ -1 +0,0 @@
-
diff --git a/spec/_files/inverted_section.txt b/spec/_files/inverted_section.txt
index 5fd0de1..06d5d66 100644
--- a/spec/_files/inverted_section.txt
+++ b/spec/_files/inverted_section.txt
@@ -1 +1,2 @@
+
 No repos :(
diff --git a/spec/_files/nesting.txt b/spec/_files/nesting.txt
index caf5afd..7db34b1 100644
--- a/spec/_files/nesting.txt
+++ b/spec/_files/nesting.txt
@@ -1,4 +1,3 @@
-      1
-        2
-        3
-  
+    1
+    2
+    3
diff --git a/spec/_files/null_string.js b/spec/_files/null_string.js
index 93414a1..ab5291f 100644
--- a/spec/_files/null_string.js
+++ b/spec/_files/null_string.js
@@ -3,6 +3,7 @@ var null_string = {
   glytch: true,
   binary: false,
   value: null,
+  undef: undefined,
   numeric: function() {
     return NaN;
   }
diff --git a/spec/_files/null_string.mustache b/spec/_files/null_string.mustache
index 12bcb08..a6f3300 100644
--- a/spec/_files/null_string.mustache
+++ b/spec/_files/null_string.mustache
@@ -2,4 +2,5 @@ Hello {{name}}
 glytch {{glytch}}
 binary {{binary}}
 value {{value}}
-numeric {{numeric}}
\ No newline at end of file
+undef {{undef}}
+numeric {{numeric}}
diff --git a/spec/_files/null_string.txt b/spec/_files/null_string.txt
index 827569b..bcabe0a 100644
--- a/spec/_files/null_string.txt
+++ b/spec/_files/null_string.txt
@@ -2,4 +2,5 @@ Hello Elise
 glytch true
 binary false
 value 
+undef 
 numeric NaN
diff --git a/spec/_files/partial_array.js b/spec/_files/partial_array.js
new file mode 100644
index 0000000..f16e9eb
--- /dev/null
+++ b/spec/_files/partial_array.js
@@ -0,0 +1,3 @@
+var partial_array = {
+  array: ['1', '2', '3', '4']
+};
\ No newline at end of file
diff --git a/spec/_files/array_partial.mustache b/spec/_files/partial_array.mustache
similarity index 100%
rename from spec/_files/array_partial.mustache
rename to spec/_files/partial_array.mustache
diff --git a/spec/_files/array_partial.2.mustache b/spec/_files/partial_array.partial
similarity index 83%
rename from spec/_files/array_partial.2.mustache
rename to spec/_files/partial_array.partial
index 235dd5f..0ba652c 100644
--- a/spec/_files/array_partial.2.mustache
+++ b/spec/_files/partial_array.partial
@@ -1,4 +1,4 @@
 Here's a non-sense array of values
 {{#array}}
   {{.}}
-{{/array}}
\ No newline at end of file
+{{/array}}
diff --git a/spec/_files/array_partial.txt b/spec/_files/partial_array.txt
similarity index 98%
rename from spec/_files/array_partial.txt
rename to spec/_files/partial_array.txt
index fd5f48e..892837c 100644
--- a/spec/_files/array_partial.txt
+++ b/spec/_files/partial_array.txt
@@ -3,4 +3,3 @@ Here's a non-sense array of values
   2
   3
   4
-
diff --git a/spec/_files/array_of_partials_partial.js b/spec/_files/partial_array_of_partials.js
similarity index 61%
rename from spec/_files/array_of_partials_partial.js
rename to spec/_files/partial_array_of_partials.js
index 45611cf..706e7ed 100644
--- a/spec/_files/array_of_partials_partial.js
+++ b/spec/_files/partial_array_of_partials.js
@@ -1,3 +1,3 @@
-var partial_context = { 
+var partial_array_of_partials = { 
   numbers: [{i: '1'}, {i: '2'}, {i: '3'}, {i: '4'}]
 };
diff --git a/spec/_files/array_of_partials_implicit_partial.mustache b/spec/_files/partial_array_of_partials.mustache
similarity index 100%
rename from spec/_files/array_of_partials_implicit_partial.mustache
rename to spec/_files/partial_array_of_partials.mustache
diff --git a/spec/_files/array_of_partials_partial.2.mustache b/spec/_files/partial_array_of_partials.partial
similarity index 100%
rename from spec/_files/array_of_partials_partial.2.mustache
rename to spec/_files/partial_array_of_partials.partial
diff --git a/spec/_files/array_of_partials_implicit_partial.txt b/spec/_files/partial_array_of_partials.txt
similarity index 100%
rename from spec/_files/array_of_partials_implicit_partial.txt
rename to spec/_files/partial_array_of_partials.txt
diff --git a/spec/_files/partial_array_of_partials_implicit.js b/spec/_files/partial_array_of_partials_implicit.js
new file mode 100644
index 0000000..864efa3
--- /dev/null
+++ b/spec/_files/partial_array_of_partials_implicit.js
@@ -0,0 +1,3 @@
+var partial_array_of_partials_implicit = { 
+  numbers: ['1', '2', '3', '4']
+};
diff --git a/spec/_files/array_of_partials_partial.mustache b/spec/_files/partial_array_of_partials_implicit.mustache
similarity index 100%
rename from spec/_files/array_of_partials_partial.mustache
rename to spec/_files/partial_array_of_partials_implicit.mustache
diff --git a/spec/_files/array_of_partials_implicit_partial.2.mustache b/spec/_files/partial_array_of_partials_implicit.partial
similarity index 100%
rename from spec/_files/array_of_partials_implicit_partial.2.mustache
rename to spec/_files/partial_array_of_partials_implicit.partial
diff --git a/spec/_files/array_of_partials_partial.txt b/spec/_files/partial_array_of_partials_implicit.txt
similarity index 100%
rename from spec/_files/array_of_partials_partial.txt
rename to spec/_files/partial_array_of_partials_implicit.txt
diff --git a/spec/_files/partial_empty.js b/spec/_files/partial_empty.js
new file mode 100644
index 0000000..3f36df6
--- /dev/null
+++ b/spec/_files/partial_empty.js
@@ -0,0 +1,3 @@
+var partial_empty = {
+  foo: 1
+};
diff --git a/spec/_files/empty_partial.mustache b/spec/_files/partial_empty.mustache
similarity index 100%
rename from spec/_files/empty_partial.mustache
rename to spec/_files/partial_empty.mustache
diff --git a/spec/_files/partial_empty.partial b/spec/_files/partial_empty.partial
new file mode 100644
index 0000000..092bfb9
--- /dev/null
+++ b/spec/_files/partial_empty.partial
@@ -0,0 +1 @@
+yo
diff --git a/spec/_files/empty_partial.txt b/spec/_files/partial_empty.txt
similarity index 100%
rename from spec/_files/empty_partial.txt
rename to spec/_files/partial_empty.txt
diff --git a/spec/_files/partial_recursion.js b/spec/_files/partial_recursion.js
index ad1f2eb..3094eba 100644
--- a/spec/_files/partial_recursion.js
+++ b/spec/_files/partial_recursion.js
@@ -1,4 +1,4 @@
-var partial_context = {
+var partial_recursion = {
   name: '1',
   kids: [
     {
diff --git a/spec/_files/partial_recursion.mustache b/spec/_files/partial_recursion.mustache
index d965a6a..3c3651a 100644
--- a/spec/_files/partial_recursion.mustache
+++ b/spec/_files/partial_recursion.mustache
@@ -1,4 +1,4 @@
 {{name}}
 {{#kids}}
 {{>partial}}
-{{/kids}}
\ No newline at end of file
+{{/kids}}
diff --git a/spec/_files/partial_recursion.2.mustache b/spec/_files/partial_recursion.partial
similarity index 72%
rename from spec/_files/partial_recursion.2.mustache
rename to spec/_files/partial_recursion.partial
index 457d2a0..ba6f8fa 100644
--- a/spec/_files/partial_recursion.2.mustache
+++ b/spec/_files/partial_recursion.partial
@@ -1,4 +1,4 @@
 {{name}}
 {{#children}}
 {{>partial}}
-{{/children}}
\ No newline at end of file
+{{/children}}
diff --git a/spec/_files/partial_template.js b/spec/_files/partial_template.js
new file mode 100644
index 0000000..196f1e8
--- /dev/null
+++ b/spec/_files/partial_template.js
@@ -0,0 +1,6 @@
+var partial_template = {
+  title: function() {
+    return "Welcome";
+  },
+  again: "Goodbye"
+};
diff --git a/spec/_files/template_partial.mustache b/spec/_files/partial_template.mustache
similarity index 59%
rename from spec/_files/template_partial.mustache
rename to spec/_files/partial_template.mustache
index 6a09372..6a7492e 100644
--- a/spec/_files/template_partial.mustache
+++ b/spec/_files/partial_template.mustache
@@ -1,2 +1,2 @@
 <h1>{{title}}</h1>
-{{>partial}}
\ No newline at end of file
+{{>partial}}
diff --git a/spec/_files/partial_template.partial b/spec/_files/partial_template.partial
new file mode 100644
index 0000000..a404529
--- /dev/null
+++ b/spec/_files/partial_template.partial
@@ -0,0 +1 @@
+Again, {{again}}!
diff --git a/spec/_files/template_partial.txt b/spec/_files/partial_template.txt
similarity index 100%
rename from spec/_files/template_partial.txt
rename to spec/_files/partial_template.txt
diff --git a/spec/_files/partial_view.js b/spec/_files/partial_view.js
new file mode 100644
index 0000000..4ea8a12
--- /dev/null
+++ b/spec/_files/partial_view.js
@@ -0,0 +1,16 @@
+var partial_view = {
+  greeting: function() {
+    return "Welcome";
+  },
+
+  farewell: function() {
+    return "Fair enough, right?";
+  },
+
+  name: "Chris",
+  value: 10000,
+  taxed_value: function() {
+    return this.value - (this.value * 0.4);
+  },
+  in_ca: true
+};
diff --git a/spec/_files/view_partial.mustache b/spec/_files/partial_view.mustache
similarity index 61%
rename from spec/_files/view_partial.mustache
rename to spec/_files/partial_view.mustache
index 8f0c08d..f8f6a5b 100644
--- a/spec/_files/view_partial.mustache
+++ b/spec/_files/partial_view.mustache
@@ -1,3 +1,3 @@
 <h1>{{greeting}}</h1>
 {{>partial}}
-<h3>{{farewell}}</h3>
\ No newline at end of file
+<h3>{{farewell}}</h3>
diff --git a/spec/_files/view_partial.2.mustache b/spec/_files/partial_view.partial
similarity index 100%
rename from spec/_files/view_partial.2.mustache
rename to spec/_files/partial_view.partial
diff --git a/spec/_files/view_partial.txt b/spec/_files/partial_view.txt
similarity index 99%
rename from spec/_files/view_partial.txt
rename to spec/_files/partial_view.txt
index 160b0b6..c09147c 100644
--- a/spec/_files/view_partial.txt
+++ b/spec/_files/partial_view.txt
@@ -2,5 +2,4 @@
 Hello Chris
 You have just won $10000!
 Well, $6000, after taxes.
-
 <h3>Fair enough, right?</h3>
diff --git a/spec/_files/partial_whitespace.js b/spec/_files/partial_whitespace.js
new file mode 100644
index 0000000..f4b1ee5
--- /dev/null
+++ b/spec/_files/partial_whitespace.js
@@ -0,0 +1,17 @@
+var partial_whitespace = {
+  greeting: function() {
+    return "Welcome";
+  },
+
+  farewell: function() {
+    return "Fair enough, right?";
+  },
+
+  name: "Chris",
+  value: 10000,
+  taxed_value: function() {
+    return this.value - (this.value * 0.4);
+  },
+  in_ca: true
+};
+
diff --git a/spec/_files/whitespace_partial.mustache b/spec/_files/partial_whitespace.mustache
similarity index 63%
rename from spec/_files/whitespace_partial.mustache
rename to spec/_files/partial_whitespace.mustache
index ce43cb3..48bd1ff 100644
--- a/spec/_files/whitespace_partial.mustache
+++ b/spec/_files/partial_whitespace.mustache
@@ -1,3 +1,3 @@
 <h1>{{  greeting  }}</h1>
 {{> partial }}
-<h3>{{ farewell }}</h3>
\ No newline at end of file
+<h3>{{ farewell }}</h3>
diff --git a/spec/_files/whitespace_partial.2.mustache b/spec/_files/partial_whitespace.partial
similarity index 100%
rename from spec/_files/whitespace_partial.2.mustache
rename to spec/_files/partial_whitespace.partial
diff --git a/spec/_files/whitespace_partial.txt b/spec/_files/partial_whitespace.txt
similarity index 99%
rename from spec/_files/whitespace_partial.txt
rename to spec/_files/partial_whitespace.txt
index 160b0b6..c09147c 100644
--- a/spec/_files/whitespace_partial.txt
+++ b/spec/_files/partial_whitespace.txt
@@ -2,5 +2,4 @@
 Hello Chris
 You have just won $10000!
 Well, $6000, after taxes.
-
 <h3>Fair enough, right?</h3>
diff --git a/spec/_files/reuse_of_enumerables.js b/spec/_files/reuse_of_enumerables.js
index 543e121..a3168d3 100644
--- a/spec/_files/reuse_of_enumerables.js
+++ b/spec/_files/reuse_of_enumerables.js
@@ -1,6 +1,6 @@
 var reuse_of_enumerables = {
   terms: [
     {name: 't1', index: 0},
-    {name: 't2', index: 1},
+    {name: 't2', index: 1}
   ]
 };
\ No newline at end of file
diff --git a/spec/_files/section_as_context.txt b/spec/_files/section_as_context.txt
index 53ee336..d834e80 100644
--- a/spec/_files/section_as_context.txt
+++ b/spec/_files/section_as_context.txt
@@ -1,6 +1,6 @@
   <h1>this is an object</h1>
   <p>one of its attributes is a list</p>
   <ul>
-        <li>listitem1</li>
-        <li>listitem2</li>
-    </ul>
+    <li>listitem1</li>
+    <li>listitem2</li>
+  </ul>
diff --git a/spec/_files/simple.mustache b/spec/_files/simple.mustache
index 03df206..2fea632 100644
--- a/spec/_files/simple.mustache
+++ b/spec/_files/simple.mustache
@@ -2,4 +2,4 @@ Hello {{name}}
 You have just won ${{value}}!
 {{#in_ca}}
 Well, ${{ taxed_value }}, after taxes.
-{{/in_ca}}
\ No newline at end of file
+{{/in_ca}}
diff --git a/spec/_files/template_partial.2.mustache b/spec/_files/template_partial.2.mustache
deleted file mode 100644
index 54bdd7d..0000000
--- a/spec/_files/template_partial.2.mustache
+++ /dev/null
@@ -1 +0,0 @@
-Again, {{again}}!
\ No newline at end of file
diff --git a/spec/_files/template_partial.js b/spec/_files/template_partial.js
deleted file mode 100644
index 68a4317..0000000
--- a/spec/_files/template_partial.js
+++ /dev/null
@@ -1,8 +0,0 @@
-var partial_context = {
-  title: function() {
-    return "Welcome";
-  },
-  partial: {
-    again: "Goodbye"
-  }
-}
diff --git a/spec/_files/two_in_a_row.mustache b/spec/_files/two_in_a_row.mustache
index dc38602..b23f29e 100644
--- a/spec/_files/two_in_a_row.mustache
+++ b/spec/_files/two_in_a_row.mustache
@@ -1 +1 @@
-{{greeting}}, {{name}}!
\ No newline at end of file
+{{greeting}}, {{name}}!
diff --git a/spec/_files/two_sections.txt b/spec/_files/two_sections.txt
index 8b13789..e69de29 100644
--- a/spec/_files/two_sections.txt
+++ b/spec/_files/two_sections.txt
@@ -1 +0,0 @@
-
diff --git a/spec/_files/unescaped.mustache b/spec/_files/unescaped.mustache
index 9982708..6b07d7b 100644
--- a/spec/_files/unescaped.mustache
+++ b/spec/_files/unescaped.mustache
@@ -1 +1 @@
-<h1>{{{title}}}</h1>
\ No newline at end of file
+<h1>{{{title}}}</h1>
diff --git a/spec/_files/unknown_pragma.js b/spec/_files/unknown_pragma.js
deleted file mode 100644
index 68344a5..0000000
--- a/spec/_files/unknown_pragma.js
+++ /dev/null
@@ -1 +0,0 @@
-var unknown_pragma = {};
diff --git a/spec/_files/unknown_pragma.mustache b/spec/_files/unknown_pragma.mustache
deleted file mode 100644
index 113810d..0000000
--- a/spec/_files/unknown_pragma.mustache
+++ /dev/null
@@ -1 +0,0 @@
-{{%I-HAVE-THE-GREATEST-MUSTACHE}}
diff --git a/spec/_files/unknown_pragma.txt b/spec/_files/unknown_pragma.txt
deleted file mode 100644
index a34840d..0000000
--- a/spec/_files/unknown_pragma.txt
+++ /dev/null
@@ -1 +0,0 @@
-ERROR: This implementation of mustache doesn't understand the 'I-HAVE-THE-GREATEST-MUSTACHE' pragma
diff --git a/spec/_files/view_partial.js b/spec/_files/view_partial.js
deleted file mode 100644
index 30ade55..0000000
--- a/spec/_files/view_partial.js
+++ /dev/null
@@ -1,19 +0,0 @@
-var partial_context = {
-  greeting: function() {
-    return "Welcome";
-  },
-
-  farewell: function() {
-    return "Fair enough, right?";
-  },
-
-  partial: {
-    name: "Chris",
-    value: 10000,
-    taxed_value: function() {
-      return this.value - (this.value * 0.4);
-    },
-    in_ca: true
-  }
-};
-
diff --git a/spec/_files/whitespace_partial.js b/spec/_files/whitespace_partial.js
deleted file mode 100644
index 30ade55..0000000
--- a/spec/_files/whitespace_partial.js
+++ /dev/null
@@ -1,19 +0,0 @@
-var partial_context = {
-  greeting: function() {
-    return "Welcome";
-  },
-
-  farewell: function() {
-    return "Fair enough, right?";
-  },
-
-  partial: {
-    name: "Chris",
-    value: 10000,
-    taxed_value: function() {
-      return this.value - (this.value * 0.4);
-    },
-    in_ca: true
-  }
-};
-
diff --git a/spec/mustache_spec.rb b/spec/mustache_spec.rb
index e04bec1..5f07294 100644
--- a/spec/mustache_spec.rb
+++ b/spec/mustache_spec.rb
@@ -11,26 +11,21 @@ TESTS = Dir.glob(File.join(FILES, '*.js')).map do |name|
   File.basename name, '.js'
 end
 
-PARTIALS = TESTS.select {|t| t.include? "partial" }
-NON_PARTIALS = TESTS.select {|t| not t.include? "partial" }
-
 NODE_PATH = `which node`.strip
 JS_PATH = `which js`.strip
 JSC_PATH = "/System/Library/Frameworks/JavaScriptCore.framework/Versions/A/Resources/jsc"
 RHINO_JAR = "org.mozilla.javascript.tools.shell.Main"
 
-def load_test(name, is_partial=false)
+def load_test(name)
+  template = File.read(File.join(FILES, "#{name}.mustache"))
   view = File.read(File.join(FILES, "#{name}.js"))
-  template = File.read(File.join(FILES, "#{name}.mustache")).to_json
-  expect = File.read(File.join(FILES, "#{name}.txt"))
-
-  test = [view, template, expect]
-
-  if is_partial
-    test << File.read(File.join(FILES, "#{name}.2.mustache")).to_json
+  partial_file = File.join(FILES, "#{name}.partial")
+  partial = if File.exist?(partial_file)
+    File.read(partial_file)
   end
+  expect = File.read(File.join(FILES, "#{name}.txt"))
 
-  test
+  [template, view, partial, expect]
 end
 
 def run_js(runner, js)
@@ -41,7 +36,7 @@ def run_js(runner, js)
       JSC_PATH
     when :rhino
       "java #{RHINO_JAR}"
-    when :node
+    when :v8
       NODE_PATH
     end
 
@@ -60,11 +55,11 @@ describe "mustache" do
       $engines_run += 1
     end
 
-    it "should return the same when invoked multiple times" do
+    it "should return the same result when invoked multiple times" do
       js = <<-JS
         #{@boilerplate}
-        Mustache.to_html("x")
-        print(Mustache.to_html("x"));
+        Mustache.render("x")
+        print(Mustache.render("x"));
       JS
 
       run_js(@runner, js).should == "x\n"
@@ -73,9 +68,9 @@ describe "mustache" do
     it "should clear the context after each run" do
       js = <<-JS
         #{@boilerplate}
-        Mustache.to_html("{{#list}}{{x}}{{/list}}", {list: [{x: 1}]})
+        Mustache.render("{{#list}}{{x}}{{/list}}", {list: [{x: 1}]})
         try {
-          print(Mustache.to_html("{{#list}}{{x}}{{/list}}", {list: [{}]}));
+          print(Mustache.render("{{#list}}{{x}}{{/list}}", {list: [{}]}));
         } catch(e) {
           print('ERROR: ' + e.message);
         }
@@ -84,111 +79,62 @@ describe "mustache" do
       run_js(@runner, js).should == "\n"
     end
 
-    NON_PARTIALS.each do |test|
+    TESTS.each do |test|
       describe test do
-        it "should generate the correct html" do
-          view, template, expect = load_test(test)
+        it "should render the correct output" do
+          template, view, partial, expect = load_test(test)
 
           js = <<-JS
             try {
               #{@boilerplate}
+              var template = #{template.to_json};
               #{view}
-              var template = #{template};
-              var result = Mustache.to_html(template, #{test});
-              print(result);
+              var partials = {partial: #{partial ? partial.to_json : '""'}};
+              print(Mustache.render(template, #{test}, partials));
             } catch(e) {
               print('ERROR: ' + e.message);
             }
           JS
 
-          run_js(@runner, js).should == expect
+          run_js(@runner, js).chomp.should == expect
         end
 
-        it "should sendFun the correct html" do
-          view, template, expect = load_test(test)
+        it "should send the correct output" do
+          template, view, partial, expect = load_test(test)
 
           js = <<-JS
             try {
               #{@boilerplate}
+              var template = #{template.to_json};
               #{view}
-              var chunks = [];
-              var sendFun = function(chunk) {
-                if (chunk != "") {
-                  chunks.push(chunk);
-                }
-              }
-              var template = #{template};
-              Mustache.to_html(template, #{test}, null, sendFun);
-              print(chunks.join("\\n"));
+              var partials = {
+                "partial": #{(partial || '').to_json}
+              };
+              var buffer = [];
+              var send = function (chunk) {
+                buffer.push(chunk);
+              };
+              Mustache.render(template, #{test}, partials, send);
+              print(buffer.join(""));
             } catch(e) {
               print('ERROR: ' + e.message);
             }
           JS
 
-          run_js(@runner, js).strip.should == expect.strip
-        end
-      end
-    end
-
-    PARTIALS.each do |test|
-      describe test do
-        it "should generate the correct html" do
-          view, template, expect, partial = load_test(test, true)
-
-          js = <<-JS
-            try {
-              #{@boilerplate}
-              #{view}
-              var template = #{template};
-              var partials = {"partial": #{partial}};
-              var result = Mustache.to_html(template, partial_context, partials);
-              print(result);
-            } catch(e) {
-              print('ERROR: ' + e.message);
-            }
-          JS
-
-          run_js(@runner, js).should == expect
-        end
-
-        it "should sendFun the correct html" do
-          view, template, expect, partial = load_test(test, true)
-
-          js = <<-JS
-            try {
-              #{@boilerplate}
-              #{view};
-              var template = #{template};
-              var partials = {"partial": #{partial}};
-              var chunks = [];
-              var sendFun = function(chunk) {
-                if (chunk != "") {
-                  chunks.push(chunk);
-                }
-              }
-              Mustache.to_html(template, partial_context, partials, sendFun);
-              print(chunks.join("\\n"));
-            } catch(e) {
-              print('ERROR: ' + e.message);
-            }
-          JS
-
-          run_js(@runner, js).strip.should == expect.strip
+          run_js(@runner, js).chomp.should == expect
         end
       end
     end
   end
 
-  context "running in node" do
+  context "running in V8 (Chrome, node)" do
     if File.exist?(NODE_PATH)
       before(:all) do
-        $stdout.write "Testing in node "
-        @runner = :node
+        $stdout.write "Testing in V8 "
+        @runner = :v8
         @boilerplate = MUSTACHE.dup
         @boilerplate << <<-JS
-        function print(message) {
-          console.log(message);
-        }
+        var print = console.log;
         JS
       end
 
@@ -198,7 +144,7 @@ describe "mustache" do
 
       it_should_behave_like "mustache rendering"
     else
-      puts "Skipping tests in node (node not found)"
+      puts "Skipping tests in V8 (node not found)"
     end
   end
 
@@ -258,15 +204,11 @@ describe "mustache" do
 
   context "suite" do
     before(:each) do
-      $stdout.write "Verifying that we ran at the tests in at least one engine ... "
+      $stdout.write "Verifying that we ran the tests in at least one engine ... "
     end
 
     after(:each) do
-      if @exception.nil?
-        puts "OK"
-      else
-        puts "ERROR!"
-      end
+      puts @exception.nil? ? "OK" : "ERROR"
     end
 
     it "should have run at least one time" do
diff --git a/wrappers/commonjs/mustache.js.tpl.post b/wrappers/commonjs/mustache.js.tpl.post
deleted file mode 100644
index f566443..0000000
--- a/wrappers/commonjs/mustache.js.tpl.post
+++ /dev/null
@@ -1,8 +0,0 @@
-if (typeof module !== 'undefined' && module.exports) {
-    exports.name = Mustache.name;
-    exports.version = Mustache.version;
-
-    exports.to_html = function() {
-      return Mustache.to_html.apply(this, arguments);
-    };
-}
diff --git a/wrappers/commonjs/mustache.js.tpl.pre b/wrappers/commonjs/mustache.js.tpl.pre
deleted file mode 100644
index 5e33b34..0000000
--- a/wrappers/commonjs/mustache.js.tpl.pre
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- * CommonJS-compatible mustache.js module
- *
- * See http://github.com/janl/mustache.js for more info.
- */
-
diff --git a/wrappers/commonjs/package.json b/wrappers/commonjs/package.json
deleted file mode 100644
index 8e13993..0000000
--- a/wrappers/commonjs/package.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "name": "mustache",
-    "author": "http://mustache.github.com/",
-    "description": "Logic-less {{mustache}} templates with JavaScript",
-    "keywords": ["template", "templates", "mustache"],
-    "version": "{{version}}",
-    "main": "./mustache"
-}

From 4835dd6a2c447ce6f23e6a709cd2361f97649eaa Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Wed, 21 Dec 2011 12:03:24 -0800
Subject: [PATCH 29/64] Add spec for nesting the same name (issue #148)

---
 spec/_files/nesting_same_name.js       | 8 ++++++++
 spec/_files/nesting_same_name.mustache | 1 +
 spec/_files/nesting_same_name.txt      | 1 +
 3 files changed, 10 insertions(+)
 create mode 100644 spec/_files/nesting_same_name.js
 create mode 100644 spec/_files/nesting_same_name.mustache
 create mode 100644 spec/_files/nesting_same_name.txt

diff --git a/spec/_files/nesting_same_name.js b/spec/_files/nesting_same_name.js
new file mode 100644
index 0000000..a5fb65b
--- /dev/null
+++ b/spec/_files/nesting_same_name.js
@@ -0,0 +1,8 @@
+var nesting_same_name = {
+  items: [
+    {
+      name: 'name',
+      items: [1, 2, 3, 4]
+    }
+  ]
+};
diff --git a/spec/_files/nesting_same_name.mustache b/spec/_files/nesting_same_name.mustache
new file mode 100644
index 0000000..777dbd6
--- /dev/null
+++ b/spec/_files/nesting_same_name.mustache
@@ -0,0 +1 @@
+{{#items}}{{name}}{{#items}}{{.}}{{/items}}{{/items}}
diff --git a/spec/_files/nesting_same_name.txt b/spec/_files/nesting_same_name.txt
new file mode 100644
index 0000000..34fcfd3
--- /dev/null
+++ b/spec/_files/nesting_same_name.txt
@@ -0,0 +1 @@
+name1234

From 09f1e88b92d7a1335cd3f34710bc24877feac006 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Wed, 28 Dec 2011 11:26:56 -0800
Subject: [PATCH 30/64] Add spec for empty partial (issue #145)

---
 spec/_files/partial_empty.partial | 1 -
 spec/_files/partial_empty.txt     | 1 -
 2 files changed, 2 deletions(-)

diff --git a/spec/_files/partial_empty.partial b/spec/_files/partial_empty.partial
index 092bfb9..e69de29 100644
--- a/spec/_files/partial_empty.partial
+++ b/spec/_files/partial_empty.partial
@@ -1 +0,0 @@
-yo
diff --git a/spec/_files/partial_empty.txt b/spec/_files/partial_empty.txt
index 90d2b9f..1a67907 100644
--- a/spec/_files/partial_empty.txt
+++ b/spec/_files/partial_empty.txt
@@ -1,2 +1 @@
 hey 1
-yo

From 364ef54901b2795a196548de894b7a215d6f4007 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Wed, 28 Dec 2011 11:31:16 -0800
Subject: [PATCH 31/64] Add spec for context lookup (issue #122)

---
 spec/_files/context_lookup.js       | 8 ++++++++
 spec/_files/context_lookup.mustache | 1 +
 spec/_files/context_lookup.txt      | 1 +
 3 files changed, 10 insertions(+)
 create mode 100644 spec/_files/context_lookup.js
 create mode 100644 spec/_files/context_lookup.mustache
 create mode 100644 spec/_files/context_lookup.txt

diff --git a/spec/_files/context_lookup.js b/spec/_files/context_lookup.js
new file mode 100644
index 0000000..49d4453
--- /dev/null
+++ b/spec/_files/context_lookup.js
@@ -0,0 +1,8 @@
+var context_lookup = {
+  "outer": {
+    "id": 1,
+    "second": {
+      "nothing": 2
+    }
+  }
+};
diff --git a/spec/_files/context_lookup.mustache b/spec/_files/context_lookup.mustache
new file mode 100644
index 0000000..3c7b767
--- /dev/null
+++ b/spec/_files/context_lookup.mustache
@@ -0,0 +1 @@
+{{#outer}}{{#second}}{{id}}{{/second}}{{/outer}}
diff --git a/spec/_files/context_lookup.txt b/spec/_files/context_lookup.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/spec/_files/context_lookup.txt
@@ -0,0 +1 @@
+1

From 1f6136c0655c423c8f6a236b3c6a16618b22ea6a Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Wed, 28 Dec 2011 11:38:21 -0800
Subject: [PATCH 32/64] Add spec for disappearing whitespace (issue #67, #147)

---
 spec/_files/disappearing_whitespace.js       | 4 ++++
 spec/_files/disappearing_whitespace.mustache | 1 +
 spec/_files/disappearing_whitespace.txt      | 1 +
 3 files changed, 6 insertions(+)
 create mode 100644 spec/_files/disappearing_whitespace.js
 create mode 100644 spec/_files/disappearing_whitespace.mustache
 create mode 100644 spec/_files/disappearing_whitespace.txt

diff --git a/spec/_files/disappearing_whitespace.js b/spec/_files/disappearing_whitespace.js
new file mode 100644
index 0000000..3fe7121
--- /dev/null
+++ b/spec/_files/disappearing_whitespace.js
@@ -0,0 +1,4 @@
+var disappearing_whitespace = {
+  bedrooms: true,
+  total: 1
+};
diff --git a/spec/_files/disappearing_whitespace.mustache b/spec/_files/disappearing_whitespace.mustache
new file mode 100644
index 0000000..16c16e0
--- /dev/null
+++ b/spec/_files/disappearing_whitespace.mustache
@@ -0,0 +1 @@
+{{#bedrooms}}{{total}}{{/bedrooms}} BED
diff --git a/spec/_files/disappearing_whitespace.txt b/spec/_files/disappearing_whitespace.txt
new file mode 100644
index 0000000..66e98ef
--- /dev/null
+++ b/spec/_files/disappearing_whitespace.txt
@@ -0,0 +1 @@
+1 BED

From 64acc17a430673785d940940252583e6aaceb241 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Wed, 28 Dec 2011 11:42:21 -0800
Subject: [PATCH 33/64] Add spec for included tag (issue #141)

---
 spec/_files/included_tag.js       | 3 +++
 spec/_files/included_tag.mustache | 1 +
 spec/_files/included_tag.txt      | 1 +
 3 files changed, 5 insertions(+)
 create mode 100644 spec/_files/included_tag.js
 create mode 100644 spec/_files/included_tag.mustache
 create mode 100644 spec/_files/included_tag.txt

diff --git a/spec/_files/included_tag.js b/spec/_files/included_tag.js
new file mode 100644
index 0000000..a63df27
--- /dev/null
+++ b/spec/_files/included_tag.js
@@ -0,0 +1,3 @@
+var included_tag = {
+  html: "I like {{mustache}}"
+};
diff --git a/spec/_files/included_tag.mustache b/spec/_files/included_tag.mustache
new file mode 100644
index 0000000..70631c2
--- /dev/null
+++ b/spec/_files/included_tag.mustache
@@ -0,0 +1 @@
+You said "{{{html}}}" today
diff --git a/spec/_files/included_tag.txt b/spec/_files/included_tag.txt
new file mode 100644
index 0000000..1af4556
--- /dev/null
+++ b/spec/_files/included_tag.txt
@@ -0,0 +1 @@
+You said "I like {{mustache}}" today

From fd0f5cf496d672d3ecd995f70435b77c2e9ab3a1 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Wed, 28 Dec 2011 11:57:18 -0800
Subject: [PATCH 34/64] Add spec for empty string (issue #94)

---
 spec/_files/empty_string.js       | 6 ++++++
 spec/_files/empty_string.mustache | 1 +
 spec/_files/empty_string.txt      | 1 +
 3 files changed, 8 insertions(+)
 create mode 100644 spec/_files/empty_string.js
 create mode 100644 spec/_files/empty_string.mustache
 create mode 100644 spec/_files/empty_string.txt

diff --git a/spec/_files/empty_string.js b/spec/_files/empty_string.js
new file mode 100644
index 0000000..2151336
--- /dev/null
+++ b/spec/_files/empty_string.js
@@ -0,0 +1,6 @@
+var empty_string = {
+  description: "That is all!",
+  child: {
+    description: ""
+  }
+};
diff --git a/spec/_files/empty_string.mustache b/spec/_files/empty_string.mustache
new file mode 100644
index 0000000..f568441
--- /dev/null
+++ b/spec/_files/empty_string.mustache
@@ -0,0 +1 @@
+{{description}}{{#child}}{{description}}{{/child}}
diff --git a/spec/_files/empty_string.txt b/spec/_files/empty_string.txt
new file mode 100644
index 0000000..22e2a6e
--- /dev/null
+++ b/spec/_files/empty_string.txt
@@ -0,0 +1 @@
+That is all!

From d5049a55522ad442382a53a5fe59bcd0048c3d39 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Wed, 28 Dec 2011 12:58:46 -0800
Subject: [PATCH 35/64] Add spec for changing delimiters (issue #77)

---
 spec/_files/changing_delimiters.js       | 4 ++++
 spec/_files/changing_delimiters.mustache | 1 +
 spec/_files/changing_delimiters.txt      | 1 +
 3 files changed, 6 insertions(+)
 create mode 100644 spec/_files/changing_delimiters.js
 create mode 100644 spec/_files/changing_delimiters.mustache
 create mode 100644 spec/_files/changing_delimiters.txt

diff --git a/spec/_files/changing_delimiters.js b/spec/_files/changing_delimiters.js
new file mode 100644
index 0000000..4fbe9f3
--- /dev/null
+++ b/spec/_files/changing_delimiters.js
@@ -0,0 +1,4 @@
+var changing_delimiters = {
+  "foo": "foooooooooooooo",
+  "bar":"<b>bar!</b>"
+};
diff --git a/spec/_files/changing_delimiters.mustache b/spec/_files/changing_delimiters.mustache
new file mode 100644
index 0000000..0cd044c
--- /dev/null
+++ b/spec/_files/changing_delimiters.mustache
@@ -0,0 +1 @@
+{{=<% %>=}}<% foo %> {{foo}} <%{bar}%> {{{bar}}}
diff --git a/spec/_files/changing_delimiters.txt b/spec/_files/changing_delimiters.txt
new file mode 100644
index 0000000..1b1510d
--- /dev/null
+++ b/spec/_files/changing_delimiters.txt
@@ -0,0 +1 @@
+foooooooooooooo {{foo}} <b>bar!</b> {{{bar}}}

From 905ccbbac887ab49bde667a1ebb2395d52df5ae1 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Wed, 28 Dec 2011 13:06:47 -0800
Subject: [PATCH 36/64] Add spec for nested iteration (issue #79)

---
 spec/_files/nested_iterating.js       | 8 ++++++++
 spec/_files/nested_iterating.mustache | 1 +
 spec/_files/nested_iterating.txt      | 1 +
 3 files changed, 10 insertions(+)
 create mode 100644 spec/_files/nested_iterating.js
 create mode 100644 spec/_files/nested_iterating.mustache
 create mode 100644 spec/_files/nested_iterating.txt

diff --git a/spec/_files/nested_iterating.js b/spec/_files/nested_iterating.js
new file mode 100644
index 0000000..a8275f9
--- /dev/null
+++ b/spec/_files/nested_iterating.js
@@ -0,0 +1,8 @@
+var nested_iterating = {
+  inner: [{
+    foo: 'foo',
+    inner: [{
+      bar: 'bar'
+    }]
+  }]
+};
diff --git a/spec/_files/nested_iterating.mustache b/spec/_files/nested_iterating.mustache
new file mode 100644
index 0000000..1a3bb1a
--- /dev/null
+++ b/spec/_files/nested_iterating.mustache
@@ -0,0 +1 @@
+{{#inner}}{{foo}}{{#inner}}{{bar}}{{/inner}}{{/inner}}
diff --git a/spec/_files/nested_iterating.txt b/spec/_files/nested_iterating.txt
new file mode 100644
index 0000000..323fae0
--- /dev/null
+++ b/spec/_files/nested_iterating.txt
@@ -0,0 +1 @@
+foobar

From c660b657bfa824da4b6f12214afbc775ca2417b3 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Wed, 11 Jan 2012 14:57:13 -0800
Subject: [PATCH 37/64] Updated CHANGES

---
 CHANGES.md | 65 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 34 insertions(+), 31 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 40d50b8..0be6033 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,49 +1,52 @@
 # mustache.js Changes
 
+## 0.5.0-dev (1/11/2012)
+
+  * Complete rewrite
+  * Removed support for pragmas
+
 ## 0.3.1-dev-twitter-b (8/23/2011)
 
-* Cached regexes for improved performance
+  * Cached regexes for improved performance
 
 ## 0.3.1-dev-twitter (12/3/2010)
 
-* fixed double-rendering bug
-* added Rhino test-runner alongside JavaScriptCore
+  * Fixed double-rendering bug
+  * Added Rhino test-runner alongside JavaScriptCore
 
 ## 0.3.1 (??-??-????)
 
 ## 0.3.0 (21-07-2010)
 
-* Improved whitespace handling.
-* Make IMPLICIT ITERATORS a first class feature.
-* Fix Rhino compat.
-* CommonJS packaging is no longer a special case.
-* DRY Rakefile.
-* Allow whitespace around tag names.
-* Fix partial scope.
-* Fix Comments.
-* Added inverted sections.
-* Avoid double encoding of entities.
-* Use sections to dereference subcontexts.
-* Added higher order sections.
-
+  * Improved whitespace handling
+  * Make IMPLICIT ITERATORS a first class feature
+  * Fix Rhino compat
+  * CommonJS packaging is no longer a special case
+  * DRY Rakefile
+  * Allow whitespace around tag names
+  * Fix partial scope
+  * Fix Comments
+  * Added inverted sections
+  * Avoid double encoding of entities
+  * Use sections to dereference subcontexts
+  * Added higher order sections
 
 ## 0.2.3 (28-03-2010)
 
-* Better error message for missing partials.
-* Added more robust type detection.
-* Parse pragmas only once.
-* Throw exception when encountering an unknown pragma.
-* Ignore undefined partial contexts. Returns verbatim partials.
-* Added yui3 packaging.
-
+  * Better error message for missing partials
+  * Added more robust type detection
+  * Parse pragmas only once
+  * Throw exception when encountering an unknown pragma
+  * Ignore undefined partial contexts. Returns verbatim partials
+  * Added yui3 packaging
 
 ## 0.2.2 (11-02-2010)
 
-* ctemplate compat: Partials are indicated by >, not <.
-* Add support for {{%PRAGMA}} to enable features.
-* Made array of strings an option. Enable with `{{%JSTACHE-ENABLE-STRING-ARRAYS}}`.
-* mustache compat: Don't barf on unknown variables.
-* Add `rake dojo` target to create a dojo package.
-* Add streaming api.
-* Rename JSTACHE-ENABLE-STRING-ARRAYS to IMPLICIT-ITERATOR.
-* Add support for pragma options.
+  * ctemplate compat: Partials are indicated by >, not <
+  * Add support for {{%PRAGMA}} to enable features
+  * Made array of strings an option. Enable with `{{%JSTACHE-ENABLE-STRING-ARRAYS}}`
+  * mustache compat: Don't barf on unknown variables
+  * Add `rake dojo` target to create a dojo package
+  * Add streaming api
+  * Rename JSTACHE-ENABLE-STRING-ARRAYS to IMPLICIT-ITERATOR
+  * Add support for pragma options

From 931749ff7fd56432163211c9e300d17615b96b7d Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Wed, 11 Jan 2012 14:57:23 -0800
Subject: [PATCH 38/64] Add spec for empty list

---
 spec/_files/empty_list.js       | 3 +++
 spec/_files/empty_list.mustache | 4 ++++
 spec/_files/empty_list.txt      | 1 +
 3 files changed, 8 insertions(+)
 create mode 100644 spec/_files/empty_list.js
 create mode 100644 spec/_files/empty_list.mustache
 create mode 100644 spec/_files/empty_list.txt

diff --git a/spec/_files/empty_list.js b/spec/_files/empty_list.js
new file mode 100644
index 0000000..80555c0
--- /dev/null
+++ b/spec/_files/empty_list.js
@@ -0,0 +1,3 @@
+var empty_list = {
+    jobs: []
+};
diff --git a/spec/_files/empty_list.mustache b/spec/_files/empty_list.mustache
new file mode 100644
index 0000000..4fdf13d
--- /dev/null
+++ b/spec/_files/empty_list.mustache
@@ -0,0 +1,4 @@
+These are the jobs:
+{{#jobs}}
+{{.}}
+{{/jobs}}
diff --git a/spec/_files/empty_list.txt b/spec/_files/empty_list.txt
new file mode 100644
index 0000000..d9b4a67
--- /dev/null
+++ b/spec/_files/empty_list.txt
@@ -0,0 +1 @@
+These are the jobs:

From a3d32fea25b5ab67c7ad8c2a45b51a4a0aac0773 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Thu, 12 Jan 2012 15:45:37 -0800
Subject: [PATCH 39/64] wip

---
 README.md | 215 +++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 195 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 7d941df..a7c35d3 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# mustache.js — Logic-less {{mustache}} templates with JavaScript
+# mustache.js - Logic-less {{mustache}} templates with JavaScript
 
 > What could be more logical awesome than no logic at all?
 
@@ -39,42 +39,217 @@ Below is quick example how to use mustache.js:
       }
     };
 
-    var html = Mustache.to_html("{{title}} spends {{calc}}", view);
+    var html = Mustache.render("{{title}} spends {{calc}}", view);
 
-In this example, the `Mustache.to_html` function takes two parameters: 1) the
+In this example, the `Mustache.render` function takes two parameters: 1) the
 [mustache](http://mustache.github.com/) template and 2) a `view` object that
 contains the data and code needed to render the template.
 
+## Templates
 
-## Template Tag Types
+A [mustache](http://mustache.github.com/) template is a string that contains
+any number of mustache tags. Tags are indicated by the double mustaches that
+surround them. *{{person}}* is a tag, as is *{{#person}}*. In both examples we
+refer to *person* as the tag's key.
 
-There are several types of tags currently implemented in mustache.js.
+There are several types of tags available in mustache.js.
 
-### Simple Tags
+### Variables
 
-Tags are always surrounded by mustaches like this `{{foobar}}`.
+The most basic tag type is a simple variable. A *{{name}}* tag renders the value
+of the *name* key in the current context. If there is no such key, nothing is
+rendered.
 
-    var view = {name: "Joe", say_hello: function(){ return "hello" }}
+All variables are HTML-escaped by default. If you want to render unescaped HTML,
+use the triple mustache: *{{{name}}}*. You can also use *&* to unescape a
+variable.
 
-    template = "{{say_hello}}, {{name}}"
+Template:
+
+    * {{name}}
+    * {{age}}
+    * {{company}}
+    * {{{company}}}
+    * {{&company}}
+
+View:
+
+    {
+      "name": "Chris",
+      "company": "<b>GitHub</b>"
+    }
+
+Output:
+
+    * Chris
+    *
+    * &lt;b&gt;GitHub&lt;/b&gt;
+    * <b>GitHub</b>
+    * <b>GitHub</b>
+
+JavaScript's dot notation may be used to access keys that are properties of
+objects in a view.
+
+Template:
+
+    * {{name.first}} {{name.last}}
+    * {{age}}
+
+View:
+
+    {
+      "name": {
+        "first": "Michael",
+        "last": "Jackson"
+      },
+      "age": "RIP"
+    }
+
+Output:
+
+    * Michael Jackson
+    * RIP
 
-#### Accessing values in nested objects (Dot Notation)
+### Sections
 
-To access data logically grouped into nested objects, specify a '.' delimited
-path to the value.
+Sections render blocks of text one or more times, depending on the value of the
+key in the current context.
 
-    var contact = {
-      name: {first: "Bill", last: "Bobitybob" },
-      age: 37
+A section begins with a pound and ends with a slash. That is, *{{#person}}*
+begins a *person* section, while *{{/person}}* ends it. The text between the two
+tags is referred to as that section's "block".
+
+The behavior of the section is determined by the value of the key.
+
+#### False Values or Empty Lists
+
+If the *person* key exists and has a value of `null`, `undefined`, or `false`,
+or is an empty list, the block will not be rendered.
+
+Template:
+
+    Shown.
+    {{#nothin}}
+      Never shown!
+    {{/nothin}}
+
+View:
+
+    {
+      "person": true,
     }
 
-    template = "Hello, {{name.first}} {{name.last}}. You are {{age}} years old."
+Output:
+
+    Shown.
+
+#### Non-Empty Lists
+
+If the *person* key exists and is not `null`, `undefined`, or `false`, and is
+not an empty list the block will be rendered one or more times.
+
+When the value is a list, the block is rendered once for each item in the list.
+The context of the block is set to the current item in the list for each
+iteration. In this way we can loop over collections.
+
+Template:
+
+    {{#stooges}}
+    <b>{{name}}</b>
+    {{/stooges}}
+
+View:
+
+    {
+      "stooges": [
+        { "name": "Moe" },
+        { "name": "Larry" },
+        { "name": "Curly" },
+      ]
+    }
+
+Output:
+
+    <b>Moe</b>
+    <b>Larry</b>
+    <b>Curly</b>
+
+When looping over an array of strings, a `.` can be used to refer to the current
+item in the list.
+
+Template:
+
+    {{#musketeers}}
+    * {{.}}
+    {{/musketeers}}
+
+View:
+
+    {
+      "musketeers": ["Athos", "Aramis", "Porthos", "D'Artagnan"]
+    }
+
+Output:
+
+    * Athos
+    * Aramis
+    * Porthos
+    * D'Artagnan
+
+
+#### Functions
+
+If the value of a key is a function, it is called with the section's literal
+block of text, unrendered, as its first argument. The second argument is a
+special rendering function that uses the current view as its view argument. It
+is called in the context of the current view object.
+
+
+Template:
+
+    {{#users}}
+    {{#employee}}
+    * {{email}}
+    {{/employee}}
+    {{/users}}
+
+View:
+
+    {
+      "domain": "example.com",
+      "users": [
+        { "handle": "joe", "employee": true },
+        { "handle": "bob", "employee": false },
+        { "handle": "jim", "employee": true }
+      ],
+      "employee": function () {
+        this.
+      },
+      "email": function () {
+        return function (text, render) {
+          return this.handle + "@" + this.domain;
+        }
+      }
+    }
+
+Output:
+
+    * joe@example.com
+    * bob@example.com
+    * jim@example.com
+    * Porthos
+    * D'Artagnan
+
+
+TODO - pick up here
+
+
+
+
+
+
 
-*NOTICE*: The dot notation feature was recently implemented for the 0.4
-  release, which is not out as of Nov 9 2011. You can find the feature in the
-  current master branch of mustachejs.
 
-### Conditional Sections
 
 Conditional sections begin with `{{#condition}}` and end with
 `{{/condition}}`. When `condition` evaluates to true, the section is rendered,

From b7db8648e4ae809981b055bbf647b955e21c398c Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Thu, 12 Jan 2012 20:45:03 -0800
Subject: [PATCH 40/64] Updated README for 0.5

---
 README.md | 294 +++++++++++++++++++-----------------------------------
 1 file changed, 104 insertions(+), 190 deletions(-)

diff --git a/README.md b/README.md
index a7c35d3..c4c3acc 100644
--- a/README.md
+++ b/README.md
@@ -34,12 +34,12 @@ Below is quick example how to use mustache.js:
 
     var view = {
       title: "Joe",
-      calc: function() {
+      calc: function () {
         return 2 + 4;
       }
     };
 
-    var html = Mustache.render("{{title}} spends {{calc}}", view);
+    var output = Mustache.render("{{title}} spends {{calc}}", view);
 
 In this example, the `Mustache.render` function takes two parameters: 1) the
 [mustache](http://mustache.github.com/) template and 2) a `view` object that
@@ -130,13 +130,13 @@ Template:
 
     Shown.
     {{#nothin}}
-      Never shown!
+    Never shown!
     {{/nothin}}
 
 View:
 
     {
-      "person": true,
+      "person": true
     }
 
 Output:
@@ -164,7 +164,7 @@ View:
       "stooges": [
         { "name": "Moe" },
         { "name": "Larry" },
-        { "name": "Curly" },
+        { "name": "Curly" }
       ]
     }
 
@@ -196,256 +196,170 @@ Output:
     * Porthos
     * D'Artagnan
 
-
-#### Functions
-
-If the value of a key is a function, it is called with the section's literal
-block of text, unrendered, as its first argument. The second argument is a
-special rendering function that uses the current view as its view argument. It
-is called in the context of the current view object.
-
+If the value of a section variable is a function, it will be called in the
+context of the current item in the list on each iteration.
 
 Template:
 
-    {{#users}}
-    {{#employee}}
-    * {{email}}
-    {{/employee}}
-    {{/users}}
+    {{#beatles}}
+    * {{name}}
+    {{/beatles}}
 
 View:
 
     {
-      "domain": "example.com",
-      "users": [
-        { "handle": "joe", "employee": true },
-        { "handle": "bob", "employee": false },
-        { "handle": "jim", "employee": true }
+      "beatles": [
+        { "firstName": "John", "lastName": "Lennon" },
+        { "firstName": "Paul", "lastName": "McCartney" },
+        { "firstName": "George", "lastName": "Harrison" },
+        { "firstName": "Ringo", "lastName": "Starr" }
       ],
-      "employee": function () {
-        this.
-      },
-      "email": function () {
-        return function (text, render) {
-          return this.handle + "@" + this.domain;
-        }
+      "name": function () {
+        return this.firstName + " " + this.lastName;
       }
     }
 
 Output:
 
-    * joe@example.com
-    * bob@example.com
-    * jim@example.com
-    * Porthos
-    * D'Artagnan
-
-
-TODO - pick up here
-
-
-
-
-
-
-
-
-
-Conditional sections begin with `{{#condition}}` and end with
-`{{/condition}}`. When `condition` evaluates to true, the section is rendered,
-otherwise the whole block will output nothing at all. `condition` may be a
-function returning true/false or a simple boolean.
-
-    var view = {condition: function() {
-      // [...your code goes here...]
-      return true;
-    }}
-
-    {{#condition}}
-      I will be visible if condition is true
-    {{/condition}}
-
-
-### Enumerable Sections
-
-Enumerable Sections use the same syntax as condition sections do.
-`{{#shopping_items}}` and `{{/shopping_items}}`. Actually the view decides how
-mustache.js renders the section. If the view returns an array, it will
-iterator over the items. Use `{{.}}` to access the current item inside the
-enumeration section.
-
-    var view = {name: "Joe's shopping card",
-                items: ["bananas", "apples"]}
-
-    var template = "{{name}}: <ul> {{#items}}<li>{{.}}</li>{{/items}} </ul>"
-
-    Outputs:
-    Joe's shopping card: <ul><li>bananas</li><li>apples</li></ul>
-
-
-### Higher Order Sections
-
-If a section key returns a function, it will be called and passed both the
-unrendered block of text and a renderer convenience function.
-
-Given this object:
+    * John Lennon
+    * Paul McCartney
+    * George Harrison
+    * Ringo Starr
 
-    "name": "Tater",
-    "bolder": function() {
-      return function(text, render) {
-        return "<b>" + render(text) + '</b>'
-      }
-    }
-
-And this template:
-
-    {{#bolder}}Hi {{name}}.{{/bolder}}
-
-We'll get this output:
-
-    <b>Hi Tater.</b>
-
-As you can see, we’re pre-processing the text in the block. This can be used
-to implement caching, filters (like syntax highlighting), etc.
+#### Functions
 
-You can use `this.name` to access the attribute `name` from your view.
+If the value of a section key is a function, it is called with the section's
+literal block of text, un-rendered, as its first argument. The second argument
+is a special rendering function that uses the current view as its view argument.
+It is called in the context of the current view object.
 
-### Dereferencing Sections
+Template:
 
-If your data has components that are logically grouped into nested objects,
-you may wish to dereference an object to access its values.
+    {{#bold}}Hi {{name}}.{{/bold}}
 
-Given this object:
+View:
 
     {
-      "name": "Bill",
-      "address": {
-        "street": "801 Streetly street",
-        "city": "Boston",
-        "state": "MA",
-        "zip" "02101"
+      "name": "Tater",
+      "bold": function () {
+        return function (text, render) {
+          return "<b>" + render(text) + "</b>";
+        }
       }
     }
 
-And this template:
+Output:
 
-    <h1>Contact: {{name}}</h1>
-    {{#address}}
-      <p>{{street}}</p>
-      <p>{{city}}, {{state}} {{zip}}</p>
-    {{/address}}
+    <b>Hi Tater.</b>
 
-We'll get this output:
+### Inverted Sections
 
-    <h1>Contact: Bill</h1>
-      <p>801 Streetly street</p>
-      <p>Boston, MA 02101</p>
+An inverted section opens with `{{^section}}` instead of `{{#section}}`. The
+block of an inverted section is rendered only if the value of that section's tag
+is `null`, `undefined`, `false`, or an empty list.
 
-### Inverted Sections
+Template:
 
-An inverted section opens with `{{^section}}` instead of `{{#section}}` and
-uses a boolean negative to evaluate. Empty arrays are considered falsy.
+    {{#repos}}<b>{{name}}</b>{{/repos}}
+    {{^repos}}No repos :({{/repos}}
 
 View:
 
-    var inverted_section =  {
-      "repo": []
+    {
+      "repos": []
     }
 
-Template:
+Output:
 
-    {{#repo}}<b>{{name}}</b>{{/repo}}
-    {{^repo}}No repos :({{/repo}}
+    No repos :(
 
-Result:
+### Comments
 
-    No repos :(
+Comments begin with a bang and are ignored. The following template:
 
+    <h1>Today{{! ignore me }}.</h1>
 
-### View Partials
+Will render as follows:
 
-mustache.js supports a quite powerful but yet simple view partial mechanism.
-Use the following syntax for partials: `{{>partial_name}}`
+    <h1>Today.</h1>
 
-    var view = {
-      name: "Joe",
-      winnings: {
-        value: 1000,
-        taxed_value: function() {
-            return this.value - (this.value * 0.4);
-        }
-      }
-    };
+Comments may contain newlines.
 
-    var template = "Welcome, {{name}}! {{>winnings}}"
-    var partials = {
-      winnings: "You just won ${{value}} (which is ${{taxed_value}} after tax)"};
+### Partials
 
-    var output = Mustache.to_html(template, view, partials)
+Partials begin with a greater than sign, like {{> box}}.
 
-    output will be:
-    Welcome, Joe! You just won $1000 (which is $600 after tax)
+Partials are rendered at runtime (as opposed to compile time), so recursive
+partials are possible. Just avoid infinite loops.
 
-You invoke a partial with `{{>winnings}}`. Invoking the partial `winnings`
-will tell mustache.js to look for a object in the context's property
-`winnings`. It will then use that object as the context for the template found
-in `partials` for `winnings`.
+They also inherit the calling context. Whereas in ERB you may have this:
 
-## Escaping
+    <%= partial :next_more, :start => start, :size => size %>
 
-mustache.js does escape all values when using the standard double mustache
-syntax. Characters which will be escaped: `& \ " ' < >`. To disable escaping,
-simply use triple mustaches like `{{{unescaped_variable}}}`.
+Mustache requires only this:
 
-Example: Using `{{variable}}` inside a template for `5 > 2` will result in `5 &gt; 2`, where as the usage of `{{{variable}}}` will result in `5 > 2`.
+{{> next_more}}
 
+Why? Because the `next_more.mustache` file will inherit the `size` and `start`
+variables from the calling context. In this way you may want to think of
+partials as includes, or template expansion, even though it's not literally true.
 
-## Streaming
+For example, this template and partial:
 
-To stream template results out of mustache.js, you can pass an optional
-`send()` callback to the `to_html()` call:
+    base.mustache:
+    <h2>Names</h2>
+    {{#names}}
+      {{> user}}
+    {{/names}}
 
-    Mustache.to_html(template, view, partials, function(line) {
-      print(line);
-    });
+    user.mustache:
+    <strong>{{name}}</strong>
 
+Can be thought of as a single, expanded template:
 
-## Pragmas
+    <h2>Names</h2>
+    {{#names}}
+      <strong>{{name}}</strong>
+    {{/names}}
 
-Pragma tags let you alter the behaviour of mustache.js. They have the format
-of
+In mustache.js an object of partials may be passed as the third argument to
+`Mustache.render`. The object should be keyed by the name of the partial, and
+its value should be the partial text.
 
-    {{%PRAGMANAME}}
+### Set Delimiter
 
-and they accept options:
+Set Delimiter tags start with an equals sign and change the tag delimiters from
+`{{` and `}}` to custom strings.
 
-    {{%PRAGMANAME option=value}}
+Consider the following contrived example:
 
+    * {{ default_tags }}
+    {{=<% %>=}}
+    * <% erb_style_tags %>
+    <%={{ }}=%>
+    * {{ default_tags_again }}
 
-### IMPLICIT-ITERATOR
+Here we have a list with three items. The first item uses the default tag style,
+the second uses ERB style as defined by the Set Delimiter tag, and the third
+returns to the default style after yet another Set Delimiter declaration.
 
-When using a block to iterate over an enumerable (Array), mustache.js expects
-an objects as enumerable items. The implicit iterator pragma enables optional
-behaviour of allowing literals as enumerable items. Consider this view:
+According to [ctemplates](http://google-ctemplate.googlecode.com/svn/trunk/doc/howto.html),
+this "is useful for languages like TeX, where double-braces may occur in the
+text and are awkward to use for markup."
 
-    var view = {
-      foo: [1, 2, 3, 4, 5, "french"]
-    };
+Custom delimiters may not contain whitespace or the equals sign.
 
-The following template can iterate over the member `foo`:
+## Streaming
 
-    {{%IMPLICIT-ITERATOR}}
-    {{#foo}}
-      {{.}}
-    {{/foo}}
+To stream template results out of mustache.js, you can pass an optional callback
+to the call to `Mustache.render`:
 
-If you don't like the dot in there, the pragma accepts an option to set your
-own iteration marker:
+    Mustache.render(template, view, partials, function (chunk) {
+      print(chunk);
+    });
 
-    {{%IMPLICIT-ITERATOR iterator=bob}}
-    {{#foo}}
-      {{bob}}
-    {{/foo}}
+When the template is finished rendering, the callback will be called with `null`
+after which it won't be called anymore for that rendering.
 
 ## Plugins for JavaScript Libraries
 

From cfc7de8ddd6a6fa6ac58190bc2858f41016a69ab Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Thu, 12 Jan 2012 20:47:05 -0800
Subject: [PATCH 41/64] Fix typos

---
 README.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index c4c3acc..0b95e68 100644
--- a/README.md
+++ b/README.md
@@ -49,19 +49,19 @@ contains the data and code needed to render the template.
 
 A [mustache](http://mustache.github.com/) template is a string that contains
 any number of mustache tags. Tags are indicated by the double mustaches that
-surround them. *{{person}}* is a tag, as is *{{#person}}*. In both examples we
-refer to *person* as the tag's key.
+surround them. `{{person}}` is a tag, as is `{{#person}}`. In both examples we
+refer to `person` as the tag's key.
 
 There are several types of tags available in mustache.js.
 
 ### Variables
 
-The most basic tag type is a simple variable. A *{{name}}* tag renders the value
-of the *name* key in the current context. If there is no such key, nothing is
+The most basic tag type is a simple variable. A `{{name}}` tag renders the value
+of the `name` key in the current context. If there is no such key, nothing is
 rendered.
 
 All variables are HTML-escaped by default. If you want to render unescaped HTML,
-use the triple mustache: *{{{name}}}*. You can also use *&* to unescape a
+use the triple mustache: `{{{name}}}`. You can also use `&` to unescape a
 variable.
 
 Template:
@@ -115,15 +115,15 @@ Output:
 Sections render blocks of text one or more times, depending on the value of the
 key in the current context.
 
-A section begins with a pound and ends with a slash. That is, *{{#person}}*
-begins a *person* section, while *{{/person}}* ends it. The text between the two
+A section begins with a pound and ends with a slash. That is, `{{#person}}`
+begins a `person` section, while `{{/person}}` ends it. The text between the two
 tags is referred to as that section's "block".
 
 The behavior of the section is determined by the value of the key.
 
 #### False Values or Empty Lists
 
-If the *person* key exists and has a value of `null`, `undefined`, or `false`,
+If the `person` key exists and has a value of `null`, `undefined`, or `false`,
 or is an empty list, the block will not be rendered.
 
 Template:
@@ -145,7 +145,7 @@ Output:
 
 #### Non-Empty Lists
 
-If the *person* key exists and is not `null`, `undefined`, or `false`, and is
+If the `person` key exists and is not `null`, `undefined`, or `false`, and is
 not an empty list the block will be rendered one or more times.
 
 When the value is a list, the block is rendered once for each item in the list.
@@ -298,7 +298,7 @@ They also inherit the calling context. Whereas in ERB you may have this:
 
 Mustache requires only this:
 
-{{> next_more}}
+    {{> next_more}}
 
 Why? Because the `next_more.mustache` file will inherit the `size` and `start`
 variables from the calling context. In this way you may want to think of

From 16a1d587c64328967644d1bb7ceb8308b2d9cecf Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Thu, 12 Jan 2012 20:52:50 -0800
Subject: [PATCH 42/64] Update wrappers to use Mustache.render

---
 wrappers/dojo/mustache.js.tpl.post            | 2 +-
 wrappers/jquery/jquery.mustache.js.tpl.post   | 2 +-
 wrappers/qooxdoo/qooxdoo.mustache.js.tpl.post | 2 +-
 wrappers/yui3/mustache.js.tpl.post            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wrappers/dojo/mustache.js.tpl.post b/wrappers/dojo/mustache.js.tpl.post
index d64667f..eeeb4b7 100644
--- a/wrappers/dojo/mustache.js.tpl.post
+++ b/wrappers/dojo/mustache.js.tpl.post
@@ -1,4 +1,4 @@
 
-  dojox.mustache = dojo.hitch(Mustache, "to_html");
+  dojox.mustache = dojo.hitch(Mustache, "render");
 
 })();
\ No newline at end of file
diff --git a/wrappers/jquery/jquery.mustache.js.tpl.post b/wrappers/jquery/jquery.mustache.js.tpl.post
index 1fe2887..5082a08 100644
--- a/wrappers/jquery/jquery.mustache.js.tpl.post
+++ b/wrappers/jquery/jquery.mustache.js.tpl.post
@@ -1,6 +1,6 @@
 
   $.mustache = function(template, view, partials) {
-    return Mustache.to_html(template, view, partials);
+    return Mustache.render(template, view, partials);
   };
 
 })(jQuery);
diff --git a/wrappers/qooxdoo/qooxdoo.mustache.js.tpl.post b/wrappers/qooxdoo/qooxdoo.mustache.js.tpl.post
index e66f9e6..bd4b406 100644
--- a/wrappers/qooxdoo/qooxdoo.mustache.js.tpl.post
+++ b/wrappers/qooxdoo/qooxdoo.mustache.js.tpl.post
@@ -4,6 +4,6 @@
 
 // EXPOSE qooxdoo variant
 qx.bom.Template.version = Mustache.version;
-qx.bom.Template.toHtml = Mustache.to_html;
+qx.bom.Template.toHtml = Mustache.render;
 
 })();
diff --git a/wrappers/yui3/mustache.js.tpl.post b/wrappers/yui3/mustache.js.tpl.post
index 373d827..3decbf8 100644
--- a/wrappers/yui3/mustache.js.tpl.post
+++ b/wrappers/yui3/mustache.js.tpl.post
@@ -1,4 +1,4 @@
 
-    Y.mustache = Mustache.to_html;
+    Y.mustache = Mustache.render;
 
 }, "0");

From bfcc05a93f0329d0488f567fe2ccc43edd0d0f59 Mon Sep 17 00:00:00 2001
From: Phui Hock <phuihock@gmail.com>
Date: Tue, 11 Oct 2011 17:42:53 +0800
Subject: [PATCH 43/64] Allow context to be used as template. Maintain
 chainability.

---
 wrappers/jquery/jquery.mustache.js.tpl.post | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/wrappers/jquery/jquery.mustache.js.tpl.post b/wrappers/jquery/jquery.mustache.js.tpl.post
index 5082a08..d27d730 100644
--- a/wrappers/jquery/jquery.mustache.js.tpl.post
+++ b/wrappers/jquery/jquery.mustache.js.tpl.post
@@ -1,6 +1,14 @@
 
-  $.mustache = function(template, view, partials) {
+  $.mustache = function (template, view, partials) {
     return Mustache.render(template, view, partials);
   };
 
+  $.fn.mustache = function (view, partials) {
+    return $(this).map(function (i, elm) {
+      var template = $(elm).html().trim();
+      var output = $.mustache(template, view, partials);
+      return $(output).get();
+    });
+  };
+
 })(jQuery);

From 1846281683bb8c494549cc7938089825b42bef44 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Thu, 12 Jan 2012 22:07:08 -0800
Subject: [PATCH 44/64] Fix inverted section rendering for missing keys

---
 mustache.js                           | 39 ++++++++++++++-------------
 spec/_files/inverted_section.js       |  4 +--
 spec/_files/inverted_section.mustache |  5 ++--
 spec/_files/inverted_section.txt      |  1 +
 4 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/mustache.js b/mustache.js
index 0121abc..29e8053 100644
--- a/mustache.js
+++ b/mustache.js
@@ -115,7 +115,11 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
   /**
    * Looks up the value of the given `name` in the given context `stack`.
    */
-  function findName(name, stack) {
+  function findName(name, stack, returnNull) {
+    if (name === ".") {
+      return stack[stack.length - 1];
+    }
+
     var names = name.split(".");
     var lastIndex = names.length - 1;
     var target = names[lastIndex];
@@ -147,10 +151,16 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
       value = value.call(localStack[localStack.length - 1]);
     }
 
-    return value == null ? "" : value;
+    if (value == null && !returnNull)  {
+      return "";
+    }
+
+    return value;
   }
 
-  function sendSection(send, value, callback, stack, inverted) {
+  function sendSection(send, name, callback, stack, inverted) {
+    var value =  findName(name, stack, true);
+
     if (inverted) {
       // From the spec: inverted sections may render text once based on the
       // inverse value of the key. That is, they will be rendered if the key
@@ -223,11 +233,6 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
       nonSpace = false;
     };
 
-    // Returns a bit of code that can be used to find the given `name`.
-    var findFor = function (name) {
-      return name === "." ? "stack[stack.length - 1]" : 'find("' + name + '")';
-    };
-
     var sectionStack = [], updateLine, nextOpenTag, nextCloseTag;
 
     var setTags = function (source) {
@@ -260,7 +265,7 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
       code.push(
         '");',
         updateLine,
-        '\nvar value = ' + findFor(name) + ';',
+        '\nvar name = "' + name + '";',
         '\nvar callback = (function () {',
         '\n  var buffer, send = function (chunk) { buffer.push(chunk); };',
         '\n  return function () {',
@@ -291,9 +296,9 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
       );
 
       if (section.inverted) {
-        code.push("\nsendSection(send,value,callback,stack,true);");
+        code.push("\nsendSection(send,name,callback,stack,true);");
       } else {
-        code.push("\nsendSection(send,value,callback,stack);");
+        code.push("\nsendSection(send,name,callback,stack);");
       }
 
       code.push('\nsend("');
@@ -303,7 +308,7 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
       code.push(
         '");',
         updateLine,
-        '\nsend(' + findFor(trim(source)) + ');',
+        '\nsend(findName("' + trim(source) + '", stack));',
         '\nsend("'
       );
     };
@@ -312,7 +317,7 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
       code.push(
         '");',
         updateLine,
-        '\nsend(escapeHTML(' + findFor(trim(source)) + '));',
+        '\nsend(escapeHTML(findName("' + trim(source) + '", stack)));',
         '\nsend("'
       );
     };
@@ -446,7 +451,7 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
    * Used by `compile` to generate a reusable function for the given `template`.
    */
   function _compile(template, options) {
-    var args = "view,partials,send,stack,find,escapeHTML,sendSection,render";
+    var args = "view,partials,send,stack,findName,escapeHTML,sendSection,render";
     var body = parse(template, options);
     var fn = new Function(args, body);
 
@@ -469,12 +474,8 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
 
       var stack = [view]; // context stack
 
-      var find = function (name) {
-        return findName(name, stack);
-      };
-
       try {
-        fn(view, partials, send, stack, find, escapeHTML, sendSection, render);
+        fn(view, partials, send, stack, findName, escapeHTML, sendSection, render);
       } catch (e) {
         throw debug(e.error, template, e.line, options.file);
       }
diff --git a/spec/_files/inverted_section.js b/spec/_files/inverted_section.js
index cb96ecf..2e07fc3 100644
--- a/spec/_files/inverted_section.js
+++ b/spec/_files/inverted_section.js
@@ -1,3 +1,3 @@
 var inverted_section =  {
-  "repo": []
-}
+  "repos": []
+};
diff --git a/spec/_files/inverted_section.mustache b/spec/_files/inverted_section.mustache
index beec558..b0a183b 100644
--- a/spec/_files/inverted_section.mustache
+++ b/spec/_files/inverted_section.mustache
@@ -1,2 +1,3 @@
-{{#repo}}<b>{{name}}</b>{{/repo}}
-{{^repo}}No repos :({{/repo}}
+{{#repos}}<b>{{name}}</b>{{/repos}}
+{{^repos}}No repos :({{/repos}}
+{{^nothin}}Hello!{{/nothin}}
diff --git a/spec/_files/inverted_section.txt b/spec/_files/inverted_section.txt
index 06d5d66..b421582 100644
--- a/spec/_files/inverted_section.txt
+++ b/spec/_files/inverted_section.txt
@@ -1,2 +1,3 @@
 
 No repos :(
+Hello!

From 0567f8f2606c4bc6d3702d34edf5a524cbefadca Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Thu, 12 Jan 2012 22:17:05 -0800
Subject: [PATCH 45/64] Add spec for values with backslashes

---
 spec/_files/backslashes.js       | 3 +++
 spec/_files/backslashes.mustache | 3 +++
 spec/_files/backslashes.txt      | 3 +++
 3 files changed, 9 insertions(+)
 create mode 100644 spec/_files/backslashes.js
 create mode 100644 spec/_files/backslashes.mustache
 create mode 100644 spec/_files/backslashes.txt

diff --git a/spec/_files/backslashes.js b/spec/_files/backslashes.js
new file mode 100644
index 0000000..0b9765b
--- /dev/null
+++ b/spec/_files/backslashes.js
@@ -0,0 +1,3 @@
+var backslashes = {
+  value: "\\abc"
+};
diff --git a/spec/_files/backslashes.mustache b/spec/_files/backslashes.mustache
new file mode 100644
index 0000000..72f3c64
--- /dev/null
+++ b/spec/_files/backslashes.mustache
@@ -0,0 +1,3 @@
+* {{value}}
+* {{{value}}}
+* {{&value}}
diff --git a/spec/_files/backslashes.txt b/spec/_files/backslashes.txt
new file mode 100644
index 0000000..ea62e57
--- /dev/null
+++ b/spec/_files/backslashes.txt
@@ -0,0 +1,3 @@
+* \abc
+* \abc
+* \abc

From cf9031c76ffad93ac5358b66480ed41c53868820 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Sat, 14 Jan 2012 10:38:40 -0800
Subject: [PATCH 46/64] Preserve empty newlines

---
 mustache.js                               | 7 +++++--
 spec/_files/recursion_with_same_names.txt | 1 +
 spec/_files/whitespace.js                 | 4 ++++
 spec/_files/whitespace.mustache           | 4 ++++
 spec/_files/whitespace.txt                | 4 ++++
 5 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 spec/_files/whitespace.js
 create mode 100644 spec/_files/whitespace.mustache
 create mode 100644 spec/_files/whitespace.txt

diff --git a/mustache.js b/mustache.js
index 29e8053..fff1b67 100644
--- a/mustache.js
+++ b/mustache.js
@@ -216,13 +216,14 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
       '\nsend("'
     ];
 
-    var spaces = [],      // indices of whitespace in code for the current line
+    var spaces = [],      // indices of whitespace in code on the current line
+        hasTag = false,   // is there a {{tag}} on the current line?
         nonSpace = false; // is there a non-space char on the current line?
 
     // Strips all space characters from the code array for the current line
     // if there was a {{tag}} on it and otherwise only spaces.
     var stripSpace = function () {
-      if (!nonSpace && !options.space) {
+      if (hasTag && !nonSpace && !options.space) {
         while (spaces.length) {
           code.splice(spaces.pop(), 1);
         }
@@ -230,6 +231,7 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
         spaces = [];
       }
 
+      hasTag = false;
       nonSpace = false;
     };
 
@@ -330,6 +332,7 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
         updateLine = '\nline = ' + line + ';';
         nextOpenTag = openTag;
         nextCloseTag = closeTag;
+        hasTag = true;
 
         switch (c) {
         case "!": // comment
diff --git a/spec/_files/recursion_with_same_names.txt b/spec/_files/recursion_with_same_names.txt
index c23bb65..cb15d75 100644
--- a/spec/_files/recursion_with_same_names.txt
+++ b/spec/_files/recursion_with_same_names.txt
@@ -1,5 +1,6 @@
 name
 desc
+
   t1
   0
   t2
diff --git a/spec/_files/whitespace.js b/spec/_files/whitespace.js
new file mode 100644
index 0000000..97f53c1
--- /dev/null
+++ b/spec/_files/whitespace.js
@@ -0,0 +1,4 @@
+var whitespace = {
+  tag1: "Hello",
+  tag2: "World"
+};
diff --git a/spec/_files/whitespace.mustache b/spec/_files/whitespace.mustache
new file mode 100644
index 0000000..aa76e08
--- /dev/null
+++ b/spec/_files/whitespace.mustache
@@ -0,0 +1,4 @@
+{{tag1}}
+
+
+{{tag2}}.
diff --git a/spec/_files/whitespace.txt b/spec/_files/whitespace.txt
new file mode 100644
index 0000000..851fa74
--- /dev/null
+++ b/spec/_files/whitespace.txt
@@ -0,0 +1,4 @@
+Hello
+
+
+World.

From 057bc20880a92723cd21116923be40b27d7e16d1 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Sat, 14 Jan 2012 10:42:45 -0800
Subject: [PATCH 47/64] Add spec for multiline comment

Fixes #47
---
 spec/_files/multiline_comment.js       | 1 +
 spec/_files/multiline_comment.mustache | 6 ++++++
 spec/_files/multiline_comment.txt      | 1 +
 3 files changed, 8 insertions(+)
 create mode 100644 spec/_files/multiline_comment.js
 create mode 100644 spec/_files/multiline_comment.mustache
 create mode 100644 spec/_files/multiline_comment.txt

diff --git a/spec/_files/multiline_comment.js b/spec/_files/multiline_comment.js
new file mode 100644
index 0000000..24e7445
--- /dev/null
+++ b/spec/_files/multiline_comment.js
@@ -0,0 +1 @@
+var multiline_comment = {};
diff --git a/spec/_files/multiline_comment.mustache b/spec/_files/multiline_comment.mustache
new file mode 100644
index 0000000..dff0893
--- /dev/null
+++ b/spec/_files/multiline_comment.mustache
@@ -0,0 +1,6 @@
+{{!
+
+This is a multi-line comment.
+
+}}
+Hello world!
diff --git a/spec/_files/multiline_comment.txt b/spec/_files/multiline_comment.txt
new file mode 100644
index 0000000..cd08755
--- /dev/null
+++ b/spec/_files/multiline_comment.txt
@@ -0,0 +1 @@
+Hello world!

From 9240db10bedb3f5e040fa2af793163a4fbb60f2b Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Sat, 14 Jan 2012 11:07:32 -0800
Subject: [PATCH 48/64] Add note about usage in CommonJS

---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index 0b95e68..4de65b9 100644
--- a/README.md
+++ b/README.md
@@ -45,6 +45,14 @@ In this example, the `Mustache.render` function takes two parameters: 1) the
 [mustache](http://mustache.github.com/) template and 2) a `view` object that
 contains the data and code needed to render the template.
 
+### CommonJS
+
+mustache.js is usable without any modification in both browsers and [CommonJS](http://www.commonjs.org/)
+environments like [node.js](http://nodejs.org/). To use it as a CommonJS module,
+simply require the file, like this:
+
+    var Mustache = require("mustache");
+
 ## Templates
 
 A [mustache](http://mustache.github.com/) template is a string that contains

From b603a1081278142237ed7f58ce88c45afbbd81ca Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Mon, 23 Jan 2012 15:01:13 -0800
Subject: [PATCH 49/64] Fixes #155

---
 mustache.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mustache.js b/mustache.js
index fff1b67..68a0ff2 100644
--- a/mustache.js
+++ b/mustache.js
@@ -285,7 +285,7 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
       var openName = sectionStack.length != 0 && sectionStack[sectionStack.length - 1].name;
 
       if (!openName || name != openName) {
-        throw debug(new Error('Section named "' + name + '" was never opened'), template, line, file);
+        throw debug(new Error('Section named "' + name + '" was never opened'), template, line, options.file);
       }
 
       var section = sectionStack.pop();

From 8320730ea9660d0af88374de9e3cfe53e80f275c Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Mon, 23 Jan 2012 15:04:51 -0800
Subject: [PATCH 50/64] Omit carriage returns

Fixes #156
---
 mustache.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mustache.js b/mustache.js
index 68a0ff2..b71f325 100644
--- a/mustache.js
+++ b/mustache.js
@@ -404,6 +404,9 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
           nonSpace = true;
           code.push("\\" + c);
           break;
+        case "\r":
+          // Ignore carriage returns.
+          break;
         case "\n":
           spaces.push(code.length);
           code.push("\\n");

From 3126a1c1318ad03107607dad420c7940ab8fad54 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Sat, 14 Jan 2012 22:41:11 -0800
Subject: [PATCH 51/64] Remove ability to use a "streaming" function

The "send" function from the 0.4 API doesn't actually stream the template
so much as it just passes chunks of the rendered template through to the
callback as they are rendered. The callbacks are fired synchronously either
way, and using a "send" function just adds extra overhead and makes things
slower.
---
 mustache.js           | 86 ++++++++++++++++++++-----------------------
 spec/mustache_spec.rb | 48 ++++++++++++------------
 2 files changed, 63 insertions(+), 71 deletions(-)

diff --git a/mustache.js b/mustache.js
index b71f325..03a55dc 100644
--- a/mustache.js
+++ b/mustache.js
@@ -14,7 +14,16 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
   exports.render = render;
   exports.clearCache = clearCache;
 
-  exports.to_html = render; // keep backwards compatibility
+  // This is here for backwards compatibility with 0.4.x.
+  exports.to_html = function (template, view, partials, send) {
+    var result = render(template, view, partials);
+
+    if (typeof send === "function") {
+      send(result);
+    } else {
+      return result;
+    }
+  };
 
   var _toString = Object.prototype.toString;
   var _isArray = Array.isArray;
@@ -158,7 +167,7 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
     return value;
   }
 
-  function sendSection(send, name, callback, stack, inverted) {
+  function sendSection(stack, buffer, name, callback, inverted) {
     var value =  findName(name, stack, true);
 
     if (inverted) {
@@ -166,26 +175,26 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
       // inverse value of the key. That is, they will be rendered if the key
       // doesn't exist, is false, or is an empty list.
       if (value == null || value === false || (isArray(value) && value.length === 0)) {
-        send(callback());
+        buffer.push(callback());
       }
     } else if (isArray(value)) {
       forEach(value, function (value) {
         stack.push(value);
-        send(callback());
+        buffer.push(callback());
         stack.pop();
       });
     } else if (typeof value === "object") {
       stack.push(value);
-      send(callback());
+      buffer.push(callback());
       stack.pop();
     } else if (typeof value === "function") {
       var scope = stack[stack.length - 1];
       var scopedRender = function (template) {
         return render(template, scope);
       };
-      send(value.call(scope, callback(), scopedRender) || "");
+      buffer.push(value.call(scope, callback(), scopedRender) || "");
     } else if (value) {
-      send(callback());
+      buffer.push(callback());
     }
   }
 
@@ -213,7 +222,7 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
     var code = [
       "var line = 1;", // keep track of source line number
       "\ntry {",
-      '\nsend("'
+      '\nbuffer.push("'
     ];
 
     var spaces = [],      // indices of whitespace in code on the current line
@@ -249,9 +258,9 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
         updateLine,
         '\nvar partial = partials["' + trim(source) + '"];',
         '\nif (partial) {',
-        '\n  send(render(partial, stack[stack.length - 1], partials));',
+        '\n  buffer.push(render(partial, stack[stack.length - 1], partials));',
         '\n}',
-        '\nsend("'
+        '\nbuffer.push("'
       );
     };
 
@@ -269,10 +278,10 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
         updateLine,
         '\nvar name = "' + name + '";',
         '\nvar callback = (function () {',
-        '\n  var buffer, send = function (chunk) { buffer.push(chunk); };',
+        '\n  var buffer;',
         '\n  return function () {',
         '\n    buffer = [];',
-        '\nsend("'
+        '\nbuffer.push("'
       );
     };
 
@@ -298,20 +307,20 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
       );
 
       if (section.inverted) {
-        code.push("\nsendSection(send,name,callback,stack,true);");
+        code.push("\nsendSection(stack,buffer,name,callback,true);");
       } else {
-        code.push("\nsendSection(send,name,callback,stack);");
+        code.push("\nsendSection(stack,buffer,name,callback);");
       }
 
-      code.push('\nsend("');
+      code.push('\nbuffer.push("');
     };
 
     var sendPlain = function (source) {
       code.push(
         '");',
         updateLine,
-        '\nsend(findName("' + trim(source) + '", stack));',
-        '\nsend("'
+        '\nbuffer.push(findName("' + trim(source) + '",stack));',
+        '\nbuffer.push("'
       );
     };
 
@@ -319,8 +328,8 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
       code.push(
         '");',
         updateLine,
-        '\nsend(escapeHTML(findName("' + trim(source) + '", stack)));',
-        '\nsend("'
+        '\nbuffer.push(escapeHTML(findName("' + trim(source) + '",stack)));',
+        '\nbuffer.push("'
       );
     };
 
@@ -435,12 +444,11 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
 
     code.push(
       '");',
-      "\nsend(null);", // Send null as the last operation.
       "\n} catch (e) { throw {error: e, line: line}; }"
     );
 
-    // Ignore empty send("") statements.
-    var body = code.join("").replace(/send\(""\);\n/g, "");
+    // Ignore buffer.push("") statements.
+    var body = code.join("").replace(/buffer\.push\(""\);\n/g, "");
 
     if (options.debug) {
       if (typeof console != "undefined" && console.log) {
@@ -457,31 +465,21 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
    * Used by `compile` to generate a reusable function for the given `template`.
    */
   function _compile(template, options) {
-    var args = "view,partials,send,stack,findName,escapeHTML,sendSection,render";
+    var args = "view,partials,stack,buffer,findName,escapeHTML,sendSection,render";
     var body = parse(template, options);
     var fn = new Function(args, body);
 
     // This anonymous function wraps the generated function so we can do
     // argument coercion, setup some variables, and handle any errors
     // encountered while executing it.
-    return function (view, partials, callback) {
-      if (typeof partials === "function") {
-        callback = partials;
-        partials = {};
-      }
-
+    return function (view, partials) {
       partials = partials || {};
 
-      var buffer = []; // output buffer
-
-      var send = callback || function (chunk) {
-        buffer.push(chunk);
-      };
-
       var stack = [view]; // context stack
+      var buffer = []; // output buffer
 
       try {
-        fn(view, partials, send, stack, findName, escapeHTML, sendSection, render);
+        fn(view, partials, stack, buffer, findName, escapeHTML, sendSection, render);
       } catch (e) {
         throw debug(e.error, template, e.line, options.file);
       }
@@ -526,18 +524,12 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
 
   /**
    * High-level function that renders the given `template` using the given
-   * `view`, `partials`, and `callback`. The `callback` is used to return the
-   * output piece by piece, as it is rendered. When finished, the callback will
-   * receive `null` as its argument, after which it will not be called any more.
-   * If no callback is given, the complete rendered template will be used as the
-   * return value for the function.
-   *
-   * Note: If no partials are needed, the third argument may be the callback.
-   * If you need to use any of the template options (see `compile` above), you
-   * must compile in a separate step, and then call that compiled function.
+   * `view` and `partials`. If you need to use any of the template options (see
+   * `compile` above), you must compile in a separate step, and then call that
+   * compiled function.
    */
-  function render(template, view, partials, callback) {
-    return compile(template)(view, partials, callback);
+  function render(template, view, partials) {
+    return compile(template)(view, partials);
   }
 
 })(Mustache);
diff --git a/spec/mustache_spec.rb b/spec/mustache_spec.rb
index 5f07294..3c27d80 100644
--- a/spec/mustache_spec.rb
+++ b/spec/mustache_spec.rb
@@ -99,30 +99,30 @@ describe "mustache" do
           run_js(@runner, js).chomp.should == expect
         end
 
-        it "should send the correct output" do
-          template, view, partial, expect = load_test(test)
-
-          js = <<-JS
-            try {
-              #{@boilerplate}
-              var template = #{template.to_json};
-              #{view}
-              var partials = {
-                "partial": #{(partial || '').to_json}
-              };
-              var buffer = [];
-              var send = function (chunk) {
-                buffer.push(chunk);
-              };
-              Mustache.render(template, #{test}, partials, send);
-              print(buffer.join(""));
-            } catch(e) {
-              print('ERROR: ' + e.message);
-            }
-          JS
-
-          run_js(@runner, js).chomp.should == expect
-        end
+        # it "should send the correct output" do
+        #   template, view, partial, expect = load_test(test)
+        #
+        #   js = <<-JS
+        #     try {
+        #       #{@boilerplate}
+        #       var template = #{template.to_json};
+        #       #{view}
+        #       var partials = {
+        #         "partial": #{(partial || '').to_json}
+        #       };
+        #       var buffer = [];
+        #       var send = function (chunk) {
+        #         buffer.push(chunk);
+        #       };
+        #       Mustache.render(template, #{test}, partials, send);
+        #       print(buffer.join(""));
+        #     } catch(e) {
+        #       print('ERROR: ' + e.message);
+        #     }
+        #   JS
+        #
+        #   run_js(@runner, js).chomp.should == expect
+        # end
       end
     end
   end

From 993aed08a24e41901b24b3370154513abf6300f3 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Wed, 18 Jan 2012 10:07:56 -0800
Subject: [PATCH 52/64] Change findName to lookup

---
 mustache.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/mustache.js b/mustache.js
index 03a55dc..cb5ccb2 100644
--- a/mustache.js
+++ b/mustache.js
@@ -124,7 +124,7 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
   /**
    * Looks up the value of the given `name` in the given context `stack`.
    */
-  function findName(name, stack, returnNull) {
+  function lookup(name, stack, defaultValue) {
     if (name === ".") {
       return stack[stack.length - 1];
     }
@@ -160,15 +160,15 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
       value = value.call(localStack[localStack.length - 1]);
     }
 
-    if (value == null && !returnNull)  {
-      return "";
+    if (value == null)  {
+      return defaultValue;
     }
 
     return value;
   }
 
-  function sendSection(stack, buffer, name, callback, inverted) {
-    var value =  findName(name, stack, true);
+  function renderSection(name, stack, buffer, callback, inverted) {
+    var value =  lookup(name, stack);
 
     if (inverted) {
       // From the spec: inverted sections may render text once based on the
@@ -307,9 +307,9 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
       );
 
       if (section.inverted) {
-        code.push("\nsendSection(stack,buffer,name,callback,true);");
+        code.push("\nrenderSection(name,stack,buffer,callback,true);");
       } else {
-        code.push("\nsendSection(stack,buffer,name,callback);");
+        code.push("\nrenderSection(name,stack,buffer,callback);");
       }
 
       code.push('\nbuffer.push("');
@@ -319,7 +319,7 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
       code.push(
         '");',
         updateLine,
-        '\nbuffer.push(findName("' + trim(source) + '",stack));',
+        '\nbuffer.push(lookup("' + trim(source) + '",stack,""));',
         '\nbuffer.push("'
       );
     };
@@ -328,7 +328,7 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
       code.push(
         '");',
         updateLine,
-        '\nbuffer.push(escapeHTML(findName("' + trim(source) + '",stack)));',
+        '\nbuffer.push(escapeHTML(lookup("' + trim(source) + '",stack,"")));',
         '\nbuffer.push("'
       );
     };
@@ -465,7 +465,7 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
    * Used by `compile` to generate a reusable function for the given `template`.
    */
   function _compile(template, options) {
-    var args = "view,partials,stack,buffer,findName,escapeHTML,sendSection,render";
+    var args = "view,partials,stack,buffer,lookup,escapeHTML,renderSection,render";
     var body = parse(template, options);
     var fn = new Function(args, body);
 
@@ -479,7 +479,7 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
       var buffer = []; // output buffer
 
       try {
-        fn(view, partials, stack, buffer, findName, escapeHTML, sendSection, render);
+        fn(view, partials, stack, buffer, lookup, escapeHTML, renderSection, render);
       } catch (e) {
         throw debug(e.error, template, e.line, options.file);
       }

From 58c91c8c7d193b2c6e3dc3ebc4eb136a9bf1ea9f Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Mon, 23 Jan 2012 15:29:35 -0800
Subject: [PATCH 53/64] Use String += instead of Array#join

---
 mustache.js | 69 +++++++++++++++++++++++++++--------------------------
 1 file changed, 35 insertions(+), 34 deletions(-)

diff --git a/mustache.js b/mustache.js
index cb5ccb2..90a66d3 100644
--- a/mustache.js
+++ b/mustache.js
@@ -167,7 +167,8 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
     return value;
   }
 
-  function renderSection(name, stack, buffer, callback, inverted) {
+  function renderSection(name, stack, callback, inverted) {
+    var buffer = "";
     var value =  lookup(name, stack);
 
     if (inverted) {
@@ -175,27 +176,29 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
       // inverse value of the key. That is, they will be rendered if the key
       // doesn't exist, is false, or is an empty list.
       if (value == null || value === false || (isArray(value) && value.length === 0)) {
-        buffer.push(callback());
+        buffer += callback();
       }
     } else if (isArray(value)) {
       forEach(value, function (value) {
         stack.push(value);
-        buffer.push(callback());
+        buffer += callback();
         stack.pop();
       });
     } else if (typeof value === "object") {
       stack.push(value);
-      buffer.push(callback());
+      buffer += callback();
       stack.pop();
     } else if (typeof value === "function") {
       var scope = stack[stack.length - 1];
       var scopedRender = function (template) {
         return render(template, scope);
       };
-      buffer.push(value.call(scope, callback(), scopedRender) || "");
+      buffer += value.call(scope, callback(), scopedRender) || "";
     } else if (value) {
-      buffer.push(callback());
+      buffer += callback();
     }
+
+    return buffer;
   }
 
   /**
@@ -220,9 +223,10 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
         closeTag = tags[tags.length - 1];
 
     var code = [
-      "var line = 1;", // keep track of source line number
+      'var buffer = "";', // output buffer
+      "\nvar line = 1;", // keep track of source line number
       "\ntry {",
-      '\nbuffer.push("'
+      '\nbuffer += "'
     ];
 
     var spaces = [],      // indices of whitespace in code on the current line
@@ -254,13 +258,13 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
 
     var includePartial = function (source) {
       code.push(
-        '");',
+        '";',
         updateLine,
         '\nvar partial = partials["' + trim(source) + '"];',
         '\nif (partial) {',
-        '\n  buffer.push(render(partial, stack[stack.length - 1], partials));',
+        '\n  buffer += render(partial,stack[stack.length - 1],partials);',
         '\n}',
-        '\nbuffer.push("'
+        '\nbuffer += "'
       );
     };
 
@@ -274,14 +278,13 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
       sectionStack.push({name: name, inverted: inverted});
 
       code.push(
-        '");',
+        '";',
         updateLine,
         '\nvar name = "' + name + '";',
         '\nvar callback = (function () {',
-        '\n  var buffer;',
         '\n  return function () {',
-        '\n    buffer = [];',
-        '\nbuffer.push("'
+        '\n    var buffer = "";',
+        '\nbuffer += "'
       );
     };
 
@@ -300,36 +303,36 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
       var section = sectionStack.pop();
 
       code.push(
-        '");',
-        '\n    return buffer.join("");',
+        '";',
+        '\n    return buffer;',
         '\n  };',
         '\n})();'
       );
 
       if (section.inverted) {
-        code.push("\nrenderSection(name,stack,buffer,callback,true);");
+        code.push("\nbuffer += renderSection(name,stack,callback,true);");
       } else {
-        code.push("\nrenderSection(name,stack,buffer,callback);");
+        code.push("\nbuffer += renderSection(name,stack,callback);");
       }
 
-      code.push('\nbuffer.push("');
+      code.push('\nbuffer += "');
     };
 
     var sendPlain = function (source) {
       code.push(
-        '");',
+        '";',
         updateLine,
-        '\nbuffer.push(lookup("' + trim(source) + '",stack,""));',
-        '\nbuffer.push("'
+        '\nbuffer += lookup("' + trim(source) + '",stack,"");',
+        '\nbuffer += "'
       );
     };
 
     var sendEscaped = function (source) {
       code.push(
-        '");',
+        '";',
         updateLine,
-        '\nbuffer.push(escapeHTML(lookup("' + trim(source) + '",stack,"")));',
-        '\nbuffer.push("'
+        '\nbuffer += escapeHTML(lookup("' + trim(source) + '",stack,""));',
+        '\nbuffer += "'
       );
     };
 
@@ -443,12 +446,13 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
     stripSpace();
 
     code.push(
-      '");',
+      '";',
+      "\nreturn buffer;",
       "\n} catch (e) { throw {error: e, line: line}; }"
     );
 
-    // Ignore buffer.push("") statements.
-    var body = code.join("").replace(/buffer\.push\(""\);\n/g, "");
+    // Ignore `buffer += "";` statements.
+    var body = code.join("").replace(/buffer \+= "";\n/g, "");
 
     if (options.debug) {
       if (typeof console != "undefined" && console.log) {
@@ -465,7 +469,7 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
    * Used by `compile` to generate a reusable function for the given `template`.
    */
   function _compile(template, options) {
-    var args = "view,partials,stack,buffer,lookup,escapeHTML,renderSection,render";
+    var args = "view,partials,stack,lookup,escapeHTML,renderSection,render";
     var body = parse(template, options);
     var fn = new Function(args, body);
 
@@ -476,15 +480,12 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
       partials = partials || {};
 
       var stack = [view]; // context stack
-      var buffer = []; // output buffer
 
       try {
-        fn(view, partials, stack, buffer, lookup, escapeHTML, renderSection, render);
+        return fn(view, partials, stack, lookup, escapeHTML, renderSection, render);
       } catch (e) {
         throw debug(e.error, template, e.line, options.file);
       }
-
-      return buffer.join("");
     };
   }
 

From 4adfb48205e00068051657695d8d4184c9a94da1 Mon Sep 17 00:00:00 2001
From: utvara <utvara@gmail.com>
Date: Sat, 11 Feb 2012 23:18:44 +0100
Subject: [PATCH 54/64] Fixed a bug when context is a string

---
 mustache.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mustache.js b/mustache.js
index 90a66d3..641cebd 100644
--- a/mustache.js
+++ b/mustache.js
@@ -149,7 +149,7 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
         localStack.push(context);
       }
 
-      if (context && target in context) {
+      if (context && typeof context === "object" && target in context) {
         value = context[target];
         break;
       }

From 51e15e25a8475d4d19de4b9c916b0f49082262bb Mon Sep 17 00:00:00 2001
From: Christopher Bennage <christopher@bennage.com>
Date: Thu, 23 Feb 2012 11:15:26 -0800
Subject: [PATCH 55/64] added nuget specification

---
 mustache.js.nuspec | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 mustache.js.nuspec

diff --git a/mustache.js.nuspec b/mustache.js.nuspec
new file mode 100644
index 0000000..ec69150
--- /dev/null
+++ b/mustache.js.nuspec
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    <id>mustache.js</id>
+    <version>0.5.0-dev</version>
+    <authors>mustache.js Authors</authors>
+    <licenseUrl>https://github.com/janl/mustache.js/blob/master/LICENSE</licenseUrl>
+    <projectUrl>http://mustache.github.com/</projectUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Logic-less templates in JavaScript.</description>
+    <releaseNotes></releaseNotes>
+    <tags>mustache template templates javascript</tags>
+  </metadata>
+</package>
\ No newline at end of file

From 6231d203f717d80413024eb3ec8915054cba9185 Mon Sep 17 00:00:00 2001
From: Jan Lehnardt <jan@apache.org>
Date: Thu, 23 Feb 2012 23:01:16 +0100
Subject: [PATCH 56/64] bump versions

---
 package.json                                 | 2 +-
 wrappers/qooxdoo/qooxdoo.mustache.js.tpl.pre | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 874404b..1845b86 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mustache",
-  "version": "0.4.0",
+  "version": "0.5.0-dev",
   "description": "Logic-less {{mustache}} templates with JavaScript",
   "author": "mustache.js Authors <http://github.com/janl/mustache.js>",
   "keywords": ["mustache", "template", "templates", "ejs"],
diff --git a/wrappers/qooxdoo/qooxdoo.mustache.js.tpl.pre b/wrappers/qooxdoo/qooxdoo.mustache.js.tpl.pre
index a70d0a4..d10c0d5 100644
--- a/wrappers/qooxdoo/qooxdoo.mustache.js.tpl.pre
+++ b/wrappers/qooxdoo/qooxdoo.mustache.js.tpl.pre
@@ -19,7 +19,7 @@
 
    This class contains code based on the following work:
 
-   * Mustache.js version 0.4.0-dev
+   * Mustache.js version 0.5.0-dev
 
      Code:
        https://github.com/janl/mustache.js

From 2de401dd8ab5858fd44bb3b3e77fc6108157e8fb Mon Sep 17 00:00:00 2001
From: Jan Lehnardt <jan@apache.org>
Date: Thu, 23 Feb 2012 23:57:25 +0100
Subject: [PATCH 57/64] see git log

---
 CHANGES.md | 52 ----------------------------------------------------
 1 file changed, 52 deletions(-)
 delete mode 100644 CHANGES.md

diff --git a/CHANGES.md b/CHANGES.md
deleted file mode 100644
index 0be6033..0000000
--- a/CHANGES.md
+++ /dev/null
@@ -1,52 +0,0 @@
-# mustache.js Changes
-
-## 0.5.0-dev (1/11/2012)
-
-  * Complete rewrite
-  * Removed support for pragmas
-
-## 0.3.1-dev-twitter-b (8/23/2011)
-
-  * Cached regexes for improved performance
-
-## 0.3.1-dev-twitter (12/3/2010)
-
-  * Fixed double-rendering bug
-  * Added Rhino test-runner alongside JavaScriptCore
-
-## 0.3.1 (??-??-????)
-
-## 0.3.0 (21-07-2010)
-
-  * Improved whitespace handling
-  * Make IMPLICIT ITERATORS a first class feature
-  * Fix Rhino compat
-  * CommonJS packaging is no longer a special case
-  * DRY Rakefile
-  * Allow whitespace around tag names
-  * Fix partial scope
-  * Fix Comments
-  * Added inverted sections
-  * Avoid double encoding of entities
-  * Use sections to dereference subcontexts
-  * Added higher order sections
-
-## 0.2.3 (28-03-2010)
-
-  * Better error message for missing partials
-  * Added more robust type detection
-  * Parse pragmas only once
-  * Throw exception when encountering an unknown pragma
-  * Ignore undefined partial contexts. Returns verbatim partials
-  * Added yui3 packaging
-
-## 0.2.2 (11-02-2010)
-
-  * ctemplate compat: Partials are indicated by >, not <
-  * Add support for {{%PRAGMA}} to enable features
-  * Made array of strings an option. Enable with `{{%JSTACHE-ENABLE-STRING-ARRAYS}}`
-  * mustache compat: Don't barf on unknown variables
-  * Add `rake dojo` target to create a dojo package
-  * Add streaming api
-  * Rename JSTACHE-ENABLE-STRING-ARRAYS to IMPLICIT-ITERATOR
-  * Add support for pragma options

From 13007fd9d609bf25adbb6f7af5a7b60c9f9c4f8c Mon Sep 17 00:00:00 2001
From: utvara <utvara@gmail.com>
Date: Fri, 24 Feb 2012 00:52:16 +0100
Subject: [PATCH 58/64] added test case for string as a context

---
 spec/_files/string_as_context.js       | 4 ++++
 spec/_files/string_as_context.mustache | 5 +++++
 spec/_files/string_as_context.txt      | 5 +++++
 3 files changed, 14 insertions(+)
 create mode 100644 spec/_files/string_as_context.js
 create mode 100644 spec/_files/string_as_context.mustache
 create mode 100644 spec/_files/string_as_context.txt

diff --git a/spec/_files/string_as_context.js b/spec/_files/string_as_context.js
new file mode 100644
index 0000000..784368b
--- /dev/null
+++ b/spec/_files/string_as_context.js
@@ -0,0 +1,4 @@
+var string_as_context = {
+    a_string: 'aa',
+    a_list: ['a','b','c']
+};
diff --git a/spec/_files/string_as_context.mustache b/spec/_files/string_as_context.mustache
new file mode 100644
index 0000000..c6aa11a
--- /dev/null
+++ b/spec/_files/string_as_context.mustache
@@ -0,0 +1,5 @@
+<ul>
+{{#a_list}}
+    <li><a href="#{{a_string}}/{{.}}">{{.}}</a></li>
+{{/a_list}}
+</ul>
\ No newline at end of file
diff --git a/spec/_files/string_as_context.txt b/spec/_files/string_as_context.txt
new file mode 100644
index 0000000..35e6306
--- /dev/null
+++ b/spec/_files/string_as_context.txt
@@ -0,0 +1,5 @@
+<ul>
+    <li><a href="#aa/a">a</a></li>
+    <li><a href="#aa/b">b</a></li>
+    <li><a href="#aa/c">c</a></li>
+</ul>
\ No newline at end of file

From f3e246f0f99c1c3c8b91bd4a7bcbb3aa994e1aad Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Thu, 23 Feb 2012 21:20:23 -0800
Subject: [PATCH 59/64] Fix MooTools build task

---
 README.md                                            |  2 ++
 Rakefile                                             | 12 ++++++++++--
 .../dojo/{mustache.js.tpl.post => mustache.js.post}  |  0
 .../dojo/{mustache.js.tpl.pre => mustache.js.pre}    |  0
 ...{jquery.mustache.js.tpl.post => mustache.js.post} |  0
 .../{jquery.mustache.js.tpl.pre => mustache.js.pre}  |  0
 .../mootools/mustache.js.post                        |  2 +-
 .../mootools/mustache.js.pre                         |  0
 ...qooxdoo.mustache.js.tpl.post => mustache.js.post} |  0
 .../{qooxdoo.mustache.js.tpl.pre => mustache.js.pre} |  0
 ...quirejs.mustache.js.tpl.post => mustache.js.post} |  0
 ...requirejs.mustache.js.tpl.pre => mustache.js.pre} |  0
 .../yui3/{mustache.js.tpl.post => mustache.js.post}  |  0
 .../yui3/{mustache.js.tpl.pre => mustache.js.pre}    |  0
 14 files changed, 13 insertions(+), 3 deletions(-)
 rename wrappers/dojo/{mustache.js.tpl.post => mustache.js.post} (100%)
 rename wrappers/dojo/{mustache.js.tpl.pre => mustache.js.pre} (100%)
 rename wrappers/jquery/{jquery.mustache.js.tpl.post => mustache.js.post} (100%)
 rename wrappers/jquery/{jquery.mustache.js.tpl.pre => mustache.js.pre} (100%)
 rename mustache-mootools/mustache.js.tpl.post => wrappers/mootools/mustache.js.post (57%)
 rename mustache-mootools/mustache.js.tpl.pre => wrappers/mootools/mustache.js.pre (100%)
 rename wrappers/qooxdoo/{qooxdoo.mustache.js.tpl.post => mustache.js.post} (100%)
 rename wrappers/qooxdoo/{qooxdoo.mustache.js.tpl.pre => mustache.js.pre} (100%)
 rename wrappers/requirejs/{requirejs.mustache.js.tpl.post => mustache.js.post} (100%)
 rename wrappers/requirejs/{requirejs.mustache.js.tpl.pre => mustache.js.pre} (100%)
 rename wrappers/yui3/{mustache.js.tpl.post => mustache.js.post} (100%)
 rename wrappers/yui3/{mustache.js.tpl.pre => mustache.js.pre} (100%)

diff --git a/README.md b/README.md
index 4de65b9..32f98f6 100644
--- a/README.md
+++ b/README.md
@@ -377,6 +377,7 @@ be built specifically for several different client libraries and platforms,
 including the following:
 
   - [jQuery](http://jquery.com/)
+  - [MooTools](http://mootools.net/)
   - [Dojo](http://www.dojotoolkit.org/)
   - [YUI](http://developer.yahoo.com/yui/)
   - [RequireJS](http://requirejs.org/)
@@ -386,6 +387,7 @@ These may be built using [Rake](http://rake.rubyforge.org/) and one of the
 following commands:
 
     $ rake jquery
+    $ rake mootools
     $ rake dojo
     $ rake yui
     $ rake requirejs
diff --git a/Rakefile b/Rakefile
index b2a83b9..744fa58 100644
--- a/Rakefile
+++ b/Rakefile
@@ -33,14 +33,22 @@ def templated_build(name, opts={})
 
     mkdir_p opts[:location] if opts[:location]
 
-    sh "cat #{source}/#{target_js}.tpl.pre mustache.js \
-      #{source}/#{target_js}.tpl.post > #{opts[:location] || '.'}/#{target_js}"
+    files = [
+      "#{source}/mustache.js.pre",
+      'mustache.js',
+      "#{source}/mustache.js.post"
+    ]
+
+    open("#{opts[:location] || '.'}/#{target_js}", 'w') do |f|
+      files.each {|file| f << File.read(file) }
+    end
 
     puts "Done, see #{opts[:location] || '.'}/#{target_js}"
   end
 end
 
 templated_build "jQuery"
+templated_build "MooTools"
 templated_build "Dojo", :location => "dojox/string"
 templated_build "YUI3", :location => "yui3/mustache"
 templated_build "RequireJS"
diff --git a/wrappers/dojo/mustache.js.tpl.post b/wrappers/dojo/mustache.js.post
similarity index 100%
rename from wrappers/dojo/mustache.js.tpl.post
rename to wrappers/dojo/mustache.js.post
diff --git a/wrappers/dojo/mustache.js.tpl.pre b/wrappers/dojo/mustache.js.pre
similarity index 100%
rename from wrappers/dojo/mustache.js.tpl.pre
rename to wrappers/dojo/mustache.js.pre
diff --git a/wrappers/jquery/jquery.mustache.js.tpl.post b/wrappers/jquery/mustache.js.post
similarity index 100%
rename from wrappers/jquery/jquery.mustache.js.tpl.post
rename to wrappers/jquery/mustache.js.post
diff --git a/wrappers/jquery/jquery.mustache.js.tpl.pre b/wrappers/jquery/mustache.js.pre
similarity index 100%
rename from wrappers/jquery/jquery.mustache.js.tpl.pre
rename to wrappers/jquery/mustache.js.pre
diff --git a/mustache-mootools/mustache.js.tpl.post b/wrappers/mootools/mustache.js.post
similarity index 57%
rename from mustache-mootools/mustache.js.tpl.post
rename to wrappers/mootools/mustache.js.post
index a1b1b43..aa9b8fa 100644
--- a/mustache-mootools/mustache.js.tpl.post
+++ b/wrappers/mootools/mustache.js.post
@@ -1,5 +1,5 @@
 
     Object.implement('mustache', function(view, partials){
-        return Mustache.to_html(view, this, partials);
+        return Mustache.render(view, this, partials);
     });
 })();
diff --git a/mustache-mootools/mustache.js.tpl.pre b/wrappers/mootools/mustache.js.pre
similarity index 100%
rename from mustache-mootools/mustache.js.tpl.pre
rename to wrappers/mootools/mustache.js.pre
diff --git a/wrappers/qooxdoo/qooxdoo.mustache.js.tpl.post b/wrappers/qooxdoo/mustache.js.post
similarity index 100%
rename from wrappers/qooxdoo/qooxdoo.mustache.js.tpl.post
rename to wrappers/qooxdoo/mustache.js.post
diff --git a/wrappers/qooxdoo/qooxdoo.mustache.js.tpl.pre b/wrappers/qooxdoo/mustache.js.pre
similarity index 100%
rename from wrappers/qooxdoo/qooxdoo.mustache.js.tpl.pre
rename to wrappers/qooxdoo/mustache.js.pre
diff --git a/wrappers/requirejs/requirejs.mustache.js.tpl.post b/wrappers/requirejs/mustache.js.post
similarity index 100%
rename from wrappers/requirejs/requirejs.mustache.js.tpl.post
rename to wrappers/requirejs/mustache.js.post
diff --git a/wrappers/requirejs/requirejs.mustache.js.tpl.pre b/wrappers/requirejs/mustache.js.pre
similarity index 100%
rename from wrappers/requirejs/requirejs.mustache.js.tpl.pre
rename to wrappers/requirejs/mustache.js.pre
diff --git a/wrappers/yui3/mustache.js.tpl.post b/wrappers/yui3/mustache.js.post
similarity index 100%
rename from wrappers/yui3/mustache.js.tpl.post
rename to wrappers/yui3/mustache.js.post
diff --git a/wrappers/yui3/mustache.js.tpl.pre b/wrappers/yui3/mustache.js.pre
similarity index 100%
rename from wrappers/yui3/mustache.js.tpl.pre
rename to wrappers/yui3/mustache.js.pre

From b487affecd448241f25aa0c4a40d3e8ec142f68c Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Thu, 23 Feb 2012 21:25:23 -0800
Subject: [PATCH 60/64] Remove dead code

---
 Rakefile | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/Rakefile b/Rakefile
index 744fa58..46afc38 100644
--- a/Rakefile
+++ b/Rakefile
@@ -12,13 +12,9 @@ task :spec do
   end
 end
 
-def version
-  File.read("mustache.js").match('version = "([^\"]+)";$')[1]
-end
-
-# Creates a rule that uses the .tmpl.{pre,post} stuff to make a final,
-# wrapped, output file. There is some extra complexity because Dojo and YUI3
-# use different template files and final locations.
+# Creates a task that uses the various template wrappers to make a wrapped
+# output file. There is some extra complexity because Dojo and YUI use
+# different final locations.
 def templated_build(name, opts={})
   short = name.downcase
   source = File.join("wrappers", short)

From 85fe317213fc6be3e69669847f16ad00e51b164c Mon Sep 17 00:00:00 2001
From: John Lindal <lindalj@listalthough-lm.burbank.corp.yahoo.com>
Date: Thu, 23 Feb 2012 14:43:55 -0800
Subject: [PATCH 61/64] update backslash unit tests

---
 spec/_files/backslashes.mustache | 4 ++++
 spec/_files/backslashes.txt      | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/spec/_files/backslashes.mustache b/spec/_files/backslashes.mustache
index 72f3c64..0db8d6f 100644
--- a/spec/_files/backslashes.mustache
+++ b/spec/_files/backslashes.mustache
@@ -1,3 +1,7 @@
 * {{value}}
 * {{{value}}}
 * {{&value}}
+<script>
+foo = { bar: 'abc\"xyz\"' };
+foo = { bar: 'x\'y' };
+</script>
\ No newline at end of file
diff --git a/spec/_files/backslashes.txt b/spec/_files/backslashes.txt
index ea62e57..038dd37 100644
--- a/spec/_files/backslashes.txt
+++ b/spec/_files/backslashes.txt
@@ -1,3 +1,7 @@
 * \abc
 * \abc
 * \abc
+<script>
+foo = { bar: 'abc\"xyz\"' };
+foo = { bar: 'x\'y' };
+</script>

From f311f880aef0fcc7dcfe143d09b7fa2474e12400 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Thu, 23 Feb 2012 21:29:33 -0800
Subject: [PATCH 62/64] Watch the whitespace. ;)

---
 spec/_files/backslashes.mustache | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/_files/backslashes.mustache b/spec/_files/backslashes.mustache
index 0db8d6f..fe7745b 100644
--- a/spec/_files/backslashes.mustache
+++ b/spec/_files/backslashes.mustache
@@ -4,4 +4,4 @@
 <script>
 foo = { bar: 'abc\"xyz\"' };
 foo = { bar: 'x\'y' };
-</script>
\ No newline at end of file
+</script>

From 2f135e2e15dcc3c61385212261faaf00597bae10 Mon Sep 17 00:00:00 2001
From: Jan Lehnardt <jan@apache.org>
Date: Fri, 24 Feb 2012 09:58:31 +0100
Subject: [PATCH 63/64] add minify task

---
 Rakefile | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Rakefile b/Rakefile
index 46afc38..61700ee 100644
--- a/Rakefile
+++ b/Rakefile
@@ -49,3 +49,11 @@ templated_build "Dojo", :location => "dojox/string"
 templated_build "YUI3", :location => "yui3/mustache"
 templated_build "RequireJS"
 templated_build "qooxdoo"
+
+task :minify do
+  # npm install uglify-js
+  mmjs = "mustache.min.js"
+  `echo "/*! Version: 0.5.1-dev */" > #{mmjs}`
+  `uglifyjs mustache.js >> #{mmjs}`
+  puts "Created #{mmjs}"
+end

From 01227221014a402044988449ef06ef53fde68ef0 Mon Sep 17 00:00:00 2001
From: Abel Martin <abel.martin@gmail.com>
Date: Tue, 29 May 2012 10:59:52 -0300
Subject: [PATCH 64/64] Changed 'nothin' => 'person' to make the documentation
 match the output.

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 32f98f6..a04f667 100644
--- a/README.md
+++ b/README.md
@@ -137,9 +137,9 @@ or is an empty list, the block will not be rendered.
 Template:
 
     Shown.
-    {{#nothin}}
+    {{#person}}
     Never shown!
-    {{/nothin}}
+    {{/person}}
 
 View: