From e2d919a21492acbd97c4c8f430cef7193a5919b6 Mon Sep 17 00:00:00 2001
From: Chad Weider <cweider@oofn.net>
Date: Tue, 10 Apr 2012 16:00:25 -0700
Subject: [PATCH 01/65] Strict HTML escape.

This replaces the soft escaping ('&amp;' -> '&amp;') with strict escaping ('&amp;' -> '&amp;amp;'). This new behavior matches that of Ruby and other Mustache implementations.

Other points:
- `dot_notation` currency is changed to use an ASCII character, since the JS interpreters did not appreciate unicode.
- Forward slash is added to escape list c/o OWASP recommendations.
---
 mustache.js                  | 5 +++--
 spec/_files/dot_notation.js  | 4 ++--
 spec/_files/dot_notation.txt | 4 ++--
 spec/_files/escaped.js       | 2 +-
 spec/_files/escaped.txt      | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/mustache.js b/mustache.js
index 641cebd..33694d0 100644
--- a/mustache.js
+++ b/mustache.js
@@ -86,11 +86,12 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
     "<": "&lt;",
     ">": "&gt;",
     '"': '&quot;',
-    "'": '&#39;'
+    "'": '&#39;',
+    "/": '&#x2F;'
   };
 
   function escapeHTML(string) {
-    return String(string).replace(/&(?!\w+;)|[<>"']/g, function (s) {
+    return String(string).replace(/[&<>"'\/]/g, function (s) {
       return escapeMap[s] || s;
     });
   }
diff --git a/spec/_files/dot_notation.js b/spec/_files/dot_notation.js
index c1295f5..17eb00e 100644
--- a/spec/_files/dot_notation.js
+++ b/spec/_files/dot_notation.js
@@ -7,8 +7,8 @@ var dot_notation = {
       return this.value * 0.2;
     },
     currency: {
-      symbol: '&euro;',
-      name: 'Euro'
+      symbol: '$',
+      name: 'USD'
     }
   },
   availability:{
diff --git a/spec/_files/dot_notation.txt b/spec/_files/dot_notation.txt
index d0e4707..08afa05 100644
--- a/spec/_files/dot_notation.txt
+++ b/spec/_files/dot_notation.txt
@@ -1,8 +1,8 @@
 <!-- exciting part -->
 <h1>A Book</h1>
 <p>Authors: <ul><li>John Power</li><li>Jamie Walsh</li></ul></p>
-<p>Price: &euro;200 Euro <b>In Stock</b></p>
-<p>VAT: &euro;40</p>
+<p>Price: $200 USD <b>In Stock</b></p>
+<p>VAT: $40</p>
 <!-- boring part -->
 <h2>Test truthy false values:</h2>
 <p>Zero: 0</p>
diff --git a/spec/_files/escaped.js b/spec/_files/escaped.js
index 7a8baef..903e559 100644
--- a/spec/_files/escaped.js
+++ b/spec/_files/escaped.js
@@ -2,5 +2,5 @@ var escaped = {
   title: function() {
     return "Bear > Shark";
   },
-  entities: "&quot;"
+  entities: "&quot; \"'<>/"
 };
diff --git a/spec/_files/escaped.txt b/spec/_files/escaped.txt
index 73ac5ce..be2f2e9 100644
--- a/spec/_files/escaped.txt
+++ b/spec/_files/escaped.txt
@@ -1,2 +1,2 @@
 <h1>Bear &gt; Shark</h1>
-But not &quot;.
+But not &amp;quot; &quot;&#39;&lt;&gt;&#x2F;.

From 2fe464e2a3246c92c629aaf4309e7924e574f42f Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Sat, 17 Mar 2012 00:04:46 -0600
Subject: [PATCH 02/65] Ignore node_modules

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index bd08399..9000776 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 .DS_Store
 .rvmrc
+node_modules
 runner.js
 jquery.mustache.js
 qooxdoo.mustache.js

From 70a4f2b986cbef18fdfcb5c5a4405726abd3af9b Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Sat, 17 Mar 2012 00:05:00 -0600
Subject: [PATCH 03/65] Run unit tests using vows (requires node)

---
 Rakefile     | 5 +++++
 package.json | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index 61700ee..37cb9b3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -12,6 +12,11 @@ task :spec do
   end
 end
 
+desc "Run all unit tests"
+task :test do
+  exec "vows test/*_test.js"
+end
+
 # 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.
diff --git a/package.json b/package.json
index 1845b86..5f348de 100644
--- a/package.json
+++ b/package.json
@@ -4,5 +4,8 @@
   "description": "Logic-less {{mustache}} templates with JavaScript",
   "author": "mustache.js Authors <http://github.com/janl/mustache.js>",
   "keywords": ["mustache", "template", "templates", "ejs"],
-  "main": "./mustache"
+  "main": "./mustache",
+  "devDependencies": {
+    "vows": "0.6.x"
+  }
 }

From fbc66a81400418983c2d7ccf0457aeea7af0fb1a Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Sat, 17 Mar 2012 00:06:19 -0600
Subject: [PATCH 04/65] Another rewrite

- Cleaner separation of responsibilities in the code between
  scanning, parsing, compiling, and rendering functions.
- Much faster
---
 Rakefile                                      |  20 +-
 mustache.js                                   | 844 +++++++++---------
 spec/_files/ampersand_escape.js               |   3 -
 spec/_files/apostrophe.js                     |   1 -
 spec/_files/array_of_strings.js               |   1 -
 spec/_files/backslashes.js                    |   3 -
 spec/_files/bug_11_eating_whitespace.js       |   3 -
 spec/_files/changing_delimiters.js            |   4 -
 spec/_files/comments.js                       |   5 -
 spec/_files/disappearing_whitespace.js        |   4 -
 spec/_files/empty_list.js                     |   3 -
 spec/_files/empty_sections.js                 |   1 -
 spec/_files/empty_template.js                 |   1 -
 spec/_files/error_not_found.js                |   1 -
 spec/_files/higher_order_sections.js          |   9 -
 spec/_files/inverted_section.js               |   3 -
 spec/_files/multiline_comment.js              |   1 -
 spec/_files/partial_array_of_partials.js      |   3 -
 .../partial_array_of_partials_implicit.js     |   3 -
 spec/_files/partial_empty.js                  |   3 -
 spec/_files/partial_template.js               |   6 -
 spec/_files/string_as_context.js              |   4 -
 spec/_files/two_sections.js                   |   1 -
 spec/_files/unescaped.js                      |   5 -
 spec/mustache_spec.rb                         | 218 -----
 test/_files/ampersand_escape.js               |   3 +
 .../_files/ampersand_escape.mustache          |   0
 {spec => test}/_files/ampersand_escape.txt    |   0
 test/_files/apostrophe.js                     |   4 +
 {spec => test}/_files/apostrophe.mustache     |   0
 {spec => test}/_files/apostrophe.txt          |   0
 test/_files/array_of_strings.js               |   3 +
 .../_files/array_of_strings.mustache          |   0
 {spec => test}/_files/array_of_strings.txt    |   0
 test/_files/backslashes.js                    |   3 +
 {spec => test}/_files/backslashes.mustache    |   0
 {spec => test}/_files/backslashes.txt         |   0
 test/_files/bug_11_eating_whitespace.js       |   3 +
 .../_files/bug_11_eating_whitespace.mustache  |   0
 .../_files/bug_11_eating_whitespace.txt       |   0
 test/_files/changing_delimiters.js            |   4 +
 .../_files/changing_delimiters.mustache       |   0
 {spec => test}/_files/changing_delimiters.txt |   0
 test/_files/comments.js                       |   5 +
 {spec => test}/_files/comments.mustache       |   0
 {spec => test}/_files/comments.txt            |   0
 {spec => test}/_files/complex.js              |  12 +-
 {spec => test}/_files/complex.mustache        |   0
 {spec => test}/_files/complex.txt             |   0
 {spec => test}/_files/context_lookup.js       |   4 +-
 {spec => test}/_files/context_lookup.mustache |   0
 {spec => test}/_files/context_lookup.txt      |   0
 {spec => test}/_files/delimiters.js           |   4 +-
 {spec => test}/_files/delimiters.mustache     |   0
 {spec => test}/_files/delimiters.txt          |   0
 test/_files/disappearing_whitespace.js        |   4 +
 .../_files/disappearing_whitespace.mustache   |   0
 .../_files/disappearing_whitespace.txt        |   0
 {spec => test}/_files/dot_notation.js         |  10 +-
 {spec => test}/_files/dot_notation.mustache   |   2 +-
 {spec => test}/_files/dot_notation.txt        |   0
 {spec => test}/_files/double_render.js        |   4 +-
 {spec => test}/_files/double_render.mustache  |   0
 {spec => test}/_files/double_render.txt       |   0
 test/_files/empty_list.js                     |   3 +
 {spec => test}/_files/empty_list.mustache     |   0
 {spec => test}/_files/empty_list.txt          |   0
 test/_files/empty_sections.js                 |   1 +
 {spec => test}/_files/empty_sections.mustache |   0
 {spec => test}/_files/empty_sections.txt      |   0
 {spec => test}/_files/empty_string.js         |   4 +-
 {spec => test}/_files/empty_string.mustache   |   0
 {spec => test}/_files/empty_string.txt        |   0
 test/_files/empty_template.js                 |   1 +
 {spec => test}/_files/empty_template.mustache |   0
 {spec => test}/_files/empty_template.txt      |   0
 test/_files/error_not_found.js                |   3 +
 .../_files/error_not_found.mustache           |   0
 {spec => test}/_files/error_not_found.txt     |   0
 {spec => test}/_files/escaped.js              |   6 +-
 {spec => test}/_files/escaped.mustache        |   0
 {spec => test}/_files/escaped.txt             |   0
 test/_files/higher_order_sections.js          |   9 +
 .../_files/higher_order_sections.mustache     |   0
 .../_files/higher_order_sections.txt          |   0
 {spec => test}/_files/included_tag.js         |   4 +-
 {spec => test}/_files/included_tag.mustache   |   0
 {spec => test}/_files/included_tag.txt        |   0
 test/_files/inverted_section.js               |   3 +
 .../_files/inverted_section.mustache          |   0
 {spec => test}/_files/inverted_section.txt    |   0
 .../_files/keys_with_questionmarks.js         |   4 +-
 .../_files/keys_with_questionmarks.mustache   |   0
 .../_files/keys_with_questionmarks.txt        |   0
 test/_files/multiline_comment.js              |   1 +
 .../_files/multiline_comment.mustache         |   0
 {spec => test}/_files/multiline_comment.txt   |   0
 {spec => test}/_files/nested_iterating.js     |   4 +-
 .../_files/nested_iterating.mustache          |   0
 {spec => test}/_files/nested_iterating.txt    |   0
 {spec => test}/_files/nesting.js              |   4 +-
 {spec => test}/_files/nesting.mustache        |   0
 {spec => test}/_files/nesting.txt             |   0
 {spec => test}/_files/nesting_same_name.js    |   4 +-
 .../_files/nesting_same_name.mustache         |   0
 {spec => test}/_files/nesting_same_name.txt   |   0
 {spec => test}/_files/null_string.js          |   4 +-
 {spec => test}/_files/null_string.mustache    |   0
 {spec => test}/_files/null_string.txt         |   0
 {spec => test}/_files/partial_array.js        |   4 +-
 {spec => test}/_files/partial_array.mustache  |   0
 {spec => test}/_files/partial_array.partial   |   0
 {spec => test}/_files/partial_array.txt       |   0
 test/_files/partial_array_of_partials.js      |   8 +
 .../_files/partial_array_of_partials.mustache |   0
 .../_files/partial_array_of_partials.partial  |   0
 .../_files/partial_array_of_partials.txt      |   0
 .../partial_array_of_partials_implicit.js     |   3 +
 ...artial_array_of_partials_implicit.mustache |   0
 ...partial_array_of_partials_implicit.partial |   0
 .../partial_array_of_partials_implicit.txt    |   0
 test/_files/partial_empty.js                  |   3 +
 {spec => test}/_files/partial_empty.mustache  |   0
 {spec => test}/_files/partial_empty.partial   |   0
 {spec => test}/_files/partial_empty.txt       |   0
 {spec => test}/_files/partial_recursion.js    |   4 +-
 .../_files/partial_recursion.mustache         |   0
 .../_files/partial_recursion.partial          |   2 +-
 {spec => test}/_files/partial_recursion.txt   |   0
 test/_files/partial_template.js               |   6 +
 .../_files/partial_template.mustache          |   0
 .../_files/partial_template.partial           |   0
 {spec => test}/_files/partial_template.txt    |   0
 {spec => test}/_files/partial_view.js         |  12 +-
 {spec => test}/_files/partial_view.mustache   |   0
 {spec => test}/_files/partial_view.partial    |   2 +-
 {spec => test}/_files/partial_view.txt        |   0
 {spec => test}/_files/partial_whitespace.js   |  13 +-
 .../_files/partial_whitespace.mustache        |   0
 .../_files/partial_whitespace.partial         |   2 +-
 {spec => test}/_files/partial_whitespace.txt  |   0
 .../_files/recursion_with_same_names.js       |   6 +-
 .../_files/recursion_with_same_names.mustache |   0
 .../_files/recursion_with_same_names.txt      |   0
 {spec => test}/_files/reuse_of_enumerables.js |   4 +-
 .../_files/reuse_of_enumerables.mustache      |   0
 .../_files/reuse_of_enumerables.txt           |   0
 {spec => test}/_files/section_as_context.js   |   9 +-
 .../_files/section_as_context.mustache        |   0
 {spec => test}/_files/section_as_context.txt  |   0
 {spec => test}/_files/simple.js               |   6 +-
 {spec => test}/_files/simple.mustache         |   0
 {spec => test}/_files/simple.txt              |   0
 test/_files/string_as_context.js              |   4 +
 .../_files/string_as_context.mustache         |   0
 {spec => test}/_files/string_as_context.txt   |   0
 {spec => test}/_files/two_in_a_row.js         |   4 +-
 {spec => test}/_files/two_in_a_row.mustache   |   0
 {spec => test}/_files/two_in_a_row.txt        |   0
 test/_files/two_sections.js                   |   1 +
 {spec => test}/_files/two_sections.mustache   |   0
 {spec => test}/_files/two_sections.txt        |   0
 test/_files/unescaped.js                      |   5 +
 {spec => test}/_files/unescaped.mustache      |   0
 {spec => test}/_files/unescaped.txt           |   0
 {spec => test}/_files/whitespace.js           |   4 +-
 {spec => test}/_files/whitespace.mustache     |   0
 {spec => test}/_files/whitespace.txt          |   0
 test/context_test.js                          |  47 +
 test/helper.rb                                |  48 +
 test/integration.rb                           |  76 ++
 test/parse_test.js                            |  67 ++
 test/render_test.js                           |  63 ++
 test/scanner_test.js                          | 117 +++
 test/unit.rb                                  |   7 +
 175 files changed, 1028 insertions(+), 769 deletions(-)
 delete mode 100644 spec/_files/ampersand_escape.js
 delete mode 100644 spec/_files/apostrophe.js
 delete mode 100644 spec/_files/array_of_strings.js
 delete mode 100644 spec/_files/backslashes.js
 delete mode 100644 spec/_files/bug_11_eating_whitespace.js
 delete mode 100644 spec/_files/changing_delimiters.js
 delete mode 100644 spec/_files/comments.js
 delete mode 100644 spec/_files/disappearing_whitespace.js
 delete mode 100644 spec/_files/empty_list.js
 delete mode 100644 spec/_files/empty_sections.js
 delete mode 100644 spec/_files/empty_template.js
 delete mode 100644 spec/_files/error_not_found.js
 delete mode 100644 spec/_files/higher_order_sections.js
 delete mode 100644 spec/_files/inverted_section.js
 delete mode 100644 spec/_files/multiline_comment.js
 delete mode 100644 spec/_files/partial_array_of_partials.js
 delete mode 100644 spec/_files/partial_array_of_partials_implicit.js
 delete mode 100644 spec/_files/partial_empty.js
 delete mode 100644 spec/_files/partial_template.js
 delete mode 100644 spec/_files/string_as_context.js
 delete mode 100644 spec/_files/two_sections.js
 delete mode 100644 spec/_files/unescaped.js
 delete mode 100644 spec/mustache_spec.rb
 create mode 100644 test/_files/ampersand_escape.js
 rename {spec => test}/_files/ampersand_escape.mustache (100%)
 rename {spec => test}/_files/ampersand_escape.txt (100%)
 create mode 100644 test/_files/apostrophe.js
 rename {spec => test}/_files/apostrophe.mustache (100%)
 rename {spec => test}/_files/apostrophe.txt (100%)
 create mode 100644 test/_files/array_of_strings.js
 rename {spec => test}/_files/array_of_strings.mustache (100%)
 rename {spec => test}/_files/array_of_strings.txt (100%)
 create mode 100644 test/_files/backslashes.js
 rename {spec => test}/_files/backslashes.mustache (100%)
 rename {spec => test}/_files/backslashes.txt (100%)
 create mode 100644 test/_files/bug_11_eating_whitespace.js
 rename {spec => test}/_files/bug_11_eating_whitespace.mustache (100%)
 rename {spec => test}/_files/bug_11_eating_whitespace.txt (100%)
 create mode 100644 test/_files/changing_delimiters.js
 rename {spec => test}/_files/changing_delimiters.mustache (100%)
 rename {spec => test}/_files/changing_delimiters.txt (100%)
 create mode 100644 test/_files/comments.js
 rename {spec => test}/_files/comments.mustache (100%)
 rename {spec => test}/_files/comments.txt (100%)
 rename {spec => test}/_files/complex.js (74%)
 rename {spec => test}/_files/complex.mustache (100%)
 rename {spec => test}/_files/complex.txt (100%)
 rename {spec => test}/_files/context_lookup.js (73%)
 rename {spec => test}/_files/context_lookup.mustache (100%)
 rename {spec => test}/_files/context_lookup.txt (100%)
 rename {spec => test}/_files/delimiters.js (89%)
 rename {spec => test}/_files/delimiters.mustache (100%)
 rename {spec => test}/_files/delimiters.txt (100%)
 create mode 100644 test/_files/disappearing_whitespace.js
 rename {spec => test}/_files/disappearing_whitespace.mustache (100%)
 rename {spec => test}/_files/disappearing_whitespace.txt (100%)
 rename {spec => test}/_files/dot_notation.js (81%)
 rename {spec => test}/_files/dot_notation.mustache (84%)
 rename {spec => test}/_files/dot_notation.txt (100%)
 rename {spec => test}/_files/double_render.js (65%)
 rename {spec => test}/_files/double_render.mustache (100%)
 rename {spec => test}/_files/double_render.txt (100%)
 create mode 100644 test/_files/empty_list.js
 rename {spec => test}/_files/empty_list.mustache (100%)
 rename {spec => test}/_files/empty_list.txt (100%)
 create mode 100644 test/_files/empty_sections.js
 rename {spec => test}/_files/empty_sections.mustache (100%)
 rename {spec => test}/_files/empty_sections.txt (100%)
 rename {spec => test}/_files/empty_string.js (73%)
 rename {spec => test}/_files/empty_string.mustache (100%)
 rename {spec => test}/_files/empty_string.txt (100%)
 create mode 100644 test/_files/empty_template.js
 rename {spec => test}/_files/empty_template.mustache (100%)
 rename {spec => test}/_files/empty_template.txt (100%)
 create mode 100644 test/_files/error_not_found.js
 rename {spec => test}/_files/error_not_found.mustache (100%)
 rename {spec => test}/_files/error_not_found.txt (100%)
 rename {spec => test}/_files/escaped.js (56%)
 rename {spec => test}/_files/escaped.mustache (100%)
 rename {spec => test}/_files/escaped.txt (100%)
 create mode 100644 test/_files/higher_order_sections.js
 rename {spec => test}/_files/higher_order_sections.mustache (100%)
 rename {spec => test}/_files/higher_order_sections.txt (100%)
 rename {spec => test}/_files/included_tag.js (55%)
 rename {spec => test}/_files/included_tag.mustache (100%)
 rename {spec => test}/_files/included_tag.txt (100%)
 create mode 100644 test/_files/inverted_section.js
 rename {spec => test}/_files/inverted_section.mustache (100%)
 rename {spec => test}/_files/inverted_section.txt (100%)
 rename {spec => test}/_files/keys_with_questionmarks.js (50%)
 rename {spec => test}/_files/keys_with_questionmarks.mustache (100%)
 rename {spec => test}/_files/keys_with_questionmarks.txt (100%)
 create mode 100644 test/_files/multiline_comment.js
 rename {spec => test}/_files/multiline_comment.mustache (100%)
 rename {spec => test}/_files/multiline_comment.txt (100%)
 rename {spec => test}/_files/nested_iterating.js (71%)
 rename {spec => test}/_files/nested_iterating.mustache (100%)
 rename {spec => test}/_files/nested_iterating.txt (100%)
 rename {spec => test}/_files/nesting.js (76%)
 rename {spec => test}/_files/nesting.mustache (100%)
 rename {spec => test}/_files/nesting.txt (100%)
 rename {spec => test}/_files/nesting_same_name.js (71%)
 rename {spec => test}/_files/nesting_same_name.mustache (100%)
 rename {spec => test}/_files/nesting_same_name.txt (100%)
 rename {spec => test}/_files/null_string.js (84%)
 rename {spec => test}/_files/null_string.mustache (100%)
 rename {spec => test}/_files/null_string.txt (100%)
 rename {spec => test}/_files/partial_array.js (55%)
 rename {spec => test}/_files/partial_array.mustache (100%)
 rename {spec => test}/_files/partial_array.partial (100%)
 rename {spec => test}/_files/partial_array.txt (100%)
 create mode 100644 test/_files/partial_array_of_partials.js
 rename {spec => test}/_files/partial_array_of_partials.mustache (100%)
 rename {spec => test}/_files/partial_array_of_partials.partial (100%)
 rename {spec => test}/_files/partial_array_of_partials.txt (100%)
 create mode 100644 test/_files/partial_array_of_partials_implicit.js
 rename {spec => test}/_files/partial_array_of_partials_implicit.mustache (100%)
 rename {spec => test}/_files/partial_array_of_partials_implicit.partial (100%)
 rename {spec => test}/_files/partial_array_of_partials_implicit.txt (100%)
 create mode 100644 test/_files/partial_empty.js
 rename {spec => test}/_files/partial_empty.mustache (100%)
 rename {spec => test}/_files/partial_empty.partial (100%)
 rename {spec => test}/_files/partial_empty.txt (100%)
 rename {spec => test}/_files/partial_recursion.js (78%)
 rename {spec => test}/_files/partial_recursion.mustache (100%)
 rename {spec => test}/_files/partial_recursion.partial (72%)
 rename {spec => test}/_files/partial_recursion.txt (100%)
 create mode 100644 test/_files/partial_template.js
 rename {spec => test}/_files/partial_template.mustache (100%)
 rename {spec => test}/_files/partial_template.partial (100%)
 rename {spec => test}/_files/partial_template.txt (100%)
 rename {spec => test}/_files/partial_view.js (60%)
 rename {spec => test}/_files/partial_view.mustache (100%)
 rename {spec => test}/_files/partial_view.partial (89%)
 rename {spec => test}/_files/partial_view.txt (100%)
 rename {spec => test}/_files/partial_whitespace.js (59%)
 rename {spec => test}/_files/partial_whitespace.mustache (100%)
 rename {spec => test}/_files/partial_whitespace.partial (87%)
 rename {spec => test}/_files/partial_whitespace.txt (100%)
 rename {spec => test}/_files/recursion_with_same_names.js (56%)
 rename {spec => test}/_files/recursion_with_same_names.mustache (100%)
 rename {spec => test}/_files/recursion_with_same_names.txt (100%)
 rename {spec => test}/_files/reuse_of_enumerables.js (69%)
 rename {spec => test}/_files/reuse_of_enumerables.mustache (100%)
 rename {spec => test}/_files/reuse_of_enumerables.txt (100%)
 rename {spec => test}/_files/section_as_context.js (53%)
 rename {spec => test}/_files/section_as_context.mustache (100%)
 rename {spec => test}/_files/section_as_context.txt (100%)
 rename {spec => test}/_files/simple.js (67%)
 rename {spec => test}/_files/simple.mustache (100%)
 rename {spec => test}/_files/simple.txt (100%)
 create mode 100644 test/_files/string_as_context.js
 rename {spec => test}/_files/string_as_context.mustache (100%)
 rename {spec => test}/_files/string_as_context.txt (100%)
 rename {spec => test}/_files/two_in_a_row.js (60%)
 rename {spec => test}/_files/two_in_a_row.mustache (100%)
 rename {spec => test}/_files/two_in_a_row.txt (100%)
 create mode 100644 test/_files/two_sections.js
 rename {spec => test}/_files/two_sections.mustache (100%)
 rename {spec => test}/_files/two_sections.txt (100%)
 create mode 100644 test/_files/unescaped.js
 rename {spec => test}/_files/unescaped.mustache (100%)
 rename {spec => test}/_files/unescaped.txt (100%)
 rename {spec => test}/_files/whitespace.js (60%)
 rename {spec => test}/_files/whitespace.mustache (100%)
 rename {spec => test}/_files/whitespace.txt (100%)
 create mode 100644 test/context_test.js
 create mode 100644 test/helper.rb
 create mode 100644 test/integration.rb
 create mode 100644 test/parse_test.js
 create mode 100644 test/render_test.js
 create mode 100644 test/scanner_test.js
 create mode 100644 test/unit.rb

diff --git a/Rakefile b/Rakefile
index 37cb9b3..7240f8b 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,20 +1,18 @@
 require 'rake'
 require 'rake/clean'
 
-task :default => :spec
+task :default => 'test:integration'
 
-desc "Run all specs"
-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 = 'spec/*_spec.rb'
+namespace :test do
+  desc "Run all integration tests"
+  task :integration do
+    require File.expand_path('../test/integration', __FILE__)
   end
-end
 
-desc "Run all unit tests"
-task :test do
-  exec "vows test/*_test.js"
+  desc "Run all unit tests"
+  task :unit do
+    require File.expand_path('../test/unit', __FILE__)
+  end
 end
 
 # Creates a task that uses the various template wrappers to make a wrapped
diff --git a/mustache.js b/mustache.js
index 641cebd..7b34bbb 100644
--- a/mustache.js
+++ b/mustache.js
@@ -9,12 +9,18 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
   exports.name = "mustache.js";
   exports.version = "0.5.0-dev";
   exports.tags = ["{{", "}}"];
+
   exports.parse = parse;
+  exports.clearCache = clearCache;
   exports.compile = compile;
+  exports.compilePartial = compilePartial;
   exports.render = render;
-  exports.clearCache = clearCache;
 
-  // This is here for backwards compatibility with 0.4.x.
+  exports.Scanner = Scanner;
+  exports.Context = Context;
+  exports.Renderer = Renderer;
+
+  // // This is here for backwards compatibility with 0.4.x.
   exports.to_html = function (template, view, partials, send) {
     var result = render(template, view, partials);
 
@@ -25,63 +31,30 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
     }
   };
 
-  var _toString = Object.prototype.toString;
-  var _isArray = Array.isArray;
-  var _forEach = Array.prototype.forEach;
-  var _trim = String.prototype.trim;
-
-  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 spaceRe = /^\s*$/;
+  var whiteRe = /\s*/;
+  var spaceRe = /\s+/;
+  var nonSpaceRe = /\S/;
+  var eqRe = /\s*=/;
+  var curlyRe = /\s*\}/;
+  var tagRe = /#|\^|\/|>|\{|&|=|!/;
 
   function isWhitespace(string) {
-    return spaceRe.test(string);
+    return !nonSpaceRe.test(string);
   }
 
-  var trim;
-  if (_trim) {
-    trim = function (string) {
-      return string == null ? "" : _trim.call(string);
-    };
-  } else {
-    var trimLeft, trimRight;
+  var isArray = Array.isArray || function (obj) {
+    return Object.prototype.toString.call(obj) === "[object Array]";
+  };
 
-    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]+$/;
-    }
+  var quote = (typeof JSON !== "undefined" && JSON.stringify) || function (string) {
+    return '"' + String(string).replace(/(^|[^\\])"/g, '\\"') + '"';
+  };
 
-    trim = function (string) {
-      return string == null ? "" :
-        String(string).replace(trimLeft, "").replace(trimRight, "");
-    };
+  function escapeRe(string) {
+    return string.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
   }
 
-  var escapeMap = {
+  var entityMap = {
     "&": "&amp;",
     "<": "&lt;",
     ">": "&gt;",
@@ -89,448 +62,519 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
     "'": '&#39;'
   };
 
-  function escapeHTML(string) {
+  function escapeHtml(string) {
     return String(string).replace(/&(?!\w+;)|[<>"']/g, function (s) {
-      return escapeMap[s] || s;
+      return entityMap[s];
     });
   }
 
+  // Export these utility functions.
+  exports.isWhitespace = isWhitespace;
+  exports.isArray = isArray;
+  exports.quote = quote;
+  exports.escapeRe = escapeRe;
+  exports.escapeHtml = escapeHtml;
+
+  function Scanner(string) {
+    this.string = string;
+    this.tail = string;
+    this.pos = 0;
+  }
+
   /**
-   * Adds the `template`, `line`, and `file` properties to the given error
-   * object and alters the message to provide more useful debugging information.
+   * Returns `true` if the tail is empty (end of string).
    */
-  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];
-    }
+  Scanner.prototype.eos = function () {
+    return this.tail === "";
+  };
 
-    e.template = template;
-    e.line = line;
-    e.file = file;
-    e.message = [file + ":" + line, context.join("\n"), "", e.message].join("\n");
+  /**
+   * Tries to match the given regular expression at the current position.
+   * Returns the matched text if it can match, `null` otherwise.
+   */
+  Scanner.prototype.scan = function (re) {
+    var match = this.tail.match(re);
 
-    return e;
-  }
+    if (match && match.index === 0) {
+      this.tail = this.tail.substring(match[0].length);
+      this.pos += match[0].length;
+      return match[0];
+    }
+
+    return null;
+  };
 
   /**
-   * Looks up the value of the given `name` in the given context `stack`.
+   * Skips all text until the given regular expression can be matched. Returns
+   * the skipped string, which is the entire tail of this scanner if no match
+   * can be made.
    */
