Addressing issues olado#121, olado#106, olado#77. Also, added an exam…

…ple for express in examples/express. And sporting new logo by @KevinKirchner

README.md

@@ -70,3 +70,9 @@ Laura Doktorova @olado
 
 ## License
 doT is licensed under the MIT License. (See LICENSE-DOT)
+
+<p align="center">
+  <img src="http://olado.github.io/doT/[email protected]" alt="logo by Kevin Kirchner"/>
+</p>
+
+

benchmarks/templating/doT.js

@@ -6,7 +6,7 @@
 	"use strict";
 
 	var doT = {
-		version: '1.0.1',
+		version: '1.0.2',
 		templateSettings: {
 			evaluate:    /\{\{([\s\S]+?(\}?)+)\}\}/g,
 			interpolate: /\{\{=([\s\S]+?)\}\}/g,
@@ -20,32 +20,34 @@
 			varname:	'it',
 			strip:		true,
 			append:		true,
-			selfcontained: false
+			selfcontained: false,
+			doNotSkipEncoded: false
 		},
 		template: undefined, //fn, compile template
 		compile:  undefined  //fn, for express
+	}, _globals;
+
+	doT.encodeHTMLSource = function(doNotSkipEncoded) {
+		var encodeHTMLRules = { "&": "&#38;", "<": "&#60;", ">": "&#62;", '"': '&#34;', "'": '&#39;', "/": '&#47;' },
+			matchHTML = doNotSkipEncoded ? /&|<|>|"|'|\//g : /&(?!#?\w+;)|<|>|"|'|\//g;
+		return function(code) {
+			return code ? code.replace(matchHTML, function(m) {return encodeHTMLRules[m] || m;}) : "";
+		};
 	};
 
