jed · May 10, 2011 16:04 · May 31, 2011 · May 16, 2011 · May 15, 2011 · May 15, 2011
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,20 +1,13 @@
-Copyright (c) 2011 Jed Schmidt, http://jed.is
-
-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.
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                    Version 2, December 2004
+
+ Copyright (C) 2011 Jed Schmidt <http://jed.is>
+
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. You just DO WHAT THE FUCK YOU WANT TO.
diff --git a/annotated.js b/annotated.js
@@ -4,7 +4,7 @@ function(
 ){
   return function(
     c, // the object called as `this` in the template
-    d  // the default `with` context of the template (optional)
+    d  // the `with` context of this template call (optional)
   ){
     return a.replace(
       /#{([^}]*)}/g, // a regexp that finds the interpolated code: "#{<code>}"
@@ -16,9 +16,9 @@ function(
           "x",
           "with(x)return " + e // the result of the interpolated code
         ).call(
-          c,    // the object passed to the template as `this`
-          d     // pass the most...
-          || b  // specific...
+          c,    // pass the data object as `this`, with
+          d     // the most
+          || b  // specific
           || {} // context.
         )
       }

diff --git a/test_kanji.js b/test_kanji.js
@@ -0,0 +1,46 @@
+// This test renders a table with every CJK ideograph.
+// On my MacBook Air, it takes about 3.5 seconds.
+
+!function() {
+  var t = function(a,b){return function(c,d){return a.replace(/#{([^}]*)}/g,function(a,e){return Function("x","with(x)return "+e).call(c,d||b||{})})}}
+
+  var kanji = []
+
+  for (var i = 0x9faf; i >= 0x4e00; i--) {
+    kanji[i] = String.fromCharCode(i)
+  } 
+
+  var d = new Date
+
+  var row = t( "\
+    <tr>\
+      <td>#{this}</td>\
+      <td>\\u#{this.charCodeAt(0).toString(16)}</td>\
+    </tr>"
+  )
+
+  var table = t( "\
+    <h1>CJK unified ideographs</h1>\
+    <table>\
+       <tr>\
+         <td><b>Glyph</b></td>\
+         <td><b>Codepoint</b></td>\
+       </tr>\
+       #{this.map(row).join('')}\
+    </table>",
+    {row:row}
+  )
+
+  console.log( "compiling templates..." )
+  console.log( "compiled templates in " + (new Date - d) + "ms" )
+
+  d = new Date
+
+  console.log( "rendering table..." )
+
+  var html = table(kanji)
+
+  console.log( "rendered table in " + (new Date - d) + "ms" )
+
+  console.log( "here's a sample:\n\n" + html.substr(0, 1000) )
+}()
diff --git a/annotated.js b/annotated.js
@@ -13,8 +13,8 @@ function(
         e  // the code matched by the interpolation
       ){
         return Function(
-          "b",
-          "with(b)return " + e // the result of the interpolated code
+          "x",
+          "with(x)return " + e // the result of the interpolated code
         ).call(
           c,    // the object passed to the template as `this`
           d     // pass the most...

diff --git a/annotated.js b/annotated.js
@@ -16,8 +16,10 @@ function(
           "b",
           "with(b)return " + e // the result of the interpolated code
         ).call(
-          c,           // the object passed to the template as `this`
-          d || b || {} // the most specific `with` context
+          c,    // the object passed to the template as `this`
+          d     // pass the most...
+          || b  // specific...
+          || {} // context.
         )
       }
     )

diff --git a/test.js b/test.js
@@ -0,0 +1,38 @@
+!function() {
+  // Put the template in your code...
+  var t = function(a,b){return function(c,d){return a.replace(/#{([^}]*)}/g,function(a,e){return Function("x","with(x)return "+e).call(c,d||b||{})})}}
+
+  // and make a template, using `#{<code>}` for JavaScript.
+  var hello = t("Hello, #{this.name || 'world'}!")
+
+  // Run the template with an object...
+  console.log( // => "Hello, Jed!"
+    hello({name: "Jed"})
+  )
+
+  // or without.
+  console.log( // => "Hello, world!"
+    hello()
+  )
+
+  // Or make a template with a context...
+  var greet = t(
+    "Allow me to say, '#{hello(this)}'",
+    {hello: hello}
+  )
+
+  // and run it as is...
+  console.log( // => "Allow me to say, 'Hello, Jed!'"
+    greet({name: "Jed"})
+  )
+
+  // or with its own context.
+  console.log( // => "Allow me to say, 'Hello, JED!'"
+    greet(
+      {name: "Jed"},
+      {hello: function(x) {
+        return hello({ name: x.name.toUpperCase() })
+      }}
+    )
+  )
+}()
diff --git a/annotated.js b/annotated.js
@@ -16,7 +16,7 @@ function(
           "b",
           "with(b)return " + e // the result of the interpolated code
         ).call(
-          c,          // the object passed to the template as `this`
+          c,           // the object passed to the template as `this`
           d || b || {} // the most specific `with` context
         )
       }

diff --git a/annotated.js b/annotated.js
@@ -17,7 +17,7 @@ function(
           "with(b)return " + e // the result of the interpolated code
         ).call(
           c,          // the object passed to the template as `this`
-          d || b || c // the most specific `with` context
+          d || b || {} // the most specific `with` context
         )
       }
     )

diff --git a/index.js b/index.js
@@ -1 +1 @@
-function(a,b){return function(c,d){return a.replace(/#{([^}]*)}/g,function(a,e){return Function("x","with(x)return "+e).call(c,d||b||c)})}}
+function(a,b){return function(c,d){return a.replace(/#{([^}]*)}/g,function(a,e){return Function("x","with(x)return "+e).call(c,d||b||{})})}}
diff --git a/annotated.js b/annotated.js
@@ -3,20 +3,21 @@ function(
   b  // the default `with` context of the template (optional)
 ){
   return function(
-    c // the object called as `this` in the template
+    c, // the object called as `this` in the template
+    d  // the default `with` context of the template (optional)
   ){
     return a.replace(
       /#{([^}]*)}/g, // a regexp that finds the interpolated code: "#{<code>}"
       function(
         a, // not used, only positional
-        d  // the code matched by the interpolation
+        e  // the code matched by the interpolation
       ){
         return Function(
           "b",
-          "with(b)return " + d // the result of the interpolated code
+          "with(b)return " + e // the result of the interpolated code
         ).call(
-          c,     // the object passed to the template as `this`
-          b || c // the `with` context if provided, or the passed object
+          c,          // the object passed to the template as `this`
+          d || b || c // the most specific `with` context
         )
       }
     )

diff --git a/index.js b/index.js
@@ -1 +1 @@
-function(a,b){return function(c){return a.replace(/#{([^}]*)}/g,function(a,d){return Function("b","with(b)return "+d).call(c,b||c)})}}
+function(a,b){return function(c,d){return a.replace(/#{([^}]*)}/g,function(a,e){return Function("x","with(x)return "+e).call(c,d||b||c)})}}
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -0,0 +1,20 @@
+Copyright (c) 2011 Jed Schmidt, http://jed.is
+
+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/annotated.js b/annotated.js
@@ -0,0 +1,24 @@
+function(
+  a, // the string source from which the template is compiled
+  b  // the default `with` context of the template (optional)
+){
+  return function(
+    c // the object called as `this` in the template
+  ){
+    return a.replace(
+      /#{([^}]*)}/g, // a regexp that finds the interpolated code: "#{<code>}"
+      function(
+        a, // not used, only positional
+        d  // the code matched by the interpolation
+      ){
+        return Function(
+          "b",
+          "with(b)return " + d // the result of the interpolated code
+        ).call(
+          c,     // the object passed to the template as `this`
+          b || c // the `with` context if provided, or the passed object
+        )
+      }
+    )
+  }
+}
diff --git a/index.js b/index.js
@@ -1 +1 @@
-function t(s,n){return t[n]=function(d){return s.replace(/{{([^}]+)}}/g,function(s,c){return Function("t","with(t)return "+c).call(d,t)})}}
+function(a,b){return function(c){return a.replace(/#{([^}]*)}/g,function(a,d){return Function("b","with(b)return "+d).call(c,b||c)})}}
diff --git a/package.json b/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "template",
+  "keywords": ["template", "HTML", "render"]
+}
diff --git a/index.js b/index.js
@@ -1 +1 @@
-function(s,d){return s.replace(/{([^}]+)}/g,function(s,c){with(d)return eval(c)})}
+function t(s,n){return t[n]=function(d){return s.replace(/{{([^}]+)}}/g,function(s,c){return Function("t","with(t)return "+c).call(d,t)})}}
diff --git a/index.js b/index.js
@@ -1 +1 @@
-function(){/******************************************************************************************************************************/}
+function(s,d){return s.replace(/{([^}]+)}/g,function(s,c){with(d)return eval(c)})}
diff --git a/index.js b/index.js
@@ -0,0 +1 @@
+function(){/******************************************************************************************************************************/}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		function(a,b){return function(c,d){return a.replace(/#{([^}]*)}/g,function(a,e){return Function("x","with(x)return "+e).call(c,d\|\|b\|\|c)})}}
		function(a,b){return function(c,d){return a.replace(/#{([^}]*)}/g,function(a,e){return Function("x","with(x)return "+e).call(c,d\|\|b\|\|{})})}}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		function(a,b){return function(c){return a.replace(/#{([^}]*)}/g,function(a,d){return Function("b","with(b)return "+d).call(c,b\|\|c)})}}
		function(a,b){return function(c,d){return a.replace(/#{([^}]*)}/g,function(a,e){return Function("x","with(x)return "+e).call(c,d\|\|b\|\|c)})}}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		function t(s,n){return t[n]=function(d){return s.replace(/{{([^}]+)}}/g,function(s,c){return Function("t","with(t)return "+c).call(d,t)})}}
		function(a,b){return function(c){return a.replace(/#{([^}]*)}/g,function(a,d){return Function("b","with(b)return "+d).call(c,b\|\|c)})}}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		function(s,d){return s.replace(/{([^}]+)}/g,function(s,c){with(d)return eval(c)})}
		function t(s,n){return t[n]=function(d){return s.replace(/{{([^}]+)}}/g,function(s,c){return Function("t","with(t)return "+c).call(d,t)})}}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		function(){/******************************************************************************************************************************/}
		function(s,d){return s.replace(/{([^}]+)}/g,function(s,c){with(d)return eval(c)})}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		function(){/******************************************************************************************************************************/}