From 549b5f482937dee4a7e84192669d621ed020e01a Mon Sep 17 00:00:00 2001
From: Kristofer Joseph <kristoferjoseph@gmail.com>
Date: Mon, 2 Jul 2012 17:14:16 -0700
Subject: [PATCH 1/7] Updating dust in benchmark to 3.0

---
 benchmark/index.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/benchmark/index.html b/benchmark/index.html
index 529cd90..bfaba11 100644
--- a/benchmark/index.html
+++ b/benchmark/index.html
@@ -74,13 +74,14 @@ <h1>shootout</h1>
 
     <script src="../vendor/jquery.min.js"></script>
     <script src="uubench.js"></script>
-    <script src="../dist/dust-full-0.2.5.min.js"></script>
+    <script src="../dist/dust-full-0.3.0.min.js"></script>
     <script src="suites/dust_suite.js"></script>
     <script src="suites/mustache_suite.js"></script>
     <script src="suites/handlebars_suite.js"></script>
     <script src="suites/jquery_suite.js"></script>
     <script src="http://github.com/wycats/handlebars.js/raw/766497bb553a926c046c5e5b50ee35529d168ba5/lib/handlebars.js"></script>
     <script src="http://github.com/janl/mustache.js/raw/master/mustache.js"></script>
+    <script src="http://underscorejs.org/underscore-min.js" ></script>
     <script src="http://github.com/jquery/jquery-tmpl/raw/master/jquery.tmpl.js"></script>
     <script type="text/javascript" src="http://www.google.com/jsapi"></script>
     <script type="text/javascript">

From 6b2aeb7a0233f6913dd8278178b26d9163a1b209 Mon Sep 17 00:00:00 2001
From: Kristofer Joseph <kristoferjoseph@gmail.com>
Date: Thu, 5 Jul 2012 22:18:52 -0700
Subject: [PATCH 2/7] Adding underscore to the shootout page

---
 benchmark/index.html                 |   6 +-
 benchmark/suites/handlebars_suite.js |   4 +-
 benchmark/suites/underscore_suite.js | 113 +++++++++++++++++++++++++++
 3 files changed, 119 insertions(+), 4 deletions(-)
 create mode 100644 benchmark/suites/underscore_suite.js

diff --git a/benchmark/index.html b/benchmark/index.html
index bfaba11..ce8191f 100644
--- a/benchmark/index.html
+++ b/benchmark/index.html
@@ -69,19 +69,20 @@ <h1>shootout</h1>
 
     <div id="content">
       <div id="charts"></div>
-      <p style="clear: both">Targets: <a href="http://akdubya.github.com/dustjs">Dust</a>, <a href="http://github.com/wycats/handlebars.js">Handlebars</a>, <a href="http://mustache.github.com/">Mustache</a>, <a href="http://api.jquery.com/tmpl/">jquery-tmpl</a>. Each benchmark runs once using an adaptive test cycles algorithm similar to the one found in <a href="http://github.com/broofa/jslitmus">jslitmus</a>.</p>
+      <p style="clear: both">Targets: <a href="http://akdubya.github.com/dustjs">Dust</a>, <a href="http://github.com/wycats/handlebars.js">Handlebars</a>, <a href="http://mustache.github.com/">Mustache</a>, <a href="http://api.jquery.com/tmpl/">jquery-tmpl</a>, <a href="http://underscorejs.org/">Underscore</a>. Each benchmark runs once using an adaptive test cycles algorithm similar to the one found in <a href="http://github.com/broofa/jslitmus">jslitmus</a>.</p>
     </div>
 
     <script src="../vendor/jquery.min.js"></script>
     <script src="uubench.js"></script>
     <script src="../dist/dust-full-0.3.0.min.js"></script>
+    <script src="http://underscorejs.org/underscore-min.js" ></script>
     <script src="suites/dust_suite.js"></script>
     <script src="suites/mustache_suite.js"></script>
     <script src="suites/handlebars_suite.js"></script>
     <script src="suites/jquery_suite.js"></script>
+    <script src="suites/underscore_suite.js"></script>
     <script src="http://github.com/wycats/handlebars.js/raw/766497bb553a926c046c5e5b50ee35529d168ba5/lib/handlebars.js"></script>
     <script src="http://github.com/janl/mustache.js/raw/master/mustache.js"></script>
-    <script src="http://underscorejs.org/underscore-min.js" ></script>
     <script src="http://github.com/jquery/jquery-tmpl/raw/master/jquery.tmpl.js"></script>
     <script type="text/javascript" src="http://www.google.com/jsapi"></script>
     <script type="text/javascript">
@@ -136,6 +137,7 @@ <h1>shootout</h1>
           handlebarsBench(suite, type, "handlebars");
           mustacheBench(suite, type, "mustache");
           jqueryBench(suite, type, "jquery");
+          underscoreBench(suite, type, "underscore");
           suite.run();
         }
 