+	_globals = (function(){ return this || (0,eval)('this'); }());
+
 	if (typeof module !== 'undefined' && module.exports) {
 		module.exports = doT;
 	} else if (typeof define === 'function' && define.amd) {
 		define(function(){return doT;});
 	} else {
-		(function(){ return this || (0,eval)('this'); }()).doT = doT;
-	}
-
-	function encodeHTMLSource() {
-		var encodeHTMLRules = { "&": "&#38;", "<": "&#60;", ">": "&#62;", '"': '&#34;', "'": '&#39;', "/": '&#47;' },
-			matchHTML = /&(?!#?\w+;)|<|>|"|'|\//g;
-		return function() {
-			return this ? this.replace(matchHTML, function(m) {return encodeHTMLRules[m] || m;}) : this;
-		};
+		_globals.doT = doT;
 	}
-	String.prototype.encodeHTML = encodeHTMLSource();
 
 	var startend = {
-		append: { start: "'+(",      end: ")+'",      endencode: "||'').toString().encodeHTML()+'" },
-		split:  { start: "';out+=(", end: ");out+='", endencode: "||'').toString().encodeHTML();out+='"}
+		append: { start: "'+(''+",      end: ")+'",      startencode: "'+encodeHTML(" },
+		split:  { start: "';out+=(''+", end: ");out+='", startencode: "';out+=encodeHTML(" }
 	}, skip = /$^/;
 
 	function resolveDefs(c, block, def) {
@@ -97,7 +99,7 @@
 			})
 			.replace(c.encode || skip, function(m, code) {
 				needhtmlencode = true;
-				return cse.start + unescape(code) + cse.endencode;
+				return cse.startencode + unescape(code) + cse.end;
 			})
 			.replace(c.conditional || skip, function(m, elsecase, code) {
 				return elsecase ?
@@ -118,8 +120,11 @@
 			.replace(/(\s|;|\}|^|\{)out\+='';/g, '$1').replace(/\+''/g, '')
 			.replace(/(\s|;|\}|^|\{)out\+=''\+/g,'$1out+=');
 
-		if (needhtmlencode && c.selfcontained) {
-			str = "String.prototype.encodeHTML=(" + encodeHTMLSource.toString() + "());" + str;
+		if (needhtmlencode) {
+			if (!c.selfcontained && _globals && !_globals._encodeHTML) _globals._encodeHTML = doT.encodeHTMLSource(c.doNotSkipEncoded);
+			str = "var encodeHTML = typeof _encodeHTML !== 'undefined' ? _encodeHTML : ("
+				+ doT.encodeHTMLSource.toString() + "(" + (c.doNotSkipEncoded || '') + "));"
+				+ str;
 		}
 		try {
 			return new Function(c.varname, str);

doT.js

@@ -6,7 +6,7 @@
 	"use strict";
 
 	var doT = {
-		version: '1.0.1',
+		version: '1.0.2',
 		templateSettings: {
 			evaluate:    /\{\{([\s\S]+?(\}?)+)\}\}/g,
 			interpolate: /\{\{=([\s\S]+?)\}\}/g,
@@ -20,33 +20,34 @@
 			varname:	'it',
 			strip:		true,
 			append:		true,
-			selfcontained: false
+			selfcontained: false,
+			doNotSkipEncoded: false
 		},
 		template: undefined, //fn, compile template
 		compile:  undefined  //fn, for express
-	}, global;
+	}, _globals;
+
+	doT.encodeHTMLSource = function(doNotSkipEncoded) {
+		var encodeHTMLRules = { "&": "&#38;", "<": "&#60;", ">": "&#62;", '"': '&#34;', "'": '&#39;', "/": '&#47;' },
+			matchHTML = doNotSkipEncoded ? /&|<|>|"|'|\//g : /&(?!#?\w+;)|<|>|"|'|\//g;
+		return function(code) {
+			return code ? code.replace(matchHTML, function(m) {return encodeHTMLRules[m] || m;}) : "";
+		};
+	};
+
+	_globals = (function(){ return this || (0,eval)('this'); }());
 
 	if (typeof module !== 'undefined' && module.exports) {
 		module.exports = doT;
 	} else if (typeof define === 'function' && define.amd) {
 		define(function(){return doT;});
 	} else {
-		global = (function(){ return this || (0,eval)('this'); }());
-		global.doT = doT;
-	}
-
-	function encodeHTMLSource() {
-		var encodeHTMLRules = { "&": "&#38;", "<": "&#60;", ">": "&#62;", '"': '&#34;', "'": '&#39;', "/": '&#47;' },
-			matchHTML = /&(?!#?\w+;)|<|>|"|'|\//g;
-		return function() {
-			return this ? this.replace(matchHTML, function(m) {return encodeHTMLRules[m] || m;}) : this;
-		};
+		_globals.doT = doT;
 	}
-	String.prototype.encodeHTML = encodeHTMLSource();
 
 	var startend = {
-		append: { start: "'+(",      end: ")+'",      endencode: "||'').toString().encodeHTML()+'" },
-		split:  { start: "';out+=(", end: ");out+='", endencode: "||'').toString().encodeHTML();out+='"}
+		append: { start: "'+(''+",      end: ")+'",      startencode: "'+encodeHTML(" },
+		split:  { start: "';out+=(''+", end: ");out+='", startencode: "';out+=encodeHTML(" }
 	}, skip = /$^/;
 
 	function resolveDefs(c, block, def) {
@@ -98,7 +99,7 @@
 			})
 			.replace(c.encode || skip, function(m, code) {
 				needhtmlencode = true;
-				return cse.start + unescape(code) + cse.endencode;
+				return cse.startencode + unescape(code) + cse.end;
 			})
 			.replace(c.conditional || skip, function(m, elsecase, code) {
 				return elsecase ?
@@ -119,8 +120,11 @@
 			.replace(/(\s|;|\}|^|\{)out\+='';/g, '$1').replace(/\+''/g, '')
 			.replace(/(\s|;|\}|^|\{)out\+=''\+/g,'$1out+=');
 
-		if (needhtmlencode && c.selfcontained) {
-			str = "String.prototype.encodeHTML=(" + encodeHTMLSource.toString() + "());" + str;
+		if (needhtmlencode) {
+			if (!c.selfcontained && _globals && !_globals._encodeHTML) _globals._encodeHTML = doT.encodeHTMLSource(c.doNotSkipEncoded);
+			str = "var encodeHTML = typeof _encodeHTML !== 'undefined' ? _encodeHTML : ("
+				+ doT.encodeHTMLSource.toString() + "(" + (c.doNotSkipEncoded || '') + "));"
+				+ str;
 		}
 		try {
 			return new Function(c.varname, str);

examples/express/index.js

@@ -0,0 +1 @@
+require("./lib/app");

examples/express/lib/app.js

@@ -0,0 +1,25 @@
+require("dot").process({
+	global: "_page.render"
+	, destination: __dirname + "/render/"
+	, path: (__dirname + "/../templates")
+});
+
+var express = require('express')
+, http = require('http')
+, app = express()
+, render = require('./render')
+;
+
+app.get('/', function(req, res){
+  res.send(render.dashboard({text:"Good morning!"}));
+});
+
+app.use(function(err, req, res, next) {
+	console.error(err.stack);
+	res.status(500).send('Something broke!');
+});
+
+var httpServer = http.createServer(app);
+httpServer.listen(3000, function() {
+	console.log('Listening on port %d', httpServer.address().port);
+});

examples/express/lib/render/index.js

@@ -0,0 +1,18 @@
+var path = require('path')
+	, fs = require('fs');
+
+function req(name) {
+	var module = require("./" + name);
+	delete exports[name];
+	return exports[name] = module;
+}
+
+fs.readdirSync(__dirname).forEach(function(file) {
+	if ((file === 'index.js') || (file[0] === '_')) { return; }
+	var ext = path.extname(file);
+	var stats = fs.statSync(__dirname + '/' + file);
+	if (stats.isFile() && !(ext in require.extensions)) { return; }
+	var basename = path.basename(file, '.js');
+  	exports.__defineGetter__(basename, function(){ return req(basename); });
+});
+

examples/express/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "dot-express-example",
+  "description": "doT express example",
+  "version": "0.0.1",
+  "private": true,
+  "dependencies": {
+    "express": "4.x",
+    "dot": "*"
+  }
+}

examples/express/templates/dashboard.jst

@@ -0,0 +1,5 @@
+{{##def.test:
+	{{=it.text}}
+#}}
+
+{{#def.test}}

examples/express/templates/login.jst

@@ -0,0 +1,34 @@
+<html>
+  <body>
+	<div>Signin</div>
+    <form action="/login" method="post">
+      <div>
+        <label>Username:</label>
+        <input type="text" name="username" />
+        <br/>
+      </div>
+      <div>
+        <label>Password:</label>
+        <input type="password" name="password" />
+      </div>
+      <div>
+        <input type="submit" value="Sign in" />
+      </div>
+    </form>
+	<div>Signup</div>
+    <form action="/signup" method="post">
+      <div>
+        <label>Username:</label>
+        <input type="text" name="username" />
+        <br/>
+      </div>
+      <div>
+        <label>Password:</label>
+        <input type="password" name="password" />
+      </div>
+      <div>
+        <input type="submit" value="Sign up" />
+      </div>
+    </form>
+   </body>
+</html>

index.js

@@ -76,7 +76,7 @@ InstallDots.prototype.compileToFile = function(path, template, def) {
 	}
 	compiled += defaultcompiled.toString().replace('anonymous', modulename);
 	fs.writeFileSync(path, "(function(){" + compiled
-		+ "var itself=" + modulename + ";"
+		+ "var itself=" + modulename + ", _encodeHTML=(" + doT.encodeHTMLSource.toSource() + "(" + (settings.doNotSkipEncoded || '') + "));"
 		+ addexports(exports)
 		+ "if(typeof module!=='undefined' && module.exports) module.exports=itself;else if(typeof define==='function')define(function(){return itself;});else {"
 		+ this.__global + "=" + this.__global + "||{};" + this.__global + "['" + modulename + "']=itself;}}());");

package.json

@@ -7,7 +7,7 @@
     "simple",
     "templating"
   ],
-  "version": "1.0.1",
+  "version": "1.0.2",
   "main": "index",
   "bin": {
     "dottojs": "./bin/dot-packer"

test/testdoT.js

@@ -8,23 +8,54 @@ describe('doT', function(){
 
 	describe('#template()', function(){
 		it('should return a function', function(){
-		   assert.equal("function", typeof basiccompiled);
+			assert.equal(typeof basiccompiled, "function");
 		});
 	});
 
 	describe('#()', function(){
 		it('should render the template', function(){
-		   assert.equal("<div>http</div>", basiccompiled({foo:"http"}));
-		   assert.equal("<div>http:&#47;&#47;abc.com</div>", basiccompiled({foo:"http://abc.com"}));
-		   assert.equal("<div></div>", basiccompiled({}));
+			assert.equal(basiccompiled({foo:"http"}), "<div>http</div>");
+			assert.equal(basiccompiled({foo:"http://abc.com"}), "<div>http:&#47;&#47;abc.com</div>");
+			assert.equal(basiccompiled({}), "<div></div>");
 		});
 	});
 
 	describe('defines', function(){
 		it('should render define', function(){
-		   assert.equal("<div>http</div>", definescompiled({foo:"http"}));
-		   assert.equal("<div>http:&#47;&#47;abc.com</div>", definescompiled({foo:"http://abc.com"}));
-		   assert.equal("<div></div>", definescompiled({}));
+			assert.equal(definescompiled({foo:"http"}), "<div>http</div>");
+			assert.equal(definescompiled({foo:"http://abc.com"}), "<div>http:&#47;&#47;abc.com</div>");
+			assert.equal(definescompiled({}), "<div></div>");
 		});
 	});
+
+	describe('encoding with doNotSkipEncoded=false', function() {
+		it('should not replace &', function() {
+			global._encodeHTML = undefined;
+			doT.templateSettings.doNotSkipEncoded = false;
+			assert.equal(doT.template(definestemplate)({foo:"&amp;"}), "<div>&amp;</div>");
+		});
+	});
+
+	describe('evaluate 2 numbers', function() {
+		it('should print numbers next to each other', function() {
+			var fn = doT.template("{{=it.one}}{{=it.two}}");
+			assert.equal(fn({one:1, two: 2}), "12");
+		});
+	});
+
+	describe('evaluate 2 numbers in the middle', function() {
+		it('should print numbers next to each other', function() {
+			var fn = doT.template("{{?it.one}}{{=it.one}}{{?}}{{=it.one}}{{=it.two}}");
+			assert.equal(fn({one:1, two: 2}), "112");
+		});
+	});
+
+	describe('encoding with doNotSkipEncoded=true', function() {
+		it('should replace &', function() {
+			global._encodeHTML = undefined;
+			doT.templateSettings.doNotSkipEncoded = true;
+			assert.equal(doT.template(definestemplate)({foo:"&amp;"}), "<div>&#38;amp;</div>");
+		});
+	});
+
 });