-  function lookup(name, stack, defaultValue) {
-    if (name === ".") {
-      return stack[stack.length - 1];
+  Scanner.prototype.scanUntil = function (re) {
+    var match, pos = this.tail.search(re);
+
+    switch (pos) {
+    case -1:
+      match = this.tail;
+      this.pos += this.tail.length;
+      this.tail = "";
+      break;
+    case 0:
+      match = null;
+      break;
+    default:
+      match = this.tail.substring(0, pos);
+      this.tail = this.tail.substring(pos);
+      this.pos += pos;
     }
 
-    var names = name.split(".");
-    var lastIndex = names.length - 1;
-    var target = names[lastIndex];
+    return match;
+  };
 
-    var value, context, i = stack.length, j, localStack;
-    while (i) {
-      localStack = stack.slice(0);
-      context = stack[--i];
+  function Context(view, parent) {
+    this.view = view;
+    this.parent = parent;
+    this.clearCache();
+  }
 
-      j = 0;
-      while (j < lastIndex) {
-        context = context[names[j++]];
+  Context.make = function (view) {
+    return (view instanceof Context) ? view : new Context(view);
+  };
 
-        if (context == null) {
-          break;
-        }
+  Context.prototype.clearCache = function () {
+    this._cache = {};
+  };
 
-        localStack.push(context);
-      }
+  Context.prototype.push = function (view) {
+    return new Context(view, this);
+  };
 
-      if (context && typeof context === "object" && target in context) {
-        value = context[target];
-        break;
+  Context.prototype.lookup = function (name) {
+    var value = this._cache[name];
+
+    if (!value) {
+      if (name === ".") {
+        value = this.view;
+      } else {
+        var context = this;
+
+        while (context) {
+          if (name.indexOf(".") > 0) {
+            var names = name.split("."), i = 0;
+
+            value = context.view;
+
+            while (value && i < names.length) {
+              value = value[names[i++]];
+            }
+          } else {
+            value = context.view[name];
+          }
+
+          if (value != null) {
+            break;
+          }
+
+          context = context.parent;
+        }
       }
-    }
 
-    // If the value is a function, call it in the current context.
-    if (typeof value === "function") {
-      value = value.call(localStack[localStack.length - 1]);
+      this._cache[name] = value;
     }
 
-    if (value == null)  {
-      return defaultValue;
+    if (typeof value === "function") {
+      value = value.call(this.view);
     }
 
     return value;
+  };
+
+  function Renderer() {
+    this.clearCache();
   }
 
-  function renderSection(name, stack, callback, inverted) {
-    var buffer = "";
-    var value =  lookup(name, stack);
+  Renderer.prototype.clearCache = function () {
+    this._cache = {};
+    this._partialCache = {};
+  };
 
-    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)) {
-        buffer += callback();
-      }
-    } else if (isArray(value)) {
-      forEach(value, function (value) {
-        stack.push(value);
-        buffer += callback();
-        stack.pop();
-      });
-    } else if (typeof value === "object") {
-      stack.push(value);
-      buffer += callback();
-      stack.pop();
-    } else if (typeof value === "function") {
-      var scope = stack[stack.length - 1];
-      var scopedRender = function (template) {
-        return render(template, scope);
-      };
-      buffer += value.call(scope, callback(), scopedRender) || "";
-    } else if (value) {
-      buffer += callback();
+  Renderer.prototype.compile = function (tokens, tags) {
+    var fn = compileTokens(tokens),
+        self = this;
+
+    return function (view) {
+      return fn(Context.make(view), self);
+    };
+  };
+
+  Renderer.prototype.compilePartial = function (name, tokens, tags) {
+    this._partialCache[name] = this.compile(tokens, tags);
+    return this._partialCache[name];
+  };
+
+  Renderer.prototype.render = function (template, view) {
+    var fn = this._cache[template];
+
+    if (!fn) {
+      fn = this.compile(template);
+      this._cache[template] = fn;
     }
 
-    return buffer;
-  }
+    return fn(view);
+  };
 
-  /**
-   * 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 buffer = "";', // output buffer
-      "\nvar line = 1;", // keep track of source line number
-      "\ntry {",
-      '\nbuffer += "'
-    ];
-
-    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 (hasTag && !nonSpace && !options.space) {
-        while (spaces.length) {
-          code.splice(spaces.pop(), 1);
+  Renderer.prototype._section = function (name, context, callback) {
+    var value = context.lookup(name);
+
+    switch (typeof value) {
+    case "object":
+      if (isArray(value)) {
+        var buffer = "";
+        for (var i = 0, len = value.length; i < len; ++i) {
+          buffer += callback(context.push(value[i]), this);
         }
+        return buffer;
       } else {
-        spaces = [];
+        return callback(context.push(value), this);
+      }
+      break;
+    case "function":
+      var sectionText = callback(context, this), self = this;
+      function scopedRender(template) {
+        return self.render(template, context);
       }
+      return value.call(context.view, sectionText, scopedRender) || "";
+      break;
+    default:
+      if (value) {
+        return callback(context, this);
+      }
+    }
 
-      hasTag = false;
-      nonSpace = false;
-    };
+    return "";
+  };
 
-    var sectionStack = [], updateLine, nextOpenTag, nextCloseTag;
+  Renderer.prototype._inverted = function (name, context, callback) {
+    var value = context.lookup(name);
 
-    var setTags = function (source) {
-      tags = trim(source).split(/\s+/);
-      nextOpenTag = tags[0];
-      nextCloseTag = tags[tags.length - 1];
-    };
+    // 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)) {
+      return callback(context, this);
+    }
 
-    var includePartial = function (source) {
-      code.push(
-        '";',
-        updateLine,
-        '\nvar partial = partials["' + trim(source) + '"];',
-        '\nif (partial) {',
-        '\n  buffer += render(partial,stack[stack.length - 1],partials);',
-        '\n}',
-        '\nbuffer += "'
-      );
-    };
+    return "";
+  };
 
-    var openSection = function (source, inverted) {
-      var name = trim(source);
+  Renderer.prototype._partial = function (name, context) {
+    var fn = this._partialCache[name];
 
-      if (name === "") {
-        throw debug(new Error("Section name may not be empty"), template, line, options.file);
-      }
+    if (fn) {
+      return fn(context, this);
+    }
 
-      sectionStack.push({name: name, inverted: inverted});
-
-      code.push(
-        '";',
-        updateLine,
-        '\nvar name = "' + name + '";',
-        '\nvar callback = (function () {',
-        '\n  return function () {',
-        '\n    var buffer = "";',
-        '\nbuffer += "'
-      );
-    };
+    return "";
+  };
 
-    var openInvertedSection = function (source) {
-      openSection(source, true);
-    };
+  Renderer.prototype._name = function (name, context, escape) {
+    var value = context.lookup(name);
 
-    var closeSection = function (source) {
-      var name = trim(source);
-      var openName = sectionStack.length != 0 && sectionStack[sectionStack.length - 1].name;
+    if (typeof value === "function") {
+      value = value.call(context.view);
+    }
 
-      if (!openName || name != openName) {
-        throw debug(new Error('Section named "' + name + '" was never opened'), template, line, options.file);
-      }
+    var string = (value == null) ? "" : String(value);
 
-      var section = sectionStack.pop();
+    if (escape) {
+      return escapeHtml(string);
+    }
 
-      code.push(
-        '";',
-        '\n    return buffer;',
-        '\n  };',
-        '\n})();'
-      );
+    return string;
+  };
 
-      if (section.inverted) {
-        code.push("\nbuffer += renderSection(name,stack,callback,true);");
-      } else {
-        code.push("\nbuffer += renderSection(name,stack,callback);");
+  /**
+   * Low-level function that compiles the given `tokens` into a
+   * function that accepts two arguments: a Context and a
+   * Renderer. Returns the body of the function as a string if
+   * `returnBody` is true.
+   */
+  function compileTokens(tokens, returnBody) {
+    if (typeof tokens === "string") {
+      tokens = parse(tokens);
+    }
+
+    var body = ['""'];
+    var token, method, escape;
+
+    for (var i = 0, len = tokens.length; i < len; ++i) {
+      token = tokens[i];
+
+      switch (token.type) {
+      case "#":
+      case "^":
+        method = (token.type === "#") ? "_section" : "_inverted";
+        body.push("r." + method + "(" + quote(token.value) + ", c, function (c, r) {\n" +
+          "  " + compileTokens(token.tokens, true) + "\n" +
+          "})");
+        break;
+      case "{":
+      case "&":
+      case "name":
+        escape = token.type === "name" ? "true" : "false";
+        body.push("r._name(" + quote(token.value) + ", c, " + escape + ")");
+        break;
+      case ">":
+        body.push("r._partial(" + quote(token.value) + ", c)");
+        break;
+      case "text":
+        body.push(quote(token.value));
+        break;
       }
+    }
 
-      code.push('\nbuffer += "');
-    };
+    // Convert to a string body.
+    body = "return " + body.join(" + ") + ";";
 
-    var sendPlain = function (source) {
-      code.push(
-        '";',
-        updateLine,
-        '\nbuffer += lookup("' + trim(source) + '",stack,"");',
-        '\nbuffer += "'
-      );
-    };
+    // Good for debugging.
+    // console.log(body);
 
-    var sendEscaped = function (source) {
-      code.push(
-        '";',
-        updateLine,
-        '\nbuffer += escapeHTML(lookup("' + trim(source) + '",stack,""));',
-        '\nbuffer += "'
-      );
-    };
+    if (returnBody) {
+      return body;
+    }
 
-    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;
-        hasTag = true;
-
-        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;
-        }
+    // For great evil!
+    return new Function("c, r", body);
+  }
 
-        var end = template.indexOf(closeTag, i);
+  function escapeTags(tags) {
+    if (tags.length === 2) {
+      return [
+        new RegExp(escapeRe(tags[0]) + "\\s*"),
+        new RegExp("\\s*" + escapeRe(tags[1]))
+      ];
+    }
 
-        if (end === -1) {
-          throw debug(new Error('Tag "' + openTag + '" was not closed properly'), template, line, options.file);
+    throw new Error("Invalid tags: " + tags.join(" "));
+  }
+
+  /**
+   * Forms the given linear array of `tokens` into a nested tree structure
+   * where tokens that represent a section have a "tokens" array property
+   * that contains all tokens that are in that section.
+   */
+  function nestTokens(tokens) {
+    var tree = [];
+    var collector = tree;
+    var sections = [];
+    var token, section;
+
+    for (var i = 0; i < tokens.length; ++i) {
+      token = tokens[i];
+
+      switch (token.type) {
+      case "#":
+      case "^":
+        token.tokens = [];
+        sections.push(token);
+        collector.push(token);
+        collector = token.tokens;
+        break;
+      case "/":
+        if (sections.length === 0) {
+          throw new Error("Unopened section: " + token.value);
         }
 
-        var source = template.substring(i, end);
+        section = sections.pop();
 
-        if (callback) {
-          callback(source);
+        if (section.value !== token.value) {
+          throw new Error("Unclosed section: " + section.value);
         }
 
-        // Maintain line count for \n in source.
-        var n = 0;
-        while (~(n = source.indexOf("\n", n))) {
-          line++;
-          n++;
+        if (sections.length > 0) {
+          collector = sections[sections.length - 1].tokens;
+        } else {
+          collector = tree;
         }
+        break;
+      default:
+        collector.push(token);
+      }
+    }
+
+    // Make sure there were no open sections when we're done.
+    section = sections.pop();
+
+    if (section) {
+      throw new Error("Unclosed section: " + section.value);
+    }
+
+    return tree;
+  }
+
+  /**
+   * Combines the values of consecutive text tokens in the given `tokens` array
+   * to a single token.
+   */
+  function squashTokens(tokens) {
+    var lastToken;
+
+    for (var i = 0; i < tokens.length; ++i) {
+      token = tokens[i];
+
+      if (lastToken && lastToken.type === "text" && token.type === "text") {
+        lastToken.value += token.value;
+        tokens.splice(i--, 1); // Remove this token from the array.
+      } else {
+        lastToken = token;
+      }
+    }
+  }
 
-        i = end + closeTag.length - 1;
-        openTag = nextOpenTag;
-        closeTag = nextCloseTag;
+  /**
+   * Breaks up the given `template` string into a tree of token objects. If
+   * `tags` is given here it must be an array with two string values: the
+   * opening and closing tags used in the template (e.g. ["<%", "%>"]). Of
+   * course, the default is to use mustaches (i.e. Mustache.tags).
+   */
+  function parse(template, tags) {
+    tags = escapeTags(tags || exports.tags);
+
+    var scanner = new Scanner(template);
+
+    var tokens = [],      // Buffer to hold the tokens
+        spaces = [],      // Indices of whitespace tokens 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 whitespace tokens array for the current line
+    // if there was a {{#tag}} on it and otherwise only space.
+    function stripSpace() {
+      if (hasTag && !nonSpace) {
+        while (spaces.length) {
+          tokens.splice(spaces.pop(), 1);
+        }
       } else {
-        c = template.substr(i, 1);
-
-        switch (c) {
-        case '"':
-        case "\\":
-          nonSpace = true;
-          code.push("\\" + c);
-          break;
-        case "\r":
-          // Ignore carriage returns.
-          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);
+        spaces = [];
+      }
+
+      hasTag = false;
+      nonSpace = false;
+    }
+
+    var type, value, chr;
+
+    while (!scanner.eos()) {
+      value = scanner.scanUntil(tags[0]);
+
+      if (value) {
+        for (var i = 0, len = value.length; i < len; ++i) {
+          chr = value[i];
+
+          if (isWhitespace(chr)) {
+            spaces.push(tokens.length);
           } else {
             nonSpace = true;
           }
 
-          code.push(c);
+          tokens.push({type: "text", value: chr});
+
+          if (chr === "\n") {
+            stripSpace(); // Check for whitespace on the current line.
+          }
         }
       }
-    }
 
-    if (sectionStack.length != 0) {
-      throw debug(new Error('Section "' + sectionStack[sectionStack.length - 1].name + '" was not closed properly'), template, line, options.file);
-    }
+      // Match the opening tag.
+      if (!scanner.scan(tags[0])) {
+        break;
+      }
+
+      hasTag = true;
+      type = scanner.scan(tagRe) || "name";
+
+      // Skip any whitespace between tag and value.
+      scanner.scan(whiteRe);
+
+      // Extract the tag value.
+      if (type === "=") {
+        value = scanner.scanUntil(eqRe);
+        scanner.scan(eqRe);
+        scanner.scanUntil(tags[1]);
+      } else if (type === "{") {
+        value = scanner.scanUntil(curlyRe);
+        scanner.scan(curlyRe);
+        scanner.scanUntil(tags[1]);
+      } else {
+        value = scanner.scanUntil(tags[1]);
+      }
 
-    // Clean up any whitespace from a closing {{tag}} that was at the end
-    // of the template without a trailing \n.
-    stripSpace();
+      // Match the closing tag.
+      if (!scanner.scan(tags[1])) {
+        throw new Error("Unclosed tag at " + scanner.pos);
+      }
 
-    code.push(
-      '";',
-      "\nreturn buffer;",
-      "\n} catch (e) { throw {error: e, line: line}; }"
-    );
+      tokens.push({type: type, value: value});
 
-    // Ignore `buffer += "";` statements.
-    var body = code.join("").replace(/buffer \+= "";\n/g, "");
+      if (type === "name" || type === "{" || type === "&") {
+        nonSpace = true;
+      }
 
-    if (options.debug) {
-      if (typeof console != "undefined" && console.log) {
-        console.log(body);
-      } else if (typeof print === "function") {
-        print(body);
+      // Set the tags for the next time around.
+      if (type === "=") {
+        tags = escapeTags(value.split(spaceRe));
       }
     }
 
-    return body;
-  }
+    squashTokens(tokens);
 
-  /**
-   * Used by `compile` to generate a reusable function for the given `template`.
-   */
-  function _compile(template, options) {
-    var args = "view,partials,stack,lookup,escapeHTML,renderSection,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) {
-      partials = partials || {};
-
-      var stack = [view]; // context stack
-
-      try {
-        return fn(view, partials, stack, lookup, escapeHTML, renderSection, render);
-      } catch (e) {
-        throw debug(e.error, template, e.line, options.file);
-      }
-    };
+    return nestTokens(tokens);
   }
 
-  // Cache of pre-compiled templates.
-  var _cache = {};
+  // The high-level clearCache, compile, compilePartial, and render functions
+  // use this default renderer.
+  var _renderer = new Renderer;
 
   /**
-   * Clear the cache of compiled templates.
+   * Clears all cached templates and partials.
    */
   function clearCache() {
-    _cache = {};
+    _renderer.clearCache();
   }
 
   /**
-   * 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
+   * High-level API for compiling the given `tokens` down to a reusable
+   * function. If `tokens` is a string it will be parsed using the given `tags`
+   * before it is compiled.
    */
-  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];
-    }
+  function compile(tokens, tags) {
+    return _renderer.compile(tokens, tags);
+  }
 
-    return _compile(template, options);
+  /**
+   * High-level API for compiling the `tokens` for the partial with the given
+   * `name` down to a reusable function. If `tokens` is a string it will be
+   * parsed using the given `tags` before it is compiled.
+   */
+  function compilePartial(name, tokens, tags) {
+    return _renderer.compilePartial(name, tokens, tags);
   }
 
   /**
-   * High-level function that renders the given `template` using the given
-   * `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.
+   * High-level API for rendering the `template` using the given `view`. The
+   * optional `partials` object may be given here for convenience, but note that
+   * it will cause all partials to be re-compiled, thus hurting performance. Of
+   * course, this only matters if you're going to render the same template more
+   * than once. If so, it is best to call `compilePartial` before calling this
+   * function and to leave the `partials` argument blank.
    */
   function render(template, view, partials) {
-    return compile(template)(view, partials);
+    if (partials) {
+      for (var name in partials) {
+        compilePartial(name, partials[name]);
+      }
+    }
+
+    return _renderer.render(template, view);
   }
 
 })(Mustache);
