Add a new api where the module itself generates a template function.

creationix · Apr 1, 2010 · e8a557e · e8a557e
1 parent d8d7492
commit e8a557e
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 14 deletions.
diff --git a/lib/haml.js b/lib/haml.js
@@ -1,9 +1,4 @@
-var Haml = {};
+var Haml;
-
-// Bind to the exports object if it exists. (CommonJS and NodeJS)
-if (typeof exports !== 'undefined') {
-  Haml = exports;
-}
 
 (function () {
 
@@ -347,7 +342,7 @@ if (typeof exports !== 'undefined') {
 
   ];
 
-  Haml.compile = function (lines) {
+  function compile(lines) {
     var block = false,
         output = [];
 
@@ -381,7 +376,7 @@ if (typeof exports !== 'undefined') {
               check_indent: new RegExp("^(?:\\s*|" + match[1] + "  (.*))$"),
               process: matcher.process,
               render_contents: function () {
-                return Haml.compile(this. contents);
+                return compile(this. contents);
               }
             };
             found = true;
@@ -429,7 +424,7 @@ if (typeof exports !== 'undefined') {
     return output.join(' + \n');
   };
 
-  Haml.optimize = function (js) {
+  function optimize(js) {
     var new_js = [], buffer = [], part, end;
 
     function flush() {
@@ -458,16 +453,16 @@ if (typeof exports !== 'undefined') {
     return new_js.join("\n");
   };
 
-  Haml.render = function(text, options) {
+  function render(text, options) {
     options = options || {};
-    var js = Haml.compile(text);
+    var js = compile(text);
     if (options.optimize) {
       js = Haml.optimize(js);
     }
-    return Haml.execute(js, options.context || Haml, options.locals);
+    return execute(js, options.context || Haml, options.locals);
   };
 
-  Haml.execute = function (js, self, locals) {
+  function execute(js, self, locals) {
     return (function () {
       with(locals || {}) {
         try {
@@ -480,5 +475,26 @@ if (typeof exports !== 'undefined') {
     }).call(self);
   };
 
+  Haml = function (haml) {
+    var js = optimize(compile(haml));
+    return function (locals) {
+      with(locals || {}) {
+        try {
+          return eval("(" + js + ")");
+        } catch (e) {
+          return "\n<pre class='error'>" + html_escape(e.stack) + "</pre>\n";
+        }
+      }
+    }
+  }
+  Haml.compile = compile;
+  Haml.optimize = optimize;
+  Haml.render = render;
+  Haml.execute = execute;
 
 }());
+
+// Hook into module system
+if (typeof module !== 'undefined') {
+  module.exports = Haml;
+}
diff --git a/test/test.js b/test/test.js
@@ -19,8 +19,9 @@ fs.readdir('.', function (err, files) {
           try {
             var js = Haml.compile(haml);
             var js_opt = Haml.optimize(js);
-            var actual = Haml.execute(js_opt, scope.context, scope.locals);
+            var actual = Haml(haml).call(scope.context, scope.locals);
             assert.equal(actual, expected);
+
             sys.puts(haml_file + " Passed")
           } catch (e) {
             var message = e.name;