From 598ef46a4582bb1b24966164c941913906ce681f Mon Sep 17 00:00:00 2001
From: Scott Sanders <scott@stonecobra.com>
Date: Sun, 1 Jan 2012 11:57:08 -0800
Subject: [PATCH 1/2] added dust.js support and feature matrix

---
 README.md                        | 18 +++++++++++-------
 index.html                       | 14 ++++++++++++++
 lib/languages/dustjs.js          | 26 ++++++++++++++++++++++++++
 lib/templates/dustjs/simple.html | 14 ++++++++++++++
 package.json                     | 10 +++++++---
 5 files changed, 72 insertions(+), 10 deletions(-)
 create mode 100644 lib/languages/dustjs.js
 create mode 100644 lib/templates/dustjs/simple.html

diff --git a/README.md b/README.md
index fce97dd..320aeb9 100644
--- a/README.md
+++ b/README.md
@@ -9,17 +9,21 @@ View all feature comparisons and templates on the [Node Templates Page](http://p
 ## Implemented Libraries
 
 (_Alphabetical Order_)
-
 * [coffeekup@0.3.0](http://coffeekup.org/)
-* [dust@0.3.0](http://akdubya.github.com/dustjs/)
+* [dust.js@0.1.0](https://github.com/stanislavfeldman/dust.js), until [dust](http://akdubya.github.com/dustjs/) supports node > 0.4
+<<<<<<< Updated upstream
 * [ejs@0.4.2](https://github.com/visionmedia/ejs)
+=======
+* [ejs@0.6.1](https://github.com/visionmedia/ejs)
+>>>>>>> Stashed changes
 * [haml@0.4.2](https://github.com/creationix/haml-js)
-* [hamljs@0.5.1](https://github.com/visionmedia/haml.js)
-* [jade@0.16.0](http://jade-lang.com/)
-* [jqtpl@1.0.6](https://github.com/kof/node-jqtpl)
+* [hamljs@0.5.2](https://github.com/visionmedia/haml.js)
+* [jade@0.20.0](http://jade-lang.com/)
+* [jqtpl@1.0.7](https://github.com/kof/node-jqtpl)
 * [mu2@0.5.3](https://github.com/raycmorgan/Mu)
-* [swig@0.5.0](https://github.com/paularmstrong/swig)
-* [Templ8@0.2.1](https://github.com/constantology/Templ8)
+* [swig@0.9.0](https://github.com/paularmstrong/swig)
+* [Templ8@0.3.0](https://github.com/constantology/Templ8)
+* [whiskers@0.1.2](https://github.com/gsf/whiskers.js)
 
 ## Running
 
diff --git a/index.html b/index.html
index 3094fe7..5660a61 100644
--- a/index.html
+++ b/index.html
@@ -30,6 +30,7 @@ <h2>Pages</h2>
         <h2>Template Languages <span>(alphabetical)</span></h2>
         <ul>
             <li><a href="http://coffeekup.org/">CoffeeKup</a> - Markup as CoffeeScript.</li>
+            <li><a href="http://akdubya.github.com/dustjs/">dustjs</a> - templates that work in node.js or browser-side</li>
             <li><a href="https://github.com/visionmedia/ejs">EJS</a> - Embedded JavaScript templates</li>
             <li><a href="https://github.com/creationix/haml-js">Haml-js</a> - Haml ported to server-side Javascript. This is a traditional server-side templating language.</li>
             <li><a href="https://github.com/visionmedia/haml.js">Haml.js</a> - Faster / Express compliant Haml implementation</li>
@@ -51,6 +52,7 @@ <h2>Feature Comparisons</h2>
                 <tr>
                     <th>(click to toggle)</th>
                     <th scope="col">CoffeeKup</th>
+                    <th scope="col">dustjs</th>
                     <th scope="col">EJS</th>
                     <th scope="col">Haml-js</th>
                     <th scope="col">Haml.js</th>
@@ -67,6 +69,7 @@ <h2>Feature Comparisons</h2>
                     <th scope="row">Express Support</th>
                     <td><span class="yes">✔</span></td>
                     <td><span class="yes">✔</span></td>
+                    <td><span class="yes">✔</span></td>
                     <td><span class="no">✖</span></td>
                     <td><span class="yes">✔</span></td>
                     <td><span class="yes">✔</span></td>
@@ -79,6 +82,7 @@ <h2>Feature Comparisons</h2>
                 <tr>
                     <th scope="row">Browser Support</th>
                     <td><span class="yes">✔</span></td>
+                    <td><span class="yes">✔</span></td>
                     <td><span class="no">✖</span></td>
                     <td><span class="yes">✔</span></td>
                     <td><span class="yes">✔</span></td>
@@ -101,11 +105,13 @@ <h2>Feature Comparisons</h2>
                     <td><span class="yes">✔</span></td>
                     <td><span class="yes">✔</span></td>
                     <td><span class="yes">✔</span></td>
+                    <td><span class="yes">✔</span></td>
                 </tr>
                 <tr>
                     <th scope="row">Variable Filters</th>
                     <td><span class="no">✖</span></td>
                     <td><span class="yes">✔</span></td>
+                    <td><span class="yes">✔</span></td>
                     <td><span class="no">✖</span></td>
                     <td><span class="no">✖</span></td>
                     <td><span class="no">✖</span></td>
@@ -119,6 +125,7 @@ <h2>Feature Comparisons</h2>
                     <th scope="row">Shorthand HTML Syntax</th>
                     <td><span class="yes">✔</span></td>
                     <td><span class="no">✖</span></td>
+                    <td><span class="no">✖</span></td>
                     <td><span class="yes">✔</span></td>
                     <td><span class="yes">✔</span></td>
                     <td><span class="yes">✔</span></td>
@@ -134,6 +141,7 @@ <h2>Feature Comparisons</h2>
                     <td><span class="no">✖</span></td>
                     <td><span class="no">✖</span></td>
                     <td><span class="no">✖</span></td>
+                    <td><span class="no">✖</span></td>
                     <td><span class="yes">✔</span></td>
                     <td><span class="no">✖</span></td>
                     <td><span class="no">✖</span></td>
@@ -151,6 +159,7 @@ <h2>Feature Comparisons</h2>
                     <td><span class="yes">✔</span></td>
                     <td><span class="yes">✔</span></td>
                     <td><span class="yes">✔</span></td>
+                    <td><span class="yes">✔</span></td>
                     <td><span class="no">✖</span></td>
                     <td><span class="no">✖</span></td>
                 </tr>
@@ -166,6 +175,7 @@ <h2>Feature Comparisons</h2>
                     <td><span class="yes">✔</span></td>
                     <td><span class="yes">✔</span></td>
                     <td><span class="yes">✔</span></td>
+                    <td><span class="yes">✔</span></td>
                 </tr>
                 <tr>
                     <th scope="row"><code>if/else</code> Conditionals</th>
@@ -175,6 +185,7 @@ <h2>Feature Comparisons</h2>
                     <td><span class="yes">✔</span></td>
                     <td><span class="yes">✔</span></td>
                     <td><span class="yes">✔</span></td>
+                    <td><span class="yes">✔</span></td>
                     <td><a class="partial" href="#mu-ifelse">✜</a></td>
                     <td><span class="yes">✔</span></td>
                     <td><span class="yes">✔</span></td>
@@ -185,6 +196,7 @@ <h2>Feature Comparisons</h2>
                     <td><span class="yes">✔</span></td>
                     <td><span class="yes">✔</span></td>
                     <td><span class="yes">✔</span></td>
+                    <td><span class="yes">✔</span></td>
                     <td><span class="no">✖</span></td>
                     <td><span class="yes">✔</span></td>
                     <td><span class="no">✖</span></td>
@@ -196,6 +208,7 @@ <h2>Feature Comparisons</h2>
                 <tr>
                     <th scope="row">Extendable Tags, Logic, and/or Filters</th>
                     <td><span class="yes">✔</span></td>
+                    <td><span class="yes">✔</span></td>
                     <td><span class="no">✖</span></td>
                     <td><span class="no">✖</span></td>
                     <td><span class="no">✖</span></td>
@@ -218,6 +231,7 @@ <h2>Feature Comparisons</h2>
                     <td><span class="yes">✔</span></td>
                     <td><span class="yes">✔</span></td>
                     <td><span class="yes">✔</span></td>
+                    <td><span class="yes">✔</span></td>
                 </tr>
             </tbody>
             <tfoot>
diff --git a/lib/languages/dustjs.js b/lib/languages/dustjs.js
new file mode 100644
index 0000000..63960b4
--- /dev/null
+++ b/lib/languages/dustjs.js
@@ -0,0 +1,26 @@
+var dust = require('dust.js'),
+    fs = require('fs'),
+    data = {
+        header: 'Colors',
+        items: [
+            {name: 'red', current: true, url: '#Red'},
+            {name: 'green', current: false, url: '#Green'},
+            {name: 'blue', current: false, url: '#Blue'}
+        ]
+    },
+    files = {
+        simple: fs.readFileSync(__dirname + '/../templates/dustjs/simple.html', 'utf8')
+    },
+    tpl = {};
+
+exports.compile = function (type, callback) {
+    if (!tpl[type]) {
+        tpl[type] = dust.compile(files[type], type);
+        dust.loadSource(tpl[type]);
+    }
+    callback();
+};
+
+exports.render = function (type, callback) {
+    dust.render(type, data, callback);
+};
diff --git a/lib/templates/dustjs/simple.html b/lib/templates/dustjs/simple.html
new file mode 100644
index 0000000..3533d76
--- /dev/null
+++ b/lib/templates/dustjs/simple.html
@@ -0,0 +1,14 @@
+<h1>{header}</h1>
+{#items}
+<ul>
+{#item}
+  {^current}
+  <li><strong>{name}</strong></li>
+  {:else}
+  <li><a href="{url}">{name}</a></li>
+  {/current}
+{/item}
+</ul>
+{:else}
+<p>The list is empty.</p>
+{/items}
diff --git a/package.json b/package.json
index 69c9008..b806263 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
     "repository": "https://github.com/paularmstrong/node-templates.git",
     "homepage": "http://paularmstrong.github.com/node-templates/",
     "author": "Paul Armstrong <paul@paularmstrongdesigns.com>",
+    "contributors" : ["Scott Sanders <scott@stonecobra.com>"],
     "dependencies": {
         "nopt": ">=1.0.8",
         "bench": ">=0.3.2",
@@ -18,9 +19,12 @@
         "jade": "0.16.0",
         "jqtpl": "1.0.6",
         "mu2": "0.5.3",
-        "swig": "0.7.0",
-        "Templ8": "0.2.1",
-        "whiskers": "0.1.0"
+        "swig": "0.9.0",
+        "Templ8": "0.3.0",
+        "whiskers": "0.1.2",
+        "dust.js": "0.1.0",
+        "abbrev": "1.0.3",
+        "coffee-script": "1.2.0"
     },
     "main": "index",
     "engines": {

From 11202ece8f89548a83ba13520adf8f7e20f80d28 Mon Sep 17 00:00:00 2001
From: Scott Sanders <scott@stonecobra.com>
Date: Sun, 1 Jan 2012 12:22:41 -0800
Subject: [PATCH 2/2] missed a stash

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

diff --git a/README.md b/README.md
index 320aeb9..ff67441 100644
--- a/README.md
+++ b/README.md
@@ -11,11 +11,7 @@ View all feature comparisons and templates on the [Node Templates Page](http://p
 (_Alphabetical Order_)
 * [coffeekup@0.3.0](http://coffeekup.org/)
 * [dust.js@0.1.0](https://github.com/stanislavfeldman/dust.js), until [dust](http://akdubya.github.com/dustjs/) supports node > 0.4
-<<<<<<< Updated upstream
-* [ejs@0.4.2](https://github.com/visionmedia/ejs)
-=======
 * [ejs@0.6.1](https://github.com/visionmedia/ejs)
->>>>>>> Stashed changes
 * [haml@0.4.2](https://github.com/creationix/haml-js)
 * [hamljs@0.5.2](https://github.com/visionmedia/haml.js)
 * [jade@0.20.0](http://jade-lang.com/)