diff --git a/spec/_files/ampersand_escape.js b/spec/_files/ampersand_escape.js
deleted file mode 100644
index 645efe1..0000000
--- a/spec/_files/ampersand_escape.js
+++ /dev/null
@@ -1,3 +0,0 @@
-var ampersand_escape = {
-  message: "Some <code>"
-};
diff --git a/spec/_files/apostrophe.js b/spec/_files/apostrophe.js
deleted file mode 100644
index df69cd2..0000000
--- a/spec/_files/apostrophe.js
+++ /dev/null
@@ -1 +0,0 @@
-var apostrophe = {'apos': "'", 'control':'X'};
diff --git a/spec/_files/array_of_strings.js b/spec/_files/array_of_strings.js
deleted file mode 100644
index 12c4992..0000000
--- a/spec/_files/array_of_strings.js
+++ /dev/null
@@ -1 +0,0 @@
-var array_of_strings = {array_of_strings: ['hello', 'world']};
diff --git a/spec/_files/backslashes.js b/spec/_files/backslashes.js
deleted file mode 100644
index 0b9765b..0000000
--- a/spec/_files/backslashes.js
+++ /dev/null
@@ -1,3 +0,0 @@
-var backslashes = {
-  value: "\\abc"
-};
diff --git a/spec/_files/bug_11_eating_whitespace.js b/spec/_files/bug_11_eating_whitespace.js
deleted file mode 100644
index 78ce975..0000000
--- a/spec/_files/bug_11_eating_whitespace.js
+++ /dev/null
@@ -1,3 +0,0 @@
-var bug_11_eating_whitespace = {
-  tag: "yo"
-};
diff --git a/spec/_files/changing_delimiters.js b/spec/_files/changing_delimiters.js
deleted file mode 100644
index 4fbe9f3..0000000
--- a/spec/_files/changing_delimiters.js
+++ /dev/null
@@ -1,4 +0,0 @@
-var changing_delimiters = {
-  "foo": "foooooooooooooo",
-  "bar":"<b>bar!</b>"
-};
diff --git a/spec/_files/comments.js b/spec/_files/comments.js
deleted file mode 100644
index f85f979..0000000
--- a/spec/_files/comments.js
+++ /dev/null
@@ -1,5 +0,0 @@
-var comments = {
-  title: function() {
-    return "A Comedy of Errors";
-  }
-};
diff --git a/spec/_files/disappearing_whitespace.js b/spec/_files/disappearing_whitespace.js
deleted file mode 100644
index 3fe7121..0000000
--- a/spec/_files/disappearing_whitespace.js
+++ /dev/null
@@ -1,4 +0,0 @@
-var disappearing_whitespace = {
-  bedrooms: true,
-  total: 1
-};
diff --git a/spec/_files/empty_list.js b/spec/_files/empty_list.js
deleted file mode 100644
index 80555c0..0000000
--- a/spec/_files/empty_list.js
+++ /dev/null
@@ -1,3 +0,0 @@
-var empty_list = {
-    jobs: []
-};
diff --git a/spec/_files/empty_sections.js b/spec/_files/empty_sections.js
deleted file mode 100644
index 6e50514..0000000
--- a/spec/_files/empty_sections.js
+++ /dev/null
@@ -1 +0,0 @@
-var empty_sections = {};
diff --git a/spec/_files/empty_template.js b/spec/_files/empty_template.js
deleted file mode 100644
index 564c9e2..0000000
--- a/spec/_files/empty_template.js
+++ /dev/null
@@ -1 +0,0 @@
-var empty_template = {};
diff --git a/spec/_files/error_not_found.js b/spec/_files/error_not_found.js
deleted file mode 100644
index 6cdbdb3..0000000
--- a/spec/_files/error_not_found.js
+++ /dev/null
@@ -1 +0,0 @@
-var error_not_found = {bar: 2};
\ No newline at end of file
diff --git a/spec/_files/higher_order_sections.js b/spec/_files/higher_order_sections.js
deleted file mode 100644
index c7e558e..0000000
--- a/spec/_files/higher_order_sections.js
+++ /dev/null
@@ -1,9 +0,0 @@
-var higher_order_sections = {
-  "name": "Tater",
-  "helper": "To tinker?",
-  "bolder": function() {
-    return function(text, render) {
-      return "<b>" + render(text) + '</b> ' + this.helper;
-    }
-  }
-}
\ No newline at end of file
diff --git a/spec/_files/inverted_section.js b/spec/_files/inverted_section.js
deleted file mode 100644
index 2e07fc3..0000000
--- a/spec/_files/inverted_section.js
+++ /dev/null
@@ -1,3 +0,0 @@
-var inverted_section =  {
-  "repos": []
-};
diff --git a/spec/_files/multiline_comment.js b/spec/_files/multiline_comment.js
deleted file mode 100644
index 24e7445..0000000
--- a/spec/_files/multiline_comment.js
+++ /dev/null
@@ -1 +0,0 @@
-var multiline_comment = {};
diff --git a/spec/_files/partial_array_of_partials.js b/spec/_files/partial_array_of_partials.js
deleted file mode 100644
index 706e7ed..0000000
--- a/spec/_files/partial_array_of_partials.js
+++ /dev/null
@@ -1,3 +0,0 @@
-var partial_array_of_partials = { 
-  numbers: [{i: '1'}, {i: '2'}, {i: '3'}, {i: '4'}]
-};
diff --git a/spec/_files/partial_array_of_partials_implicit.js b/spec/_files/partial_array_of_partials_implicit.js
deleted file mode 100644
index 864efa3..0000000
--- a/spec/_files/partial_array_of_partials_implicit.js
+++ /dev/null
@@ -1,3 +0,0 @@
-var partial_array_of_partials_implicit = { 
-  numbers: ['1', '2', '3', '4']
-};
diff --git a/spec/_files/partial_empty.js b/spec/_files/partial_empty.js
deleted file mode 100644
index 3f36df6..0000000
--- a/spec/_files/partial_empty.js
+++ /dev/null
@@ -1,3 +0,0 @@
-var partial_empty = {
-  foo: 1
-};
diff --git a/spec/_files/partial_template.js b/spec/_files/partial_template.js
deleted file mode 100644
index 196f1e8..0000000
--- a/spec/_files/partial_template.js
+++ /dev/null
@@ -1,6 +0,0 @@
-var partial_template = {
-  title: function() {
-    return "Welcome";
-  },
-  again: "Goodbye"
-};
diff --git a/spec/_files/string_as_context.js b/spec/_files/string_as_context.js
deleted file mode 100644
index 784368b..0000000
--- a/spec/_files/string_as_context.js
+++ /dev/null
@@ -1,4 +0,0 @@
-var string_as_context = {
-    a_string: 'aa',
-    a_list: ['a','b','c']
-};
diff --git a/spec/_files/two_sections.js b/spec/_files/two_sections.js
deleted file mode 100644
index 8546f64..0000000
--- a/spec/_files/two_sections.js
+++ /dev/null
@@ -1 +0,0 @@
-var two_sections = {};
\ No newline at end of file
diff --git a/spec/_files/unescaped.js b/spec/_files/unescaped.js
deleted file mode 100644
index 0bd20b8..0000000
--- a/spec/_files/unescaped.js
+++ /dev/null
@@ -1,5 +0,0 @@
-var unescaped = {
-  title: function() {
-    return "Bear > Shark";
-  }
-};
diff --git a/spec/mustache_spec.rb b/spec/mustache_spec.rb
deleted file mode 100644
index 3c27d80..0000000
--- a/spec/mustache_spec.rb
+++ /dev/null
@@ -1,218 +0,0 @@
-require 'rubygems'
-require 'json'
-
-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(FILES, '*.js')).map do |name|
-  File.basename name, '.js'
-end
-
-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)
-  template = File.read(File.join(FILES, "#{name}.mustache"))
-  view = File.read(File.join(FILES, "#{name}.js"))
-  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"))
-
-  [template, view, partial, expect]
-end
-
-def run_js(runner, js)
-  cmd = case runner
-    when :spidermonkey
-      JS_PATH
-    when :jsc
-      JSC_PATH
-    when :rhino
-      "java #{RHINO_JAR}"
-    when :v8
-      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 result when invoked multiple times" do
-      js = <<-JS
-        #{@boilerplate}
-        Mustache.render("x")
-        print(Mustache.render("x"));
-      JS
-
-      run_js(@runner, js).should == "x\n"
-    end
-
-    it "should clear the context after each run" do
-      js = <<-JS
-        #{@boilerplate}
-        Mustache.render("{{#list}}{{x}}{{/list}}", {list: [{x: 1}]})
-        try {
-          print(Mustache.render("{{#list}}{{x}}{{/list}}", {list: [{}]}));
-        } catch(e) {
-          print('ERROR: ' + e.message);
-        }
-      JS
-
-      run_js(@runner, js).should == "\n"
-    end
-
-    TESTS.each do |test|
-      describe test do
-        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 partials = {partial: #{partial ? partial.to_json : '""'}};
-              print(Mustache.render(template, #{test}, partials));
-            } 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
-
-  context "running in V8 (Chrome, node)" do
-    if File.exist?(NODE_PATH)
-      before(:all) do
-        $stdout.write "Testing in V8 "
-        @runner = :v8
-        @boilerplate = MUSTACHE.dup
-        @boilerplate << <<-JS
-        var print = console.log;
-        JS
-      end
-
-      after(:all) do
-        puts " Done!"
-      end
-
-      it_should_behave_like "mustache rendering"
-    else
-      puts "Skipping tests in V8 (node not found)"
-    end
-  end
-
-  context "running in SpiderMonkey (Mozilla, Firefox)" do
-    if File.exist?(JS_PATH)
-      before(:all) do
-        $stdout.write "Testing in SpiderMonkey "
-        @runner = :spidermonkey
-        @boilerplate = MUSTACHE.dup
-      end
-
-      after(:all) do
-        puts " Done!"
-      end
-
-      it_should_behave_like "mustache rendering"
-    else
-      puts "Skipping tests in SpiderMonkey (js not found)"
-    end
-  end
-
-  context "running in JavaScriptCore (WebKit, Safari)" do
-    if File.exist?(JSC_PATH)
-      before(:all) do
-        $stdout.write "Testing in JavaScriptCore "
-        @runner = :jsc
-        @boilerplate = MUSTACHE.dup
-      end
-
-      after(:all) do
-        puts " Done!"
-      end
-
-      it_should_behave_like "mustache rendering"
-    else
-      puts "Skipping tests in JavaScriptCore (jsc not found)"
-    end
-  end
-
-  context "running in Rhino (Mozilla, Java)" do
-    if `java #{RHINO_JAR} 'foo' 2>&1` !~ /ClassNotFoundException/
-      before(:all) do
-        $stdout.write "Testing in Rhino "
-        @runner = :rhino
-        @boilerplate = MUSTACHE.dup
-      end
-
-      after(:all) do
-        puts " Done!"
-      end
-
-      it_should_behave_like "mustache rendering"
-    else
-      puts "Skipping tests in Rhino (JAR #{RHINO_JAR} was not found)"
-    end
-  end
-
-  context "suite" do
-    before(:each) do
-      $stdout.write "Verifying that we ran the tests in at least one engine ... "
-    end
-
-    after(:each) do
-      puts @exception.nil? ? "OK" : "ERROR"
-    end
-
-    it "should have run at least one time" do
-      $engines_run.should > 0
-    end
-  end
-end
diff --git a/test/_files/ampersand_escape.js b/test/_files/ampersand_escape.js
new file mode 100644
index 0000000..df6409f
--- /dev/null
+++ b/test/_files/ampersand_escape.js
@@ -0,0 +1,3 @@
+({
+  message: "Some <code>"
+})
diff --git a/spec/_files/ampersand_escape.mustache b/test/_files/ampersand_escape.mustache
similarity index 100%
rename from spec/_files/ampersand_escape.mustache
rename to test/_files/ampersand_escape.mustache
diff --git a/spec/_files/ampersand_escape.txt b/test/_files/ampersand_escape.txt
similarity index 100%
rename from spec/_files/ampersand_escape.txt
rename to test/_files/ampersand_escape.txt
diff --git a/test/_files/apostrophe.js b/test/_files/apostrophe.js
new file mode 100644
index 0000000..183c6d5
--- /dev/null
+++ b/test/_files/apostrophe.js
@@ -0,0 +1,4 @@
+({
+  'apos': "'",
+  'control': 'X'
+})
diff --git a/spec/_files/apostrophe.mustache b/test/_files/apostrophe.mustache
similarity index 100%
rename from spec/_files/apostrophe.mustache
rename to test/_files/apostrophe.mustache
diff --git a/spec/_files/apostrophe.txt b/test/_files/apostrophe.txt
similarity index 100%
rename from spec/_files/apostrophe.txt
rename to test/_files/apostrophe.txt
diff --git a/test/_files/array_of_strings.js b/test/_files/array_of_strings.js
new file mode 100644
index 0000000..6926612
--- /dev/null
+++ b/test/_files/array_of_strings.js
@@ -0,0 +1,3 @@
+({
+  array_of_strings: ['hello', 'world']
+})
diff --git a/spec/_files/array_of_strings.mustache b/test/_files/array_of_strings.mustache
similarity index 100%
rename from spec/_files/array_of_strings.mustache
rename to test/_files/array_of_strings.mustache
diff --git a/spec/_files/array_of_strings.txt b/test/_files/array_of_strings.txt
similarity index 100%
rename from spec/_files/array_of_strings.txt
rename to test/_files/array_of_strings.txt
diff --git a/test/_files/backslashes.js b/test/_files/backslashes.js
new file mode 100644
index 0000000..427acd9
--- /dev/null
+++ b/test/_files/backslashes.js
@@ -0,0 +1,3 @@
+({
+  value: "\\abc"
+})
diff --git a/spec/_files/backslashes.mustache b/test/_files/backslashes.mustache
similarity index 100%
rename from spec/_files/backslashes.mustache
rename to test/_files/backslashes.mustache
diff --git a/spec/_files/backslashes.txt b/test/_files/backslashes.txt
similarity index 100%
rename from spec/_files/backslashes.txt
rename to test/_files/backslashes.txt
diff --git a/test/_files/bug_11_eating_whitespace.js b/test/_files/bug_11_eating_whitespace.js
new file mode 100644
index 0000000..e41ccd1
--- /dev/null
+++ b/test/_files/bug_11_eating_whitespace.js
@@ -0,0 +1,3 @@
+({
+  tag: "yo"
+})
diff --git a/spec/_files/bug_11_eating_whitespace.mustache b/test/_files/bug_11_eating_whitespace.mustache
similarity index 100%
rename from spec/_files/bug_11_eating_whitespace.mustache
rename to test/_files/bug_11_eating_whitespace.mustache
diff --git a/spec/_files/bug_11_eating_whitespace.txt b/test/_files/bug_11_eating_whitespace.txt
similarity index 100%
rename from spec/_files/bug_11_eating_whitespace.txt
rename to test/_files/bug_11_eating_whitespace.txt
diff --git a/test/_files/changing_delimiters.js b/test/_files/changing_delimiters.js
new file mode 100644
index 0000000..b808f4c
--- /dev/null
+++ b/test/_files/changing_delimiters.js
@@ -0,0 +1,4 @@
+({
+  "foo": "foooooooooooooo",
+  "bar": "<b>bar!</b>"
+})
diff --git a/spec/_files/changing_delimiters.mustache b/test/_files/changing_delimiters.mustache
similarity index 100%
rename from spec/_files/changing_delimiters.mustache
rename to test/_files/changing_delimiters.mustache
diff --git a/spec/_files/changing_delimiters.txt b/test/_files/changing_delimiters.txt
similarity index 100%
rename from spec/_files/changing_delimiters.txt
rename to test/_files/changing_delimiters.txt
diff --git a/test/_files/comments.js b/test/_files/comments.js
new file mode 100644
index 0000000..f20b8b1
--- /dev/null
+++ b/test/_files/comments.js
@@ -0,0 +1,5 @@
+({
+  title: function () {
+    return "A Comedy of Errors";
+  }
+})
diff --git a/spec/_files/comments.mustache b/test/_files/comments.mustache
similarity index 100%
rename from spec/_files/comments.mustache
rename to test/_files/comments.mustache
diff --git a/spec/_files/comments.txt b/test/_files/comments.txt
similarity index 100%
rename from spec/_files/comments.txt
rename to test/_files/comments.txt
diff --git a/spec/_files/complex.js b/test/_files/complex.js
similarity index 74%
rename from spec/_files/complex.js
rename to test/_files/complex.js
index a0dfb63..68a4809 100644
--- a/spec/_files/complex.js
+++ b/test/_files/complex.js
@@ -1,5 +1,5 @@
-var complex = {
-  header: function() {
+({
+  header: function () {
     return "Colors";
   },
   item: [
@@ -7,13 +7,13 @@ var complex = {
       {name: "green", current: false, url: "#Green"},
       {name: "blue", current: false, url: "#Blue"}
   ],
-  link: function() {
+  link: function () {
     return this["current"] !== true;
   },
-  list: function() {
+  list: function () {
     return this.item.length !== 0;
   },
-  empty: function() {
+  empty: function () {
     return this.item.length === 0;
   }
-};
+})
diff --git a/spec/_files/complex.mustache b/test/_files/complex.mustache
similarity index 100%
rename from spec/_files/complex.mustache
rename to test/_files/complex.mustache
diff --git a/spec/_files/complex.txt b/test/_files/complex.txt
similarity index 100%
rename from spec/_files/complex.txt
rename to test/_files/complex.txt
diff --git a/spec/_files/context_lookup.js b/test/_files/context_lookup.js
similarity index 73%
rename from spec/_files/context_lookup.js
rename to test/_files/context_lookup.js
index 49d4453..8ce6299 100644
--- a/spec/_files/context_lookup.js
+++ b/test/_files/context_lookup.js
@@ -1,8 +1,8 @@
-var context_lookup = {
+({
   "outer": {
     "id": 1,
     "second": {
       "nothing": 2
     }
   }
-};
+})
diff --git a/spec/_files/context_lookup.mustache b/test/_files/context_lookup.mustache
similarity index 100%
rename from spec/_files/context_lookup.mustache
rename to test/_files/context_lookup.mustache
diff --git a/spec/_files/context_lookup.txt b/test/_files/context_lookup.txt
similarity index 100%
rename from spec/_files/context_lookup.txt
rename to test/_files/context_lookup.txt
diff --git a/spec/_files/delimiters.js b/test/_files/delimiters.js
similarity index 89%
rename from spec/_files/delimiters.js
rename to test/_files/delimiters.js
index 220d0d2..365d01e 100644
--- a/spec/_files/delimiters.js
+++ b/test/_files/delimiters.js
@@ -1,6 +1,6 @@
-var delimiters = {
+({
   first: "It worked the first time.",
   second: "And it worked the second time.",
   third: "Then, surprisingly, it worked the third time.",
   fourth: "Fourth time also fine!."
-}
+})
diff --git a/spec/_files/delimiters.mustache b/test/_files/delimiters.mustache
similarity index 100%
rename from spec/_files/delimiters.mustache
rename to test/_files/delimiters.mustache
diff --git a/spec/_files/delimiters.txt b/test/_files/delimiters.txt
similarity index 100%
rename from spec/_files/delimiters.txt
rename to test/_files/delimiters.txt
diff --git a/test/_files/disappearing_whitespace.js b/test/_files/disappearing_whitespace.js
new file mode 100644
index 0000000..973dd1c
--- /dev/null
+++ b/test/_files/disappearing_whitespace.js
@@ -0,0 +1,4 @@
+({
+  bedrooms: true,
+  total: 1
+})
diff --git a/spec/_files/disappearing_whitespace.mustache b/test/_files/disappearing_whitespace.mustache
similarity index 100%
rename from spec/_files/disappearing_whitespace.mustache
rename to test/_files/disappearing_whitespace.mustache
diff --git a/spec/_files/disappearing_whitespace.txt b/test/_files/disappearing_whitespace.txt
similarity index 100%
rename from spec/_files/disappearing_whitespace.txt
rename to test/_files/disappearing_whitespace.txt
diff --git a/spec/_files/dot_notation.js b/test/_files/dot_notation.js
similarity index 81%
rename from spec/_files/dot_notation.js
rename to test/_files/dot_notation.js
index c1295f5..ca995f7 100644
--- a/spec/_files/dot_notation.js
+++ b/test/_files/dot_notation.js
@@ -1,9 +1,9 @@
-var dot_notation = {
+({
   name: "A Book",
   authors: ["John Power", "Jamie Walsh"],
-  price:{
+  price: {
     value: 200,
-    vat: function() {
+    vat: function () {
       return this.value * 0.2;
     },
     currency: {
@@ -11,7 +11,7 @@ var dot_notation = {
       name: 'Euro'
     }
   },
-  availability:{
+  availability: {
     status: true,
     text: "In Stock"
   },
@@ -20,4 +20,4 @@ var dot_notation = {
     zero: 0,
     notTrue: false
   }
-};
+})
diff --git a/spec/_files/dot_notation.mustache b/test/_files/dot_notation.mustache
similarity index 84%
rename from spec/_files/dot_notation.mustache
rename to test/_files/dot_notation.mustache
index da1bad7..138ddd0 100644
--- a/spec/_files/dot_notation.mustache
+++ b/test/_files/dot_notation.mustache
@@ -2,7 +2,7 @@
 <h1>{{name}}</h1>
 <p>Authors: <ul>{{#authors}}<li>{{.}}</li>{{/authors}}</ul></p>
 <p>Price: {{price.currency.symbol}}{{price.value}} {{#price.currency}}{{name}} <b>{{availability.text}}</b>{{/price.currency}}</p>
-<p>VAT: {{price.currency.symbol}}{{price.vat}}</p>
+<p>VAT: {{price.currency.symbol}}{{#price}}{{vat}}{{/price}}</p>
 <!-- boring part -->
 <h2>Test truthy false values:</h2>
 <p>Zero: {{truthy.zero}}</p>
diff --git a/spec/_files/dot_notation.txt b/test/_files/dot_notation.txt
similarity index 100%
rename from spec/_files/dot_notation.txt
rename to test/_files/dot_notation.txt
diff --git a/spec/_files/double_render.js b/test/_files/double_render.js
similarity index 65%
rename from spec/_files/double_render.js
rename to test/_files/double_render.js
index 24125dc..28acb2c 100644
--- a/spec/_files/double_render.js
+++ b/test/_files/double_render.js
@@ -1,5 +1,5 @@
-var double_render = {
+({
   foo: true,
   bar: "{{win}}",
   win: "FAIL"
-};
\ No newline at end of file
+})
diff --git a/spec/_files/double_render.mustache b/test/_files/double_render.mustache
similarity index 100%
rename from spec/_files/double_render.mustache
rename to test/_files/double_render.mustache
diff --git a/spec/_files/double_render.txt b/test/_files/double_render.txt
similarity index 100%
rename from spec/_files/double_render.txt
rename to test/_files/double_render.txt
diff --git a/test/_files/empty_list.js b/test/_files/empty_list.js
new file mode 100644
index 0000000..c0e1159
--- /dev/null
+++ b/test/_files/empty_list.js
@@ -0,0 +1,3 @@
+({
+  jobs: []
+})
diff --git a/spec/_files/empty_list.mustache b/test/_files/empty_list.mustache
similarity index 100%
rename from spec/_files/empty_list.mustache
rename to test/_files/empty_list.mustache
diff --git a/spec/_files/empty_list.txt b/test/_files/empty_list.txt
similarity index 100%
rename from spec/_files/empty_list.txt
rename to test/_files/empty_list.txt
diff --git a/test/_files/empty_sections.js b/test/_files/empty_sections.js
new file mode 100644
index 0000000..b4100a5
--- /dev/null
+++ b/test/_files/empty_sections.js
@@ -0,0 +1 @@
+({})
diff --git a/spec/_files/empty_sections.mustache b/test/_files/empty_sections.mustache
similarity index 100%
rename from spec/_files/empty_sections.mustache
rename to test/_files/empty_sections.mustache
diff --git a/spec/_files/empty_sections.txt b/test/_files/empty_sections.txt
similarity index 100%
rename from spec/_files/empty_sections.txt
rename to test/_files/empty_sections.txt
diff --git a/spec/_files/empty_string.js b/test/_files/empty_string.js
similarity index 73%
rename from spec/_files/empty_string.js
rename to test/_files/empty_string.js
index 2151336..be6e058 100644
--- a/spec/_files/empty_string.js
+++ b/test/_files/empty_string.js
@@ -1,6 +1,6 @@
-var empty_string = {
+({
   description: "That is all!",
   child: {
     description: ""
   }
-};
+})
diff --git a/spec/_files/empty_string.mustache b/test/_files/empty_string.mustache
similarity index 100%
rename from spec/_files/empty_string.mustache
rename to test/_files/empty_string.mustache
diff --git a/spec/_files/empty_string.txt b/test/_files/empty_string.txt
similarity index 100%
rename from spec/_files/empty_string.txt
rename to test/_files/empty_string.txt
diff --git a/test/_files/empty_template.js b/test/_files/empty_template.js
new file mode 100644
index 0000000..b4100a5
--- /dev/null
+++ b/test/_files/empty_template.js
@@ -0,0 +1 @@
+({})
diff --git a/spec/_files/empty_template.mustache b/test/_files/empty_template.mustache
similarity index 100%
rename from spec/_files/empty_template.mustache
rename to test/_files/empty_template.mustache
diff --git a/spec/_files/empty_template.txt b/test/_files/empty_template.txt
similarity index 100%
rename from spec/_files/empty_template.txt
rename to test/_files/empty_template.txt
diff --git a/test/_files/error_not_found.js b/test/_files/error_not_found.js
new file mode 100644
index 0000000..10e4709
--- /dev/null
+++ b/test/_files/error_not_found.js
@@ -0,0 +1,3 @@
+({
+  bar: 2
+})
diff --git a/spec/_files/error_not_found.mustache b/test/_files/error_not_found.mustache
similarity index 100%
rename from spec/_files/error_not_found.mustache
rename to test/_files/error_not_found.mustache
diff --git a/spec/_files/error_not_found.txt b/test/_files/error_not_found.txt
similarity index 100%
rename from spec/_files/error_not_found.txt
rename to test/_files/error_not_found.txt
diff --git a/spec/_files/escaped.js b/test/_files/escaped.js
similarity index 56%
rename from spec/_files/escaped.js
rename to test/_files/escaped.js
index 7a8baef..7735877 100644
--- a/spec/_files/escaped.js
+++ b/test/_files/escaped.js
@@ -1,6 +1,6 @@
-var escaped = {
-  title: function() {
+({
+  title: function () {
     return "Bear > Shark";
   },
   entities: "&quot;"
-};
+})
diff --git a/spec/_files/escaped.mustache b/test/_files/escaped.mustache
similarity index 100%
rename from spec/_files/escaped.mustache
rename to test/_files/escaped.mustache
diff --git a/spec/_files/escaped.txt b/test/_files/escaped.txt
similarity index 100%
rename from spec/_files/escaped.txt
rename to test/_files/escaped.txt
diff --git a/test/_files/higher_order_sections.js b/test/_files/higher_order_sections.js
new file mode 100644
index 0000000..7b52c0d
--- /dev/null
+++ b/test/_files/higher_order_sections.js
@@ -0,0 +1,9 @@
+({
+  name: "Tater",
+  helper: "To tinker?",
+  bolder: function () {
+    return function (text, render) {
+      return "<b>" + render(text) + '</b> ' + this.helper;
+    }
+  }
+})
diff --git a/spec/_files/higher_order_sections.mustache b/test/_files/higher_order_sections.mustache
similarity index 100%
rename from spec/_files/higher_order_sections.mustache
rename to test/_files/higher_order_sections.mustache
diff --git a/spec/_files/higher_order_sections.txt b/test/_files/higher_order_sections.txt
similarity index 100%
rename from spec/_files/higher_order_sections.txt
rename to test/_files/higher_order_sections.txt
diff --git a/spec/_files/included_tag.js b/test/_files/included_tag.js
similarity index 55%
rename from spec/_files/included_tag.js
rename to test/_files/included_tag.js
index a63df27..eb032a4 100644
--- a/spec/_files/included_tag.js
+++ b/test/_files/included_tag.js
@@ -1,3 +1,3 @@
-var included_tag = {
+({
   html: "I like {{mustache}}"
-};
+})
diff --git a/spec/_files/included_tag.mustache b/test/_files/included_tag.mustache
similarity index 100%
rename from spec/_files/included_tag.mustache
rename to test/_files/included_tag.mustache
diff --git a/spec/_files/included_tag.txt b/test/_files/included_tag.txt
similarity index 100%
rename from spec/_files/included_tag.txt
rename to test/_files/included_tag.txt
diff --git a/test/_files/inverted_section.js b/test/_files/inverted_section.js
new file mode 100644
index 0000000..f8f08fd
--- /dev/null
+++ b/test/_files/inverted_section.js
@@ -0,0 +1,3 @@
+({
+  "repos": []
+})
diff --git a/spec/_files/inverted_section.mustache b/test/_files/inverted_section.mustache
similarity index 100%
rename from spec/_files/inverted_section.mustache
rename to test/_files/inverted_section.mustache
diff --git a/spec/_files/inverted_section.txt b/test/_files/inverted_section.txt
similarity index 100%
rename from spec/_files/inverted_section.txt
rename to test/_files/inverted_section.txt
diff --git a/spec/_files/keys_with_questionmarks.js b/test/_files/keys_with_questionmarks.js
similarity index 50%
rename from spec/_files/keys_with_questionmarks.js
rename to test/_files/keys_with_questionmarks.js
index 55a220d..becd631 100644
--- a/spec/_files/keys_with_questionmarks.js
+++ b/test/_files/keys_with_questionmarks.js
@@ -1,5 +1,5 @@
-var keys_with_questionmarks = {
+({
   "person?": {
     name: "Jon"
   }
-}
+})
diff --git a/spec/_files/keys_with_questionmarks.mustache b/test/_files/keys_with_questionmarks.mustache
similarity index 100%
rename from spec/_files/keys_with_questionmarks.mustache
rename to test/_files/keys_with_questionmarks.mustache
diff --git a/spec/_files/keys_with_questionmarks.txt b/test/_files/keys_with_questionmarks.txt
similarity index 100%
rename from spec/_files/keys_with_questionmarks.txt
rename to test/_files/keys_with_questionmarks.txt
diff --git a/test/_files/multiline_comment.js b/test/_files/multiline_comment.js
new file mode 100644
index 0000000..b4100a5
--- /dev/null
+++ b/test/_files/multiline_comment.js
@@ -0,0 +1 @@
+({})
diff --git a/spec/_files/multiline_comment.mustache b/test/_files/multiline_comment.mustache
similarity index 100%
rename from spec/_files/multiline_comment.mustache
rename to test/_files/multiline_comment.mustache
diff --git a/spec/_files/multiline_comment.txt b/test/_files/multiline_comment.txt
similarity index 100%
rename from spec/_files/multiline_comment.txt
rename to test/_files/multiline_comment.txt
diff --git a/spec/_files/nested_iterating.js b/test/_files/nested_iterating.js
similarity index 71%
rename from spec/_files/nested_iterating.js
rename to test/_files/nested_iterating.js
index a8275f9..2708b2d 100644
--- a/spec/_files/nested_iterating.js
+++ b/test/_files/nested_iterating.js
@@ -1,8 +1,8 @@
-var nested_iterating = {
+({
   inner: [{
     foo: 'foo',
     inner: [{
       bar: 'bar'
     }]
   }]
-};
+})
diff --git a/spec/_files/nested_iterating.mustache b/test/_files/nested_iterating.mustache
similarity index 100%
rename from spec/_files/nested_iterating.mustache
rename to test/_files/nested_iterating.mustache
diff --git a/spec/_files/nested_iterating.txt b/test/_files/nested_iterating.txt
similarity index 100%
rename from spec/_files/nested_iterating.txt
rename to test/_files/nested_iterating.txt
diff --git a/spec/_files/nesting.js b/test/_files/nesting.js
similarity index 76%
rename from spec/_files/nesting.js
rename to test/_files/nesting.js
index 1f76cd0..264cc2f 100644
--- a/spec/_files/nesting.js
+++ b/test/_files/nesting.js
@@ -1,7 +1,7 @@
-var nesting = {
+({
   foo: [
     {a: {b: 1}},
     {a: {b: 2}},
     {a: {b: 3}}
   ]
-};
+})
diff --git a/spec/_files/nesting.mustache b/test/_files/nesting.mustache
similarity index 100%
rename from spec/_files/nesting.mustache
rename to test/_files/nesting.mustache
diff --git a/spec/_files/nesting.txt b/test/_files/nesting.txt
similarity index 100%
rename from spec/_files/nesting.txt
rename to test/_files/nesting.txt
diff --git a/spec/_files/nesting_same_name.js b/test/_files/nesting_same_name.js
similarity index 71%
rename from spec/_files/nesting_same_name.js
rename to test/_files/nesting_same_name.js
index a5fb65b..10a0c14 100644
--- a/spec/_files/nesting_same_name.js
+++ b/test/_files/nesting_same_name.js
@@ -1,8 +1,8 @@
-var nesting_same_name = {
+({
   items: [
     {
       name: 'name',
       items: [1, 2, 3, 4]
     }
   ]
-};
+})
diff --git a/spec/_files/nesting_same_name.mustache b/test/_files/nesting_same_name.mustache
similarity index 100%
rename from spec/_files/nesting_same_name.mustache
rename to test/_files/nesting_same_name.mustache
diff --git a/spec/_files/nesting_same_name.txt b/test/_files/nesting_same_name.txt
similarity index 100%
rename from spec/_files/nesting_same_name.txt
rename to test/_files/nesting_same_name.txt
diff --git a/spec/_files/null_string.js b/test/_files/null_string.js
similarity index 84%
rename from spec/_files/null_string.js
rename to test/_files/null_string.js
index ab5291f..984ee51 100644
--- a/spec/_files/null_string.js
+++ b/test/_files/null_string.js
@@ -1,4 +1,4 @@
-var null_string = {
+({
   name: "Elise",
   glytch: true,
   binary: false,
@@ -7,4 +7,4 @@ var null_string = {
   numeric: function() {
     return NaN;
   }
-};
+})
diff --git a/spec/_files/null_string.mustache b/test/_files/null_string.mustache
similarity index 100%
rename from spec/_files/null_string.mustache
rename to test/_files/null_string.mustache
diff --git a/spec/_files/null_string.txt b/test/_files/null_string.txt
similarity index 100%
rename from spec/_files/null_string.txt
rename to test/_files/null_string.txt
diff --git a/spec/_files/partial_array.js b/test/_files/partial_array.js
similarity index 55%
rename from spec/_files/partial_array.js
rename to test/_files/partial_array.js
index f16e9eb..2a6ddf1 100644
--- a/spec/_files/partial_array.js
+++ b/test/_files/partial_array.js
@@ -1,3 +1,3 @@
-var partial_array = {
+({
   array: ['1', '2', '3', '4']
-};
\ No newline at end of file
+})
diff --git a/spec/_files/partial_array.mustache b/test/_files/partial_array.mustache
similarity index 100%
rename from spec/_files/partial_array.mustache
rename to test/_files/partial_array.mustache
diff --git a/spec/_files/partial_array.partial b/test/_files/partial_array.partial
similarity index 100%
rename from spec/_files/partial_array.partial
rename to test/_files/partial_array.partial
diff --git a/spec/_files/partial_array.txt b/test/_files/partial_array.txt
similarity index 100%
rename from spec/_files/partial_array.txt
rename to test/_files/partial_array.txt
diff --git a/test/_files/partial_array_of_partials.js b/test/_files/partial_array_of_partials.js
new file mode 100644
index 0000000..03f13c9
--- /dev/null
+++ b/test/_files/partial_array_of_partials.js
@@ -0,0 +1,8 @@
+({
+  numbers: [
+    {i: '1'},
+    {i: '2'},
+    {i: '3'},
+    {i: '4'}
+  ]
+})
diff --git a/spec/_files/partial_array_of_partials.mustache b/test/_files/partial_array_of_partials.mustache
similarity index 100%
rename from spec/_files/partial_array_of_partials.mustache
rename to test/_files/partial_array_of_partials.mustache
diff --git a/spec/_files/partial_array_of_partials.partial b/test/_files/partial_array_of_partials.partial
similarity index 100%
rename from spec/_files/partial_array_of_partials.partial
rename to test/_files/partial_array_of_partials.partial
diff --git a/spec/_files/partial_array_of_partials.txt b/test/_files/partial_array_of_partials.txt
similarity index 100%
rename from spec/_files/partial_array_of_partials.txt
rename to test/_files/partial_array_of_partials.txt
diff --git a/test/_files/partial_array_of_partials_implicit.js b/test/_files/partial_array_of_partials_implicit.js
new file mode 100644
index 0000000..9ec0c00
--- /dev/null
+++ b/test/_files/partial_array_of_partials_implicit.js
@@ -0,0 +1,3 @@
+({
+  numbers: ['1', '2', '3', '4']
+})
diff --git a/spec/_files/partial_array_of_partials_implicit.mustache b/test/_files/partial_array_of_partials_implicit.mustache
similarity index 100%
rename from spec/_files/partial_array_of_partials_implicit.mustache
rename to test/_files/partial_array_of_partials_implicit.mustache
diff --git a/spec/_files/partial_array_of_partials_implicit.partial b/test/_files/partial_array_of_partials_implicit.partial
similarity index 100%
rename from spec/_files/partial_array_of_partials_implicit.partial
rename to test/_files/partial_array_of_partials_implicit.partial
diff --git a/spec/_files/partial_array_of_partials_implicit.txt b/test/_files/partial_array_of_partials_implicit.txt
similarity index 100%
rename from spec/_files/partial_array_of_partials_implicit.txt
rename to test/_files/partial_array_of_partials_implicit.txt
diff --git a/test/_files/partial_empty.js b/test/_files/partial_empty.js
new file mode 100644
index 0000000..82b8c22
--- /dev/null
+++ b/test/_files/partial_empty.js
@@ -0,0 +1,3 @@
+({
+  foo: 1
+})
diff --git a/spec/_files/partial_empty.mustache b/test/_files/partial_empty.mustache
similarity index 100%
rename from spec/_files/partial_empty.mustache
rename to test/_files/partial_empty.mustache
diff --git a/spec/_files/partial_empty.partial b/test/_files/partial_empty.partial
similarity index 100%
rename from spec/_files/partial_empty.partial
rename to test/_files/partial_empty.partial
diff --git a/spec/_files/partial_empty.txt b/test/_files/partial_empty.txt
similarity index 100%
rename from spec/_files/partial_empty.txt
rename to test/_files/partial_empty.txt
diff --git a/spec/_files/partial_recursion.js b/test/_files/partial_recursion.js
similarity index 78%
rename from spec/_files/partial_recursion.js
rename to test/_files/partial_recursion.js
index 3094eba..e39d64d 100644
--- a/spec/_files/partial_recursion.js
+++ b/test/_files/partial_recursion.js
@@ -1,4 +1,4 @@
-var partial_recursion = {
+({
   name: '1',
   kids: [
     {
@@ -8,4 +8,4 @@ var partial_recursion = {
       ]
     }
   ]
-};
+})
diff --git a/spec/_files/partial_recursion.mustache b/test/_files/partial_recursion.mustache
similarity index 100%
rename from spec/_files/partial_recursion.mustache
rename to test/_files/partial_recursion.mustache
diff --git a/spec/_files/partial_recursion.partial b/test/_files/partial_recursion.partial
similarity index 72%
rename from spec/_files/partial_recursion.partial
rename to test/_files/partial_recursion.partial
index ba6f8fa..457d2a0 100644
--- a/spec/_files/partial_recursion.partial
+++ b/test/_files/partial_recursion.partial
@@ -1,4 +1,4 @@
 {{name}}
 {{#children}}
 {{>partial}}
-{{/children}}
+{{/children}}
\ No newline at end of file
diff --git a/spec/_files/partial_recursion.txt b/test/_files/partial_recursion.txt
similarity index 100%
rename from spec/_files/partial_recursion.txt
rename to test/_files/partial_recursion.txt
diff --git a/test/_files/partial_template.js b/test/_files/partial_template.js
new file mode 100644
index 0000000..a913f87
--- /dev/null
+++ b/test/_files/partial_template.js
@@ -0,0 +1,6 @@
+({
+  title: function () {
+    return "Welcome";
+  },
+  again: "Goodbye"
+})
diff --git a/spec/_files/partial_template.mustache b/test/_files/partial_template.mustache
similarity index 100%
rename from spec/_files/partial_template.mustache
rename to test/_files/partial_template.mustache
diff --git a/spec/_files/partial_template.partial b/test/_files/partial_template.partial
similarity index 100%
rename from spec/_files/partial_template.partial
rename to test/_files/partial_template.partial
diff --git a/spec/_files/partial_template.txt b/test/_files/partial_template.txt
similarity index 100%
rename from spec/_files/partial_template.txt
rename to test/_files/partial_template.txt
diff --git a/spec/_files/partial_view.js b/test/_files/partial_view.js
similarity index 60%
rename from spec/_files/partial_view.js
rename to test/_files/partial_view.js
index 4ea8a12..3ad70d3 100644
--- a/spec/_files/partial_view.js
+++ b/test/_files/partial_view.js
@@ -1,16 +1,14 @@
-var partial_view = {
-  greeting: function() {
+({
+  greeting: function () {
     return "Welcome";
   },
-
-  farewell: function() {
+  farewell: function () {
     return "Fair enough, right?";
   },
-
   name: "Chris",
   value: 10000,
-  taxed_value: function() {
+  taxed_value: function () {
     return this.value - (this.value * 0.4);
   },
   in_ca: true
-};
+})
diff --git a/spec/_files/partial_view.mustache b/test/_files/partial_view.mustache
similarity index 100%
rename from spec/_files/partial_view.mustache
rename to test/_files/partial_view.mustache
diff --git a/spec/_files/partial_view.partial b/test/_files/partial_view.partial
similarity index 89%
rename from spec/_files/partial_view.partial
rename to test/_files/partial_view.partial
index 2fea632..03df206 100644
--- a/spec/_files/partial_view.partial
+++ b/test/_files/partial_view.partial
@@ -2,4 +2,4 @@ Hello {{name}}
 You have just won ${{value}}!
 {{#in_ca}}
 Well, ${{ taxed_value }}, after taxes.
-{{/in_ca}}
+{{/in_ca}}
\ No newline at end of file
diff --git a/spec/_files/partial_view.txt b/test/_files/partial_view.txt
similarity index 100%
rename from spec/_files/partial_view.txt
rename to test/_files/partial_view.txt
diff --git a/spec/_files/partial_whitespace.js b/test/_files/partial_whitespace.js
similarity index 59%
rename from spec/_files/partial_whitespace.js
rename to test/_files/partial_whitespace.js
index f4b1ee5..3ad70d3 100644
--- a/spec/_files/partial_whitespace.js
+++ b/test/_files/partial_whitespace.js
@@ -1,17 +1,14 @@
-var partial_whitespace = {
-  greeting: function() {
+({
+  greeting: function () {
     return "Welcome";
   },
-
-  farewell: function() {
+  farewell: function () {
     return "Fair enough, right?";
   },
-
   name: "Chris",
   value: 10000,
-  taxed_value: function() {
+  taxed_value: function () {
     return this.value - (this.value * 0.4);
   },
   in_ca: true
-};
-
+})
diff --git a/spec/_files/partial_whitespace.mustache b/test/_files/partial_whitespace.mustache
similarity index 100%
rename from spec/_files/partial_whitespace.mustache
rename to test/_files/partial_whitespace.mustache
diff --git a/spec/_files/partial_whitespace.partial b/test/_files/partial_whitespace.partial
similarity index 87%
rename from spec/_files/partial_whitespace.partial
rename to test/_files/partial_whitespace.partial
index 9c46084..30de8f6 100644
--- a/spec/_files/partial_whitespace.partial
+++ b/test/_files/partial_whitespace.partial
@@ -2,4 +2,4 @@ Hello {{ name}}
 You have just won ${{value }}!
 {{# in_ca  }}
 Well, ${{ taxed_value }}, after taxes.
-{{/  in_ca }}
+{{/  in_ca }}
\ No newline at end of file
diff --git a/spec/_files/partial_whitespace.txt b/test/_files/partial_whitespace.txt
similarity index 100%
rename from spec/_files/partial_whitespace.txt
rename to test/_files/partial_whitespace.txt
diff --git a/spec/_files/recursion_with_same_names.js b/test/_files/recursion_with_same_names.js
similarity index 56%
rename from spec/_files/recursion_with_same_names.js
rename to test/_files/recursion_with_same_names.js
index 5cceb08..ce26502 100644
--- a/spec/_files/recursion_with_same_names.js
+++ b/test/_files/recursion_with_same_names.js
@@ -1,8 +1,8 @@
-var recursion_with_same_names = {
+({
   name: 'name',
   description: 'desc',
   terms: [
     {name: 't1', index: 0},
-    {name: 't2', index: 1},
+    {name: 't2', index: 1}
   ]
-};
\ No newline at end of file
+})
diff --git a/spec/_files/recursion_with_same_names.mustache b/test/_files/recursion_with_same_names.mustache
similarity index 100%
rename from spec/_files/recursion_with_same_names.mustache
rename to test/_files/recursion_with_same_names.mustache
diff --git a/spec/_files/recursion_with_same_names.txt b/test/_files/recursion_with_same_names.txt
similarity index 100%
rename from spec/_files/recursion_with_same_names.txt
rename to test/_files/recursion_with_same_names.txt
diff --git a/spec/_files/reuse_of_enumerables.js b/test/_files/reuse_of_enumerables.js
similarity index 69%
rename from spec/_files/reuse_of_enumerables.js
rename to test/_files/reuse_of_enumerables.js
index a3168d3..4368b57 100644
--- a/spec/_files/reuse_of_enumerables.js
+++ b/test/_files/reuse_of_enumerables.js
@@ -1,6 +1,6 @@
-var reuse_of_enumerables = {
+({
   terms: [
     {name: 't1', index: 0},
     {name: 't2', index: 1}
   ]
-};
\ No newline at end of file
+})
diff --git a/spec/_files/reuse_of_enumerables.mustache b/test/_files/reuse_of_enumerables.mustache
similarity index 100%
rename from spec/_files/reuse_of_enumerables.mustache
rename to test/_files/reuse_of_enumerables.mustache
diff --git a/spec/_files/reuse_of_enumerables.txt b/test/_files/reuse_of_enumerables.txt
similarity index 100%
rename from spec/_files/reuse_of_enumerables.txt
rename to test/_files/reuse_of_enumerables.txt
diff --git a/spec/_files/section_as_context.js b/test/_files/section_as_context.js
similarity index 53%
rename from spec/_files/section_as_context.js
rename to test/_files/section_as_context.js
index 81ca1be..425b29c 100644
--- a/spec/_files/section_as_context.js
+++ b/test/_files/section_as_context.js
@@ -1,7 +1,10 @@
-var section_as_context = {
+({
   a_object: {
     title: 'this is an object',
     description: 'one of its attributes is a list',
-    a_list: [{label: 'listitem1'}, {label: 'listitem2'}]
+    a_list: [
+      {label: 'listitem1'},
+      {label: 'listitem2'}
+    ]
   }
-};
+})
diff --git a/spec/_files/section_as_context.mustache b/test/_files/section_as_context.mustache
similarity index 100%
rename from spec/_files/section_as_context.mustache
rename to test/_files/section_as_context.mustache
diff --git a/spec/_files/section_as_context.txt b/test/_files/section_as_context.txt
similarity index 100%
rename from spec/_files/section_as_context.txt
rename to test/_files/section_as_context.txt
diff --git a/spec/_files/simple.js b/test/_files/simple.js
similarity index 67%
rename from spec/_files/simple.js
rename to test/_files/simple.js
index 30f9834..1d8d6f4 100644
--- a/spec/_files/simple.js
+++ b/test/_files/simple.js
@@ -1,8 +1,8 @@
-var simple = {
+({
   name: "Chris",
   value: 10000,
-  taxed_value: function() {
+  taxed_value: function () {
     return this.value - (this.value * 0.4);
   },
   in_ca: true
-};
+})
diff --git a/spec/_files/simple.mustache b/test/_files/simple.mustache
similarity index 100%
rename from spec/_files/simple.mustache
rename to test/_files/simple.mustache
diff --git a/spec/_files/simple.txt b/test/_files/simple.txt
similarity index 100%
rename from spec/_files/simple.txt
rename to test/_files/simple.txt
diff --git a/test/_files/string_as_context.js b/test/_files/string_as_context.js
new file mode 100644
index 0000000..e8bb4da
--- /dev/null
+++ b/test/_files/string_as_context.js
@@ -0,0 +1,4 @@
+({
+  a_string: 'aa',
+  a_list: ['a','b','c']
+})
diff --git a/spec/_files/string_as_context.mustache b/test/_files/string_as_context.mustache
similarity index 100%
rename from spec/_files/string_as_context.mustache
rename to test/_files/string_as_context.mustache
diff --git a/spec/_files/string_as_context.txt b/test/_files/string_as_context.txt
similarity index 100%
rename from spec/_files/string_as_context.txt
rename to test/_files/string_as_context.txt
diff --git a/spec/_files/two_in_a_row.js b/test/_files/two_in_a_row.js
similarity index 60%
rename from spec/_files/two_in_a_row.js
rename to test/_files/two_in_a_row.js
index 09c1809..9c17c11 100644
--- a/spec/_files/two_in_a_row.js
+++ b/test/_files/two_in_a_row.js
@@ -1,4 +1,4 @@
-var two_in_a_row = {
+({
   name: "Joe",
   greeting: "Welcome"
-};
+})
diff --git a/spec/_files/two_in_a_row.mustache b/test/_files/two_in_a_row.mustache
similarity index 100%
rename from spec/_files/two_in_a_row.mustache
rename to test/_files/two_in_a_row.mustache
diff --git a/spec/_files/two_in_a_row.txt b/test/_files/two_in_a_row.txt
similarity index 100%
rename from spec/_files/two_in_a_row.txt
rename to test/_files/two_in_a_row.txt
diff --git a/test/_files/two_sections.js b/test/_files/two_sections.js
new file mode 100644
index 0000000..b4100a5
--- /dev/null
+++ b/test/_files/two_sections.js
@@ -0,0 +1 @@
+({})
diff --git a/spec/_files/two_sections.mustache b/test/_files/two_sections.mustache
similarity index 100%
rename from spec/_files/two_sections.mustache
rename to test/_files/two_sections.mustache
diff --git a/spec/_files/two_sections.txt b/test/_files/two_sections.txt
similarity index 100%
rename from spec/_files/two_sections.txt
rename to test/_files/two_sections.txt
diff --git a/test/_files/unescaped.js b/test/_files/unescaped.js
new file mode 100644
index 0000000..b6d064f
--- /dev/null
+++ b/test/_files/unescaped.js
@@ -0,0 +1,5 @@
+({
+  title: function () {
+    return "Bear > Shark";
+  }
+})
diff --git a/spec/_files/unescaped.mustache b/test/_files/unescaped.mustache
similarity index 100%
rename from spec/_files/unescaped.mustache
rename to test/_files/unescaped.mustache
diff --git a/spec/_files/unescaped.txt b/test/_files/unescaped.txt
similarity index 100%
rename from spec/_files/unescaped.txt
rename to test/_files/unescaped.txt
diff --git a/spec/_files/whitespace.js b/test/_files/whitespace.js
similarity index 60%
rename from spec/_files/whitespace.js
rename to test/_files/whitespace.js
index 97f53c1..f41cb56 100644
--- a/spec/_files/whitespace.js
+++ b/test/_files/whitespace.js
@@ -1,4 +1,4 @@
-var whitespace = {
+({
   tag1: "Hello",
   tag2: "World"
-};
+})
diff --git a/spec/_files/whitespace.mustache b/test/_files/whitespace.mustache
similarity index 100%
rename from spec/_files/whitespace.mustache
rename to test/_files/whitespace.mustache
diff --git a/spec/_files/whitespace.txt b/test/_files/whitespace.txt
similarity index 100%
rename from spec/_files/whitespace.txt
rename to test/_files/whitespace.txt
diff --git a/test/context_test.js b/test/context_test.js
new file mode 100644
index 0000000..71c5830
--- /dev/null
+++ b/test/context_test.js
@@ -0,0 +1,47 @@
+var assert = require("assert"),
+    vows = require("vows"),
+    Context = require("./../mustache").Context;
+
+vows.describe("Mustache.Context").addBatch({
+  "A Context": {
+    topic: function () {
+      var view = { name: 'parent', message: 'hi', a: { b: 'b' } };
+      var context = new Context(view);
+      return context;
+    },
+    "should be able to lookup properties of its own view": function (context) {
+      assert.equal(context.lookup("name"), "parent");
+    },
+    "should be able to lookup nested properties of its own view": function (context) {
+      assert.equal(context.lookup("a.b"), "b");
+    },
+    "when pushed": {
+      topic: function (context) {
+        var view = { name: 'child', c: { d: 'd' } };
+        return context.push(view);
+      },
+      "should return the child context": function (context) {
+        assert.equal(context.view.name, "child");
+        assert.equal(context.parent.view.name, "parent");
+      },
+      "should be able to lookup properties of its own view": function (context) {
+        assert.equal(context.lookup("name"), "child");
+      },
+      "should be able to lookup properties of the parent context's view": function (context) {
+        assert.equal(context.lookup("message"), "hi");
+      },
+      "should be able to lookup nested properties of its own view": function (context) {
+        assert.equal(context.lookup("c.d"), "d");
+      },
+      "should be able to lookup nested properties of its parent view": function (context) {
+        assert.equal(context.lookup("a.b"), "b");
+      }
+    } // when pushed
+  }, // A Context
+  "make": {
+    "should return the same object when given a Context": function () {
+      var context = new Context;
+      assert.strictEqual(Context.make(context), context);
+    }
+  }
+}).export(module);
diff --git a/test/helper.rb b/test/helper.rb
new file mode 100644
index 0000000..baadb94
--- /dev/null
+++ b/test/helper.rb
@@ -0,0 +1,48 @@
+require 'test/unit'
+
+module Mustache
+  extend self
+
+  ROOT = File.expand_path('../..', __FILE__)
+  TEST = File.join(ROOT, 'test')
+  TEST_FILES = File.join(TEST, '_files')
+
+  MUSTACHE_JS = File.read(File.join(ROOT, 'mustache.js'))
+
+  TESTS = Dir.glob(File.join(TEST_FILES, '*.js')).map do |name|
+    File.basename name, '.js'
+  end
+
+  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 javascript_engines
+    %w[v8 spidermonkey javascriptcore rhino]
+  end
+
+  def available_javascript_engines
+    javascript_engines.select {|engine| send("has_#{engine}?") }
+  end
+
+  def has_any_engines?
+    available_javascript_engines.any?
+  end
+
+  def has_v8?
+    File.exist?(NODE_PATH)
+  end
+
+  def has_spidermonkey?
+    File.exist?(JS_PATH)
+  end
+
+  def has_javascriptcore?
+    File.exist?(JSC_PATH)
+  end
+
+  def has_rhino?
+    `java #{RHINO_JAR} 'foo' 2>&1` !~ /ClassNotFoundException/
+  end
+end
diff --git a/test/integration.rb b/test/integration.rb
new file mode 100644
index 0000000..d3d482d
--- /dev/null
+++ b/test/integration.rb
@@ -0,0 +1,76 @@
+require File.expand_path('../helper', __FILE__)
+require 'fileutils'
+require 'json'
+
+module Mustache
+  class Test < Test::Unit::TestCase
+
+    def self.run_tests_for(engine)
+      TESTS.each do |test|
+        define_method("test_#{engine}_#{test}") do
+          template, view, partial, expect = load_test(test)
+
+          assert_equal expect, run_js(engine, <<-JS).chomp
+            try {
+              #{boilerplate_for(engine)}
+              var template = #{template.to_json};
+              var view = #{view};
+              var partials = {partial: #{partial.to_json}};
+              print(Mustache.render(template, view, partials));
+            } catch(e) {
+              print('ERROR: ' + e.message);
+            }
+          JS
+        end
+      end
+    end
+
+    unless Mustache.has_any_engines?
+      abort "ERROR: Please install node, SpiderMonkey, JavaScriptCore or Rhino"
+    end
+
+    run_tests_for :v8 if Mustache.has_v8?
+    run_tests_for :spidermonkey if Mustache.has_spidermonkey?
+    run_tests_for :javascriptcore if Mustache.has_javascriptcore?
+    run_tests_for :rhino if Mustache.has_rhino?
+
+  private
+
+    def load_test(name)
+      template_file = File.join(TEST_FILES, "#{name}.mustache")
+      view_file = File.join(TEST_FILES, "#{name}.js")
+      partial_file = File.join(TEST_FILES, "#{name}.partial")
+      expect_file = File.join(TEST_FILES, "#{name}.txt")
+
+      [template_file, view_file, partial_file, expect_file].map do |file|
+        File.exist?(file) ? File.read(file) : ""
+      end
+    end
+
+    def runner_file
+      "runner.js"
+    end
+
+    def run_js(engine, js)
+      cmd = case engine
+        when :v8              then NODE_PATH
+        when :spidermonkey    then JS_PATH
+        when :javascriptcore  then JSC_PATH
+        when :rhino           then "java #{RHINO_JAR}"
+        end
+
+      File.open(runner_file, 'w') {|file| file.write(js) }
+
+      `#{cmd} #{runner_file}`
+    ensure
+      FileUtils.rm_r(runner_file)
+    end
+
+    def boilerplate_for(engine)
+      boilerplate = MUSTACHE_JS
+      boilerplate += "\nvar print = console.log;" if engine == :v8
+      boilerplate
+    end
+
+  end
+end
diff --git a/test/parse_test.js b/test/parse_test.js
new file mode 100644
index 0000000..8586a25
--- /dev/null
+++ b/test/parse_test.js
@@ -0,0 +1,67 @@
+var assert = require("assert"),
+    vows = require("vows"),
+    parse = require("./../mustache").parse;
+
+// A map of templates to their expected token output.
+var expectations = {
+  "{{hi}}"                                  : [ { type: 'name', value: 'hi' } ],
+  "{{hi.world}}"                            : [ { type: 'name', value: 'hi.world' } ],
+  "{{hi . world}}"                          : [ { type: 'name', value: 'hi . world' } ],
+  "{{ hi}}"                                 : [ { type: 'name', value: 'hi' } ],
+  "{{hi }}"                                 : [ { type: 'name', value: 'hi' } ],
+  "{{ hi }}"                                : [ { type: 'name', value: 'hi' } ],
+  "{{{hi}}}"                                : [ { type: '{', value: 'hi' } ],
+  "{{!hi}}"                                 : [ { type: '!', value: 'hi' } ],
+  "{{! hi}}"                                : [ { type: '!', value: 'hi' } ],
+  "{{! hi }}"                               : [ { type: '!', value: 'hi' } ],
+  "{{ !hi}}"                                : [ { type: '!', value: 'hi' } ],
+  "{{ ! hi}}"                               : [ { type: '!', value: 'hi' } ],
+  "{{ ! hi }}"                              : [ { type: '!', value: 'hi' } ],
+  "a{{hi}}"                                 : [ { type: 'text', value: 'a' }, { type: 'name', value: 'hi' } ],
+  "a {{hi}}"                                : [ { type: 'text', value: 'a ' }, { type: 'name', value: 'hi' } ],
+  " a{{hi}}"                                : [ { type: 'text', value: ' a' }, { type: 'name', value: 'hi' } ],
+  " a {{hi}}"                               : [ { type: 'text', value: ' a ' }, { type: 'name', value: 'hi' } ],
+  "a{{hi}}b"                                : [ { type: 'text', value: 'a' }, { type: 'name', value: 'hi' }, { type: 'text', value: 'b' } ],
+  "a{{hi}} b"                               : [ { type: 'text', value: 'a' }, { type: 'name', value: 'hi' }, { type: 'text', value: ' b' } ],
+  "a{{hi}}b "                               : [ { type: 'text', value: 'a' }, { type: 'name', value: 'hi' }, { type: 'text', value: 'b ' } ],
+  "a\n{{hi}} b \n"                          : [ { type: 'text', value: 'a\n' }, { type: 'name', value: 'hi' }, { type: 'text', value: ' b \n' } ],
+  "a\n {{hi}} \nb"                          : [ { type: 'text', value: 'a\n ' }, { type: 'name', value: 'hi' }, { type: 'text', value: ' \nb' } ],
+  "a\n {{!hi}} \nb"                         : [ { type: 'text', value: 'a\n' }, { type: '!', value: 'hi' }, { type: 'text', value: 'b' } ],
+  "a\n{{#a}}{{/a}}\nb"                      : [ { type: 'text', value: 'a\n' }, { type: '#', value: 'a', tokens: [] }, { type: 'text', value: 'b' } ],
+  "a\n {{#a}}{{/a}}\nb"                     : [ { type: 'text', value: 'a\n' }, { type: '#', value: 'a', tokens: [] }, { type: 'text', value: 'b' } ],
+  "a\n {{#a}}{{/a}} \nb"                    : [ { type: 'text', value: 'a\n' }, { type: '#', value: 'a', tokens: [] }, { type: 'text', value: 'b' } ],
+  "a\n{{#a}}\n{{/a}}\nb"                    : [ { type: 'text', value: 'a\n' }, { type: '#', value: 'a', tokens: [] }, { type: 'text', value: 'b' } ],
+  "a\n {{#a}}\n{{/a}}\nb"                   : [ { type: 'text', value: 'a\n' }, { type: '#', value: 'a', tokens: [] }, { type: 'text', value: 'b' } ],
+  "a\n {{#a}}\n{{/a}} \nb"                  : [ { type: 'text', value: 'a\n' }, { type: '#', value: 'a', tokens: [] }, { type: 'text', value: 'b' } ],
+  "a\n{{#a}}\n{{/a}}\n{{#b}}\n{{/b}}\nb"    : [ { type: 'text', value: 'a\n' }, { type: '#', value: 'a', tokens: [] }, { type: '#', value: 'b', tokens: [] }, { type: 'text', value: 'b' } ],
+  "a\n {{#a}}\n{{/a}}\n{{#b}}\n{{/b}}\nb"   : [ { type: 'text', value: 'a\n' }, { type: '#', value: 'a', tokens: [] }, { type: '#', value: 'b', tokens: [] }, { type: 'text', value: 'b' } ],
+  "a\n {{#a}}\n{{/a}}\n{{#b}}\n{{/b}} \nb"  : [ { type: 'text', value: 'a\n' }, { type: '#', value: 'a', tokens: [] }, { type: '#', value: 'b', tokens: [] }, { type: 'text', value: 'b' } ],
+  "a\n{{#a}}\n{{#b}}\n{{/b}}\n{{/a}}\nb"    : [ { type: 'text', value: 'a\n' }, { type: '#', value: 'a', tokens: [ { type: '#', value: 'b', tokens: [] } ] }, { type: 'text', value: 'b' } ],
+  "a\n {{#a}}\n{{#b}}\n{{/b}}\n{{/a}}\nb"   : [ { type: 'text', value: 'a\n' }, { type: '#', value: 'a', tokens: [ { type: '#', value: 'b', tokens: [] } ] }, { type: 'text', value: 'b' } ],
+  "a\n {{#a}}\n{{#b}}\n{{/b}}\n{{/a}} \nb"  : [ { type: 'text', value: 'a\n' }, { type: '#', value: 'a', tokens: [ { type: '#', value: 'b', tokens: [] } ] }, { type: 'text', value: 'b' } ],
+  "{{>abc}}"                                : [ { type: '>', value: 'abc' } ],
+  "{{> abc }}"                              : [ { type: '>', value: 'abc' } ],
+  "{{ > abc }}"                             : [ { type: '>', value: 'abc' } ],
+  "{{=<% %>=}}"                             : [ { type: '=', value: '<% %>' } ],
+  "{{= <% %> =}}"                           : [ { type: '=', value: '<% %>' } ],
+  "{{=<% %>=}}<%={{ }}=%>"                  : [ { type: '=', value: '<% %>' }, { type: '=', value: '{{ }}' } ],
+  "{{=<% %>=}}<%hi%>"                       : [ { type: '=', value: '<% %>' }, { type: 'name', value: 'hi' } ],
+  "{{#a}}{{/a}}hi{{#b}}{{/b}}\n"            : [ { type: '#', value: 'a', tokens: [] }, { type: 'text', value: 'hi' }, { type: '#', value: 'b', tokens: [] }, { type: 'text', value: '\n' } ],
+  "{{a}}\n{{b}}\n\n{{#c}}\n{{/c}}\n"        : [ { type: 'name', value: 'a' }, { type: 'text', value: '\n' }, { type: 'name', value: 'b' }, { type: 'text', value: '\n\n' }, { type: '#', value: 'c', tokens: [] } ],
+  "{{#foo}}\n  {{#a}}\n    {{b}}\n  {{/a}}\n{{/foo}}\n"
+                                            : [ { type: "#", value: "foo", tokens: [ { type: "#", value: "a", tokens: [ { type: "text", value: "    " }, { type: "name", value: "b" }, { type: "text", value: "\n" } ] } ] } ]
+};
+
+var spec = {};
+
+for (var template in expectations) {
+  (function (template, tokens) {
+    spec["knows how to parse " + JSON.stringify(template)] = function () {
+      assert.deepEqual(parse(template), tokens);
+    };
+  })(template, expectations[template]);
+}
+
+vows.describe("Mustache.parse").addBatch({
+  "parse": spec
+}).export(module);
diff --git a/test/render_test.js b/test/render_test.js
new file mode 100644
index 0000000..9638638
--- /dev/null
+++ b/test/render_test.js
@@ -0,0 +1,63 @@
+var fs = require("fs"),
+    path = require("path"),
+    assert = require("assert"),
+    vows = require("vows");
+
+var Mustache = require(path.join(__dirname, "..", "mustache"));
+var _files = path.join(__dirname, "_files");
+
+function getContents(testName, ext) {
+  var file = path.join(_files, testName + "." + ext);
+  try {
+    return fs.readFileSync(file, "utf8");
+  } catch (e) {}
+}
+
+// You can put the name of a specific test to run in the TEST environment
+// variable (e.g. TEST=backslashes vows test/render_test.js)
+var testToRun = process.env["TEST"];
+
+var testNames;
+if (testToRun) {
+  testNames = [testToRun];
+} else {
+  testNames = fs.readdirSync(_files).filter(function (file) {
+    return (/\.js$/).test(file);
+  }).map(function (file) {
+    return path.basename(file).replace(/\.js$/, "");
+  });
+}
+
+var spec = {};
+
+testNames.forEach(function (testName) {
+  var view = getContents(testName, "js");
+
+  if (view) {
+    view = eval(view);
+  } else {
+    console.log("Cannot find view for test: " + testName);
+    process.exit();
+  }
+
+  var template = getContents(testName, "mustache");
+  var expect = getContents(testName, "txt");
+  var partial = getContents(testName, "partial");
+
+  spec["knows how to render " + testName] = function () {
+    Mustache.clearCache();
+
+    var output;
+    if (partial) {
+      output = Mustache.render(template, view, {partial: partial});
+    } else {
+      output = Mustache.render(template, view);
+    }
+
+    assert.equal(output, expect);
+  };
+});
+
+vows.describe("Mustache.render").addBatch({
+  "render": spec
+}).export(module);
diff --git a/test/scanner_test.js b/test/scanner_test.js
new file mode 100644
index 0000000..79def2f
--- /dev/null
+++ b/test/scanner_test.js
@@ -0,0 +1,117 @@
+var assert = require("assert"),
+    vows = require("vows"),
+    Scanner = require("./../mustache").Scanner;
+
+vows.describe("Mustache.Scanner").addBatch({
+  "A Scanner": {
+    "for an empty string": {
+      topic: new Scanner(""),
+      "should be at the end of the string": function () {
+        var scanner = new Scanner("");
+        assert(scanner.eos());
+      }
+    },
+    "for a non-empty string": {
+      topic: "a b c",
+      "when calling scan": {
+        "when the regexp matches the entire string": {
+          topic: function (string) {
+            var scanner = new Scanner(string);
+            var match = scanner.scan(/a b c/);
+            this.callback(scanner, match);
+          },
+          "it should return the entire string": function (scanner, match) {
+            assert.equal(match, scanner.string);
+          },
+          "it should be at the end of the string": function (scanner, match) {
+            assert(scanner.eos());
+          }
+        }, // when the regexp matches the entire string
+        "when the regexp matches": {
+          "at the 0th index": {
+            topic: function (string) {
+              var scanner = new Scanner(string);
+              var match = scanner.scan(/a/);
+              this.callback(scanner, match);
+            },
+            "it should return the portion of the string that was matched": function (scanner, match) {
+              assert.equal(match, "a");
+            },
+            "it should advance the internal pointer the length of the match": function (scanner, match) {
+              assert.equal(scanner.pos, 1);
+            }
+          }, // at the 0th index
+          "at some index other than 0": {
+            topic: function (string) {
+              var scanner = new Scanner(string);
+              var match = scanner.scan(/b/);
+              this.callback(scanner, match);
+            },
+            "it should return null": function (scanner, match) {
+              assert.equal(match, null);
+            },
+            "it should not advance the internal pointer": function (scanner, match) {
+              assert.equal(scanner.pos, 0);
+            }
+          } // at some index other than 0
+        }, // when the regexp matches
+        "when the regexp doesn't match": {
+          topic: function (string) {
+            var scanner = new Scanner(string);
+            var match = scanner.scan(/z/);
+            this.callback(scanner, match);
+          },
+          "it should return null": function (scanner, match) {
+            assert.equal(match, null);
+          },
+          "it should not advance the internal pointer": function (scanner, match) {
+            assert.equal(scanner.pos, 0);
+          }
+        }
+      }, // when calling scan
+      "when calling scanUntil": {
+        "when the regexp matches": {
+          "at the 0th index": {
+            topic: function (string) {
+              var scanner = new Scanner(string);
+              var match = scanner.scanUntil(/a/);
+              this.callback(scanner, match);
+            },
+            "it should return null": function (scanner, match) {
+              assert.equal(match, null)
+            },
+            "it should not advance the internal pointer": function (scanner, match) {
+              assert.equal(scanner.pos, 0);
+            }
+          },
+          "at index 2": {
+            topic: function (string) {
+              var scanner = new Scanner(string);
+              var match = scanner.scanUntil(/b/);
+              this.callback(scanner, match);
+            },
+            "it should return the portion of the string it scanned": function (scanner, match) {
+              assert.equal(match, "a ");
+            },
+            "it should advance the internal pointer the length of the match": function (scanner, match) {
+              assert.equal(scanner.pos, 2);
+            }
+          }
+        }, // when the regexp matches
+        "when the regexp doesn't match": {
+          topic: function (string) {
+            var scanner = new Scanner(string);
+            var match = scanner.scanUntil(/z/);
+            this.callback(scanner, match);
+          },
+          "it should return the entire string": function (scanner, match) {
+            assert.equal(match, scanner.string);
+          },
+          "it should be at the end of the string": function (scanner, match) {
+            assert(scanner.eos());
+          }
+        } // when the regexp doesn't match
+      } // when calling scanUntil
+    } // for a non-empty string
+  }
+}).export(module);
diff --git a/test/unit.rb b/test/unit.rb
new file mode 100644
index 0000000..eb473bd
--- /dev/null
+++ b/test/unit.rb
@@ -0,0 +1,7 @@
+require File.expand_path('../helper', __FILE__)
+
+if Mustache.has_v8?
+  exec "vows #{Mustache::TEST}/*_test.js"
+else
+  abort "ERROR: Please install node"
+end

From 8efd0538cf5a89fd7b373f13719f14b8fc5becda Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Mon, 4 Jun 2012 07:39:21 -0700
Subject: [PATCH 05/65] This test should not work

---
 test/_files/partial_recursion.js       | 11 -----------
 test/_files/partial_recursion.mustache |  4 ----
 test/_files/partial_recursion.partial  |  4 ----
 test/_files/partial_recursion.txt      |  3 ---
 4 files changed, 22 deletions(-)
 delete mode 100644 test/_files/partial_recursion.js
 delete mode 100644 test/_files/partial_recursion.mustache
 delete mode 100644 test/_files/partial_recursion.partial
 delete mode 100644 test/_files/partial_recursion.txt

diff --git a/test/_files/partial_recursion.js b/test/_files/partial_recursion.js
deleted file mode 100644
index e39d64d..0000000
--- a/test/_files/partial_recursion.js
+++ /dev/null
@@ -1,11 +0,0 @@
-({
-  name: '1',
-  kids: [
-    {
-      name: '1.1',
-      children: [
-        {name: '1.1.1'}
-      ]
-    }
-  ]
-})
diff --git a/test/_files/partial_recursion.mustache b/test/_files/partial_recursion.mustache
deleted file mode 100644
index 3c3651a..0000000
--- a/test/_files/partial_recursion.mustache
+++ /dev/null
@@ -1,4 +0,0 @@
-{{name}}
-{{#kids}}
-{{>partial}}
-{{/kids}}
diff --git a/test/_files/partial_recursion.partial b/test/_files/partial_recursion.partial
deleted file mode 100644
index 457d2a0..0000000
--- a/test/_files/partial_recursion.partial
+++ /dev/null
@@ -1,4 +0,0 @@
-{{name}}
-{{#children}}
-{{>partial}}
-{{/children}}
\ No newline at end of file
diff --git a/test/_files/partial_recursion.txt b/test/_files/partial_recursion.txt
deleted file mode 100644
index 0f70515..0000000
--- a/test/_files/partial_recursion.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-1
-1.1
-1.1.1

From eda51730614df1a3a5d5abec5d629a37d81affec Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Sun, 3 Jun 2012 22:26:14 -0700
Subject: [PATCH 06/65] Remove Ruby dependency

---
 Rakefile            | 38 ++++++++++++-----------
 test/helper.rb      | 48 ----------------------------
 test/integration.rb | 76 ---------------------------------------------
 test/unit.rb        |  7 -----
 4 files changed, 20 insertions(+), 149 deletions(-)
 delete mode 100644 test/helper.rb
 delete mode 100644 test/integration.rb
 delete mode 100644 test/unit.rb

diff --git a/Rakefile b/Rakefile
index 7240f8b..0a62cb4 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,18 +1,28 @@
 require 'rake'
 require 'rake/clean'
 
-task :default => 'test:integration'
+task :default => :test
 
-namespace :test do
-  desc "Run all integration tests"
-  task :integration do
-    require File.expand_path('../test/integration', __FILE__)
-  end
+ROOT = File.expand_path('..', __FILE__)
+MUSTACHE_JS = File.read(File.join(ROOT, 'mustache.js'))
 
-  desc "Run all unit tests"
-  task :unit do
-    require File.expand_path('../test/unit', __FILE__)
-  end
+def mustache_version
+  match = MUSTACHE_JS.match(/exports\.version = "([^"]+)";/)
+  match[1]
+end
+
+def minified_file
+  ENV['FILE'] || 'mustache.min.js'
+end
+
+desc "Run all tests, requires vows (see http://vowsjs.org)"
+task :test do
+  sh "vows test/*_test.js"
+end
+
+desc "Minify to #{minified_file}, requires UglifyJS (see http://marijnhaverbeke.nl/uglifyjs)"
+task :minify do
+  sh "uglifyjs mustache.js > #{minified_file}"
 end
 
 # Creates a task that uses the various template wrappers to make a wrapped
@@ -52,11 +62,3 @@ 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
diff --git a/test/helper.rb b/test/helper.rb
deleted file mode 100644
index baadb94..0000000
--- a/test/helper.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-require 'test/unit'
-
-module Mustache
-  extend self
-
-  ROOT = File.expand_path('../..', __FILE__)
-  TEST = File.join(ROOT, 'test')
-  TEST_FILES = File.join(TEST, '_files')
-
-  MUSTACHE_JS = File.read(File.join(ROOT, 'mustache.js'))
-
-  TESTS = Dir.glob(File.join(TEST_FILES, '*.js')).map do |name|
-    File.basename name, '.js'
-  end
-
-  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 javascript_engines
-    %w[v8 spidermonkey javascriptcore rhino]
-  end
-
-  def available_javascript_engines
-    javascript_engines.select {|engine| send("has_#{engine}?") }
-  end
-
-  def has_any_engines?
-    available_javascript_engines.any?
-  end
-
-  def has_v8?
-    File.exist?(NODE_PATH)
-  end
-
-  def has_spidermonkey?
-    File.exist?(JS_PATH)
-  end
-
-  def has_javascriptcore?
-    File.exist?(JSC_PATH)
-  end
-
-  def has_rhino?
-    `java #{RHINO_JAR} 'foo' 2>&1` !~ /ClassNotFoundException/
-  end
-end
diff --git a/test/integration.rb b/test/integration.rb
deleted file mode 100644
index d3d482d..0000000
--- a/test/integration.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-require 'fileutils'
-require 'json'
-
-module Mustache
-  class Test < Test::Unit::TestCase
-
-    def self.run_tests_for(engine)
-      TESTS.each do |test|
-        define_method("test_#{engine}_#{test}") do
-          template, view, partial, expect = load_test(test)
-
-          assert_equal expect, run_js(engine, <<-JS).chomp
-            try {
-              #{boilerplate_for(engine)}
-              var template = #{template.to_json};
-              var view = #{view};
-              var partials = {partial: #{partial.to_json}};
-              print(Mustache.render(template, view, partials));
-            } catch(e) {
-              print('ERROR: ' + e.message);
-            }
-          JS
-        end
-      end
-    end
-
-    unless Mustache.has_any_engines?
-      abort "ERROR: Please install node, SpiderMonkey, JavaScriptCore or Rhino"
-    end
-
-    run_tests_for :v8 if Mustache.has_v8?
-    run_tests_for :spidermonkey if Mustache.has_spidermonkey?
-    run_tests_for :javascriptcore if Mustache.has_javascriptcore?
-    run_tests_for :rhino if Mustache.has_rhino?
-
-  private
-
-    def load_test(name)
-      template_file = File.join(TEST_FILES, "#{name}.mustache")
-      view_file = File.join(TEST_FILES, "#{name}.js")
-      partial_file = File.join(TEST_FILES, "#{name}.partial")
-      expect_file = File.join(TEST_FILES, "#{name}.txt")
-
-      [template_file, view_file, partial_file, expect_file].map do |file|
-        File.exist?(file) ? File.read(file) : ""
-      end
-    end
-
-    def runner_file
-      "runner.js"
-    end
-
-    def run_js(engine, js)
-      cmd = case engine
-        when :v8              then NODE_PATH
-        when :spidermonkey    then JS_PATH
-        when :javascriptcore  then JSC_PATH
-        when :rhino           then "java #{RHINO_JAR}"
-        end
-
-      File.open(runner_file, 'w') {|file| file.write(js) }
-
-      `#{cmd} #{runner_file}`
-    ensure
-      FileUtils.rm_r(runner_file)
-    end
-
-    def boilerplate_for(engine)
-      boilerplate = MUSTACHE_JS
-      boilerplate += "\nvar print = console.log;" if engine == :v8
-      boilerplate
-    end
-
-  end
-end
diff --git a/test/unit.rb b/test/unit.rb
deleted file mode 100644
index eb473bd..0000000
--- a/test/unit.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-
-if Mustache.has_v8?
-  exec "vows #{Mustache::TEST}/*_test.js"
-else
-  abort "ERROR: Please install node"
-end

From c6aef7ea1299273038a033ed96adc6dd8237d329 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Sun, 3 Jun 2012 22:37:56 -0700
Subject: [PATCH 07/65] Update testing instructions

---
 README.md  | 41 ++++++++++++++++++++++++------------
 TESTING.md | 62 ------------------------------------------------------
 2 files changed, 28 insertions(+), 75 deletions(-)
 delete mode 100644 TESTING.md

diff --git a/README.md b/README.md
index a04f667..20e2f77 100644
--- a/README.md
+++ b/README.md
@@ -357,21 +357,9 @@ text and are awkward to use for markup."
 
 Custom delimiters may not contain whitespace or the equals sign.
 
-## Streaming
-
-To stream template results out of mustache.js, you can pass an optional callback
-to the call to `Mustache.render`:
-
-    Mustache.render(template, view, partials, function (chunk) {
-      print(chunk);
-    });
-
-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
 
-By default mustache.js may be used in a browser or any [CommonJS](http://www.commonjs.org/)
+By default mustache.js may be used in any browser or [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:
@@ -393,6 +381,33 @@ following commands:
     $ rake requirejs
     $ rake qooxdoo
 
+## Testing
+
+The mustache.js test suite uses the [vows](http://vowsjs.org/) testing
+framework. In order to run the tests you'll need to install [node](http://nodejs.org/)
+first. Once it's installed, you can install vows using [npm](http://npmjs.org/).
+
+    $ npm install -g vows
+
+Then, run the tests.
+
+    $ vows test/*_test.js
+
+The test suite consists of both unit and integration tests. If a template isn't
+rendering correctly for you, you can make a test for it by doing the following:
+
+  1. Create a template file named `mytest.mustache` in the `test/_files`
+     directory. Replace `mytest` with the name of your test.
+  2. Create a corresponding view file named `mytest.js` in the same directory.
+     This file should contain a JavaScript object literal enclosed in
+     parentheses. See any of the other view files for an example.
+  3. Create a file with the expected output in `mytest.txt` in the same
+     directory.
+
+Then, you can run the test with:
+
+    $ TEST=mytest vows test/render_test.js
+
 ## Thanks
 
 Mustache.js wouldn't kick ass if it weren't for these fine souls:
diff --git a/TESTING.md b/TESTING.md
deleted file mode 100644
index 47d15e4..0000000
--- a/TESTING.md
+++ /dev/null
@@ -1,62 +0,0 @@
-## 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 called `somename.mustache`
-  * Create a JavaScript file containing the view called `somename.js`
-  * Create a text file with the expected result called `somename.txt`

From 3355e1720d462266783d6eb2a126cd825f84d25f Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Mon, 4 Jun 2012 07:48:27 -0700
Subject: [PATCH 08/65] Version 0.5.1-dev

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

diff --git a/mustache.js b/mustache.js
index 7b34bbb..c89711a 100644
--- a/mustache.js
+++ b/mustache.js
@@ -7,7 +7,7 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
 (function (exports) {
 
   exports.name = "mustache.js";
-  exports.version = "0.5.0-dev";
+  exports.version = "0.5.1-dev";
   exports.tags = ["{{", "}}"];
 
   exports.parse = parse;
diff --git a/mustache.js.nuspec b/mustache.js.nuspec
index ec69150..7eb14ac 100644
--- a/mustache.js.nuspec
+++ b/mustache.js.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>mustache.js</id>
-    <version>0.5.0-dev</version>
+    <version>0.5.1-dev</version>
     <authors>mustache.js Authors</authors>
     <licenseUrl>https://github.com/janl/mustache.js/blob/master/LICENSE</licenseUrl>
     <projectUrl>http://mustache.github.com/</projectUrl>
diff --git a/package.json b/package.json
index 5f348de..d64cd27 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,12 @@
 {
   "name": "mustache",
-  "version": "0.5.0-dev",
+  "version": "0.5.1-dev",
   "description": "Logic-less {{mustache}} templates with JavaScript",
   "author": "mustache.js Authors <http://github.com/janl/mustache.js>",
   "keywords": ["mustache", "template", "templates", "ejs"],
   "main": "./mustache",
   "devDependencies": {
-    "vows": "0.6.x"
+    "vows": "0.6.x",
+    "uglify-js": "1.3.0"
   }
 }
diff --git a/wrappers/qooxdoo/mustache.js.pre b/wrappers/qooxdoo/mustache.js.pre
index d10c0d5..f6b1c96 100644
--- a/wrappers/qooxdoo/mustache.js.pre
+++ b/wrappers/qooxdoo/mustache.js.pre
@@ -19,7 +19,7 @@
 
    This class contains code based on the following work:
 
-   * Mustache.js version 0.5.0-dev
+   * Mustache.js version 0.5.1-dev
 
      Code:
        https://github.com/janl/mustache.js

From 9cc8ef13fd77b1dd4640ee99c6458525fd8be1fa Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Mon, 4 Jun 2012 13:23:33 -0700
Subject: [PATCH 09/65] Remove extra slashes

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

diff --git a/mustache.js b/mustache.js
index c89711a..7dee0e9 100644
--- a/mustache.js
+++ b/mustache.js
@@ -20,7 +20,7 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
   exports.Context = Context;
   exports.Renderer = Renderer;
 
-  // // This is here for backwards compatibility with 0.4.x.
+  // This is here for backwards compatibility with 0.4.x.
   exports.to_html = function (template, view, partials, send) {
     var result = render(template, view, partials);
 

From cae4fd5abe21b5f3ba5694ee35ef5fe765843ad6 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Tue, 12 Jun 2012 14:46:23 -0700
Subject: [PATCH 10/65] Declare stripSpace with var

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

diff --git a/mustache.js b/mustache.js
index 7dee0e9..0fef360 100644
--- a/mustache.js
+++ b/mustache.js
@@ -448,7 +448,7 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
 
     // Strips all whitespace tokens array for the current line
     // if there was a {{#tag}} on it and otherwise only space.
-    function stripSpace() {
+    var stripSpace = function () {
       if (hasTag && !nonSpace) {
         while (spaces.length) {
           tokens.splice(spaces.pop(), 1);
@@ -459,7 +459,7 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
 
       hasTag = false;
       nonSpace = false;
-    }
+    };
 
     var type, value, chr;
 

From b8a14eafe9f260277ee03cc52c26901166045f81 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Tue, 12 Jun 2012 14:51:43 -0700
Subject: [PATCH 11/65] Strict escaping of ampersands

---
 mustache.js                       | 2 +-
 test/_files/dot_notation.mustache | 4 ++--
 test/_files/escaped.mustache      | 2 +-
 test/_files/escaped.txt           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mustache.js b/mustache.js
index 0fef360..c5be0c9 100644
--- a/mustache.js
+++ b/mustache.js
@@ -63,7 +63,7 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
   };
 
   function escapeHtml(string) {
-    return String(string).replace(/&(?!\w+;)|[<>"']/g, function (s) {
+    return String(string).replace(/[&<>"']/g, function (s) {
       return entityMap[s];
     });
   }
diff --git a/test/_files/dot_notation.mustache b/test/_files/dot_notation.mustache
index 138ddd0..f89d70b 100644
--- a/test/_files/dot_notation.mustache
+++ b/test/_files/dot_notation.mustache
@@ -1,8 +1,8 @@
 <!-- exciting part -->
 <h1>{{name}}</h1>
 <p>Authors: <ul>{{#authors}}<li>{{.}}</li>{{/authors}}</ul></p>
-<p>Price: {{price.currency.symbol}}{{price.value}} {{#price.currency}}{{name}} <b>{{availability.text}}</b>{{/price.currency}}</p>
-<p>VAT: {{price.currency.symbol}}{{#price}}{{vat}}{{/price}}</p>
+<p>Price: {{{price.currency.symbol}}}{{price.value}} {{#price.currency}}{{name}} <b>{{availability.text}}</b>{{/price.currency}}</p>
+<p>VAT: {{{price.currency.symbol}}}{{#price}}{{vat}}{{/price}}</p>
 <!-- boring part -->
 <h2>Test truthy false values:</h2>
 <p>Zero: {{truthy.zero}}</p>
diff --git a/test/_files/escaped.mustache b/test/_files/escaped.mustache
index ea25951..93e800b 100644
--- a/test/_files/escaped.mustache
+++ b/test/_files/escaped.mustache
@@ -1,2 +1,2 @@
 <h1>{{title}}</h1>
-But not {{entities}}.
+And even {{entities}}, but not {{{entities}}}.
diff --git a/test/_files/escaped.txt b/test/_files/escaped.txt
index 73ac5ce..2c3ad1f 100644
--- a/test/_files/escaped.txt
+++ b/test/_files/escaped.txt
@@ -1,2 +1,2 @@
 <h1>Bear &gt; Shark</h1>
-But not &quot;.
+And even &amp;quot;, but not &quot;.

From e53ce34af442d4d4b8cc3074c569e1a56e1b66ac Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Tue, 12 Jun 2012 15:25:35 -0700
Subject: [PATCH 12/65] Fix quote implementation for environments without
 JSON.stringify

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

diff --git a/mustache.js b/mustache.js
index c5be0c9..3535e66 100644
--- a/mustache.js
+++ b/mustache.js
@@ -47,7 +47,7 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
   };
 
   var quote = (typeof JSON !== "undefined" && JSON.stringify) || function (string) {
-    return '"' + String(string).replace(/(^|[^\\])"/g, '\\"') + '"';
+    return '"' + String(string).replace(/([\\"])/g, '\\$1') + '"';
   };
 
   function escapeRe(string) {

From 585bff401a46c4b0142356fa94ddabb79d4aef49 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Wed, 13 Jun 2012 11:11:39 -0700
Subject: [PATCH 13/65] Run tests using node on Travis

---
 .travis.yml  | 11 ++++++-----
 package.json |  3 +++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b52599e..ad74a3f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
-rvm:
-  - 1.9.2
-before_script:
-  - sudo apt-get -y install xulrunner-2.0
-  - gem install rspec
+language: node_js
+node_js:
+  - 0.4
+  - 0.6
+  - 0.7
+
diff --git a/package.json b/package.json
index d64cd27..a3ae822 100644
--- a/package.json
+++ b/package.json
@@ -8,5 +8,8 @@
   "devDependencies": {
     "vows": "0.6.x",
     "uglify-js": "1.3.0"
+  },
+  "scripts": {
+    "test": "vows --spec"
   }
 }

From 72971b320cb72c6cc8dc8de80e18c2000d247ad7 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Wed, 6 Jun 2012 07:37:48 -0700
Subject: [PATCH 14/65] Use var declaration for helper functions

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

diff --git a/mustache.js b/mustache.js
index 3535e66..dcb848c 100644
--- a/mustache.js
+++ b/mustache.js
@@ -239,9 +239,9 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
       break;
     case "function":
       var sectionText = callback(context, this), self = this;
-      function scopedRender(template) {
+      var scopedRender = function (template) {
         return self.render(template, context);
-      }
+      };
       return value.call(context.view, sectionText, scopedRender) || "";
       break;
     default:

From c316c973f64f52794c0c420bb0c2d753f2984808 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Wed, 20 Jun 2012 20:47:24 -0700
Subject: [PATCH 15/65] Run tests on node 0.6

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ad74a3f..3d839b0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,4 @@
 language: node_js
 node_js:
-  - 0.4
   - 0.6
-  - 0.7
 

From 144d8bef85eaac11308493897bb7271ef2f5b469 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Wed, 20 Jun 2012 21:02:22 -0700
Subject: [PATCH 16/65] Workaround for old SpiderMonkey builds

Fixes #189
---
 mustache.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/mustache.js b/mustache.js
index a242c1c..24b1c19 100644
--- a/mustache.js
+++ b/mustache.js
@@ -38,8 +38,14 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
   var curlyRe = /\s*\}/;
   var tagRe = /#|\^|\/|>|\{|&|=|!/;
 
+  // Workaround for https://issues.apache.org/jira/browse/COUCHDB-577
+  // See https://github.com/janl/mustache.js/issues/189
+  function testRe(re, string) {
+    return RegExp.prototype.test.call(re, string);
+  }
+
   function isWhitespace(string) {
-    return !nonSpaceRe.test(string);
+    return !testRe(nonSpaceRe, string);
   }
 
   var isArray = Array.isArray || function (obj) {

From bb58576ba5ef62bce90d79a51cbc1bd4cf8d25ae Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Wed, 20 Jun 2012 21:03:44 -0700
Subject: [PATCH 17/65] Update testing instructions

---
 README.md | 2 +-
 Rakefile  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 20e2f77..d117222 100644
--- a/README.md
+++ b/README.md
@@ -391,7 +391,7 @@ first. Once it's installed, you can install vows using [npm](http://npmjs.org/).
 
 Then, run the tests.
 
-    $ vows test/*_test.js
+    $ vows --spec
 
 The test suite consists of both unit and integration tests. If a template isn't
 rendering correctly for you, you can make a test for it by doing the following:
diff --git a/Rakefile b/Rakefile
index 0a62cb4..33eb805 100644
--- a/Rakefile
+++ b/Rakefile
@@ -17,7 +17,7 @@ end
 
 desc "Run all tests, requires vows (see http://vowsjs.org)"
 task :test do
-  sh "vows test/*_test.js"
+  sh "vows --spec"
 end
 
 desc "Minify to #{minified_file}, requires UglifyJS (see http://marijnhaverbeke.nl/uglifyjs)"

From a7a6e742d18c1fdf049263948c4f72a820e35210 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Wed, 20 Jun 2012 21:37:27 -0700
Subject: [PATCH 18/65] Use @cweider's quoting function

Also fixed a bug that occurs when using the triple-stache with a key
that contains a closing stache. Fixes #192.
---
 mustache.js                             | 34 ++++++++++++++++---------
 test/_files/malicious_template.js       |  1 +
 test/_files/malicious_template.mustache |  5 ++++
 test/_files/malicious_template.txt      |  2 ++
 4 files changed, 30 insertions(+), 12 deletions(-)
 create mode 100644 test/_files/malicious_template.js
 create mode 100644 test/_files/malicious_template.mustache
 create mode 100644 test/_files/malicious_template.txt

diff --git a/mustache.js b/mustache.js
index 24b1c19..42b0144 100644
--- a/mustache.js
+++ b/mustache.js
@@ -52,9 +52,16 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
     return Object.prototype.toString.call(obj) === "[object Array]";
   };
 
-  var quote = (typeof JSON !== "undefined" && JSON.stringify) || function (string) {
-    return '"' + String(string).replace(/([\\"])/g, '\\$1') + '"';
-  };
+  // OSWASP Guidlines: escape all non alphanumeric characters in ASCII space.
+  var jsCharsRe = /[\x00-\x2F\x3A-\x40\x5B-\x60\x7B-\xFF\u2028\u2029]/gm;
+
+  function quote(text) {
+    var escaped = text.replace(jsCharsRe, function (c) {
+      return "\\u" + ('0000' + c.charCodeAt(0).toString(16)).slice(-4);
+    });
+
+    return '"' + escaped + '"';
+  }
 
   function escapeRe(string) {
     return string.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
@@ -444,7 +451,8 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
    * course, the default is to use mustaches (i.e. Mustache.tags).
    */
   function parse(template, tags) {
-    tags = escapeTags(tags || exports.tags);
+    tags = tags || exports.tags;
+    tagRes = escapeTags(tags);
 
     var scanner = new Scanner(template);
 
@@ -471,7 +479,7 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
     var type, value, chr;
 
     while (!scanner.eos()) {
-      value = scanner.scanUntil(tags[0]);
+      value = scanner.scanUntil(tagRes[0]);
 
       if (value) {
         for (var i = 0, len = value.length; i < len; ++i) {
@@ -492,7 +500,7 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
       }
 
       // Match the opening tag.
-      if (!scanner.scan(tags[0])) {
+      if (!scanner.scan(tagRes[0])) {
         break;
       }
 
@@ -506,17 +514,18 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
       if (type === "=") {
         value = scanner.scanUntil(eqRe);
         scanner.scan(eqRe);
-        scanner.scanUntil(tags[1]);
+        scanner.scanUntil(tagRes[1]);
       } else if (type === "{") {
-        value = scanner.scanUntil(curlyRe);
+        var closeRe = new RegExp("\\s*" + escapeRe("}" + tags[1]));
+        value = scanner.scanUntil(closeRe);
         scanner.scan(curlyRe);
-        scanner.scanUntil(tags[1]);
+        scanner.scanUntil(tagRes[1]);
       } else {
-        value = scanner.scanUntil(tags[1]);
+        value = scanner.scanUntil(tagRes[1]);
       }
 
       // Match the closing tag.
-      if (!scanner.scan(tags[1])) {
+      if (!scanner.scan(tagRes[1])) {
         throw new Error("Unclosed tag at " + scanner.pos);
       }
 
@@ -528,7 +537,8 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
 
       // Set the tags for the next time around.
       if (type === "=") {
-        tags = escapeTags(value.split(spaceRe));
+        tags = value.split(spaceRe);
+        tagRes = escapeTags(tags);
       }
     }
 
diff --git a/test/_files/malicious_template.js b/test/_files/malicious_template.js
new file mode 100644
index 0000000..b4100a5
--- /dev/null
+++ b/test/_files/malicious_template.js
@@ -0,0 +1 @@
+({})
diff --git a/test/_files/malicious_template.mustache b/test/_files/malicious_template.mustache
new file mode 100644
index 0000000..b956867
--- /dev/null
+++ b/test/_files/malicious_template.mustache
@@ -0,0 +1,5 @@
+{{"+(function () {throw "evil"})()+"}}
+{{{"+(function () {throw "evil"})()+"}}}
+{{> "+(function () {throw "evil"})()+"}}
+{{# "+(function () {throw "evil"})()+"}}
+{{/ "+(function () {throw "evil"})()+"}}
diff --git a/test/_files/malicious_template.txt b/test/_files/malicious_template.txt
new file mode 100644
index 0000000..139597f
--- /dev/null
+++ b/test/_files/malicious_template.txt
@@ -0,0 +1,2 @@
+
+

From 118cf2fc9ed40dc46ab9ac9fbe9b7fb87d624542 Mon Sep 17 00:00:00 2001
From: feng <feng.shen@onycloud.com>
Date: Sat, 30 Jun 2012 22:50:34 +0800
Subject: [PATCH 19/65] fix global var leak

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

diff --git a/mustache.js b/mustache.js
index 42b0144..085d60b 100644
--- a/mustache.js
+++ b/mustache.js
@@ -433,7 +433,7 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
     var lastToken;
 
     for (var i = 0; i < tokens.length; ++i) {
-      token = tokens[i];
+      var token = tokens[i];
 
       if (lastToken && lastToken.type === "text" && token.type === "text") {
         lastToken.value += token.value;
@@ -452,7 +452,7 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
    */
   function parse(template, tags) {
     tags = tags || exports.tags;
-    tagRes = escapeTags(tags);
+    var tagRes = escapeTags(tags);
 
     var scanner = new Scanner(template);
 

From 74ac6ae1442799b3a57b338d44683f5431d29c36 Mon Sep 17 00:00:00 2001
From: TimZaripov <timur@ktlabs.ru>
Date: Tue, 3 Jul 2012 01:03:51 +0400
Subject: [PATCH 20/65] fixed error in README.md -- in case of {"person": true}
 text from template {{#person}}     Never shown! {{/person}} WILL be shown

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d117222..d657757 100644
--- a/README.md
+++ b/README.md
@@ -144,7 +144,7 @@ Template:
 View:
 
     {
-      "person": true
+      "person": false
     }
 
 Output:

From 9079bd88f21e51f44f8de38d1322d6f86419956f Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Thu, 21 Jun 2012 17:29:39 -0700
Subject: [PATCH 21/65] Add lint task using JSHint

---
 .jshintrc   |  5 +++++
 Rakefile    |  5 +++++
 mustache.js | 18 +++++++++++-------
 3 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 .jshintrc

diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 0000000..28dff71
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,5 @@
+{
+  "eqnull": true,
+  "evil": true
+}
+
diff --git a/Rakefile b/Rakefile
index 33eb805..a1c7920 100644
--- a/Rakefile
+++ b/Rakefile
@@ -25,6 +25,11 @@ task :minify do
   sh "uglifyjs mustache.js > #{minified_file}"
 end
 
+desc "Run JSHint, requires jshint (see http://www.jshint.com)"
+task :lint do
+  sh "jshint mustache.js"
+end
+
 # 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.
diff --git a/mustache.js b/mustache.js
index 085d60b..f45009a 100644
--- a/mustache.js
+++ b/mustache.js
@@ -64,7 +64,7 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
   }
 
   function escapeRe(string) {
-    return string.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
+    return string.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&");
   }
 
   var entityMap = {
@@ -243,21 +243,25 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
     case "object":
       if (isArray(value)) {
         var buffer = "";
+
         for (var i = 0, len = value.length; i < len; ++i) {
           buffer += callback(context.push(value[i]), this);
         }
+
         return buffer;
-      } else {
-        return callback(context.push(value), this);
       }
-      break;
+
+      return callback(context.push(value), this);
     case "function":
-      var sectionText = callback(context, this), self = this;
+      // TODO: The text should be passed to the callback plain, not rendered.
+      var sectionText = callback(context, this),
+          self = this;
+
       var scopedRender = function (template) {
         return self.render(template, context);
       };
+
       return value.call(context.view, sectionText, scopedRender) || "";
-      break;
     default:
       if (value) {
         return callback(context, this);
@@ -549,7 +553,7 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
 
   // The high-level clearCache, compile, compilePartial, and render functions
   // use this default renderer.
-  var _renderer = new Renderer;
+  var _renderer = new Renderer();
 
   /**
    * Clears all cached templates and partials.

From 33920ad674126483414b8e879c57558352a382ed Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Fri, 13 Jul 2012 22:09:54 -0700
Subject: [PATCH 22/65] Add AMD module support

---
 Rakefile                            |  1 -
 mustache.js                         | 16 ++++++++++++++--
 wrappers/requirejs/mustache.js.post |  3 ---
 wrappers/requirejs/mustache.js.pre  |  6 ------
 4 files changed, 14 insertions(+), 12 deletions(-)
 delete mode 100644 wrappers/requirejs/mustache.js.post
 delete mode 100644 wrappers/requirejs/mustache.js.pre

diff --git a/Rakefile b/Rakefile
index a1c7920..bc32175 100644
--- a/Rakefile
+++ b/Rakefile
@@ -65,5 +65,4 @@ templated_build "jQuery"
 templated_build "MooTools"
 templated_build "Dojo", :location => "dojox/string"
 templated_build "YUI3", :location => "yui3/mustache"
-templated_build "RequireJS"
 templated_build "qooxdoo"
diff --git a/mustache.js b/mustache.js
index f45009a..c6b6c6b 100644
--- a/mustache.js
+++ b/mustache.js
@@ -2,9 +2,19 @@
  * mustache.js - Logic-less {{mustache}} templates with JavaScript
  * http://github.com/janl/mustache.js
  */
-var Mustache = (typeof module !== "undefined" && module.exports) || {};
+
+var Mustache;
 
 (function (exports) {
+  if (typeof module !== "undefined") {
+    module.exports = exports; // CommonJS
+  } else if (typeof define === "function") {
+    define(exports); // AMD
+  } else {
+    Mustache = exports; // <script>
+  }
+}(function () {
+  var exports = {};
 
   exports.name = "mustache.js";
   exports.version = "0.5.1-dev";
@@ -598,4 +608,6 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
     return _renderer.render(template, view);
   }
 
-})(Mustache);
+  return exports;
+
+}()));
diff --git a/wrappers/requirejs/mustache.js.post b/wrappers/requirejs/mustache.js.post
deleted file mode 100644
index 632fd2a..0000000
--- a/wrappers/requirejs/mustache.js.post
+++ /dev/null
@@ -1,3 +0,0 @@
-
-return Mustache;
-});
\ No newline at end of file
diff --git a/wrappers/requirejs/mustache.js.pre b/wrappers/requirejs/mustache.js.pre
deleted file mode 100644
index 160286d..0000000
--- a/wrappers/requirejs/mustache.js.pre
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
-Shameless port of a shameless port ^ 2
-@defunkt => @janl => @aq => @voodootikigod => @timruffles
- 
-*/
-define(function(){

From e3ac2d245c2e59dcc128b756664681909adde210 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Fri, 13 Jul 2012 22:10:04 -0700
Subject: [PATCH 23/65] Fix spelling in comment

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

diff --git a/mustache.js b/mustache.js
index c6b6c6b..75f98ac 100644
--- a/mustache.js
+++ b/mustache.js
@@ -62,7 +62,7 @@ var Mustache;
     return Object.prototype.toString.call(obj) === "[object Array]";
   };
 
-  // OSWASP Guidlines: escape all non alphanumeric characters in ASCII space.
+  // OSWASP Guidelines: escape all non alphanumeric characters in ASCII space.
   var jsCharsRe = /[\x00-\x2F\x3A-\x40\x5B-\x60\x7B-\xFF\u2028\u2029]/gm;
 
   function quote(text) {

From 280a00f1c46661b838706d6cba6eccca194a812e Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Fri, 13 Jul 2012 22:35:42 -0700
Subject: [PATCH 24/65] Update README

---
 README.md | 36 +++++++++++++-----------------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index d657757..1eb178d 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/) template 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
@@ -13,15 +13,17 @@ 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.
 
-For a language-agnostic overview of Mustache's template syntax, see the
+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?
 
-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.
+You can use mustache.js to render mustache templates anywhere you can use
+JavaScript. This includes web browsers, server-side environments such as [node](http://nodejs.org/), and [CouchDB](http://couchdb.apache.org/)
+views.
+
+mustache.js ships with support for both the [CommonJS](http://www.commonjs.org/)
+module API and the [Asynchronous Module Definition](https://github.com/amdjs/amdjs-api/wiki/AMD) API, or AMD.
 
 ## Who uses mustache.js?
 
@@ -45,14 +47,6 @@ 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
@@ -359,16 +353,13 @@ Custom delimiters may not contain whitespace or the equals sign.
 
 ## Plugins for JavaScript Libraries
 
-By default mustache.js may be used in any browser or [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,
+mustache.js may be built specifically for several different client libraries,
 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/)
   - [qooxdoo](http://qooxdoo.org/)
 
 These may be built using [Rake](http://rake.rubyforge.org/) and one of the
@@ -378,18 +369,17 @@ following commands:
     $ rake mootools
     $ rake dojo
     $ rake yui
-    $ rake requirejs
     $ rake qooxdoo
 
 ## Testing
 
 The mustache.js test suite uses the [vows](http://vowsjs.org/) testing
-framework. In order to run the tests you'll need to install [node](http://nodejs.org/)
-first. Once it's installed, you can install vows using [npm](http://npmjs.org/).
+framework. In order to run the tests you'll need to install [node](http://nodejs.org/).
+Once that's done you can install vows using [npm](http://npmjs.org/).
 
     $ npm install -g vows
 
-Then, run the tests.
+Then run the tests.
 
     $ vows --spec
 
@@ -410,7 +400,7 @@ Then, you can run the test with:
 
 ## Thanks
 
-Mustache.js wouldn't kick ass if it weren't for these fine souls:
+mustache.js wouldn't kick ass if it weren't for these fine souls:
 
   * Chris Wanstrath / defunkt
   * Alexander Lang / langalex

From d6068505a322a1bc9e80951466c450b637970388 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Fri, 13 Jul 2012 22:43:38 -0700
Subject: [PATCH 25/65] Fix subtle IE7 bug

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

diff --git a/mustache.js b/mustache.js
index 75f98ac..903e895 100644
--- a/mustache.js
+++ b/mustache.js
@@ -497,7 +497,7 @@ var Mustache;
 
       if (value) {
         for (var i = 0, len = value.length; i < len; ++i) {
-          chr = value[i];
+          chr = value.charAt(i);
 
           if (isWhitespace(chr)) {
             spaces.push(tokens.length);

From e30455533341db99ec9449ded4a15e2e4a528f34 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Fri, 13 Jul 2012 23:16:30 -0700
Subject: [PATCH 26/65] Fix null section data

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

diff --git a/mustache.js b/mustache.js
index 903e895..3f1d95b 100644
--- a/mustache.js
+++ b/mustache.js
@@ -261,7 +261,7 @@ var Mustache;
         return buffer;
       }
 
-      return callback(context.push(value), this);
+      return value ? callback(context.push(value), this) : "";
     case "function":
       // TODO: The text should be passed to the callback plain, not rendered.
       var sectionText = callback(context, this),

From 008d6c7dcfed2e618a47ae85b9ea38290280c772 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Sat, 14 Jul 2012 01:03:22 -0700
Subject: [PATCH 27/65] Move call to parse into Renderer#compile

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

diff --git a/mustache.js b/mustache.js
index 3f1d95b..aab62f9 100644
--- a/mustache.js
+++ b/mustache.js
@@ -222,6 +222,10 @@ var Mustache;
   };
 
   Renderer.prototype.compile = function (tokens, tags) {
+    if (typeof tokens === "string") {
+      tokens = parse(tokens, tags);
+    }
+
     var fn = compileTokens(tokens),
         self = this;
 
@@ -327,10 +331,6 @@ var Mustache;
    * `returnBody` is true.
    */
   function compileTokens(tokens, returnBody) {
-    if (typeof tokens === "string") {
-      tokens = parse(tokens);
-    }
-
     var body = ['""'];
     var token, method, escape;
 
@@ -466,8 +466,8 @@ var Mustache;
    */
   function parse(template, tags) {
     tags = tags || exports.tags;
-    var tagRes = escapeTags(tags);
 
+    var tagRes = escapeTags(tags);
     var scanner = new Scanner(template);
 
     var tokens = [],      // Buffer to hold the tokens

From fe3de766cda7cafbc2b169d985ab665e18a416ce Mon Sep 17 00:00:00 2001
From: fisch42 <fionaschmidtke@web.de>
Date: Sun, 22 Jul 2012 13:56:50 +0300
Subject: [PATCH 28/65] added .js to main property in package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a3ae822..0de2b51 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "description": "Logic-less {{mustache}} templates with JavaScript",
   "author": "mustache.js Authors <http://github.com/janl/mustache.js>",
   "keywords": ["mustache", "template", "templates", "ejs"],
-  "main": "./mustache",
+  "main": "./mustache.js",
   "devDependencies": {
     "vows": "0.6.x",
     "uglify-js": "1.3.0"

From 9e6943c867d61afc7446b5471b1698b84aa122ff Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Fri, 27 Jul 2012 08:30:35 -0700
Subject: [PATCH 29/65] Scanner returns empty string if it can't match

---
 mustache.js          |  9 ++++-----
 test/scanner_test.js | 12 ++++++------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/mustache.js b/mustache.js
index 75f98ac..194815b 100644
--- a/mustache.js
+++ b/mustache.js
@@ -114,7 +114,7 @@ var Mustache;
 
   /**
    * Tries to match the given regular expression at the current position.
-   * Returns the matched text if it can match, `null` otherwise.
+   * Returns the matched text if it can match, the empty string otherwise.
    */
   Scanner.prototype.scan = function (re) {
     var match = this.tail.match(re);
@@ -125,13 +125,12 @@ var Mustache;
       return match[0];
     }
 
-    return null;
+    return "";
   };
 
   /**
    * Skips all text until the given regular expression can be matched. Returns
-   * the skipped string, which is the entire tail of this scanner if no match
-   * can be made.
+   * the skipped string, which is the entire tail if no match can be made.
    */
   Scanner.prototype.scanUntil = function (re) {
     var match, pos = this.tail.search(re);
@@ -143,7 +142,7 @@ var Mustache;
       this.tail = "";
       break;
     case 0:
-      match = null;
+      match = "";
       break;
     default:
       match = this.tail.substring(0, pos);
diff --git a/test/scanner_test.js b/test/scanner_test.js
index 79def2f..7c03a2a 100644
--- a/test/scanner_test.js
+++ b/test/scanner_test.js
@@ -47,8 +47,8 @@ vows.describe("Mustache.Scanner").addBatch({
               var match = scanner.scan(/b/);
               this.callback(scanner, match);
             },
-            "it should return null": function (scanner, match) {
-              assert.equal(match, null);
+            "it should return the empty string": function (scanner, match) {
+              assert.equal(match, "");
             },
             "it should not advance the internal pointer": function (scanner, match) {
               assert.equal(scanner.pos, 0);
@@ -61,8 +61,8 @@ vows.describe("Mustache.Scanner").addBatch({
             var match = scanner.scan(/z/);
             this.callback(scanner, match);
           },
-          "it should return null": function (scanner, match) {
-            assert.equal(match, null);
+          "it should return the empty string": function (scanner, match) {
+            assert.equal(match, "");
           },
           "it should not advance the internal pointer": function (scanner, match) {
             assert.equal(scanner.pos, 0);
@@ -77,8 +77,8 @@ vows.describe("Mustache.Scanner").addBatch({
               var match = scanner.scanUntil(/a/);
               this.callback(scanner, match);
             },
-            "it should return null": function (scanner, match) {
-              assert.equal(match, null)
+            "it should return the empty string": function (scanner, match) {
+              assert.equal(match, "")
             },
             "it should not advance the internal pointer": function (scanner, match) {
               assert.equal(scanner.pos, 0);

From 2de3ba6537df5c253600bc191edca526c0ce6877 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Wed, 1 Aug 2012 21:42:12 -0700
Subject: [PATCH 30/65] Fix JSHint warnings

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

diff --git a/mustache.js b/mustache.js
index 07e94e5..af8c2ab 100644
--- a/mustache.js
+++ b/mustache.js
@@ -3,6 +3,8 @@
  * http://github.com/janl/mustache.js
  */
 
+/*global define: false*/
+
 var Mustache;
 
 (function (exports) {
@@ -13,7 +15,7 @@ var Mustache;
   } else {
     Mustache = exports; // <script>
   }
-}(function () {
+}((function () {
   var exports = {};
 
   exports.name = "mustache.js";
@@ -609,4 +611,4 @@ var Mustache;
 
   return exports;
 
-}()));
+}())));

From a8a0392cd64d67245a143492570e93e5636c9251 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Wed, 1 Aug 2012 22:03:31 -0700
Subject: [PATCH 31/65] Added 3-level deep nesting test

Fixes #42
---
 mustache.js                              |  1 -
 test/_files/grandparent_context.js       | 19 +++++++++++++++++++
 test/_files/grandparent_context.mustache | 10 ++++++++++
 test/_files/grandparent_context.txt      | 17 +++++++++++++++++
 4 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 test/_files/grandparent_context.js
 create mode 100644 test/_files/grandparent_context.mustache
 create mode 100644 test/_files/grandparent_context.txt

diff --git a/mustache.js b/mustache.js
index af8c2ab..36a478a 100644
--- a/mustache.js
+++ b/mustache.js
@@ -610,5 +610,4 @@ var Mustache;
   }
 
   return exports;
-
 }())));
diff --git a/test/_files/grandparent_context.js b/test/_files/grandparent_context.js
new file mode 100644
index 0000000..97dbfd3
--- /dev/null
+++ b/test/_files/grandparent_context.js
@@ -0,0 +1,19 @@
+({
+  grand_parent_id: 'grand_parent1',
+  parent_contexts: [
+    {
+      parent_id: 'parent1',
+      child_contexts: [
+        { child_id: 'parent1-child1' },
+        { child_id: 'parent1-child2' }
+      ]
+    },
+    {
+      parent_id: 'parent2',
+      child_contexts: [
+        { child_id: 'parent2-child1' },
+        { child_id: 'parent2-child2' }
+      ]
+    }
+  ]
+})
diff --git a/test/_files/grandparent_context.mustache b/test/_files/grandparent_context.mustache
new file mode 100644
index 0000000..e6c07a2
--- /dev/null
+++ b/test/_files/grandparent_context.mustache
@@ -0,0 +1,10 @@
+{{grand_parent_id}}
+{{#parent_contexts}}
+{{grand_parent_id}}
+{{parent_id}}
+{{#child_contexts}}
+{{grand_parent_id}}
+{{parent_id}}
+{{child_id}}
+{{/child_contexts}}
+{{/parent_contexts}}
diff --git a/test/_files/grandparent_context.txt b/test/_files/grandparent_context.txt
new file mode 100644
index 0000000..64996ad
--- /dev/null
+++ b/test/_files/grandparent_context.txt
@@ -0,0 +1,17 @@
+grand_parent1
+grand_parent1
+parent1
+grand_parent1
+parent1
+parent1-child1
+grand_parent1
+parent1
+parent1-child2
+grand_parent1
+parent2
+grand_parent1
+parent2
+parent2-child1
+grand_parent1
+parent2
+parent2-child2

From 95d6ca9ada028d9d0de6fec77053473ec64874a8 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Wed, 1 Aug 2012 22:16:17 -0700
Subject: [PATCH 32/65] Move views before templates in examples

---
 README.md | 90 +++++++++++++++++++++++++++----------------------------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/README.md b/README.md
index 1eb178d..7f9fa98 100644
--- a/README.md
+++ b/README.md
@@ -66,6 +66,13 @@ 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.
 
+View:
+
+    {
+      "name": "Chris",
+      "company": "<b>GitHub</b>"
+    }
+
 Template:
 
     * {{name}}
@@ -74,13 +81,6 @@ Template:
     * {{{company}}}
     * {{&company}}
 
-View:
-
-    {
-      "name": "Chris",
-      "company": "<b>GitHub</b>"
-    }
-
 Output:
 
     * Chris
@@ -92,11 +92,6 @@ Output:
 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:
 
     {
@@ -107,6 +102,11 @@ View:
       "age": "RIP"
     }
 
+Template:
+
+    * {{name.first}} {{name.last}}
+    * {{age}}
+
 Output:
 
     * Michael Jackson
@@ -128,6 +128,12 @@ The behavior of the section is determined by the value of the key.
 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.
 
+View:
+
+    {
+      "person": false
+    }
+
 Template:
 
     Shown.
@@ -135,12 +141,6 @@ Template:
     Never shown!
     {{/person}}
 
-View:
-
-    {
-      "person": false
-    }
-
 Output:
 
     Shown.
@@ -154,12 +154,6 @@ 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:
 
     {
@@ -170,6 +164,12 @@ View:
       ]
     }
 
+Template:
+
+    {{#stooges}}
+    <b>{{name}}</b>
+    {{/stooges}}
+
 Output:
 
     <b>Moe</b>
@@ -179,18 +179,18 @@ Output:
 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"]
     }
 
+Template:
+
+    {{#musketeers}}
+    * {{.}}
+    {{/musketeers}}
+
 Output:
 
     * Athos
@@ -201,12 +201,6 @@ Output:
 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:
-
-    {{#beatles}}
-    * {{name}}
-    {{/beatles}}
-
 View:
 
     {
@@ -221,6 +215,12 @@ View:
       }
     }
 
+Template:
+
+    {{#beatles}}
+    * {{name}}
+    {{/beatles}}
+
 Output:
 
     * John Lennon
@@ -235,10 +235,6 @@ 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.
 
-Template:
-
-    {{#bold}}Hi {{name}}.{{/bold}}
-
 View:
 
     {
@@ -250,6 +246,10 @@ View:
       }
     }
 
+Template:
+
+    {{#bold}}Hi {{name}}.{{/bold}}
+
 Output:
 
     <b>Hi Tater.</b>
@@ -260,17 +260,17 @@ 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.
 
-Template:
-
-    {{#repos}}<b>{{name}}</b>{{/repos}}
-    {{^repos}}No repos :({{/repos}}
-
 View:
 
     {
       "repos": []
     }
 
+Template:
+
+    {{#repos}}<b>{{name}}</b>{{/repos}}
+    {{^repos}}No repos :({{/repos}}
+
 Output:
 
     No repos :(

From a160c16d902cea966fcda4561d702a4f97b1ca76 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Wed, 1 Aug 2012 22:46:37 -0700
Subject: [PATCH 33/65] Remove ignored argument

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

diff --git a/mustache.js b/mustache.js
index 36a478a..d0f7503 100644
--- a/mustache.js
+++ b/mustache.js
@@ -303,7 +303,7 @@ var Mustache;
     var fn = this._partialCache[name];
 
     if (fn) {
-      return fn(context, this);
+      return fn(context);
     }
 
     return "";

From 6d1954cb5c125c40548c9952efe79a4534c6760a Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Wed, 1 Aug 2012 22:55:57 -0700
Subject: [PATCH 34/65] Version 0.5.2

---
 mustache.js        | 2 +-
 mustache.js.nuspec | 2 +-
 package.json       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mustache.js b/mustache.js
index d0f7503..4286635 100644
--- a/mustache.js
+++ b/mustache.js
@@ -19,7 +19,7 @@ var Mustache;
   var exports = {};
 
   exports.name = "mustache.js";
-  exports.version = "0.5.1-dev";
+  exports.version = "0.5.2";
   exports.tags = ["{{", "}}"];
 
   exports.parse = parse;
diff --git a/mustache.js.nuspec b/mustache.js.nuspec
index 7eb14ac..67c8042 100644
--- a/mustache.js.nuspec
+++ b/mustache.js.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>mustache.js</id>
-    <version>0.5.1-dev</version>
+    <version>0.5.2</version>
     <authors>mustache.js Authors</authors>
     <licenseUrl>https://github.com/janl/mustache.js/blob/master/LICENSE</licenseUrl>
     <projectUrl>http://mustache.github.com/</projectUrl>
diff --git a/package.json b/package.json
index 0de2b51..59310f4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mustache",
-  "version": "0.5.1-dev",
+  "version": "0.5.2",
   "description": "Logic-less {{mustache}} templates with JavaScript",
   "author": "mustache.js Authors <http://github.com/janl/mustache.js>",
   "keywords": ["mustache", "template", "templates", "ejs"],

From 2afdb083fc4c87d0300322113a2ec62782db051e Mon Sep 17 00:00:00 2001
From: Bastian Bleker <basti.bleker@gmail.com>
Date: Tue, 7 Aug 2012 17:01:41 +0300
Subject: [PATCH 35/65] fixed CommonJS check

QUnit defines module too. If you try to use mustache in a QUnit and AMD environment it won't work
---
 mustache.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mustache.js b/mustache.js
index 4286635..9e20b87 100644
--- a/mustache.js
+++ b/mustache.js
@@ -8,7 +8,7 @@
 var Mustache;
 
 (function (exports) {
-  if (typeof module !== "undefined") {
+  if (typeof module !== "undefined" && typeof module.exports !== "undefined") {
     module.exports = exports; // CommonJS
   } else if (typeof define === "function") {
     define(exports); // AMD

From 52c7e43a5f76b72004435c6b31d2326dc2f4ac36 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Tue, 14 Aug 2012 07:01:20 -0700
Subject: [PATCH 36/65] throw inside the if

---
 mustache.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mustache.js b/mustache.js
index 9e20b87..b17923a 100644
--- a/mustache.js
+++ b/mustache.js
@@ -376,14 +376,14 @@ var Mustache;
   }
 
   function escapeTags(tags) {
-    if (tags.length === 2) {
-      return [
-        new RegExp(escapeRe(tags[0]) + "\\s*"),
-        new RegExp("\\s*" + escapeRe(tags[1]))
-      ];
+    if (tags.length !== 2) {
+      throw new Error("Invalid tags: " + tags.join(" "));
     }
 
-    throw new Error("Invalid tags: " + tags.join(" "));
+    return [
+      new RegExp(escapeRe(tags[0]) + "\\s*"),
+      new RegExp("\\s*" + escapeRe(tags[1]))
+    ];
   }
 
   /**

From a6420e433e5add22e350fd80a3edd5e9eff908ec Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Fri, 31 Aug 2012 13:59:24 -0700
Subject: [PATCH 37/65] Use exported escaping function

Fixes #244
---
 mustache.js | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/mustache.js b/mustache.js
index b17923a..deb0792 100644
--- a/mustache.js
+++ b/mustache.js
@@ -64,7 +64,7 @@ var Mustache;
     return Object.prototype.toString.call(obj) === "[object Array]";
   };
 
-  // OSWASP Guidelines: escape all non alphanumeric characters in ASCII space.
+  // OSWASP Guidelines: Escape all non alphanumeric characters in ASCII space.
   var jsCharsRe = /[\x00-\x2F\x3A-\x40\x5B-\x60\x7B-\xFF\u2028\u2029]/gm;
 
   function quote(text) {
@@ -94,12 +94,9 @@ var Mustache;
     });
   }
 
-  // Export these utility functions.
-  exports.isWhitespace = isWhitespace;
-  exports.isArray = isArray;
-  exports.quote = quote;
-  exports.escapeRe = escapeRe;
-  exports.escapeHtml = escapeHtml;
+  // Export the escaping function so that the user may override it.
+  // See https://github.com/janl/mustache.js/issues/244
+  exports.escape = escapeHtml;
 
   function Scanner(string) {
     this.string = string;
@@ -319,7 +316,7 @@ var Mustache;
     var string = (value == null) ? "" : String(value);
 
     if (escape) {
-      return escapeHtml(string);
+      return exports.escape(string);
     }
 
     return string;

From 5ab345eddf53f69d82019f2613daeced150c6b8a Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Fri, 31 Aug 2012 15:03:39 -0700
Subject: [PATCH 38/65] Use JavaScript's definition of falsy

Fixes #186
---
 mustache.js                |  7 +++----
 test/_files/falsy.js       |  8 ++++++++
 test/_files/falsy.mustache | 12 ++++++++++++
 test/_files/falsy.txt      | 12 ++++++++++++
 4 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 test/_files/falsy.js
 create mode 100644 test/_files/falsy.mustache
 create mode 100644 test/_files/falsy.txt

diff --git a/mustache.js b/mustache.js
index deb0792..6528281 100644
--- a/mustache.js
+++ b/mustache.js
@@ -286,10 +286,9 @@ var Mustache;
   Renderer.prototype._inverted = function (name, context, callback) {
     var value = context.lookup(name);
 
-    // 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)) {
+    // Use JavaScript's definition of falsy. Include empty arrays.
+    // See https://github.com/janl/mustache.js/issues/186
+    if (!value || (isArray(value) && value.length === 0)) {
       return callback(context, this);
     }
 
diff --git a/test/_files/falsy.js b/test/_files/falsy.js
new file mode 100644
index 0000000..ae9b9bf
--- /dev/null
+++ b/test/_files/falsy.js
@@ -0,0 +1,8 @@
+({
+  "emptyString": "",
+  "emptyArray": [],
+  "zero": 0,
+  "null": null,
+  "undefined": undefined,
+  "NaN": 0/0
+})
\ No newline at end of file
diff --git a/test/_files/falsy.mustache b/test/_files/falsy.mustache
new file mode 100644
index 0000000..f3698da
--- /dev/null
+++ b/test/_files/falsy.mustache
@@ -0,0 +1,12 @@
+{{#emptyString}}empty string{{/emptyString}}
+{{^emptyString}}inverted empty string{{/emptyString}}
+{{#emptyArray}}empty array{{/emptyArray}}
+{{^emptyArray}}inverted empty array{{/emptyArray}}
+{{#zero}}zero{{/zero}}
+{{^zero}}inverted zero{{/zero}}
+{{#null}}null{{/null}}
+{{^null}}inverted null{{/null}}
+{{#undefined}}undefined{{/undefined}}
+{{^undefined}}inverted undefined{{/undefined}}
+{{#NaN}}NaN{{/NaN}}
+{{^NaN}}inverted NaN{{/NaN}}
diff --git a/test/_files/falsy.txt b/test/_files/falsy.txt
new file mode 100644
index 0000000..9b7cde3
--- /dev/null
+++ b/test/_files/falsy.txt
@@ -0,0 +1,12 @@
+
+inverted empty string
+
+inverted empty array
+
+inverted zero
+
+inverted null
+
+inverted undefined
+
+inverted NaN

From 4236e61c9524362dedc082f5141d42675d5dd255 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Fri, 31 Aug 2012 15:12:45 -0700
Subject: [PATCH 39/65] Remove newlines

---
 LICENSE   |  23 +++--------
 README.md | 111 +++++++++++++++---------------------------------------
 2 files changed, 36 insertions(+), 98 deletions(-)

diff --git a/LICENSE b/LICENSE
index 395e263..6626848 100644
--- a/LICENSE
+++ b/LICENSE
@@ -3,21 +3,8 @@ The MIT License
 Copyright (c) 2009 Chris Wanstrath (Ruby)
 Copyright (c) 2010 Jan Lehnardt (JavaScript)
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
- 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
- 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README.md b/README.md
index 7f9fa98..d4394f5 100644
--- a/README.md
+++ b/README.md
@@ -2,33 +2,23 @@
 
 > 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/) template system in JavaScript.
+[mustache.js](http://github.com/janl/mustache.js) is an implementation of the [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
-tags in a template using values provided in a hash or object.
+[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.
 
-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.
+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.
 
-For a language-agnostic overview of mustache's template syntax, see the
-`mustache(5)` [manpage](http://mustache.github.com/mustache.5.html).
+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?
 
-You can use mustache.js to render mustache templates anywhere you can use
-JavaScript. This includes web browsers, server-side environments such as [node](http://nodejs.org/), and [CouchDB](http://couchdb.apache.org/)
-views.
+You can use mustache.js to render mustache templates anywhere you can use JavaScript. This includes web browsers, server-side environments such as [node](http://nodejs.org/), and [CouchDB](http://couchdb.apache.org/) views.
 
-mustache.js ships with support for both the [CommonJS](http://www.commonjs.org/)
-module API and the [Asynchronous Module Definition](https://github.com/amdjs/amdjs-api/wiki/AMD) API, or AMD.
+mustache.js ships with support for both the [CommonJS](http://www.commonjs.org/) module API and the [Asynchronous Module Definition](https://github.com/amdjs/amdjs-api/wiki/AMD) API, or AMD.
 
 ## 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!
+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
 
@@ -43,28 +33,19 @@ Below is quick example how to use mustache.js:
 
     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
-contains the data and code needed to render the template.
+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
 
-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.
+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 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
-rendered.
+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
-variable.
+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.
 
 View:
 
@@ -89,8 +70,7 @@ Output:
     * <b>GitHub</b>
     * <b>GitHub</b>
 
-JavaScript's dot notation may be used to access keys that are properties of
-objects in a view.
+JavaScript's dot notation may be used to access keys that are properties of objects in a view.
 
 View:
 
@@ -114,19 +94,15 @@ Output:
 
 ### Sections
 
-Sections render blocks of text one or more times, depending on the value of the
-key in the current context.
+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
-tags is referred to as that section's "block".
+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.
+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.
 
 View:
 
@@ -147,12 +123,9 @@ Output:
 
 #### 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.
+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.
+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.
 
 View:
 
@@ -176,8 +149,7 @@ Output:
     <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.
+When looping over an array of strings, a `.` can be used to refer to the current item in the list.
 
 View:
 
@@ -198,8 +170,7 @@ Output:
     * Porthos
     * D'Artagnan
 
-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.
+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.
 
 View:
 
@@ -230,10 +201,7 @@ Output:
 
 #### Functions
 
-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.
+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.
 
 View:
 
@@ -256,9 +224,7 @@ Output:
 
 ### Inverted Sections
 
-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.
+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.
 
 View:
 
@@ -291,8 +257,7 @@ Comments may contain newlines.
 
 Partials begin with a greater than sign, like {{> box}}.
 
-Partials are rendered at runtime (as opposed to compile time), so recursive
-partials are possible. Just avoid infinite loops.
+Partials are rendered at runtime (as opposed to compile time), so recursive partials are possible. Just avoid infinite loops.
 
 They also inherit the calling context. Whereas in ERB you may have this:
 
@@ -302,9 +267,7 @@ Mustache requires only this:
 
     {{> 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.
+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.
 
 For example, this template and partial:
 
@@ -324,14 +287,11 @@ Can be thought of as a single, expanded template:
       <strong>{{name}}</strong>
     {{/names}}
 
-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.
+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.
 
 ### Set Delimiter
 
-Set Delimiter tags start with an equals sign and change the tag delimiters from
-`{{` and `}}` to custom strings.
+Set Delimiter tags start with an equals sign and change the tag delimiters from `{{` and `}}` to custom strings.
 
 Consider the following contrived example:
 
@@ -341,20 +301,15 @@ Consider the following contrived example:
     <%={{ }}=%>
     * {{ default_tags_again }}
 
-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.
+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.
 
-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."
+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."
 
 Custom delimiters may not contain whitespace or the equals sign.
 
 ## Plugins for JavaScript Libraries
 
-mustache.js may be built specifically for several different client libraries,
-including the following:
+mustache.js may be built specifically for several different client libraries, including the following:
 
   - [jQuery](http://jquery.com/)
   - [MooTools](http://mootools.net/)
@@ -362,8 +317,7 @@ including the following:
   - [YUI](http://developer.yahoo.com/yui/)
   - [qooxdoo](http://qooxdoo.org/)
 
-These may be built using [Rake](http://rake.rubyforge.org/) and one of the
-following commands:
+These may be built using [Rake](http://rake.rubyforge.org/) and one of the following commands:
 
     $ rake jquery
     $ rake mootools
@@ -373,9 +327,7 @@ following commands:
 
 ## Testing
 
-The mustache.js test suite uses the [vows](http://vowsjs.org/) testing
-framework. In order to run the tests you'll need to install [node](http://nodejs.org/).
-Once that's done you can install vows using [npm](http://npmjs.org/).
+The mustache.js test suite uses the [vows](http://vowsjs.org/) testing framework. In order to run the tests you'll need to install [node](http://nodejs.org/). Once that's done you can install vows using [npm](http://npmjs.org/).
 
     $ npm install -g vows
 
@@ -383,8 +335,7 @@ Then run the tests.
 
     $ vows --spec
 
-The test suite consists of both unit and integration tests. If a template isn't
-rendering correctly for you, you can make a test for it by doing the following:
+The test suite consists of both unit and integration tests. If a template isn't rendering correctly for you, you can make a test for it by doing the following:
 
   1. Create a template file named `mytest.mustache` in the `test/_files`
      directory. Replace `mytest` with the name of your test.

From f7c6a2064da362b981e0778ef644f9b3f9cd85df Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Fri, 31 Aug 2012 15:38:11 -0700
Subject: [PATCH 40/65] Track changes in CHANGES

---
 CHANGES | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 CHANGES

diff --git a/CHANGES b/CHANGES
new file mode 100644
index 0000000..b7e8354
--- /dev/null
+++ b/CHANGES
@@ -0,0 +1,7 @@
+= HEAD
+
+  * Use JavaScript's definition of falsy when determining whether to render an
+    inverted section or not. Issue #186.
+  * Use Mustache.escape to escape values inside {{}}. This function may be
+    reassigned to alter the default escaping behavior. Issue #244.
+  * Fixed a bug that clashed with QUnit. Thanks @kannix.

From bf61bf619969b841a881dee3bc93acc95fe263f1 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Fri, 31 Aug 2012 15:39:09 -0700
Subject: [PATCH 41/65] Add volo support

Fixes #249
---
 package.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 59310f4..804a15d 100644
--- a/package.json
+++ b/package.json
@@ -6,8 +6,10 @@
   "keywords": ["mustache", "template", "templates", "ejs"],
   "main": "./mustache.js",
   "devDependencies": {
-    "vows": "0.6.x",
-    "uglify-js": "1.3.0"
+    "vows": "0.6.x"
+  },
+  "volo": {
+    "url": "https://raw.github.com/janl/mustache.js/0.5.2/mustache.js"
   },
   "scripts": {
     "test": "vows --spec"

From f5d18caee285aeba3e46563fafc2d74684f569d5 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Fri, 31 Aug 2012 15:42:39 -0700
Subject: [PATCH 42/65] Version 0.6.0

---
 CHANGES            | 5 +++--
 mustache.js        | 2 +-
 mustache.js.nuspec | 2 +-
 package.json       | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index b7e8354..953420c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,8 @@
-= HEAD
+= 0.6.0 / 31 Aug 2012
 
   * Use JavaScript's definition of falsy when determining whether to render an
     inverted section or not. Issue #186.
   * Use Mustache.escape to escape values inside {{}}. This function may be
     reassigned to alter the default escaping behavior. Issue #244.
-  * Fixed a bug that clashed with QUnit. Thanks @kannix.
+  * Fixed a bug that clashed with QUnit (thanks @kannix).
+  * Added volo support (thanks @guybedford).
diff --git a/mustache.js b/mustache.js
index 6528281..579a959 100644
--- a/mustache.js
+++ b/mustache.js
@@ -19,7 +19,7 @@ var Mustache;
   var exports = {};
 
   exports.name = "mustache.js";
-  exports.version = "0.5.2";
+  exports.version = "0.6.0";
   exports.tags = ["{{", "}}"];
 
   exports.parse = parse;
diff --git a/mustache.js.nuspec b/mustache.js.nuspec
index 67c8042..138014d 100644
--- a/mustache.js.nuspec
+++ b/mustache.js.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>mustache.js</id>
-    <version>0.5.2</version>
+    <version>0.6.0</version>
     <authors>mustache.js Authors</authors>
     <licenseUrl>https://github.com/janl/mustache.js/blob/master/LICENSE</licenseUrl>
     <projectUrl>http://mustache.github.com/</projectUrl>
diff --git a/package.json b/package.json
index 804a15d..83469cb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mustache",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "description": "Logic-less {{mustache}} templates with JavaScript",
   "author": "mustache.js Authors <http://github.com/janl/mustache.js>",
   "keywords": ["mustache", "template", "templates", "ejs"],
@@ -9,7 +9,7 @@
     "vows": "0.6.x"
   },
   "volo": {
-    "url": "https://raw.github.com/janl/mustache.js/0.5.2/mustache.js"
+    "url": "https://raw.github.com/janl/mustache.js/0.6.0/mustache.js"
   },
   "scripts": {
     "test": "vows --spec"

From be4fd1cc2972743f7f1444eeab830bf95fbbe3c3 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Fri, 7 Sep 2012 15:13:50 -0700
Subject: [PATCH 43/65] Text passed to higher-order sections unrendered

Fixes #187
---
 CHANGES                               |   5 ++
 mustache.js                           |  84 +++++++++++--------
 test/_files/higher_order_sections.js  |   2 +-
 test/_files/higher_order_sections.txt |   2 +-
 test/context_test.js                  |   6 +-
 test/parse_test.js                    | 113 +++++++++++++++-----------
 test/render_test.js                   |   8 +-
 test/scanner_test.js                  |   6 +-
 8 files changed, 133 insertions(+), 93 deletions(-)

diff --git a/CHANGES b/CHANGES
index 953420c..cc0f1f8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+= HEAD
+
+  * Fixed a bug with higher-order sections that prevented them from being
+    passed the raw text of the section from the original template.
+
 = 0.6.0 / 31 Aug 2012
 
   * Use JavaScript's definition of falsy when determining whether to render an
diff --git a/mustache.js b/mustache.js
index 579a959..16e85ba 100644
--- a/mustache.js
+++ b/mustache.js
@@ -219,24 +219,6 @@ var Mustache;
     this._partialCache = {};
   };
 
-  Renderer.prototype.compile = function (tokens, tags) {
-    if (typeof tokens === "string") {
-      tokens = parse(tokens, tags);
-    }
-
-    var fn = compileTokens(tokens),
-        self = this;
-
-    return function (view) {
-      return fn(Context.make(view), self);
-    };
-  };
-
-  Renderer.prototype.compilePartial = function (name, tokens, tags) {
-    this._partialCache[name] = this.compile(tokens, tags);
-    return this._partialCache[name];
-  };
-
   Renderer.prototype.render = function (template, view) {
     var fn = this._cache[template];
 
@@ -248,7 +230,22 @@ var Mustache;
     return fn(view);
   };
 
-  Renderer.prototype._section = function (name, context, callback) {
+  Renderer.prototype.compile = function (template, tags) {
+    var tokens = parse(template, tags);
+    var render = compileTokens(tokens);
+
+    var self = this;
+    return function (view) {
+      return render(Context.make(view), self, template);
+    };
+  };
+
+  Renderer.prototype.compilePartial = function (name, template, tags) {
+    this._partialCache[name] = this.compile(template, tags);
+    return this._partialCache[name];
+  };
+
+  Renderer.prototype._section = function (name, context, text, callback) {
     var value = context.lookup(name);
 
     switch (typeof value) {
@@ -265,15 +262,12 @@ var Mustache;
 
       return value ? callback(context.push(value), this) : "";
     case "function":
-      // TODO: The text should be passed to the callback plain, not rendered.
-      var sectionText = callback(context, this),
-          self = this;
-
+      var self = this;
       var scopedRender = function (template) {
         return self.render(template, context);
       };
 
-      return value.call(context.view, sectionText, scopedRender) || "";
+      return value.call(context.view, text, scopedRender) || "";
     default:
       if (value) {
         return callback(context, this);
@@ -321,6 +315,24 @@ var Mustache;
     return string;
   };
 
+  /**
+   * Calculates the bounds of the section represented by the given `token` in
+   * the original template by drilling down into nested sections to find the
+   * last token that is part of that section. Returns an array of [start, end].
+   */
+  function sectionBounds(token) {
+    var start = token.end;
+    var end = start;
+
+    var tokens;
+    while ((tokens = token.tokens) && tokens.length) {
+      token = tokens[tokens.length - 1];
+      end = token.end;
+    }
+
+    return [start, end];
+  }
+
   /**
    * Low-level function that compiles the given `tokens` into a
    * function that accepts two arguments: a Context and a
@@ -329,23 +341,28 @@ var Mustache;
    */
   function compileTokens(tokens, returnBody) {
     var body = ['""'];
-    var token, method, escape;
+    var token, escape, bounds, text;
 
     for (var i = 0, len = tokens.length; i < len; ++i) {
       token = tokens[i];
 
       switch (token.type) {
       case "#":
+        bounds = sectionBounds(token);
+        text = "t.slice(" + bounds[0] + ", " + bounds[1] + ")";
+        body.push("r._section(" + quote(token.value) + ", c, " + text + ", function (c, r) {\n" +
+          "  " + compileTokens(token.tokens, true) + "\n" +
+          "})");
+        break;
       case "^":
-        method = (token.type === "#") ? "_section" : "_inverted";
-        body.push("r." + method + "(" + quote(token.value) + ", c, function (c, r) {\n" +
+        body.push("r._inverted(" + quote(token.value) + ", c, function (c, r) {\n" +
           "  " + compileTokens(token.tokens, true) + "\n" +
           "})");
         break;
       case "{":
       case "&":
       case "name":
-        escape = token.type === "name" ? "true" : "false";
+        escape = String(token.type === "name");
         body.push("r._name(" + quote(token.value) + ", c, " + escape + ")");
         break;
       case ">":
@@ -368,7 +385,7 @@ var Mustache;
     }
 
     // For great evil!
-    return new Function("c, r", body);
+    return new Function("c, r, t", body);
   }
 
   function escapeTags(tags) {
@@ -487,9 +504,10 @@ var Mustache;
       nonSpace = false;
     };
 
-    var type, value, chr;
+    var start, type, value, chr;
 
     while (!scanner.eos()) {
+      start = scanner.pos;
       value = scanner.scanUntil(tagRes[0]);
 
       if (value) {
@@ -502,7 +520,7 @@ var Mustache;
             nonSpace = true;
           }
 
-          tokens.push({type: "text", value: chr});
+          tokens.push({type: "text", value: chr, start: start, end: scanner.pos});
 
           if (chr === "\n") {
             stripSpace(); // Check for whitespace on the current line.
@@ -510,6 +528,8 @@ var Mustache;
         }
       }
 
+      start = scanner.pos;
+
       // Match the opening tag.
       if (!scanner.scan(tagRes[0])) {
         break;
@@ -540,7 +560,7 @@ var Mustache;
         throw new Error("Unclosed tag at " + scanner.pos);
       }
 
-      tokens.push({type: type, value: value});
+      tokens.push({type: type, value: value, start: start, end: scanner.pos});
 
       if (type === "name" || type === "{" || type === "&") {
         nonSpace = true;
diff --git a/test/_files/higher_order_sections.js b/test/_files/higher_order_sections.js
index 7b52c0d..bacb0a4 100644
--- a/test/_files/higher_order_sections.js
+++ b/test/_files/higher_order_sections.js
@@ -3,7 +3,7 @@
   helper: "To tinker?",
   bolder: function () {
     return function (text, render) {
-      return "<b>" + render(text) + '</b> ' + this.helper;
+      return text + ' => <b>' + render(text) + '</b> ' + this.helper;
     }
   }
 })
diff --git a/test/_files/higher_order_sections.txt b/test/_files/higher_order_sections.txt
index 9db786a..be50ad7 100644
--- a/test/_files/higher_order_sections.txt
+++ b/test/_files/higher_order_sections.txt
@@ -1 +1 @@
-<b>Hi Tater.</b> To tinker?
+Hi {{name}}. => <b>Hi Tater.</b> To tinker?
diff --git a/test/context_test.js b/test/context_test.js
index 71c5830..167b9ca 100644
--- a/test/context_test.js
+++ b/test/context_test.js
@@ -1,6 +1,6 @@
-var assert = require("assert"),
-    vows = require("vows"),
-    Context = require("./../mustache").Context;
+var assert = require("assert");
+var vows = require("vows");
+var Context = require("./../mustache").Context;
 
 vows.describe("Mustache.Context").addBatch({
   "A Context": {
diff --git a/test/parse_test.js b/test/parse_test.js
index 8586a25..c54b57f 100644
--- a/test/parse_test.js
+++ b/test/parse_test.js
@@ -1,63 +1,78 @@
-var assert = require("assert"),
-    vows = require("vows"),
-    parse = require("./../mustache").parse;
+var assert = require("assert");
+var vows = require("vows");
+var parse = require("./../mustache").parse;
 
 // A map of templates to their expected token output.
 var expectations = {
-  "{{hi}}"                                  : [ { type: 'name', value: 'hi' } ],
-  "{{hi.world}}"                            : [ { type: 'name', value: 'hi.world' } ],
-  "{{hi . world}}"                          : [ { type: 'name', value: 'hi . world' } ],
-  "{{ hi}}"                                 : [ { type: 'name', value: 'hi' } ],
-  "{{hi }}"                                 : [ { type: 'name', value: 'hi' } ],
-  "{{ hi }}"                                : [ { type: 'name', value: 'hi' } ],
-  "{{{hi}}}"                                : [ { type: '{', value: 'hi' } ],
-  "{{!hi}}"                                 : [ { type: '!', value: 'hi' } ],
-  "{{! hi}}"                                : [ { type: '!', value: 'hi' } ],
-  "{{! hi }}"                               : [ { type: '!', value: 'hi' } ],
-  "{{ !hi}}"                                : [ { type: '!', value: 'hi' } ],
-  "{{ ! hi}}"                               : [ { type: '!', value: 'hi' } ],
-  "{{ ! hi }}"                              : [ { type: '!', value: 'hi' } ],
-  "a{{hi}}"                                 : [ { type: 'text', value: 'a' }, { type: 'name', value: 'hi' } ],
-  "a {{hi}}"                                : [ { type: 'text', value: 'a ' }, { type: 'name', value: 'hi' } ],
-  " a{{hi}}"                                : [ { type: 'text', value: ' a' }, { type: 'name', value: 'hi' } ],
-  " a {{hi}}"                               : [ { type: 'text', value: ' a ' }, { type: 'name', value: 'hi' } ],
-  "a{{hi}}b"                                : [ { type: 'text', value: 'a' }, { type: 'name', value: 'hi' }, { type: 'text', value: 'b' } ],
-  "a{{hi}} b"                               : [ { type: 'text', value: 'a' }, { type: 'name', value: 'hi' }, { type: 'text', value: ' b' } ],
-  "a{{hi}}b "                               : [ { type: 'text', value: 'a' }, { type: 'name', value: 'hi' }, { type: 'text', value: 'b ' } ],
-  "a\n{{hi}} b \n"                          : [ { type: 'text', value: 'a\n' }, { type: 'name', value: 'hi' }, { type: 'text', value: ' b \n' } ],
-  "a\n {{hi}} \nb"                          : [ { type: 'text', value: 'a\n ' }, { type: 'name', value: 'hi' }, { type: 'text', value: ' \nb' } ],
-  "a\n {{!hi}} \nb"                         : [ { type: 'text', value: 'a\n' }, { type: '!', value: 'hi' }, { type: 'text', value: 'b' } ],
-  "a\n{{#a}}{{/a}}\nb"                      : [ { type: 'text', value: 'a\n' }, { type: '#', value: 'a', tokens: [] }, { type: 'text', value: 'b' } ],
-  "a\n {{#a}}{{/a}}\nb"                     : [ { type: 'text', value: 'a\n' }, { type: '#', value: 'a', tokens: [] }, { type: 'text', value: 'b' } ],
-  "a\n {{#a}}{{/a}} \nb"                    : [ { type: 'text', value: 'a\n' }, { type: '#', value: 'a', tokens: [] }, { type: 'text', value: 'b' } ],
-  "a\n{{#a}}\n{{/a}}\nb"                    : [ { type: 'text', value: 'a\n' }, { type: '#', value: 'a', tokens: [] }, { type: 'text', value: 'b' } ],
-  "a\n {{#a}}\n{{/a}}\nb"                   : [ { type: 'text', value: 'a\n' }, { type: '#', value: 'a', tokens: [] }, { type: 'text', value: 'b' } ],
-  "a\n {{#a}}\n{{/a}} \nb"                  : [ { type: 'text', value: 'a\n' }, { type: '#', value: 'a', tokens: [] }, { type: 'text', value: 'b' } ],
-  "a\n{{#a}}\n{{/a}}\n{{#b}}\n{{/b}}\nb"    : [ { type: 'text', value: 'a\n' }, { type: '#', value: 'a', tokens: [] }, { type: '#', value: 'b', tokens: [] }, { type: 'text', value: 'b' } ],
-  "a\n {{#a}}\n{{/a}}\n{{#b}}\n{{/b}}\nb"   : [ { type: 'text', value: 'a\n' }, { type: '#', value: 'a', tokens: [] }, { type: '#', value: 'b', tokens: [] }, { type: 'text', value: 'b' } ],
-  "a\n {{#a}}\n{{/a}}\n{{#b}}\n{{/b}} \nb"  : [ { type: 'text', value: 'a\n' }, { type: '#', value: 'a', tokens: [] }, { type: '#', value: 'b', tokens: [] }, { type: 'text', value: 'b' } ],
-  "a\n{{#a}}\n{{#b}}\n{{/b}}\n{{/a}}\nb"    : [ { type: 'text', value: 'a\n' }, { type: '#', value: 'a', tokens: [ { type: '#', value: 'b', tokens: [] } ] }, { type: 'text', value: 'b' } ],
-  "a\n {{#a}}\n{{#b}}\n{{/b}}\n{{/a}}\nb"   : [ { type: 'text', value: 'a\n' }, { type: '#', value: 'a', tokens: [ { type: '#', value: 'b', tokens: [] } ] }, { type: 'text', value: 'b' } ],
-  "a\n {{#a}}\n{{#b}}\n{{/b}}\n{{/a}} \nb"  : [ { type: 'text', value: 'a\n' }, { type: '#', value: 'a', tokens: [ { type: '#', value: 'b', tokens: [] } ] }, { type: 'text', value: 'b' } ],
-  "{{>abc}}"                                : [ { type: '>', value: 'abc' } ],
-  "{{> abc }}"                              : [ { type: '>', value: 'abc' } ],
-  "{{ > abc }}"                             : [ { type: '>', value: 'abc' } ],
-  "{{=<% %>=}}"                             : [ { type: '=', value: '<% %>' } ],
-  "{{= <% %> =}}"                           : [ { type: '=', value: '<% %>' } ],
-  "{{=<% %>=}}<%={{ }}=%>"                  : [ { type: '=', value: '<% %>' }, { type: '=', value: '{{ }}' } ],
-  "{{=<% %>=}}<%hi%>"                       : [ { type: '=', value: '<% %>' }, { type: 'name', value: 'hi' } ],
-  "{{#a}}{{/a}}hi{{#b}}{{/b}}\n"            : [ { type: '#', value: 'a', tokens: [] }, { type: 'text', value: 'hi' }, { type: '#', value: 'b', tokens: [] }, { type: 'text', value: '\n' } ],
-  "{{a}}\n{{b}}\n\n{{#c}}\n{{/c}}\n"        : [ { type: 'name', value: 'a' }, { type: 'text', value: '\n' }, { type: 'name', value: 'b' }, { type: 'text', value: '\n\n' }, { type: '#', value: 'c', tokens: [] } ],
+  "{{hi}}"                                  : [ [ 'name', 'hi', 0, 6 ] ],
+  "{{hi.world}}"                            : [ [ 'name', 'hi.world', 0, 12 ] ],
+  "{{hi . world}}"                          : [ [ 'name', 'hi . world', 0, 14 ] ],
+  "{{ hi}}"                                 : [ [ 'name', 'hi', 0, 7 ] ],
+  "{{hi }}"                                 : [ [ 'name', 'hi', 0, 7 ] ],
+  "{{ hi }}"                                : [ [ 'name', 'hi', 0, 8 ] ],
+  "{{{hi}}}"                                : [ [ '{', 'hi', 0, 8 ] ],
+  "{{!hi}}"                                 : [ [ '!', 'hi', 0, 7 ] ],
+  "{{! hi}}"                                : [ [ '!', 'hi', 0, 8 ] ],
+  "{{! hi }}"                               : [ [ '!', 'hi', 0, 9 ] ],
+  "{{ !hi}}"                                : [ [ '!', 'hi', 0, 8 ] ],
+  "{{ ! hi}}"                               : [ [ '!', 'hi', 0, 9 ] ],
+  "{{ ! hi }}"                              : [ [ '!', 'hi', 0, 10 ] ],
+  "a{{hi}}"                                 : [ [ 'text', 'a', 0, 1 ], [ 'name', 'hi', 1, 7 ] ],
+  "a {{hi}}"                                : [ [ 'text', 'a ', 0, 2 ], [ 'name', 'hi', 2, 8 ] ],
+  " a{{hi}}"                                : [ [ 'text', ' a', 0, 2 ], [ 'name', 'hi', 2, 8 ] ],
+  " a {{hi}}"                               : [ [ 'text', ' a ', 0, 3 ], [ 'name', 'hi', 3, 9 ] ],
+  "a{{hi}}b"                                : [ [ 'text', 'a', 0, 1 ], [ 'name', 'hi', 1, 7 ], [ 'text', 'b', 7, 8 ] ],
+  "a{{hi}} b"                               : [ [ 'text', 'a', 0, 1 ], [ 'name', 'hi', 1, 7 ], [ 'text', ' b', 7, 9 ] ],
+  "a{{hi}}b "                               : [ [ 'text', 'a', 0, 1 ], [ 'name', 'hi', 1, 7 ], [ 'text', 'b ', 7, 9 ] ],
+  "a\n{{hi}} b \n"                          : [ [ 'text', 'a\n', 0, 2 ], [ 'name', 'hi', 2, 8 ], [ 'text', ' b \n', 8, 12 ] ],
+  "a\n {{hi}} \nb"                          : [ [ 'text', 'a\n ', 0, 3 ], [ 'name', 'hi', 3, 9 ], [ 'text', ' \nb', 9, 12 ] ],
+  "a\n {{!hi}} \nb"                         : [ [ 'text', 'a\n', 0, 3 ], [ '!', 'hi', 3, 10 ], [ 'text', 'b', 10, 13 ] ],
+  "a\n{{#a}}{{/a}}\nb"                      : [ [ 'text', 'a\n', 0, 2 ], [ '#', 'a', 2, 8, [] ], [ 'text', 'b', 14, 16 ] ],
+  "a\n {{#a}}{{/a}}\nb"                     : [ [ 'text', 'a\n', 0, 3 ], [ '#', 'a', 3, 9, [] ], [ 'text', 'b', 15, 17 ] ],
+  "a\n {{#a}}{{/a}} \nb"                    : [ [ 'text', 'a\n', 0, 3 ], [ '#', 'a', 3, 9, [] ], [ 'text', 'b', 15, 18 ] ],
+  "a\n{{#a}}\n{{/a}}\nb"                    : [ [ 'text', 'a\n', 0, 2 ], [ '#', 'a', 2, 8, [] ], [ 'text', 'b', 15, 17 ] ],
+  "a\n {{#a}}\n{{/a}}\nb"                   : [ [ 'text', 'a\n', 0, 3 ], [ '#', 'a', 3, 9, [] ], [ 'text', 'b', 16, 18 ] ],
+  "a\n {{#a}}\n{{/a}} \nb"                  : [ [ 'text', 'a\n', 0, 3 ], [ '#', 'a', 3, 9, [] ], [ 'text', 'b', 16, 19 ] ],
+  "a\n{{#a}}\n{{/a}}\n{{#b}}\n{{/b}}\nb"    : [ [ 'text', 'a\n', 0, 2 ], [ '#', 'a', 2, 8, [] ], [ '#', 'b', 16, 22, [] ], [ 'text', 'b', 29, 31 ] ],
+  "a\n {{#a}}\n{{/a}}\n{{#b}}\n{{/b}}\nb"   : [ [ 'text', 'a\n', 0, 3 ], [ '#', 'a', 3, 9, [] ], [ '#', 'b', 17, 23, [] ], [ 'text', 'b', 30, 32 ] ],
+  "a\n {{#a}}\n{{/a}}\n{{#b}}\n{{/b}} \nb"  : [ [ 'text', 'a\n', 0, 3 ], [ '#', 'a', 3, 9, [] ], [ '#', 'b', 17, 23, [] ], [ 'text', 'b', 30, 33 ] ],
+  "a\n{{#a}}\n{{#b}}\n{{/b}}\n{{/a}}\nb"    : [ [ 'text', 'a\n', 0, 2 ], [ '#', 'a', 2, 8, [ [ '#', 'b', 9, 15, [] ] ] ], [ 'text', 'b', 29, 31 ] ],
+  "a\n {{#a}}\n{{#b}}\n{{/b}}\n{{/a}}\nb"   : [ [ 'text', 'a\n', 0, 3 ], [ '#', 'a', 3, 9, [ [ '#', 'b', 10, 16, [] ] ] ], [ 'text', 'b', 30, 32 ] ],
+  "a\n {{#a}}\n{{#b}}\n{{/b}}\n{{/a}} \nb"  : [ [ 'text', 'a\n', 0, 3 ], [ '#', 'a', 3, 9, [ [ '#', 'b', 10, 16, [] ] ] ], [ 'text', 'b', 30, 33 ] ],
+  "{{>abc}}"                                : [ [ '>', 'abc', 0, 8 ] ],
+  "{{> abc }}"                              : [ [ '>', 'abc', 0, 10 ] ],
+  "{{ > abc }}"                             : [ [ '>', 'abc', 0, 11 ] ],
+  "{{=<% %>=}}"                             : [ [ '=', '<% %>', 0, 11 ] ],
+  "{{= <% %> =}}"                           : [ [ '=', '<% %>', 0, 13 ] ],
+  "{{=<% %>=}}<%={{ }}=%>"                  : [ [ '=', '<% %>', 0, 11 ], [ '=', '{{ }}', 11, 22 ] ],
+  "{{=<% %>=}}<%hi%>"                       : [ [ '=', '<% %>', 0, 11 ], [ 'name', 'hi', 11, 17 ] ],
+  "{{#a}}{{/a}}hi{{#b}}{{/b}}\n"            : [ [ '#', 'a', 0, 6, [] ], [ 'text', 'hi', 12, 14 ], [ '#', 'b', 14, 20, [] ], [ 'text', '\n', 26, 27 ] ],
+  "{{a}}\n{{b}}\n\n{{#c}}\n{{/c}}\n"        : [ [ 'name', 'a', 0, 5 ], [ 'text', '\n', 5, 6 ], [ 'name', 'b', 6, 11 ], [ 'text', '\n\n', 11, 13 ], [ '#', 'c', 13, 19, [] ] ],
   "{{#foo}}\n  {{#a}}\n    {{b}}\n  {{/a}}\n{{/foo}}\n"
-                                            : [ { type: "#", value: "foo", tokens: [ { type: "#", value: "a", tokens: [ { type: "text", value: "    " }, { type: "name", value: "b" }, { type: "text", value: "\n" } ] } ] } ]
+                                            : [ [ '#', 'foo', 0, 8, [ [ '#', 'a', 11, 17, [ [ 'text', '    ', 17, 22 ], [ 'name', 'b', 22, 27 ], [ 'text', '\n', 27, 30 ] ] ] ] ] ]
 };
 
+function makeToken(tokenArray) {
+  var token = {
+    type: tokenArray[0],
+    value: tokenArray[1],
+    start: tokenArray[2],
+    end: tokenArray[3]
+  };
+
+  if (tokenArray[4]) {
+    token.tokens = tokenArray[4].map(makeToken);
+  }
+
+  return token;
+}
+
 var spec = {};
 
 for (var template in expectations) {
   (function (template, tokens) {
     spec["knows how to parse " + JSON.stringify(template)] = function () {
-      assert.deepEqual(parse(template), tokens);
+      assert.deepEqual(parse(template), tokens.map(makeToken));
     };
   })(template, expectations[template]);
 }
diff --git a/test/render_test.js b/test/render_test.js
index 9638638..859cb71 100644
--- a/test/render_test.js
+++ b/test/render_test.js
@@ -1,7 +1,7 @@
-var fs = require("fs"),
-    path = require("path"),
-    assert = require("assert"),
-    vows = require("vows");
+var fs = require("fs");
+var path = require("path");
+var assert = require("assert");
+var vows = require("vows");
 
 var Mustache = require(path.join(__dirname, "..", "mustache"));
 var _files = path.join(__dirname, "_files");
diff --git a/test/scanner_test.js b/test/scanner_test.js
index 7c03a2a..3e9277e 100644
--- a/test/scanner_test.js
+++ b/test/scanner_test.js
@@ -1,6 +1,6 @@
-var assert = require("assert"),
-    vows = require("vows"),
-    Scanner = require("./../mustache").Scanner;
+var assert = require("assert");
+var vows = require("vows");
+var Scanner = require("./../mustache").Scanner;
 
 vows.describe("Mustache.Scanner").addBatch({
   "A Scanner": {

From 3fb61fc0562ea9b92db20fc56960035306f018a4 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Fri, 7 Sep 2012 18:25:31 -0700
Subject: [PATCH 44/65] More concise token format

---
 CHANGES            |   1 +
 mustache.js        |  52 +++++++++----------
 test/parse_test.js | 122 ++++++++++++++++++++-------------------------
 3 files changed, 81 insertions(+), 94 deletions(-)

diff --git a/CHANGES b/CHANGES
index cc0f1f8..34d23e2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
 
   * Fixed a bug with higher-order sections that prevented them from being
     passed the raw text of the section from the original template.
+  * More concise token format.
 
 = 0.6.0 / 31 Aug 2012
 
diff --git a/mustache.js b/mustache.js
index 16e85ba..390fb0c 100644
--- a/mustache.js
+++ b/mustache.js
@@ -321,13 +321,13 @@ var Mustache;
    * last token that is part of that section. Returns an array of [start, end].
    */
   function sectionBounds(token) {
-    var start = token.end;
+    var start = token[3];
     var end = start;
 
     var tokens;
-    while ((tokens = token.tokens) && tokens.length) {
+    while ((tokens = token[4]) && tokens.length) {
       token = tokens[tokens.length - 1];
-      end = token.end;
+      end = token[3];
     }
 
     return [start, end];
@@ -346,30 +346,30 @@ var Mustache;
     for (var i = 0, len = tokens.length; i < len; ++i) {
       token = tokens[i];
 
-      switch (token.type) {
+      switch (token[0]) {
       case "#":
         bounds = sectionBounds(token);
         text = "t.slice(" + bounds[0] + ", " + bounds[1] + ")";
-        body.push("r._section(" + quote(token.value) + ", c, " + text + ", function (c, r) {\n" +
-          "  " + compileTokens(token.tokens, true) + "\n" +
+        body.push("r._section(" + quote(token[1]) + ", c, " + text + ", function (c, r) {\n" +
+          "  " + compileTokens(token[4], true) + "\n" +
           "})");
         break;
       case "^":
-        body.push("r._inverted(" + quote(token.value) + ", c, function (c, r) {\n" +
-          "  " + compileTokens(token.tokens, true) + "\n" +
+        body.push("r._inverted(" + quote(token[1]) + ", c, function (c, r) {\n" +
+          "  " + compileTokens(token[4], true) + "\n" +
           "})");
         break;
       case "{":
       case "&":
       case "name":
-        escape = String(token.type === "name");
-        body.push("r._name(" + quote(token.value) + ", c, " + escape + ")");
+        escape = String(token[0] === "name");
+        body.push("r._name(" + quote(token[1]) + ", c, " + escape + ")");
         break;
       case ">":
-        body.push("r._partial(" + quote(token.value) + ", c)");
+        body.push("r._partial(" + quote(token[1]) + ", c)");
         break;
       case "text":
-        body.push(quote(token.value));
+        body.push(quote(token[1]));
         break;
       }
     }
@@ -413,27 +413,27 @@ var Mustache;
     for (var i = 0; i < tokens.length; ++i) {
       token = tokens[i];
 
-      switch (token.type) {
+      switch (token[0]) {
       case "#":
       case "^":
-        token.tokens = [];
+        token[4] = [];
         sections.push(token);
         collector.push(token);
-        collector = token.tokens;
+        collector = token[4];
         break;
       case "/":
         if (sections.length === 0) {
-          throw new Error("Unopened section: " + token.value);
+          throw new Error("Unopened section: " + token[1]);
         }
 
         section = sections.pop();
 
-        if (section.value !== token.value) {
-          throw new Error("Unclosed section: " + section.value);
+        if (section[1] !== token[1]) {
+          throw new Error("Unclosed section: " + section[1]);
         }
 
         if (sections.length > 0) {
-          collector = sections[sections.length - 1].tokens;
+          collector = sections[sections.length - 1][4];
         } else {
           collector = tree;
         }
@@ -447,7 +447,7 @@ var Mustache;
     section = sections.pop();
 
     if (section) {
-      throw new Error("Unclosed section: " + section.value);
+      throw new Error("Unclosed section: " + section[1]);
     }
 
     return tree;
@@ -458,13 +458,13 @@ var Mustache;
    * to a single token.
    */
   function squashTokens(tokens) {
-    var lastToken;
+    var token, lastToken;
 
     for (var i = 0; i < tokens.length; ++i) {
-      var token = tokens[i];
+      token = tokens[i];
 
-      if (lastToken && lastToken.type === "text" && token.type === "text") {
-        lastToken.value += token.value;
+      if (lastToken && lastToken[0] === "text" && token[0] === "text") {
+        lastToken[1] += token[1];
         tokens.splice(i--, 1); // Remove this token from the array.
       } else {
         lastToken = token;
@@ -520,7 +520,7 @@ var Mustache;
             nonSpace = true;
           }
 
-          tokens.push({type: "text", value: chr, start: start, end: scanner.pos});
+          tokens.push(["text", chr, start, scanner.pos]);
 
           if (chr === "\n") {
             stripSpace(); // Check for whitespace on the current line.
@@ -560,7 +560,7 @@ var Mustache;
         throw new Error("Unclosed tag at " + scanner.pos);
       }
 
-      tokens.push({type: type, value: value, start: start, end: scanner.pos});
+      tokens.push([type, value, start, scanner.pos]);
 
       if (type === "name" || type === "{" || type === "&") {
         nonSpace = true;
diff --git a/test/parse_test.js b/test/parse_test.js
index c54b57f..e3e06dc 100644
--- a/test/parse_test.js
+++ b/test/parse_test.js
@@ -1,82 +1,68 @@
-var assert = require("assert");
-var vows = require("vows");
-var parse = require("./../mustache").parse;
+var assert = require('assert');
+var vows = require('vows');
+var parse = require('./../mustache').parse;
 
-// A map of templates to their expected token output.
+// A map of templates to their expected token output. Tokens are in the format:
+// [type, value, startIndex, endIndex].
 var expectations = {
-  "{{hi}}"                                  : [ [ 'name', 'hi', 0, 6 ] ],
-  "{{hi.world}}"                            : [ [ 'name', 'hi.world', 0, 12 ] ],
-  "{{hi . world}}"                          : [ [ 'name', 'hi . world', 0, 14 ] ],
-  "{{ hi}}"                                 : [ [ 'name', 'hi', 0, 7 ] ],
-  "{{hi }}"                                 : [ [ 'name', 'hi', 0, 7 ] ],
-  "{{ hi }}"                                : [ [ 'name', 'hi', 0, 8 ] ],
-  "{{{hi}}}"                                : [ [ '{', 'hi', 0, 8 ] ],
-  "{{!hi}}"                                 : [ [ '!', 'hi', 0, 7 ] ],
-  "{{! hi}}"                                : [ [ '!', 'hi', 0, 8 ] ],
-  "{{! hi }}"                               : [ [ '!', 'hi', 0, 9 ] ],
-  "{{ !hi}}"                                : [ [ '!', 'hi', 0, 8 ] ],
-  "{{ ! hi}}"                               : [ [ '!', 'hi', 0, 9 ] ],
-  "{{ ! hi }}"                              : [ [ '!', 'hi', 0, 10 ] ],
-  "a{{hi}}"                                 : [ [ 'text', 'a', 0, 1 ], [ 'name', 'hi', 1, 7 ] ],
-  "a {{hi}}"                                : [ [ 'text', 'a ', 0, 2 ], [ 'name', 'hi', 2, 8 ] ],
-  " a{{hi}}"                                : [ [ 'text', ' a', 0, 2 ], [ 'name', 'hi', 2, 8 ] ],
-  " a {{hi}}"                               : [ [ 'text', ' a ', 0, 3 ], [ 'name', 'hi', 3, 9 ] ],
-  "a{{hi}}b"                                : [ [ 'text', 'a', 0, 1 ], [ 'name', 'hi', 1, 7 ], [ 'text', 'b', 7, 8 ] ],
-  "a{{hi}} b"                               : [ [ 'text', 'a', 0, 1 ], [ 'name', 'hi', 1, 7 ], [ 'text', ' b', 7, 9 ] ],
-  "a{{hi}}b "                               : [ [ 'text', 'a', 0, 1 ], [ 'name', 'hi', 1, 7 ], [ 'text', 'b ', 7, 9 ] ],
-  "a\n{{hi}} b \n"                          : [ [ 'text', 'a\n', 0, 2 ], [ 'name', 'hi', 2, 8 ], [ 'text', ' b \n', 8, 12 ] ],
-  "a\n {{hi}} \nb"                          : [ [ 'text', 'a\n ', 0, 3 ], [ 'name', 'hi', 3, 9 ], [ 'text', ' \nb', 9, 12 ] ],
-  "a\n {{!hi}} \nb"                         : [ [ 'text', 'a\n', 0, 3 ], [ '!', 'hi', 3, 10 ], [ 'text', 'b', 10, 13 ] ],
-  "a\n{{#a}}{{/a}}\nb"                      : [ [ 'text', 'a\n', 0, 2 ], [ '#', 'a', 2, 8, [] ], [ 'text', 'b', 14, 16 ] ],
-  "a\n {{#a}}{{/a}}\nb"                     : [ [ 'text', 'a\n', 0, 3 ], [ '#', 'a', 3, 9, [] ], [ 'text', 'b', 15, 17 ] ],
-  "a\n {{#a}}{{/a}} \nb"                    : [ [ 'text', 'a\n', 0, 3 ], [ '#', 'a', 3, 9, [] ], [ 'text', 'b', 15, 18 ] ],
-  "a\n{{#a}}\n{{/a}}\nb"                    : [ [ 'text', 'a\n', 0, 2 ], [ '#', 'a', 2, 8, [] ], [ 'text', 'b', 15, 17 ] ],
-  "a\n {{#a}}\n{{/a}}\nb"                   : [ [ 'text', 'a\n', 0, 3 ], [ '#', 'a', 3, 9, [] ], [ 'text', 'b', 16, 18 ] ],
-  "a\n {{#a}}\n{{/a}} \nb"                  : [ [ 'text', 'a\n', 0, 3 ], [ '#', 'a', 3, 9, [] ], [ 'text', 'b', 16, 19 ] ],
-  "a\n{{#a}}\n{{/a}}\n{{#b}}\n{{/b}}\nb"    : [ [ 'text', 'a\n', 0, 2 ], [ '#', 'a', 2, 8, [] ], [ '#', 'b', 16, 22, [] ], [ 'text', 'b', 29, 31 ] ],
-  "a\n {{#a}}\n{{/a}}\n{{#b}}\n{{/b}}\nb"   : [ [ 'text', 'a\n', 0, 3 ], [ '#', 'a', 3, 9, [] ], [ '#', 'b', 17, 23, [] ], [ 'text', 'b', 30, 32 ] ],
-  "a\n {{#a}}\n{{/a}}\n{{#b}}\n{{/b}} \nb"  : [ [ 'text', 'a\n', 0, 3 ], [ '#', 'a', 3, 9, [] ], [ '#', 'b', 17, 23, [] ], [ 'text', 'b', 30, 33 ] ],
-  "a\n{{#a}}\n{{#b}}\n{{/b}}\n{{/a}}\nb"    : [ [ 'text', 'a\n', 0, 2 ], [ '#', 'a', 2, 8, [ [ '#', 'b', 9, 15, [] ] ] ], [ 'text', 'b', 29, 31 ] ],
-  "a\n {{#a}}\n{{#b}}\n{{/b}}\n{{/a}}\nb"   : [ [ 'text', 'a\n', 0, 3 ], [ '#', 'a', 3, 9, [ [ '#', 'b', 10, 16, [] ] ] ], [ 'text', 'b', 30, 32 ] ],
-  "a\n {{#a}}\n{{#b}}\n{{/b}}\n{{/a}} \nb"  : [ [ 'text', 'a\n', 0, 3 ], [ '#', 'a', 3, 9, [ [ '#', 'b', 10, 16, [] ] ] ], [ 'text', 'b', 30, 33 ] ],
-  "{{>abc}}"                                : [ [ '>', 'abc', 0, 8 ] ],
-  "{{> abc }}"                              : [ [ '>', 'abc', 0, 10 ] ],
-  "{{ > abc }}"                             : [ [ '>', 'abc', 0, 11 ] ],
-  "{{=<% %>=}}"                             : [ [ '=', '<% %>', 0, 11 ] ],
-  "{{= <% %> =}}"                           : [ [ '=', '<% %>', 0, 13 ] ],
-  "{{=<% %>=}}<%={{ }}=%>"                  : [ [ '=', '<% %>', 0, 11 ], [ '=', '{{ }}', 11, 22 ] ],
-  "{{=<% %>=}}<%hi%>"                       : [ [ '=', '<% %>', 0, 11 ], [ 'name', 'hi', 11, 17 ] ],
-  "{{#a}}{{/a}}hi{{#b}}{{/b}}\n"            : [ [ '#', 'a', 0, 6, [] ], [ 'text', 'hi', 12, 14 ], [ '#', 'b', 14, 20, [] ], [ 'text', '\n', 26, 27 ] ],
-  "{{a}}\n{{b}}\n\n{{#c}}\n{{/c}}\n"        : [ [ 'name', 'a', 0, 5 ], [ 'text', '\n', 5, 6 ], [ 'name', 'b', 6, 11 ], [ 'text', '\n\n', 11, 13 ], [ '#', 'c', 13, 19, [] ] ],
-  "{{#foo}}\n  {{#a}}\n    {{b}}\n  {{/a}}\n{{/foo}}\n"
+  '{{hi}}'                                  : [ [ 'name', 'hi', 0, 6 ] ],
+  '{{hi.world}}'                            : [ [ 'name', 'hi.world', 0, 12 ] ],
+  '{{hi . world}}'                          : [ [ 'name', 'hi . world', 0, 14 ] ],
+  '{{ hi}}'                                 : [ [ 'name', 'hi', 0, 7 ] ],
+  '{{hi }}'                                 : [ [ 'name', 'hi', 0, 7 ] ],
+  '{{ hi }}'                                : [ [ 'name', 'hi', 0, 8 ] ],
+  '{{{hi}}}'                                : [ [ '{', 'hi', 0, 8 ] ],
+  '{{!hi}}'                                 : [ [ '!', 'hi', 0, 7 ] ],
+  '{{! hi}}'                                : [ [ '!', 'hi', 0, 8 ] ],
+  '{{! hi }}'                               : [ [ '!', 'hi', 0, 9 ] ],
+  '{{ !hi}}'                                : [ [ '!', 'hi', 0, 8 ] ],
+  '{{ ! hi}}'                               : [ [ '!', 'hi', 0, 9 ] ],
+  '{{ ! hi }}'                              : [ [ '!', 'hi', 0, 10 ] ],
+  'a{{hi}}'                                 : [ [ 'text', 'a', 0, 1 ], [ 'name', 'hi', 1, 7 ] ],
+  'a {{hi}}'                                : [ [ 'text', 'a ', 0, 2 ], [ 'name', 'hi', 2, 8 ] ],
+  ' a{{hi}}'                                : [ [ 'text', ' a', 0, 2 ], [ 'name', 'hi', 2, 8 ] ],
+  ' a {{hi}}'                               : [ [ 'text', ' a ', 0, 3 ], [ 'name', 'hi', 3, 9 ] ],
+  'a{{hi}}b'                                : [ [ 'text', 'a', 0, 1 ], [ 'name', 'hi', 1, 7 ], [ 'text', 'b', 7, 8 ] ],
+  'a{{hi}} b'                               : [ [ 'text', 'a', 0, 1 ], [ 'name', 'hi', 1, 7 ], [ 'text', ' b', 7, 9 ] ],
+  'a{{hi}}b '                               : [ [ 'text', 'a', 0, 1 ], [ 'name', 'hi', 1, 7 ], [ 'text', 'b ', 7, 9 ] ],
+  'a\n{{hi}} b \n'                          : [ [ 'text', 'a\n', 0, 2 ], [ 'name', 'hi', 2, 8 ], [ 'text', ' b \n', 8, 12 ] ],
+  'a\n {{hi}} \nb'                          : [ [ 'text', 'a\n ', 0, 3 ], [ 'name', 'hi', 3, 9 ], [ 'text', ' \nb', 9, 12 ] ],
+  'a\n {{!hi}} \nb'                         : [ [ 'text', 'a\n', 0, 3 ], [ '!', 'hi', 3, 10 ], [ 'text', 'b', 10, 13 ] ],
+  'a\n{{#a}}{{/a}}\nb'                      : [ [ 'text', 'a\n', 0, 2 ], [ '#', 'a', 2, 8, [] ], [ 'text', 'b', 14, 16 ] ],
+  'a\n {{#a}}{{/a}}\nb'                     : [ [ 'text', 'a\n', 0, 3 ], [ '#', 'a', 3, 9, [] ], [ 'text', 'b', 15, 17 ] ],
+  'a\n {{#a}}{{/a}} \nb'                    : [ [ 'text', 'a\n', 0, 3 ], [ '#', 'a', 3, 9, [] ], [ 'text', 'b', 15, 18 ] ],
+  'a\n{{#a}}\n{{/a}}\nb'                    : [ [ 'text', 'a\n', 0, 2 ], [ '#', 'a', 2, 8, [] ], [ 'text', 'b', 15, 17 ] ],
+  'a\n {{#a}}\n{{/a}}\nb'                   : [ [ 'text', 'a\n', 0, 3 ], [ '#', 'a', 3, 9, [] ], [ 'text', 'b', 16, 18 ] ],
+  'a\n {{#a}}\n{{/a}} \nb'                  : [ [ 'text', 'a\n', 0, 3 ], [ '#', 'a', 3, 9, [] ], [ 'text', 'b', 16, 19 ] ],
+  'a\n{{#a}}\n{{/a}}\n{{#b}}\n{{/b}}\nb'    : [ [ 'text', 'a\n', 0, 2 ], [ '#', 'a', 2, 8, [] ], [ '#', 'b', 16, 22, [] ], [ 'text', 'b', 29, 31 ] ],
+  'a\n {{#a}}\n{{/a}}\n{{#b}}\n{{/b}}\nb'   : [ [ 'text', 'a\n', 0, 3 ], [ '#', 'a', 3, 9, [] ], [ '#', 'b', 17, 23, [] ], [ 'text', 'b', 30, 32 ] ],
+  'a\n {{#a}}\n{{/a}}\n{{#b}}\n{{/b}} \nb'  : [ [ 'text', 'a\n', 0, 3 ], [ '#', 'a', 3, 9, [] ], [ '#', 'b', 17, 23, [] ], [ 'text', 'b', 30, 33 ] ],
+  'a\n{{#a}}\n{{#b}}\n{{/b}}\n{{/a}}\nb'    : [ [ 'text', 'a\n', 0, 2 ], [ '#', 'a', 2, 8, [ [ '#', 'b', 9, 15, [] ] ] ], [ 'text', 'b', 29, 31 ] ],
+  'a\n {{#a}}\n{{#b}}\n{{/b}}\n{{/a}}\nb'   : [ [ 'text', 'a\n', 0, 3 ], [ '#', 'a', 3, 9, [ [ '#', 'b', 10, 16, [] ] ] ], [ 'text', 'b', 30, 32 ] ],
+  'a\n {{#a}}\n{{#b}}\n{{/b}}\n{{/a}} \nb'  : [ [ 'text', 'a\n', 0, 3 ], [ '#', 'a', 3, 9, [ [ '#', 'b', 10, 16, [] ] ] ], [ 'text', 'b', 30, 33 ] ],
+  '{{>abc}}'                                : [ [ '>', 'abc', 0, 8 ] ],
+  '{{> abc }}'                              : [ [ '>', 'abc', 0, 10 ] ],
+  '{{ > abc }}'                             : [ [ '>', 'abc', 0, 11 ] ],
+  '{{=<% %>=}}'                             : [ [ '=', '<% %>', 0, 11 ] ],
+  '{{= <% %> =}}'                           : [ [ '=', '<% %>', 0, 13 ] ],
+  '{{=<% %>=}}<%={{ }}=%>'                  : [ [ '=', '<% %>', 0, 11 ], [ '=', '{{ }}', 11, 22 ] ],
+  '{{=<% %>=}}<%hi%>'                       : [ [ '=', '<% %>', 0, 11 ], [ 'name', 'hi', 11, 17 ] ],
+  '{{#a}}{{/a}}hi{{#b}}{{/b}}\n'            : [ [ '#', 'a', 0, 6, [] ], [ 'text', 'hi', 12, 14 ], [ '#', 'b', 14, 20, [] ], [ 'text', '\n', 26, 27 ] ],
+  '{{a}}\n{{b}}\n\n{{#c}}\n{{/c}}\n'        : [ [ 'name', 'a', 0, 5 ], [ 'text', '\n', 5, 6 ], [ 'name', 'b', 6, 11 ], [ 'text', '\n\n', 11, 13 ], [ '#', 'c', 13, 19, [] ] ],
+  '{{#foo}}\n  {{#a}}\n    {{b}}\n  {{/a}}\n{{/foo}}\n'
                                             : [ [ '#', 'foo', 0, 8, [ [ '#', 'a', 11, 17, [ [ 'text', '    ', 17, 22 ], [ 'name', 'b', 22, 27 ], [ 'text', '\n', 27, 30 ] ] ] ] ] ]
 };
 
-function makeToken(tokenArray) {
-  var token = {
-    type: tokenArray[0],
-    value: tokenArray[1],
-    start: tokenArray[2],
-    end: tokenArray[3]
-  };
-
-  if (tokenArray[4]) {
-    token.tokens = tokenArray[4].map(makeToken);
-  }
-
-  return token;
-}
-
 var spec = {};
 
 for (var template in expectations) {
   (function (template, tokens) {
-    spec["knows how to parse " + JSON.stringify(template)] = function () {
-      assert.deepEqual(parse(template), tokens.map(makeToken));
+    spec['knows how to parse ' + JSON.stringify(template)] = function () {
+      assert.deepEqual(parse(template), tokens);
     };
   })(template, expectations[template]);
 }
 
-vows.describe("Mustache.parse").addBatch({
-  "parse": spec
+vows.describe('Mustache.parse').addBatch({
+  'parse': spec
 }).export(module);

From 18e797d47e6ed77059be651995794bf21cb7ed56 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Fri, 7 Sep 2012 18:52:22 -0700
Subject: [PATCH 45/65] Coerce { token types to &

---
 mustache.js        | 46 ++++++++++++++++++++--------------------------
 test/parse_test.js |  2 +-
 2 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/mustache.js b/mustache.js
index 390fb0c..be93d69 100644
--- a/mustache.js
+++ b/mustache.js
@@ -291,28 +291,21 @@ var Mustache;
 
   Renderer.prototype._partial = function (name, context) {
     var fn = this._partialCache[name];
-
-    if (fn) {
-      return fn(context);
-    }
-
-    return "";
+    return fn ? fn(context) : "";
   };
 
-  Renderer.prototype._name = function (name, context, escape) {
+  Renderer.prototype._name = function (name, context) {
     var value = context.lookup(name);
 
     if (typeof value === "function") {
       value = value.call(context.view);
     }
 
-    var string = (value == null) ? "" : String(value);
-
-    if (escape) {
-      return exports.escape(string);
-    }
+    return (value == null) ? "" : String(value);
+  };
 
-    return string;
+  Renderer.prototype._escaped = function (name, context) {
+    return exports.escape(this._name(name, context));
   };
 
   /**
@@ -340,36 +333,36 @@ var Mustache;
    * `returnBody` is true.
    */
   function compileTokens(tokens, returnBody) {
-    var body = ['""'];
-    var token, escape, bounds, text;
+    var body = ['""'], token, quotedValue, bounds, text;
 
     for (var i = 0, len = tokens.length; i < len; ++i) {
       token = tokens[i];
+      quotedValue = quote(token[1]);
 
       switch (token[0]) {
       case "#":
         bounds = sectionBounds(token);
         text = "t.slice(" + bounds[0] + ", " + bounds[1] + ")";
-        body.push("r._section(" + quote(token[1]) + ", c, " + text + ", function (c, r) {\n" +
+        body.push("r._section(" + quotedValue + ", c, " + text + ", function (c, r) {\n" +
           "  " + compileTokens(token[4], true) + "\n" +
           "})");
         break;
       case "^":
-        body.push("r._inverted(" + quote(token[1]) + ", c, function (c, r) {\n" +
+        body.push("r._inverted(" + quotedValue + ", c, function (c, r) {\n" +
           "  " + compileTokens(token[4], true) + "\n" +
           "})");
         break;
-      case "{":
+      case ">":
+        body.push("r._partial(" + quotedValue + ", c)");
+        break;
       case "&":
-      case "name":
-        escape = String(token[0] === "name");
-        body.push("r._name(" + quote(token[1]) + ", c, " + escape + ")");
+        body.push("r._name(" + quotedValue + ", c)");
         break;
-      case ">":
-        body.push("r._partial(" + quote(token[1]) + ", c)");
+      case "name":
+        body.push("r._escaped(" + quotedValue + ", c)");
         break;
       case "text":
-        body.push(quote(token[1]));
+        body.push(quotedValue);
         break;
       }
     }
@@ -401,8 +394,8 @@ var Mustache;
 
   /**
    * Forms the given linear array of `tokens` into a nested tree structure
-   * where tokens that represent a section have a "tokens" array property
-   * that contains all tokens that are in that section.
+   * where tokens that represent a section have a fifth item: an array that
+   * contains all tokens in that section.
    */
   function nestTokens(tokens) {
     var tree = [];
@@ -551,6 +544,7 @@ var Mustache;
         value = scanner.scanUntil(closeRe);
         scanner.scan(curlyRe);
         scanner.scanUntil(tagRes[1]);
+        type = "&";
       } else {
         value = scanner.scanUntil(tagRes[1]);
       }
diff --git a/test/parse_test.js b/test/parse_test.js
index e3e06dc..0fd2a57 100644
--- a/test/parse_test.js
+++ b/test/parse_test.js
@@ -11,7 +11,7 @@ var expectations = {
   '{{ hi}}'                                 : [ [ 'name', 'hi', 0, 7 ] ],
   '{{hi }}'                                 : [ [ 'name', 'hi', 0, 7 ] ],
   '{{ hi }}'                                : [ [ 'name', 'hi', 0, 8 ] ],
-  '{{{hi}}}'                                : [ [ '{', 'hi', 0, 8 ] ],
+  '{{{hi}}}'                                : [ [ '&', 'hi', 0, 8 ] ],
   '{{!hi}}'                                 : [ [ '!', 'hi', 0, 7 ] ],
   '{{! hi}}'                                : [ [ '!', 'hi', 0, 8 ] ],
   '{{! hi }}'                               : [ [ '!', 'hi', 0, 9 ] ],

From 544a32b7a1abb1c0b98d9fea171773d8665c470c Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Sat, 8 Sep 2012 10:13:44 -0700
Subject: [PATCH 46/65] Make high-level API same as Renderer API

Also, allow partials to be passed to the function that is returned
for pre-compiled templates. This makes the API more consistent all
around, but comes with the caveat that renderers are much more
aggressive at caching. Now, any time a template or partial is
compiled with the same name as a previously compiled template the
cached version is used.

Fixes #240
---
 CHANGES     |  2 ++
 mustache.js | 72 ++++++++++++++++++++++++-----------------------------
 2 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/CHANGES b/CHANGES
index 34d23e2..04c4f43 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,8 @@
   * Fixed a bug with higher-order sections that prevented them from being
     passed the raw text of the section from the original template.
   * More concise token format.
+  * High-level API is consistent with the Renderer API.
+  * Allow partials to be passed to the pre-compiled function (thanks @fallenice).
 
 = 0.6.0 / 31 Aug 2012
 
diff --git a/mustache.js b/mustache.js
index be93d69..d0da857 100644
--- a/mustache.js
+++ b/mustache.js
@@ -219,30 +219,36 @@ var Mustache;
     this._partialCache = {};
   };
 
-  Renderer.prototype.render = function (template, view) {
-    var fn = this._cache[template];
+  Renderer.prototype._compile = function (cache, key, template, tags) {
+    if (!cache[key]) {
+      var tokens = parse(template, tags);
+      var fn = compileTokens(tokens);
 
-    if (!fn) {
-      fn = this.compile(template);
-      this._cache[template] = fn;
+      var self = this;
+      cache[key] = function (view, partials) {
+        if (partials) {
+          for (var name in partials) {
+            self.compilePartial(name, partials[name]);
+          }
+        }
+
+        return fn(Context.make(view), self, template);
+      };
     }
 
-    return fn(view);
+    return cache[key];
   };
 
   Renderer.prototype.compile = function (template, tags) {
-    var tokens = parse(template, tags);
-    var render = compileTokens(tokens);
-
-    var self = this;
-    return function (view) {
-      return render(Context.make(view), self, template);
-    };
+    return this._compile(this._cache, template, template, tags);
   };
 
   Renderer.prototype.compilePartial = function (name, template, tags) {
-    this._partialCache[name] = this.compile(template, tags);
-    return this._partialCache[name];
+    return this._compile(this._partialCache, name, template, tags);
+  };
+
+  Renderer.prototype.render = function (template, view, partials) {
+    return this.compile(template)(view, partials);
   };
 
   Renderer.prototype._section = function (name, context, text, callback) {
@@ -577,46 +583,34 @@ var Mustache;
   var _renderer = new Renderer();
 
   /**
-   * Clears all cached templates and partials.
+   * Clears all cached templates and partials in the default renderer.
    */
   function clearCache() {
     _renderer.clearCache();
   }
 
   /**
-   * High-level API for compiling the given `tokens` down to a reusable
-   * function. If `tokens` is a string it will be parsed using the given `tags`
-   * before it is compiled.
+   * Compiles the given `template` to a reusable function using the default
+   * renderer.
    */
-  function compile(tokens, tags) {
-    return _renderer.compile(tokens, tags);
+  function compile(template, tags) {
+    return _renderer.compile(template, tags);
   }
 
   /**
-   * High-level API for compiling the `tokens` for the partial with the given
-   * `name` down to a reusable function. If `tokens` is a string it will be
-   * parsed using the given `tags` before it is compiled.
+   * Compiles the partial with the given `name` and `template` to a reusable
+   * function using the default renderer.
    */
-  function compilePartial(name, tokens, tags) {
-    return _renderer.compilePartial(name, tokens, tags);
+  function compilePartial(name, template, tags) {
+    return _renderer.compilePartial(name, template, tags);
   }
 
   /**
-   * High-level API for rendering the `template` using the given `view`. The
-   * optional `partials` object may be given here for convenience, but note that
-   * it will cause all partials to be re-compiled, thus hurting performance. Of
-   * course, this only matters if you're going to render the same template more
-   * than once. If so, it is best to call `compilePartial` before calling this
-   * function and to leave the `partials` argument blank.
+   * Renders the `template` with the given `view` and `partials` using the
+   * default renderer.
    */
   function render(template, view, partials) {
-    if (partials) {
-      for (var name in partials) {
-        compilePartial(name, partials[name]);
-      }
-    }
-
-    return _renderer.render(template, view);
+    return _renderer.render(template, view, partials);
   }
 
   return exports;

From 0a6d71ca90df937b15da9a521d5bd6aa7e0cfccf Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Sat, 8 Sep 2012 17:27:18 -0700
Subject: [PATCH 47/65] Add tests for null view

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

diff --git a/test/_files/null_view.js b/test/_files/null_view.js
new file mode 100644
index 0000000..dbdae72
--- /dev/null
+++ b/test/_files/null_view.js
@@ -0,0 +1,4 @@
+({
+  name: 'Joe',
+  friends: null
+})
diff --git a/test/_files/null_view.mustache b/test/_files/null_view.mustache
new file mode 100644
index 0000000..115b376
--- /dev/null
+++ b/test/_files/null_view.mustache
@@ -0,0 +1 @@
+{{name}}'s friends: {{#friends}}{{name}}, {{/friends}}
\ No newline at end of file
diff --git a/test/_files/null_view.txt b/test/_files/null_view.txt
new file mode 100644
index 0000000..15ed2ab
--- /dev/null
+++ b/test/_files/null_view.txt
@@ -0,0 +1 @@
+Joe's friends: 
\ No newline at end of file

From dac64709f0458cc58caea724eaae2cf521e14c01 Mon Sep 17 00:00:00 2001
From: Chad Weider <cweider@oofn.net>
Date: Sun, 9 Sep 2012 20:17:38 -0700
Subject: [PATCH 48/65] Replace code generation with straight function
 execution.

This is a strict port of the existing process - there are many opportunities for optimization based on this.
---
 mustache.js | 87 +++++++++++++++++++++++------------------------------
 1 file changed, 38 insertions(+), 49 deletions(-)

diff --git a/mustache.js b/mustache.js
index d0da857..ed4b235 100644
--- a/mustache.js
+++ b/mustache.js
@@ -64,17 +64,6 @@ var Mustache;
     return Object.prototype.toString.call(obj) === "[object Array]";
   };
 
-  // OSWASP Guidelines: Escape all non alphanumeric characters in ASCII space.
-  var jsCharsRe = /[\x00-\x2F\x3A-\x40\x5B-\x60\x7B-\xFF\u2028\u2029]/gm;
-
-  function quote(text) {
-    var escaped = text.replace(jsCharsRe, function (c) {
-      return "\\u" + ('0000' + c.charCodeAt(0).toString(16)).slice(-4);
-    });
-
-    return '"' + escaped + '"';
-  }
-
   function escapeRe(string) {
     return string.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&");
   }
@@ -335,56 +324,56 @@ var Mustache;
   /**
    * Low-level function that compiles the given `tokens` into a
    * function that accepts two arguments: a Context and a
-   * Renderer. Returns the body of the function as a string if
-   * `returnBody` is true.
+   * Renderer.
    */
-  function compileTokens(tokens, returnBody) {
-    var body = ['""'], token, quotedValue, bounds, text;
-
+  function compileTokens(tokens) {
+    var subproceedures = [];
     for (var i = 0, len = tokens.length; i < len; ++i) {
       token = tokens[i];
-      quotedValue = quote(token[1]);
 
       switch (token[0]) {
       case "#":
-        bounds = sectionBounds(token);
-        text = "t.slice(" + bounds[0] + ", " + bounds[1] + ")";
-        body.push("r._section(" + quotedValue + ", c, " + text + ", function (c, r) {\n" +
-          "  " + compileTokens(token[4], true) + "\n" +
-          "})");
-        break;
       case "^":
-        body.push("r._inverted(" + quotedValue + ", c, function (c, r) {\n" +
-          "  " + compileTokens(token[4], true) + "\n" +
-          "})");
-        break;
-      case ">":
-        body.push("r._partial(" + quotedValue + ", c)");
-        break;
-      case "&":
-        body.push("r._name(" + quotedValue + ", c)");
-        break;
-      case "name":
-        body.push("r._escaped(" + quotedValue + ", c)");
-        break;
-      case "text":
-        body.push(quotedValue);
-        break;
+        subproceedures[i] = compileTokens(token[4]);
       }
     }
 
-    // Convert to a string body.
-    body = "return " + body.join(" + ") + ";";
-
-    // Good for debugging.
-    // console.log(body);
+    function renderFunction(c, r, t) {
+      var body = [];
+      for (var i = 0, len = tokens.length; i < len; ++i) {
+        token = tokens[i];
+
+        switch (token[0]) {
+        case "#":
+          bounds = sectionBounds(token);
+          text = t.slice(bounds[0], bounds[1]);
+          body.push(r._section(token[1], c, text, function (c, r) {
+            return subproceedures[i](c, r, t);
+          }));
+          break;
+        case "^":
+          body.push(r._inverted(token[1], c, function (c, r) {
+            return subproceedures[i](c, r, t);
+          }));
+          break;
+        case ">":
+          body.push(r._partial(token[1], c));
+          break;
+        case "&":
+          body.push(r._name(token[1], c));
+          break;
+        case "name":
+          body.push(r._escaped(token[1], c));
+          break;
+        case "text":
+          body.push(token[1]);
+          break;
+        }
+      }
 
-    if (returnBody) {
-      return body;
+      return body.join('');
     }
-
-    // For great evil!
-    return new Function("c, r, t", body);
+    return renderFunction;
   }
 
   function escapeTags(tags) {

From 0c0c6fde3a7ea2597955cbd6d44555d5a2e45bb1 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Mon, 10 Sep 2012 09:19:34 -0700
Subject: [PATCH 49/65] Don't use eval

Fixes #207 #210
---
 CHANGES | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES b/CHANGES
index 04c4f43..cc3aa33 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@
   * More concise token format.
   * High-level API is consistent with the Renderer API.
   * Allow partials to be passed to the pre-compiled function (thanks @fallenice).
+  * Don't use eval (thanks @cweider).
 
 = 0.6.0 / 31 Aug 2012
 

From dc6cdf1ae6a323c18ea1141d9a322ad87a512d8b Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Mon, 10 Sep 2012 09:28:09 -0700
Subject: [PATCH 50/65] Rename Renderer => Writer

---
 CHANGES     |  3 +-
 mustache.js | 91 ++++++++++++++++++++++++++---------------------------
 2 files changed, 46 insertions(+), 48 deletions(-)

diff --git a/CHANGES b/CHANGES
index cc3aa33..ec057fe 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,10 @@
 = HEAD
 
+  * Rename Renderer => Writer.
   * Fixed a bug with higher-order sections that prevented them from being
     passed the raw text of the section from the original template.
   * More concise token format.
-  * High-level API is consistent with the Renderer API.
+  * High-level API is consistent with the Writer API.
   * Allow partials to be passed to the pre-compiled function (thanks @fallenice).
   * Don't use eval (thanks @cweider).
 
diff --git a/mustache.js b/mustache.js
index ed4b235..9673602 100644
--- a/mustache.js
+++ b/mustache.js
@@ -16,6 +16,7 @@ var Mustache;
     Mustache = exports; // <script>
   }
 }((function () {
+
   var exports = {};
 
   exports.name = "mustache.js";
@@ -23,14 +24,9 @@ var Mustache;
   exports.tags = ["{{", "}}"];
 
   exports.parse = parse;
-  exports.clearCache = clearCache;
-  exports.compile = compile;
-  exports.compilePartial = compilePartial;
-  exports.render = render;
-
   exports.Scanner = Scanner;
   exports.Context = Context;
-  exports.Renderer = Renderer;
+  exports.Writer = Writer;
 
   // This is here for backwards compatibility with 0.4.x.
   exports.to_html = function (template, view, partials, send) {
@@ -199,16 +195,28 @@ var Mustache;
     return value;
   };
 
-  function Renderer() {
+  function Writer() {
     this.clearCache();
   }
 
-  Renderer.prototype.clearCache = function () {
+  Writer.prototype.clearCache = function () {
     this._cache = {};
     this._partialCache = {};
   };
 
-  Renderer.prototype._compile = function (cache, key, template, tags) {
+  Writer.prototype.compile = function (template, tags) {
+    return this._compile(this._cache, template, template, tags);
+  };
+
+  Writer.prototype.compilePartial = function (name, template, tags) {
+    return this._compile(this._partialCache, name, template, tags);
+  };
+
+  Writer.prototype.render = function (template, view, partials) {
+    return this.compile(template)(view, partials);
+  };
+
+  Writer.prototype._compile = function (cache, key, template, tags) {
     if (!cache[key]) {
       var tokens = parse(template, tags);
       var fn = compileTokens(tokens);
@@ -228,19 +236,7 @@ var Mustache;
     return cache[key];
   };
 
-  Renderer.prototype.compile = function (template, tags) {
-    return this._compile(this._cache, template, template, tags);
-  };
-
-  Renderer.prototype.compilePartial = function (name, template, tags) {
-    return this._compile(this._partialCache, name, template, tags);
-  };
-
-  Renderer.prototype.render = function (template, view, partials) {
-    return this.compile(template)(view, partials);
-  };
-
-  Renderer.prototype._section = function (name, context, text, callback) {
+  Writer.prototype._section = function (name, context, text, callback) {
     var value = context.lookup(name);
 
     switch (typeof value) {
@@ -272,7 +268,7 @@ var Mustache;
     return "";
   };
 
-  Renderer.prototype._inverted = function (name, context, callback) {
+  Writer.prototype._inverted = function (name, context, callback) {
     var value = context.lookup(name);
 
     // Use JavaScript's definition of falsy. Include empty arrays.
@@ -284,12 +280,12 @@ var Mustache;
     return "";
   };
 
-  Renderer.prototype._partial = function (name, context) {
+  Writer.prototype._partial = function (name, context) {
     var fn = this._partialCache[name];
     return fn ? fn(context) : "";
   };
 
-  Renderer.prototype._name = function (name, context) {
+  Writer.prototype._name = function (name, context) {
     var value = context.lookup(name);
 
     if (typeof value === "function") {
@@ -299,7 +295,7 @@ var Mustache;
     return (value == null) ? "" : String(value);
   };
 
-  Renderer.prototype._escaped = function (name, context) {
+  Writer.prototype._escaped = function (name, context) {
     return exports.escape(this._name(name, context));
   };
 
@@ -324,7 +320,7 @@ var Mustache;
   /**
    * Low-level function that compiles the given `tokens` into a
    * function that accepts two arguments: a Context and a
-   * Renderer.
+   * Writer.
    */
   function compileTokens(tokens) {
     var subproceedures = [];
@@ -479,7 +475,7 @@ var Mustache;
 
     // Strips all whitespace tokens array for the current line
     // if there was a {{#tag}} on it and otherwise only space.
-    var stripSpace = function () {
+    function stripSpace() {
       if (hasTag && !nonSpace) {
         while (spaces.length) {
           tokens.splice(spaces.pop(), 1);
@@ -490,7 +486,7 @@ var Mustache;
 
       hasTag = false;
       nonSpace = false;
-    };
+    }
 
     var start, type, value, chr;
 
@@ -568,39 +564,40 @@ var Mustache;
   }
 
   // The high-level clearCache, compile, compilePartial, and render functions
-  // use this default renderer.
-  var _renderer = new Renderer();
+  // use this default writer.
+  var _writer = new Writer();
 
   /**
-   * Clears all cached templates and partials in the default renderer.
+   * Clears all cached templates and partials in the default writer.
    */
-  function clearCache() {
-    _renderer.clearCache();
-  }
+  exports.clearCache = function () {
+    return _writer.clearCache();
+  };
 
   /**
    * Compiles the given `template` to a reusable function using the default
-   * renderer.
+   * writer.
    */
-  function compile(template, tags) {
-    return _renderer.compile(template, tags);
-  }
+  exports.compile = function (template, tags) {
+    return _writer.compile(template, tags);
+  };
 
   /**
    * Compiles the partial with the given `name` and `template` to a reusable
-   * function using the default renderer.
+   * function using the default writer.
    */
-  function compilePartial(name, template, tags) {
-    return _renderer.compilePartial(name, template, tags);
-  }
+  exports.compilePartial = function (name, template, tags) {
+    return _writer.compilePartial(name, template, tags);
+  };
 
   /**
    * Renders the `template` with the given `view` and `partials` using the
-   * default renderer.
+   * default writer.
    */
-  function render(template, view, partials) {
-    return _renderer.render(template, view, partials);
-  }
+  exports.render = function (template, view, partials) {
+    return _writer.render(template, view, partials);
+  };
 
   return exports;
+
 }())));

From e45bbb3e879b960635bd05a59f0b1561dfed4e21 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Mon, 10 Sep 2012 09:51:37 -0700
Subject: [PATCH 51/65] Better variable names

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

diff --git a/mustache.js b/mustache.js
index 9673602..5888559 100644
--- a/mustache.js
+++ b/mustache.js
@@ -323,52 +323,51 @@ var Mustache;
    * Writer.
    */
   function compileTokens(tokens) {
-    var subproceedures = [];
-    for (var i = 0, len = tokens.length; i < len; ++i) {
-      token = tokens[i];
-
-      switch (token[0]) {
-      case "#":
-      case "^":
-        subproceedures[i] = compileTokens(token[4]);
+    var subRenders = {};
+
+    function subRender(i, tokens, template) {
+      if (!subRenders[i]) {
+        var render = compileTokens(tokens);
+        subRenders[i] = function (context, writer) {
+          return render(context, writer, template);
+        };
       }
+
+      return subRenders[i];
     }
 
-    function renderFunction(c, r, t) {
-      var body = [];
+    function renderFunction(context, writer, template) {
+      var buffer = [], text;
+
       for (var i = 0, len = tokens.length; i < len; ++i) {
         token = tokens[i];
 
         switch (token[0]) {
         case "#":
-          bounds = sectionBounds(token);
-          text = t.slice(bounds[0], bounds[1]);
-          body.push(r._section(token[1], c, text, function (c, r) {
-            return subproceedures[i](c, r, t);
-          }));
+          text = template.slice.apply(template, sectionBounds(token));
+          buffer.push(writer._section(token[1], context, text, subRender(i, token[4], template)));
           break;
         case "^":
-          body.push(r._inverted(token[1], c, function (c, r) {
-            return subproceedures[i](c, r, t);
-          }));
+          buffer.push(writer._inverted(token[1], context, subRender(i, token[4], template)));
           break;
         case ">":
-          body.push(r._partial(token[1], c));
+          buffer.push(writer._partial(token[1], context));
           break;
         case "&":
-          body.push(r._name(token[1], c));
+          buffer.push(writer._name(token[1], context));
           break;
         case "name":
-          body.push(r._escaped(token[1], c));
+          buffer.push(writer._escaped(token[1], context));
           break;
         case "text":
-          body.push(token[1]);
+          buffer.push(token[1]);
           break;
         }
       }
 
-      return body.join('');
+      return buffer.join('');
     }
+
     return renderFunction;
   }
 

From 2bc29ec6087eba00ece331a5972286c78cd72789 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Mon, 10 Sep 2012 09:58:08 -0700
Subject: [PATCH 52/65] Prevent global var leak

Also, changed order of arguments to internal render function.
---
 mustache.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/mustache.js b/mustache.js
index 5888559..d9d6740 100644
--- a/mustache.js
+++ b/mustache.js
@@ -229,7 +229,7 @@ var Mustache;
           }
         }
 
-        return fn(Context.make(view), self, template);
+        return fn(self, Context.make(view), template);
       };
     }
 
@@ -245,13 +245,13 @@ var Mustache;
         var buffer = "";
 
         for (var i = 0, len = value.length; i < len; ++i) {
-          buffer += callback(context.push(value[i]), this);
+          buffer += callback(this, context.push(value[i]));
         }
 
         return buffer;
       }
 
-      return value ? callback(context.push(value), this) : "";
+      return value ? callback(this, context.push(value)) : "";
     case "function":
       var self = this;
       var scopedRender = function (template) {
@@ -261,7 +261,7 @@ var Mustache;
       return value.call(context.view, text, scopedRender) || "";
     default:
       if (value) {
-        return callback(context, this);
+        return callback(this, context);
       }
     }
 
@@ -274,7 +274,7 @@ var Mustache;
     // Use JavaScript's definition of falsy. Include empty arrays.
     // See https://github.com/janl/mustache.js/issues/186
     if (!value || (isArray(value) && value.length === 0)) {
-      return callback(context, this);
+      return callback(this, context);
     }
 
     return "";
@@ -328,16 +328,17 @@ var Mustache;
     function subRender(i, tokens, template) {
       if (!subRenders[i]) {
         var render = compileTokens(tokens);
-        subRenders[i] = function (context, writer) {
-          return render(context, writer, template);
+        subRenders[i] = function (writer, context) {
+          return render(writer, context, template);
         };
       }
 
       return subRenders[i];
     }
 
-    function renderFunction(context, writer, template) {
-      var buffer = [], text;
+    function renderFunction(writer, context, template) {
+      var buffer = [];
+      var token, text;
 
       for (var i = 0, len = tokens.length; i < len; ++i) {
         token = tokens[i];

From f41bbb1f66612710af97b164db5636b59febd194 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Mon, 10 Sep 2012 10:05:28 -0700
Subject: [PATCH 53/65] Use exported parse function

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

diff --git a/mustache.js b/mustache.js
index d9d6740..75cfc14 100644
--- a/mustache.js
+++ b/mustache.js
@@ -23,7 +23,6 @@ var Mustache;
   exports.version = "0.6.0";
   exports.tags = ["{{", "}}"];
 
-  exports.parse = parse;
   exports.Scanner = Scanner;
   exports.Context = Context;
   exports.Writer = Writer;
@@ -218,7 +217,7 @@ var Mustache;
 
   Writer.prototype._compile = function (cache, key, template, tags) {
     if (!cache[key]) {
-      var tokens = parse(template, tags);
+      var tokens = exports.parse(template, tags);
       var fn = compileTokens(tokens);
 
       var self = this;
@@ -462,7 +461,7 @@ var Mustache;
    * opening and closing tags used in the template (e.g. ["<%", "%>"]). Of
    * course, the default is to use mustaches (i.e. Mustache.tags).
    */
-  function parse(template, tags) {
+  exports.parse = function (template, tags) {
     tags = tags || exports.tags;
 
     var tagRes = escapeTags(tags);
@@ -561,7 +560,7 @@ var Mustache;
     squashTokens(tokens);
 
     return nestTokens(tokens);
-  }
+  };
 
   // The high-level clearCache, compile, compilePartial, and render functions
   // use this default writer.

From fea239fb3c4c75d4b1e93fe36f748754247f72f4 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Mon, 10 Sep 2012 10:05:43 -0700
Subject: [PATCH 54/65] Use String#+= instead of Array#push + Array#join

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

diff --git a/mustache.js b/mustache.js
index 75cfc14..7280cfb 100644
--- a/mustache.js
+++ b/mustache.js
@@ -336,36 +336,36 @@ var Mustache;
     }
 
     function renderFunction(writer, context, template) {
-      var buffer = [];
-      var token, text;
+      var buffer = "";
+      var token, sectionText;
 
       for (var i = 0, len = tokens.length; i < len; ++i) {
         token = tokens[i];
 
         switch (token[0]) {
         case "#":
-          text = template.slice.apply(template, sectionBounds(token));
-          buffer.push(writer._section(token[1], context, text, subRender(i, token[4], template)));
+          sectionText = template.slice.apply(template, sectionBounds(token));
+          buffer += writer._section(token[1], context, sectionText, subRender(i, token[4], template));
           break;
         case "^":
-          buffer.push(writer._inverted(token[1], context, subRender(i, token[4], template)));
+          buffer += writer._inverted(token[1], context, subRender(i, token[4], template));
           break;
         case ">":
-          buffer.push(writer._partial(token[1], context));
+          buffer += writer._partial(token[1], context);
           break;
         case "&":
-          buffer.push(writer._name(token[1], context));
+          buffer += writer._name(token[1], context);
           break;
         case "name":
-          buffer.push(writer._escaped(token[1], context));
+          buffer += writer._escaped(token[1], context);
           break;
         case "text":
-          buffer.push(token[1]);
+          buffer += token[1];
           break;
         }
       }
 
-      return buffer.join('');
+      return buffer;
     }
 
     return renderFunction;

From 7489f70790d63140e7b75460f4f5ff2207843ca7 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Mon, 10 Sep 2012 10:07:33 -0700
Subject: [PATCH 55/65] Fix exports.to_html

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

diff --git a/mustache.js b/mustache.js
index 7280cfb..4843e3c 100644
--- a/mustache.js
+++ b/mustache.js
@@ -27,17 +27,6 @@ var Mustache;
   exports.Context = Context;
   exports.Writer = Writer;
 
-  // 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 whiteRe = /\s*/;
   var spaceRe = /\s+/;
   var nonSpaceRe = /\S/;
@@ -597,6 +586,17 @@ var Mustache;
     return _writer.render(template, view, partials);
   };
 
+  // This is here for backwards compatibility with 0.4.x.
+  exports.to_html = function (template, view, partials, send) {
+    var result = exports.render(template, view, partials);
+
+    if (typeof send === "function") {
+      send(result);
+    } else {
+      return result;
+    }
+  };
+
   return exports;
 
 }())));

From 1159c236efd1cfb55e10cf1993d80731a256f587 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Mon, 10 Sep 2012 10:11:14 -0700
Subject: [PATCH 56/65] Simplify CommonJS check

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

diff --git a/mustache.js b/mustache.js
index 4843e3c..7992c6e 100644
--- a/mustache.js
+++ b/mustache.js
@@ -8,7 +8,7 @@
 var Mustache;
 
 (function (exports) {
-  if (typeof module !== "undefined" && typeof module.exports !== "undefined") {
+  if (typeof module !== "undefined" && module.exports) {
     module.exports = exports; // CommonJS
   } else if (typeof define === "function") {
     define(exports); // AMD

From a5dbb708d74f0999b674a3067204d9dae684f38b Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Mon, 10 Sep 2012 14:05:39 -0700
Subject: [PATCH 57/65] Fix text token offsets

Text tokens now accurately reflect their content's exact position
in the original template.
---
 CHANGES            |  3 ++-
 mustache.js        | 36 +++++++++++++++++++-----------------
 test/parse_test.js | 29 +++++++++++++++--------------
 3 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/CHANGES b/CHANGES
index ec057fe..06c055a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,7 +3,8 @@
   * Rename Renderer => Writer.
   * Fixed a bug with higher-order sections that prevented them from being
     passed the raw text of the section from the original template.
-  * More concise token format.
+  * More concise token format. Tokens also include start/end indices in the
+    original template.
   * High-level API is consistent with the Writer API.
   * Allow partials to be passed to the pre-compiled function (thanks @fallenice).
   * Don't use eval (thanks @cweider).
diff --git a/mustache.js b/mustache.js
index 7992c6e..dbbc1fe 100644
--- a/mustache.js
+++ b/mustache.js
@@ -315,9 +315,9 @@ var Mustache;
 
     function subRender(i, tokens, template) {
       if (!subRenders[i]) {
-        var render = compileTokens(tokens);
+        var fn = compileTokens(tokens);
         subRenders[i] = function (writer, context) {
-          return render(writer, context, template);
+          return fn(writer, context, template);
         };
       }
 
@@ -360,21 +360,10 @@ var Mustache;
     return renderFunction;
   }
 
-  function escapeTags(tags) {
-    if (tags.length !== 2) {
-      throw new Error("Invalid tags: " + tags.join(" "));
-    }
-
-    return [
-      new RegExp(escapeRe(tags[0]) + "\\s*"),
-      new RegExp("\\s*" + escapeRe(tags[1]))
-    ];
-  }
-
   /**
-   * Forms the given linear array of `tokens` into a nested tree structure
-   * where tokens that represent a section have a fifth item: an array that
-   * contains all tokens in that section.
+   * Forms the given array of `tokens` into a nested tree structure where
+   * tokens that represent a section have a fifth item: an array that contains
+   * all tokens in that section.
    */
   function nestTokens(tokens) {
     var tree = [];
@@ -437,6 +426,7 @@ var Mustache;
 
       if (lastToken && lastToken[0] === "text" && token[0] === "text") {
         lastToken[1] += token[1];
+        lastToken[3] = token[3];
         tokens.splice(i--, 1); // Remove this token from the array.
       } else {
         lastToken = token;
@@ -444,6 +434,17 @@ var Mustache;
     }
   }
 
+  function escapeTags(tags) {
+    if (tags.length !== 2) {
+      throw new Error("Invalid tags: " + tags.join(" "));
+    }
+
+    return [
+      new RegExp(escapeRe(tags[0]) + "\\s*"),
+      new RegExp("\\s*" + escapeRe(tags[1]))
+    ];
+  }
+
   /**
    * Breaks up the given `template` string into a tree of token objects. If
    * `tags` is given here it must be an array with two string values: the
@@ -492,7 +493,8 @@ var Mustache;
             nonSpace = true;
           }
 
-          tokens.push(["text", chr, start, scanner.pos]);
+          tokens.push(["text", chr, start, start + 1]);
+          start += 1;
 
           if (chr === "\n") {
             stripSpace(); // Check for whitespace on the current line.
diff --git a/test/parse_test.js b/test/parse_test.js
index 0fd2a57..6a56826 100644
--- a/test/parse_test.js
+++ b/test/parse_test.js
@@ -18,6 +18,7 @@ var expectations = {
   '{{ !hi}}'                                : [ [ '!', 'hi', 0, 8 ] ],
   '{{ ! hi}}'                               : [ [ '!', 'hi', 0, 9 ] ],
   '{{ ! hi }}'                              : [ [ '!', 'hi', 0, 10 ] ],
+  'a\n b'                                   : [ [ 'text', 'a\n b', 0, 4 ] ],
   'a{{hi}}'                                 : [ [ 'text', 'a', 0, 1 ], [ 'name', 'hi', 1, 7 ] ],
   'a {{hi}}'                                : [ [ 'text', 'a ', 0, 2 ], [ 'name', 'hi', 2, 8 ] ],
   ' a{{hi}}'                                : [ [ 'text', ' a', 0, 2 ], [ 'name', 'hi', 2, 8 ] ],
@@ -27,19 +28,19 @@ var expectations = {
   'a{{hi}}b '                               : [ [ 'text', 'a', 0, 1 ], [ 'name', 'hi', 1, 7 ], [ 'text', 'b ', 7, 9 ] ],
   'a\n{{hi}} b \n'                          : [ [ 'text', 'a\n', 0, 2 ], [ 'name', 'hi', 2, 8 ], [ 'text', ' b \n', 8, 12 ] ],
   'a\n {{hi}} \nb'                          : [ [ 'text', 'a\n ', 0, 3 ], [ 'name', 'hi', 3, 9 ], [ 'text', ' \nb', 9, 12 ] ],
-  'a\n {{!hi}} \nb'                         : [ [ 'text', 'a\n', 0, 3 ], [ '!', 'hi', 3, 10 ], [ 'text', 'b', 10, 13 ] ],
-  'a\n{{#a}}{{/a}}\nb'                      : [ [ 'text', 'a\n', 0, 2 ], [ '#', 'a', 2, 8, [] ], [ 'text', 'b', 14, 16 ] ],
-  'a\n {{#a}}{{/a}}\nb'                     : [ [ 'text', 'a\n', 0, 3 ], [ '#', 'a', 3, 9, [] ], [ 'text', 'b', 15, 17 ] ],
-  'a\n {{#a}}{{/a}} \nb'                    : [ [ 'text', 'a\n', 0, 3 ], [ '#', 'a', 3, 9, [] ], [ 'text', 'b', 15, 18 ] ],
-  'a\n{{#a}}\n{{/a}}\nb'                    : [ [ 'text', 'a\n', 0, 2 ], [ '#', 'a', 2, 8, [] ], [ 'text', 'b', 15, 17 ] ],
-  'a\n {{#a}}\n{{/a}}\nb'                   : [ [ 'text', 'a\n', 0, 3 ], [ '#', 'a', 3, 9, [] ], [ 'text', 'b', 16, 18 ] ],
-  'a\n {{#a}}\n{{/a}} \nb'                  : [ [ 'text', 'a\n', 0, 3 ], [ '#', 'a', 3, 9, [] ], [ 'text', 'b', 16, 19 ] ],
-  'a\n{{#a}}\n{{/a}}\n{{#b}}\n{{/b}}\nb'    : [ [ 'text', 'a\n', 0, 2 ], [ '#', 'a', 2, 8, [] ], [ '#', 'b', 16, 22, [] ], [ 'text', 'b', 29, 31 ] ],
-  'a\n {{#a}}\n{{/a}}\n{{#b}}\n{{/b}}\nb'   : [ [ 'text', 'a\n', 0, 3 ], [ '#', 'a', 3, 9, [] ], [ '#', 'b', 17, 23, [] ], [ 'text', 'b', 30, 32 ] ],
-  'a\n {{#a}}\n{{/a}}\n{{#b}}\n{{/b}} \nb'  : [ [ 'text', 'a\n', 0, 3 ], [ '#', 'a', 3, 9, [] ], [ '#', 'b', 17, 23, [] ], [ 'text', 'b', 30, 33 ] ],
-  'a\n{{#a}}\n{{#b}}\n{{/b}}\n{{/a}}\nb'    : [ [ 'text', 'a\n', 0, 2 ], [ '#', 'a', 2, 8, [ [ '#', 'b', 9, 15, [] ] ] ], [ 'text', 'b', 29, 31 ] ],
-  'a\n {{#a}}\n{{#b}}\n{{/b}}\n{{/a}}\nb'   : [ [ 'text', 'a\n', 0, 3 ], [ '#', 'a', 3, 9, [ [ '#', 'b', 10, 16, [] ] ] ], [ 'text', 'b', 30, 32 ] ],
-  'a\n {{#a}}\n{{#b}}\n{{/b}}\n{{/a}} \nb'  : [ [ 'text', 'a\n', 0, 3 ], [ '#', 'a', 3, 9, [ [ '#', 'b', 10, 16, [] ] ] ], [ 'text', 'b', 30, 33 ] ],
+  'a\n {{!hi}} \nb'                         : [ [ 'text', 'a\n', 0, 2 ], [ '!', 'hi', 3, 10 ], [ 'text', 'b', 12, 13 ] ],
+  'a\n{{#a}}{{/a}}\nb'                      : [ [ 'text', 'a\n', 0, 2 ], [ '#', 'a', 2, 8, [] ], [ 'text', 'b', 15, 16 ] ],
+  'a\n {{#a}}{{/a}}\nb'                     : [ [ 'text', 'a\n', 0, 2 ], [ '#', 'a', 3, 9, [] ], [ 'text', 'b', 16, 17 ] ],
+  'a\n {{#a}}{{/a}} \nb'                    : [ [ 'text', 'a\n', 0, 2 ], [ '#', 'a', 3, 9, [] ], [ 'text', 'b', 17, 18 ] ],
+  'a\n{{#a}}\n{{/a}}\nb'                    : [ [ 'text', 'a\n', 0, 2 ], [ '#', 'a', 2, 8, [] ], [ 'text', 'b', 16, 17 ] ],
+  'a\n {{#a}}\n{{/a}}\nb'                   : [ [ 'text', 'a\n', 0, 2 ], [ '#', 'a', 3, 9, [] ], [ 'text', 'b', 17, 18 ] ],
+  'a\n {{#a}}\n{{/a}} \nb'                  : [ [ 'text', 'a\n', 0, 2 ], [ '#', 'a', 3, 9, [] ], [ 'text', 'b', 18, 19 ] ],
+  'a\n{{#a}}\n{{/a}}\n{{#b}}\n{{/b}}\nb'    : [ [ 'text', 'a\n', 0, 2 ], [ '#', 'a', 2, 8, [] ], [ '#', 'b', 16, 22, [] ], [ 'text', 'b', 30, 31 ] ],
+  'a\n {{#a}}\n{{/a}}\n{{#b}}\n{{/b}}\nb'   : [ [ 'text', 'a\n', 0, 2 ], [ '#', 'a', 3, 9, [] ], [ '#', 'b', 17, 23, [] ], [ 'text', 'b', 31, 32 ] ],
+  'a\n {{#a}}\n{{/a}}\n{{#b}}\n{{/b}} \nb'  : [ [ 'text', 'a\n', 0, 2 ], [ '#', 'a', 3, 9, [] ], [ '#', 'b', 17, 23, [] ], [ 'text', 'b', 32, 33 ] ],
+  'a\n{{#a}}\n{{#b}}\n{{/b}}\n{{/a}}\nb'    : [ [ 'text', 'a\n', 0, 2 ], [ '#', 'a', 2, 8, [ [ '#', 'b', 9, 15, [] ] ] ], [ 'text', 'b', 30, 31 ] ],
+  'a\n {{#a}}\n{{#b}}\n{{/b}}\n{{/a}}\nb'   : [ [ 'text', 'a\n', 0, 2 ], [ '#', 'a', 3, 9, [ [ '#', 'b', 10, 16, [] ] ] ], [ 'text', 'b', 31, 32 ] ],
+  'a\n {{#a}}\n{{#b}}\n{{/b}}\n{{/a}} \nb'  : [ [ 'text', 'a\n', 0, 2 ], [ '#', 'a', 3, 9, [ [ '#', 'b', 10, 16, [] ] ] ], [ 'text', 'b', 32, 33 ] ],
   '{{>abc}}'                                : [ [ '>', 'abc', 0, 8 ] ],
   '{{> abc }}'                              : [ [ '>', 'abc', 0, 10 ] ],
   '{{ > abc }}'                             : [ [ '>', 'abc', 0, 11 ] ],
@@ -50,7 +51,7 @@ var expectations = {
   '{{#a}}{{/a}}hi{{#b}}{{/b}}\n'            : [ [ '#', 'a', 0, 6, [] ], [ 'text', 'hi', 12, 14 ], [ '#', 'b', 14, 20, [] ], [ 'text', '\n', 26, 27 ] ],
   '{{a}}\n{{b}}\n\n{{#c}}\n{{/c}}\n'        : [ [ 'name', 'a', 0, 5 ], [ 'text', '\n', 5, 6 ], [ 'name', 'b', 6, 11 ], [ 'text', '\n\n', 11, 13 ], [ '#', 'c', 13, 19, [] ] ],
   '{{#foo}}\n  {{#a}}\n    {{b}}\n  {{/a}}\n{{/foo}}\n'
-                                            : [ [ '#', 'foo', 0, 8, [ [ '#', 'a', 11, 17, [ [ 'text', '    ', 17, 22 ], [ 'name', 'b', 22, 27 ], [ 'text', '\n', 27, 30 ] ] ] ] ] ]
+                                            : [ [ '#', 'foo', 0, 8, [ [ '#', 'a', 11, 17, [ [ 'text', '    ', 18, 22 ], [ 'name', 'b', 22, 27 ], [ 'text', '\n', 27, 28 ] ] ] ] ] ]
 };
 
 var spec = {};

From 0ea95746a8d64b434389832d5daf3bb37ff83a59 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Mon, 10 Sep 2012 14:50:17 -0700
Subject: [PATCH 58/65] Allow auto-loading of partials

Fixes #247
---
 CHANGES             |  2 ++
 mustache.js         | 18 +++++++++++++-----
 test/parse_test.js  |  4 ++--
 test/render_test.js | 15 +++++++++------
 test/writer_test.js | 21 +++++++++++++++++++++
 5 files changed, 47 insertions(+), 13 deletions(-)
 create mode 100644 test/writer_test.js

diff --git a/CHANGES b/CHANGES
index 06c055a..687af82 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 = HEAD
 
   * Rename Renderer => Writer.
+  * Allow partials to be loaded dynamically using a callback (thanks @TiddoLangerak
+    for the suggestion).
   * Fixed a bug with higher-order sections that prevented them from being
     passed the raw text of the section from the original template.
   * More concise token format. Tokens also include start/end indices in the
diff --git a/mustache.js b/mustache.js
index dbbc1fe..c9498e4 100644
--- a/mustache.js
+++ b/mustache.js
@@ -212,8 +212,12 @@ var Mustache;
       var self = this;
       cache[key] = function (view, partials) {
         if (partials) {
-          for (var name in partials) {
-            self.compilePartial(name, partials[name]);
+          if (typeof partials === "function") {
+            self._loadPartial = partials;
+          } else {
+            for (var name in partials) {
+              self.compilePartial(name, partials[name]);
+            }
           }
         }
 
@@ -269,7 +273,12 @@ var Mustache;
   };
 
   Writer.prototype._partial = function (name, context) {
+    if (!(name in this._partialCache) && this._loadPartial) {
+      this.compilePartial(name, this._loadPartial(name));
+    }
+
     var fn = this._partialCache[name];
+
     return fn ? fn(context) : "";
   };
 
@@ -306,9 +315,8 @@ var Mustache;
   }
 
   /**
-   * Low-level function that compiles the given `tokens` into a
-   * function that accepts two arguments: a Context and a
-   * Writer.
+   * Low-level function that compiles the given `tokens` into a function
+   * that accepts two arguments: a Context and a Writer.
    */
   function compileTokens(tokens) {
     var subRenders = {};
diff --git a/test/parse_test.js b/test/parse_test.js
index 6a56826..6aa0609 100644
--- a/test/parse_test.js
+++ b/test/parse_test.js
@@ -1,6 +1,6 @@
 var assert = require('assert');
 var vows = require('vows');
-var parse = require('./../mustache').parse;
+var Mustache = require('./../mustache');
 
 // A map of templates to their expected token output. Tokens are in the format:
 // [type, value, startIndex, endIndex].
@@ -59,7 +59,7 @@ var spec = {};
 for (var template in expectations) {
   (function (template, tokens) {
     spec['knows how to parse ' + JSON.stringify(template)] = function () {
-      assert.deepEqual(parse(template), tokens);
+      assert.deepEqual(Mustache.parse(template), tokens);
     };
   })(template, expectations[template]);
 }
diff --git a/test/render_test.js b/test/render_test.js
index 859cb71..57f41a1 100644
--- a/test/render_test.js
+++ b/test/render_test.js
@@ -2,15 +2,12 @@ var fs = require("fs");
 var path = require("path");
 var assert = require("assert");
 var vows = require("vows");
+var Mustache = require("./../mustache");
 
-var Mustache = require(path.join(__dirname, "..", "mustache"));
 var _files = path.join(__dirname, "_files");
 
 function getContents(testName, ext) {
-  var file = path.join(_files, testName + "." + ext);
-  try {
-    return fs.readFileSync(file, "utf8");
-  } catch (e) {}
+  return fs.readFileSync(path.join(_files, testName + "." + ext), "utf8");
 }
 
 // You can put the name of a specific test to run in the TEST environment
@@ -42,7 +39,13 @@ testNames.forEach(function (testName) {
 
   var template = getContents(testName, "mustache");
   var expect = getContents(testName, "txt");
-  var partial = getContents(testName, "partial");
+
+  var partial;
+  try {
+    partial = getContents(testName, "partial");
+  } catch (e) {
+    // No big deal.
+  }
 
   spec["knows how to render " + testName] = function () {
     Mustache.clearCache();
diff --git a/test/writer_test.js b/test/writer_test.js
new file mode 100644
index 0000000..8fcd6e1
--- /dev/null
+++ b/test/writer_test.js
@@ -0,0 +1,21 @@
+var assert = require("assert");
+var vows = require("vows");
+var Writer = require("./../mustache").Writer;
+
+vows.describe("Mustache.Writer").addBatch({
+  "A Writer": {
+    topic: function () {
+      var writer = new Writer();
+      return writer;
+    },
+    "loads partials correctly": function (writer) {
+      var partial = "The content of the partial.";
+      var result = writer.render("{{>partial}}", {}, function (name) {
+        assert.equal(name, "partial");
+        return partial;
+      });
+
+      assert.equal(result, partial);
+    }
+  }
+}).export(module);

From afc6e0f1b16052dd57928e6418c48899a5d7b7f1 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Mon, 10 Sep 2012 14:56:09 -0700
Subject: [PATCH 59/65] Changed wording of some specs

---
 test/context_test.js | 16 ++++++++--------
 test/scanner_test.js | 30 +++++++++++++++---------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/test/context_test.js b/test/context_test.js
index 167b9ca..eab6729 100644
--- a/test/context_test.js
+++ b/test/context_test.js
@@ -9,10 +9,10 @@ vows.describe("Mustache.Context").addBatch({
       var context = new Context(view);
       return context;
     },
-    "should be able to lookup properties of its own view": function (context) {
+    "is able to lookup properties of its own view": function (context) {
       assert.equal(context.lookup("name"), "parent");
     },
-    "should be able to lookup nested properties of its own view": function (context) {
+    "is able to lookup nested properties of its own view": function (context) {
       assert.equal(context.lookup("a.b"), "b");
     },
     "when pushed": {
@@ -20,26 +20,26 @@ vows.describe("Mustache.Context").addBatch({
         var view = { name: 'child', c: { d: 'd' } };
         return context.push(view);
       },
-      "should return the child context": function (context) {
+      "returns the child context": function (context) {
         assert.equal(context.view.name, "child");
         assert.equal(context.parent.view.name, "parent");
       },
-      "should be able to lookup properties of its own view": function (context) {
+      "is able to lookup properties of its own view": function (context) {
         assert.equal(context.lookup("name"), "child");
       },
-      "should be able to lookup properties of the parent context's view": function (context) {
+      "is able to lookup properties of the parent context's view": function (context) {
         assert.equal(context.lookup("message"), "hi");
       },
-      "should be able to lookup nested properties of its own view": function (context) {
+      "is able to lookup nested properties of its own view": function (context) {
         assert.equal(context.lookup("c.d"), "d");
       },
-      "should be able to lookup nested properties of its parent view": function (context) {
+      "is able to lookup nested properties of its parent view": function (context) {
         assert.equal(context.lookup("a.b"), "b");
       }
     } // when pushed
   }, // A Context
   "make": {
-    "should return the same object when given a Context": function () {
+    "returns the same object when given a Context": function () {
       var context = new Context;
       assert.strictEqual(Context.make(context), context);
     }
diff --git a/test/scanner_test.js b/test/scanner_test.js
index 3e9277e..5850fe2 100644
--- a/test/scanner_test.js
+++ b/test/scanner_test.js
@@ -6,7 +6,7 @@ vows.describe("Mustache.Scanner").addBatch({
   "A Scanner": {
     "for an empty string": {
       topic: new Scanner(""),
-      "should be at the end of the string": function () {
+      "is at the end of the string": function () {
         var scanner = new Scanner("");
         assert(scanner.eos());
       }
@@ -20,10 +20,10 @@ vows.describe("Mustache.Scanner").addBatch({
             var match = scanner.scan(/a b c/);
             this.callback(scanner, match);
           },
-          "it should return the entire string": function (scanner, match) {
+          "returns the entire string": function (scanner, match) {
             assert.equal(match, scanner.string);
           },
-          "it should be at the end of the string": function (scanner, match) {
+          "is at the end of the string": function (scanner, match) {
             assert(scanner.eos());
           }
         }, // when the regexp matches the entire string
@@ -34,10 +34,10 @@ vows.describe("Mustache.Scanner").addBatch({
               var match = scanner.scan(/a/);
               this.callback(scanner, match);
             },
-            "it should return the portion of the string that was matched": function (scanner, match) {
+            "returns the portion of the string that was matched": function (scanner, match) {
               assert.equal(match, "a");
             },
-            "it should advance the internal pointer the length of the match": function (scanner, match) {
+            "advances the internal pointer the length of the match": function (scanner, match) {
               assert.equal(scanner.pos, 1);
             }
           }, // at the 0th index
@@ -47,10 +47,10 @@ vows.describe("Mustache.Scanner").addBatch({
               var match = scanner.scan(/b/);
               this.callback(scanner, match);
             },
-            "it should return the empty string": function (scanner, match) {
+            "returns the empty string": function (scanner, match) {
               assert.equal(match, "");
             },
-            "it should not advance the internal pointer": function (scanner, match) {
+            "does not advance the internal pointer": function (scanner, match) {
               assert.equal(scanner.pos, 0);
             }
           } // at some index other than 0
@@ -61,10 +61,10 @@ vows.describe("Mustache.Scanner").addBatch({
             var match = scanner.scan(/z/);
             this.callback(scanner, match);
           },
-          "it should return the empty string": function (scanner, match) {
+          "returns the empty string": function (scanner, match) {
             assert.equal(match, "");
           },
-          "it should not advance the internal pointer": function (scanner, match) {
+          "does not advance the internal pointer": function (scanner, match) {
             assert.equal(scanner.pos, 0);
           }
         }
@@ -77,10 +77,10 @@ vows.describe("Mustache.Scanner").addBatch({
               var match = scanner.scanUntil(/a/);
               this.callback(scanner, match);
             },
-            "it should return the empty string": function (scanner, match) {
+            "returns the empty string": function (scanner, match) {
               assert.equal(match, "")
             },
-            "it should not advance the internal pointer": function (scanner, match) {
+            "does not advance the internal pointer": function (scanner, match) {
               assert.equal(scanner.pos, 0);
             }
           },
@@ -90,10 +90,10 @@ vows.describe("Mustache.Scanner").addBatch({
               var match = scanner.scanUntil(/b/);
               this.callback(scanner, match);
             },
-            "it should return the portion of the string it scanned": function (scanner, match) {
+            "returns the portion of the string it scanned": function (scanner, match) {
               assert.equal(match, "a ");
             },
-            "it should advance the internal pointer the length of the match": function (scanner, match) {
+            "advances the internal pointer the length of the match": function (scanner, match) {
               assert.equal(scanner.pos, 2);
             }
           }
@@ -104,10 +104,10 @@ vows.describe("Mustache.Scanner").addBatch({
             var match = scanner.scanUntil(/z/);
             this.callback(scanner, match);
           },
-          "it should return the entire string": function (scanner, match) {
+          "returns the entire string": function (scanner, match) {
             assert.equal(match, scanner.string);
           },
-          "it should be at the end of the string": function (scanner, match) {
+          "is at the end of the string": function (scanner, match) {
             assert(scanner.eos());
           }
         } // when the regexp doesn't match

From 8b19e0ef2338f556fe3df4bd69ee00e8a478ac5b Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Mon, 10 Sep 2012 15:42:34 -0700
Subject: [PATCH 60/65] Version 0.7.0

---
 CHANGES            | 2 +-
 mustache.js        | 2 +-
 mustache.js.nuspec | 2 +-
 package.json       | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index 687af82..25546c2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-= HEAD
+= 0.7.0 / 10 Sep 2012
 
   * Rename Renderer => Writer.
   * Allow partials to be loaded dynamically using a callback (thanks @TiddoLangerak
diff --git a/mustache.js b/mustache.js
index c9498e4..5ccbf9b 100644
--- a/mustache.js
+++ b/mustache.js
@@ -20,7 +20,7 @@ var Mustache;
   var exports = {};
 
   exports.name = "mustache.js";
-  exports.version = "0.6.0";
+  exports.version = "0.7.0";
   exports.tags = ["{{", "}}"];
 
   exports.Scanner = Scanner;
diff --git a/mustache.js.nuspec b/mustache.js.nuspec
index 138014d..1e5554b 100644
--- a/mustache.js.nuspec
+++ b/mustache.js.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>mustache.js</id>
-    <version>0.6.0</version>
+    <version>0.7.0</version>
     <authors>mustache.js Authors</authors>
     <licenseUrl>https://github.com/janl/mustache.js/blob/master/LICENSE</licenseUrl>
     <projectUrl>http://mustache.github.com/</projectUrl>
diff --git a/package.json b/package.json
index 83469cb..1303ec0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mustache",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Logic-less {{mustache}} templates with JavaScript",
   "author": "mustache.js Authors <http://github.com/janl/mustache.js>",
   "keywords": ["mustache", "template", "templates", "ejs"],
@@ -9,7 +9,7 @@
     "vows": "0.6.x"
   },
   "volo": {
-    "url": "https://raw.github.com/janl/mustache.js/0.6.0/mustache.js"
+    "url": "https://raw.github.com/janl/mustache.js/0.7.0/mustache.js"
   },
   "scripts": {
     "test": "vows --spec"

From 03a9da9b93f1384401be79e90220006acc83dab4 Mon Sep 17 00:00:00 2001
From: Julien Chaumond <chaumond@gmail.com>
Date: Fri, 14 Sep 2012 15:24:20 +0300
Subject: [PATCH 61/65] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d4394f5..75c45b1 100644
--- a/README.md
+++ b/README.md
@@ -102,7 +102,7 @@ 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.
+If the `person` key does not exist, or exists and has a value of `null`, `undefined`, or `false`, or is an empty list, the block will not be rendered.
 
 View:
 

From 85014a4f6c7617b69f5b5b7449129b86f955fbf3 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Sat, 22 Sep 2012 13:34:05 -0700
Subject: [PATCH 62/65] Add spec for partial caching issue

---
 test/writer_test.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/test/writer_test.js b/test/writer_test.js
index 8fcd6e1..f2253d5 100644
--- a/test/writer_test.js
+++ b/test/writer_test.js
@@ -16,6 +16,19 @@ vows.describe("Mustache.Writer").addBatch({
       });
 
       assert.equal(result, partial);
+    },
+    "caches partials by content, not by name": function (writer) {
+      var result = writer.render("{{>partial}}", {}, {
+        partial: "partial one"
+      });
+
+      assert.equal(result, "partial one");
+
+      result = writer.render("{{>partial}}", {}, {
+        partial: "partial two"
+      });
+
+      assert.equal(result, "partial two");
     }
   }
 }).export(module);

From 658f9e051fc5d6654f18911e8e8dede9e0a70dc8 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Sat, 22 Sep 2012 13:31:12 -0700
Subject: [PATCH 63/65] Cache partials by template, not by name

Fixes #257
---
 mustache.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/mustache.js b/mustache.js
index 5ccbf9b..981b887 100644
--- a/mustache.js
+++ b/mustache.js
@@ -193,24 +193,26 @@ var Mustache;
   };
 
   Writer.prototype.compile = function (template, tags) {
-    return this._compile(this._cache, template, template, tags);
+    return this._compile(template, tags);
   };
 
   Writer.prototype.compilePartial = function (name, template, tags) {
-    return this._compile(this._partialCache, name, template, tags);
+    var fn = this._compile(template, tags);
+    this._partialCache[name] = fn;
+    return fn;
   };
 
   Writer.prototype.render = function (template, view, partials) {
     return this.compile(template)(view, partials);
   };
 
-  Writer.prototype._compile = function (cache, key, template, tags) {
-    if (!cache[key]) {
+  Writer.prototype._compile = function (template, tags) {
+    if (!this._cache[template]) {
       var tokens = exports.parse(template, tags);
       var fn = compileTokens(tokens);
 
       var self = this;
-      cache[key] = function (view, partials) {
+      this._cache[template] = function (view, partials) {
         if (partials) {
           if (typeof partials === "function") {
             self._loadPartial = partials;
@@ -225,7 +227,7 @@ var Mustache;
       };
     }
 
-    return cache[key];
+    return this._cache[template];
   };
 
   Writer.prototype._section = function (name, context, text, callback) {

From 26dfacd8beff5a9bc418491ad6bcf5336e20917f Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Sat, 22 Sep 2012 14:12:16 -0700
Subject: [PATCH 64/65] Add Mustache.compileTokens

Fixes #258
---
 mustache.js         | 64 +++++++++++++++++++++++++--------------------
 test/writer_test.js | 12 ++++++++-
 2 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/mustache.js b/mustache.js
index 981b887..7165a8a 100644
--- a/mustache.js
+++ b/mustache.js
@@ -193,41 +193,43 @@ var Mustache;
   };
 
   Writer.prototype.compile = function (template, tags) {
-    return this._compile(template, tags);
+    var fn = this._cache[template];
+
+    if (!fn) {
+      var tokens = exports.parse(template, tags);
+      fn = this._cache[template] = this.compileTokens(tokens, template);
+    }
+
+    return fn;
   };
 
   Writer.prototype.compilePartial = function (name, template, tags) {
-    var fn = this._compile(template, tags);
+    var fn = this.compile(template, tags);
     this._partialCache[name] = fn;
     return fn;
   };
 
-  Writer.prototype.render = function (template, view, partials) {
-    return this.compile(template)(view, partials);
-  };
-
-  Writer.prototype._compile = function (template, tags) {
-    if (!this._cache[template]) {
-      var tokens = exports.parse(template, tags);
-      var fn = compileTokens(tokens);
+  Writer.prototype.compileTokens = function (tokens, template) {
+    var fn = compileTokens(tokens);
+    var self = this;
 
-      var self = this;
-      this._cache[template] = function (view, partials) {
-        if (partials) {
-          if (typeof partials === "function") {
-            self._loadPartial = partials;
-          } else {
-            for (var name in partials) {
-              self.compilePartial(name, partials[name]);
-            }
+    return function (view, partials) {
+      if (partials) {
+        if (typeof partials === "function") {
+          self._loadPartial = partials;
+        } else {
+          for (var name in partials) {
+            self.compilePartial(name, partials[name]);
           }
         }
+      }
 
-        return fn(self, Context.make(view), template);
-      };
-    }
+      return fn(self, Context.make(view), template);
+    };
+  };
 
-    return this._cache[template];
+  Writer.prototype.render = function (template, view, partials) {
+    return this.compile(template)(view, partials);
   };
 
   Writer.prototype._section = function (name, context, text, callback) {
@@ -318,7 +320,7 @@ var Mustache;
 
   /**
    * Low-level function that compiles the given `tokens` into a function
-   * that accepts two arguments: a Context and a Writer.
+   * that accepts three arguments: a Writer, a Context, and the template.
    */
   function compileTokens(tokens) {
     var subRenders = {};
@@ -334,7 +336,7 @@ var Mustache;
       return subRenders[i];
     }
 
-    function renderFunction(writer, context, template) {
+    return function (writer, context, template) {
       var buffer = "";
       var token, sectionText;
 
@@ -365,9 +367,7 @@ var Mustache;
       }
 
       return buffer;
-    }
-
-    return renderFunction;
+    };
   }
 
   /**
@@ -590,6 +590,14 @@ var Mustache;
     return _writer.compilePartial(name, template, tags);
   };
 
+  /**
+   * Compiles the given array of tokens (the output of a parse) to a reusable
+   * function using the default writer.
+   */
+  exports.compileTokens = function (tokens, template) {
+    return _writer.compileTokens(tokens, template);
+  };
+
   /**
    * Renders the `template` with the given `view` and `partials` using the
    * default writer.
diff --git a/test/writer_test.js b/test/writer_test.js
index f2253d5..10a4587 100644
--- a/test/writer_test.js
+++ b/test/writer_test.js
@@ -1,6 +1,7 @@
 var assert = require("assert");
 var vows = require("vows");
-var Writer = require("./../mustache").Writer;
+var Mustache = require("./../mustache");
+var Writer = Mustache.Writer;
 
 vows.describe("Mustache.Writer").addBatch({
   "A Writer": {
@@ -29,6 +30,15 @@ vows.describe("Mustache.Writer").addBatch({
       });
 
       assert.equal(result, "partial two");
+    },
+    "can compile an array of tokens": function (writer) {
+      var template = "Hello {{name}}!";
+      var tokens = Mustache.parse(template);
+      var render = writer.compileTokens(tokens, template);
+
+      var result = render({ name: 'Michael' });
+
+      assert.equal(result, 'Hello Michael!');
     }
   }
 }).export(module);

From 9fb00529d4aac44336641b53655747ea4d678e19 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Sat, 22 Sep 2012 14:12:40 -0700
Subject: [PATCH 65/65] Updated with most recent changes

---
 CHANGES | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES b/CHANGES
index 25546c2..436f791 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+= HEAD / 22 Sep 2012
+
+  * Cache partials by template, not by name. Fixes #257.
+  * Added Mustache.compileTokens to compile the output of Mustache.parse. Fixes
+    #258.
+
 = 0.7.0 / 10 Sep 2012
 
   * Rename Renderer => Writer.