diff --git a/benchmark/suites/handlebars_suite.js b/benchmark/suites/handlebars_suite.js
index ae0c88d..fcd636d 100644
--- a/benchmark/suites/handlebars_suite.js
+++ b/benchmark/suites/handlebars_suite.js
@@ -76,7 +76,7 @@ var benches = {
              }
   }
 
-}
+};
 
 exports.handlebarsBench = function(suite, name, id) {
   var bench = benches[name],
@@ -94,7 +94,7 @@ exports.handlebarsBench = function(suite, name, id) {
     fn(ctx, {partials: partials});
     next();
   });
-}
+};
 
 exports.handlebarsBench.benches = benches;
 
diff --git a/benchmark/suites/underscore_suite.js b/benchmark/suites/underscore_suite.js
new file mode 100644
index 0000000..fa3ecfa
--- /dev/null
+++ b/benchmark/suites/underscore_suite.js
@@ -0,0 +1,113 @@
+(function(exports){
+
+var benches = {
+
+  string: {
+    source:  "Hello World!",
+    context: {}
+  },
+
+  replace: {
+    source:  "Hello <%= name %>! You have <%= count %> new messages.",
+    context: { name: "Mick", count: 30 }
+  },
+
+  array: {
+    source:   "<% _.each(names, function(name) { %> <%= name %> <% }); %>",
+    context:  { names: [{name: "Moe"}, {name: "Larry"}, {name: "Curly"}, {name: "Shemp"}] }
+  },
+
+  object: {
+    source:   "<%= person.name %> <%= person.age %>",
+    context:  { person: { name: "Larry", age: 45 } }
+  },
+
+  partial: {
+    source:   "<% _.each(peeps, function(peep) { %> <%= partials.myPartialTemplate(peep) %> <% }); %>",
+    context:  { peeps: [{name: "Moe", count: 15}, {name: "Larry", count: 5}, {name: "Curly", count: 1}] },
+    partials: { myPartialTemplate: "Hello <%= name %>! You have <%= count %> new messages." }
+  },
+
+  recursion: {
+    source:   "<%= name %> <% _.each(kids, function(kid) { %> <%= recursion %> <% }); %>",
+    context:  {
+                name: '1',
+                kids: [
+                  {
+                    name: '1.1',
+                    kids: [
+                      {name: '1.1.1'}
+                    ]
+                  }
+                ]
+              },
+    partials: { recursion: "<%= name %> <% _.each(kids, function(kid) { %> <%= recursion %> <% }); %>" }
+  },
+
+  filter: {
+    source:   "foo <%= filter(bar) %>",
+    context:  {
+                filter: function(ctx) {
+                  return ctx.toUpperCase();
+                },
+                bar: "bar"
+              }
+  },
+
+  complex: {
+    source:  "<h1><%= header %></h1>\n" +
+             "<% if(hasItems) { %>" +
+             "  <% _.each(items, function(item) { %>\n" +
+             "    <ul>\n" +
+             "        <% if(item.current) { %>\n" +
+             "          <li><strong> <%- item.name %> </strong></li>\n" +
+             "        <% } else { %>\n" +
+             "          <li><a href=\" <%- item.url %> \"> <%- item.name %> </a></li>\n" +
+             "        <% } %>\n" +
+             "    </ul>\n" +
+             "  <% }); %>" +
+             "<% } else { %>\n" +
+             "  <p>The list is empty.</p>\n" +
+             "<% } %>",
+    context: {
+               header: function() {
+                 return "Colors";
+               },
+               items: [
+                 {name: "red", current: true, url: "#Red"},
+                 {name: "green", current: false, url: "#Green"},
+                 {name: "blue", current: false, url: "#Blue"}
+               ],
+               hasItems: function(ctx, fn) {
+                 if (ctx.items.length) {
+                   return fn(ctx);
+                 }
+               }
+             }
+  }
+
+};
+
+exports.underscoreBench = function(suite, name, id) {
+  var bench = benches[name],
+      fn = _.template(bench.source),
+      ctx = bench.context,
+      partials = {};
+
+  if (bench.partials) {
+    for (var key in bench.partials) {
+      partials[key] = _.template(bench.partials[key]);
+    }
+  }
+
+  ctx.partials = partials;
+
+  suite.bench(id || name, function(next) {
+    fn(ctx);
+    next();
+  });
+};
+
+exports.underscoreBench.benches = benches;
+
+})(typeof exports !== "undefined" ? exports : window);

From 5a09f93fe19cafd528cacde3937bcbd531ad7bf1 Mon Sep 17 00:00:00 2001
From: Kristofer Joseph <kristoferjoseph@gmail.com>
Date: Thu, 5 Jul 2012 23:19:13 -0700
Subject: [PATCH 3/7] Updated partials bench to actually render the recursive
 partial.

---
 benchmark/suites/underscore_suite.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/benchmark/suites/underscore_suite.js b/benchmark/suites/underscore_suite.js
