Merge branch 'master' of git@github.com:jbarnette/johnson

Manifest.txt

@@ -23,6 +23,8 @@ ext/spidermonkey/ruby_land_proxy.c
 ext/spidermonkey/ruby_land_proxy.h
 ext/spidermonkey/spidermonkey.c
 ext/spidermonkey/spidermonkey.h
+js/prelude.js
+js/template.js
 lib/johnson.rb
 lib/johnson/context.rb
 lib/johnson/nodes.rb
@@ -44,7 +46,6 @@ lib/johnson/visitable.rb
 lib/johnson/visitors.rb
 lib/johnson/visitors/ecma_visitor.rb
 lib/johnson/visitors/sexp_visitor.rb
-lib/prelude.js
 test/helper.rb
 test/johnson/context_test.rb
 test/johnson/conversions/boolean_test.rb

js/template.js

@@ -0,0 +1,30 @@
+$ = {};
+$.makeTemplate = function (template, begin, end) {
+  var begin = begin || "<%"
+  var end = end || "%>"
+  var rebegin = begin.replace(/([\]{}[\\])/g, '\\$1');
+  var reend = end.replace(/([\]{}[\\])/g, '\\$1');
+
+  var code = "_context = _context || {}; with (_context) {" +
+    "var _result = '';" +
+      template
+        .replace(/[\t\r\n]/g, ' ')
+        .replace(/^(.*)$/, end + '$1' + begin)
+        .replace(new RegExp(reend + "(.*?)" + rebegin, "g"), function (text) {
+          return text
+            .replace(new RegExp("^" + reend + "(.*)" + rebegin + "$"), "$1")
+            .replace(/\\/g, "\\\\")
+            .replace(/'/g, "\\'")
+            .replace(/^(.*)$/, 
+              function(sub, m) { 
+                return end + (m == "" ? "" : "_result += '" + m + "';") + begin;
+              });
+        })
+        .replace(new RegExp(rebegin + "=(.*?)" + reend, "g"), "_result += ($1);")
+        .replace(new RegExp(rebegin + "(.*?)" + reend, "g"), ' $1 ')
+        .replace(new RegExp("^" + reend + "(.*)" + rebegin + "$"), '$1') +
+    "return _result;" +
+  "}";
+
+  return new Function("_context", code);
+};

lib/johnson.rb

@@ -24,8 +24,10 @@
 require "johnson/context"
 require "johnson/parser"
 
+$LOAD_PATH.push File.expand_path("#{File.dirname(__FILE__)}/../js")
+
 module Johnson
-  PRELUDE = IO.read(File.dirname(__FILE__) + "/prelude.js")
+  PRELUDE = IO.read(File.dirname(__FILE__) + "/../js/prelude.js")
 
   def self.evaluate(expression, vars={})
     context = Johnson::Context.new