string.js
@@ -37,33 +37,56 @@
// -%> as the closing tag removes the newline (if the tag is the last
// thing on the line)
-exports.EJS = function(string) {
- var self = this;
-
- self._process = function(string) {
- var body = "var s = '';\n";
- var tags = /<%=|%>/m;
- var match;
- var insideTag = false;
- while (match = tags.exec(string)) {
- if (match[0] == "<%=") {
- if (insideTag) throw "Compile error: No '<%=' allowed inside of '<%='";
- insideTag = true;
- body += "s += '" + RegExp.leftContext + "';"
- } else {
- insideTag = false;
- var re = RegExp.leftContext.replace(/^\s*/,'').replace(/\s*$/, '');
- body += "s += r." + re + ";"
+include("string");
+
+function onLoad() {
+ exports.EJS = function(string) {
+ var self = this;
+
+ self._process = function(string) {
+ var body = "var s = '';\n";
+ var tags = /<%(?:=)?|%>/m;
+ var match;
+ var insideCodeTag = false;
+ var insideExprTag = false;
+ var that = this;
+ function insideTag() {
+ return insideCodeTag || insideExprTag;
}
- string = RegExp.rightContext
- }
- body += "s += '" + string + "';\nreturn s;"
- self.template = new Function("r", body);
- };
-
- self.result = function(context) {
- return self.template(context);
+ while (match = tags.exec(string)) {
+ var left = string.substring(0, match.index)
+ var right = string.substring(match.index+match[0].length)
+ if (match[0] == "<%=") {
+ if (insideTag()) throw "Compile error: No '<%=' or '<%' allowed inside of '" + match[0] + "'";
+ insideCodeTag = true;
+ if (left != "") body += "s += '" + left.escape() + "';\n"
+ } else if (match[0] == "<%") {
+ if (insideTag()) throw "Compile error: No '<%=' or '<%' allowed inside of '" + match[0] + "'";
+ insideExprTag = true;
+ if (left != "") body += "s += '" + left.escape() + "';\n"
+ } else {
+ if (insideCodeTag) {
+ insideCodeTag = false;
+ var re = left.strip()
+ body += "s += r." + re + ";\n"
+ } else if (insideExprTag) {
+ insideExprTag = false;
+ var re = left.strip()
+ body += re + "\n"
+ right = right.lstrip()
+ }
+ }
+ string = right;
+ }
+ if (string != "") body += "s += '" + string.escape() + "';\n"
+ body += "return s;\n"
+ self.template = new Function("r", body);
+ };
+
+ self.result = function(context) {
+ return self.template(context);
+ };
+
+ self._process(string);
};
-
- self._process(string);
-};
\ No newline at end of file
+}
ejs.js
@@ -41,14 +41,14 @@ function onLoad() {
var context = {replacement: "some text"}
assertEquals(context.replacement, e.result(context))
}
-
+
suite.testCompileErrorOnDuplicateOpeningTag = function() {
var t = "<%= oops <%= %>"
try {
new EJS(t);
assertUnreachable();
} catch(e) {
- assertTrue(/Compile error: No '<%=' allowed inside of '<%='/.test(e))
+ assertTrue(/Compile error: No '<%=' or '<%' allowed inside of '<%='/.test(e))
}
}
@@ -59,5 +59,42 @@ function onLoad() {
assertEquals(context.replacement, e.result(context))
}
+ suite.testInsertedJSCode = function() {
+ var t = "<% \"string\" %>"
+ var e = new EJS(t);
+ var context = {}
+ assertEquals("", e.result(context))
+ }
+
+ suite.testLoopInTemplate = function() {
+ var t = "<% for (var i=0; i < 3; i++) { %>\n"
+ t += "content\n"
+ t += "<% }; %>"
+ var e = new EJS(t);
+ var context = {}
+ var result = e.result(context)
+ assertEquals("content\ncontent\ncontent\n", result)
+ }
+
+ suite.testReplacementInLoop = function() {
+ var t = "<% for (var i=0; i < 3; i++) { %>\n"
+ t += "<%= replacement %>\n"
+ t += "<% }; %>"
+ var e = new EJS(t);
+ var context = {replacement: "content"}
+ var result = e.result(context)
+ assertEquals("content\ncontent\ncontent\n", result)
+ }
+
+ suite.testReplacementInLoopWithNewLineAtEnd = function() {
+ var t = "<% for (var i=0; i < 3; i++) { %>\n"
+ t += "<%= replacement %>\n"
+ t += "<% }; %>\n"
+ var e = new EJS(t);
+ var context = {replacement: "content"}
+ var result = e.result(context)
+ assertEquals("content\ncontent\ncontent\n", result)
+ }
+
suite.run();
}
\ No newline at end of file
test/test-ejs.js
ba3a346c2f2a0ea454047169155f10d5dc87ca4d
Urban Hafner
urban@bettong.net
http://github.com/ujh/frisbee/commit/049828b8095bc3918d430c4bb836e8e5707a35eb
049828b8095bc3918d430c4bb836e8e5707a35eb
2009-06-04T08:02:48-07:00
2009-06-04T08:02:48-07:00
EJS with support for <%= and <%. Closes #7
25a37b4cf2ad27b8cc1da1a2a57f8f61e7af72ea
Urban Hafner
urban@bettong.net