index fa3ecfa..bd42aee 100644
--- a/benchmark/suites/underscore_suite.js
+++ b/benchmark/suites/underscore_suite.js
@@ -29,7 +29,7 @@ var benches = {
   },
 
   recursion: {
-    source:   "<%= name %> <% _.each(kids, function(kid) { %> <%= recursion %> <% }); %>",
+    source:   "<%= name %> <% _.each(kids, function(kid) { %> <%= partials.recursion({data:kid, partials:partials}) %> <% }); %>",
     context:  {
                 name: '1',
                 kids: [
@@ -41,7 +41,7 @@ var benches = {
                   }
                 ]
               },
-    partials: { recursion: "<%= name %> <% _.each(kids, function(kid) { %> <%= recursion %> <% }); %>" }
+    partials: { recursion: "<%= data.name %> <% _.each(data.kids, function(kid) { %> <%= partials.recursion({data:kid, partials:partials}) %> <% }); %>" }
   },
 
   filter: {

From e044df15365c461748a9464fc9df4fdfcb59c7b8 Mon Sep 17 00:00:00 2001
From: Kristofer Joseph <kristoferjoseph@gmail.com>
Date: Thu, 5 Jul 2012 23:36:47 -0700
Subject: [PATCH 4/7] Fixing hasItems function to actually work

---
 benchmark/suites/underscore_suite.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/benchmark/suites/underscore_suite.js b/benchmark/suites/underscore_suite.js
index bd42aee..8c6bf24 100644
--- a/benchmark/suites/underscore_suite.js
+++ b/benchmark/suites/underscore_suite.js
@@ -78,10 +78,8 @@ var benches = {
                  {name: "green", current: false, url: "#Green"},
                  {name: "blue", current: false, url: "#Blue"}
                ],
-               hasItems: function(ctx, fn) {
-                 if (ctx.items.length) {
-                   return fn(ctx);
-                 }
+               hasItems: function(ctx) {
+                  return ctx.items.length == true;
                }
              }
   }

From d7ec732e82f570a74f7e14f7ec64116caddc4ed0 Mon Sep 17 00:00:00 2001
From: Kristofer Joseph <kristoferjoseph@gmail.com>
Date: Thu, 5 Jul 2012 23:42:35 -0700
Subject: [PATCH 5/7] Updating filter function

---
 benchmark/suites/underscore_suite.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/benchmark/suites/underscore_suite.js b/benchmark/suites/underscore_suite.js
index 8c6bf24..fb5b715 100644
--- a/benchmark/suites/underscore_suite.js
+++ b/benchmark/suites/underscore_suite.js
@@ -47,8 +47,8 @@ var benches = {
   filter: {
     source:   "foo <%= filter(bar) %>",
     context:  {
-                filter: function(ctx) {
-                  return ctx.toUpperCase();
+                filter: function(str) {
+                  return str.toUpperCase();
                 },
                 bar: "bar"
               }

From 912ebbac255742770286c7fb89d44a45fbc00e3c Mon Sep 17 00:00:00 2001
From: Kristofer Joseph <kristoferjoseph@gmail.com>
Date: Thu, 5 Jul 2012 23:53:32 -0700
Subject: [PATCH 6/7] Doing a much less lame comparison

---
 benchmark/suites/underscore_suite.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/benchmark/suites/underscore_suite.js b/benchmark/suites/underscore_suite.js
index fb5b715..4b9cc7d 100644
--- a/benchmark/suites/underscore_suite.js
+++ b/benchmark/suites/underscore_suite.js
@@ -79,7 +79,7 @@ var benches = {
                  {name: "blue", current: false, url: "#Blue"}
                ],
                hasItems: function(ctx) {
-                  return ctx.items.length == true;
+                  return ctx.items.length ? true : false;
                }
              }
   }

From 8510e05d8f5ce1b442db865096258d75cf4a740b Mon Sep 17 00:00:00 2001
From: Kristofer Joseph <kristoferjoseph@gmail.com>
Date: Fri, 6 Jul 2012 11:56:39 -0700
Subject: [PATCH 7/7] Fixed bugs in array and complex benchs

---
 benchmark/suites/underscore_suite.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/benchmark/suites/underscore_suite.js b/benchmark/suites/underscore_suite.js
index 4b9cc7d..165c7a3 100644
--- a/benchmark/suites/underscore_suite.js
+++ b/benchmark/suites/underscore_suite.js
@@ -13,7 +13,7 @@ var benches = {
   },
 
   array: {
-    source:   "<% _.each(names, function(name) { %> <%= name %> <% }); %>",
+    source:   "<% _.each(names, function(item) { %> <%= item.name %> <% }); %>",
     context:  { names: [{name: "Moe"}, {name: "Larry"}, {name: "Curly"}, {name: "Shemp"}] }
   },
 
@@ -55,7 +55,7 @@ var benches = {
   },
 
   complex: {
-    source:  "<h1><%= header %></h1>\n" +
+    source:  "<h1><%= header() %></h1>\n" +
              "<% if(hasItems) { %>" +
              "  <% _.each(items, function(item) { %>\n" +
              "    <ul>\n" +