entities 0.4.1 → 0.5.0

package/compile.js

@@ -23,9 +23,13 @@ modes.reduce(function(prev, name, i){
 	return obj;
 }, null);
 
+function sortDesc(a, b){
+	return a < b ? 1 : -1;
+}
+
 function getReplacer(obj){
-	var keys = Object.keys(obj).sort();
-	var re = keys.join("|").replace(/(\w+)\|\1;/g, "$1;?");
+	var keys = Object.keys(obj).sort(sortDesc);
+	var re = keys.join("|")//.replace(/(\w+);\|\1/g, "$1;?");
 
 	// also match hex and char codes
 	re += "|#[xX][\\da-fA-F]+;?|#\\d+;?";
@@ -34,7 +38,7 @@ function getReplacer(obj){
 }
 
 function getStrictReplacer(obj){
-	var keys = Object.keys(obj).sort().filter(RegExp.prototype.test, /;$/);
+	var keys = Object.keys(obj).sort(sortDesc).filter(RegExp.prototype.test, /;$/);
 	var re = keys.map(function(name){
 		return name.slice(0, -1); //remove trailing semicolon
 	}).join("|");

package/index.js

@@ -40,14 +40,18 @@ function getReplacer(obj){
 	return function normalReplacer(name){
 		if(name.charAt(1) === "#"){
 			if(name.charAt(2).toLowerCase() === "x"){
-				return String.fromCharCode(parseInt(name.substr(3), 16));
+				return codePointToSymbol(parseInt(name.substr(3), 16));
 			}
-			return String.fromCharCode(parseInt(name.substr(2), 10));
+			return codePointToSymbol(parseInt(name.substr(2), 10));
 		}
 		return obj[name.substr(1)];
 	};
 }
 
+function codePointToSymbol(entity){
+	return String.fromCharCode(entity); //TODO
+}
+
 function getStrictReplacer(obj){
 	return function strictReplacer(name){
 		if(name.charAt(1) === "#"){

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "entities",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "description": "Encode & decode XML/HTML entities with ease",
   "author": "Felix Boehm <me@feedic.com>",
   "keywords": [

package/test/test.js

@@ -1,7 +1,8 @@
-var assert = require("assert");
-var entities = require('../');
+var assert = require("assert"),
+    path = require("path"),
+    entities = require('../');
 
-describe("Encode->decode test", function() {
+describe("Encode->decode test", function(){
 	var testcases = [
 		{
 			input: "asdf & ÿ ü '",
@@ -17,30 +18,41 @@ describe("Encode->decode test", function() {
 	];
 	testcases.forEach(function(tc) {
 		var encodedXML = entities.encodeXML(tc.input);
-		it("should XML encode " + tc.input, function() {
+		it("should XML encode " + tc.input, function(){
 			assert.equal(encodedXML, tc.xml);
 		});
-		it("should XML decode " + encodedXML, function() {
+		it("should default to XML encode " + tc.input, function(){
+			assert.equal(entities.encode(tc.input), tc.xml);
+		});
+		it("should XML decode " + encodedXML, function(){
 			assert.equal(entities.decodeXML(encodedXML), tc.input);
 		});
+		it("should default to XML encode " + encodedXML, function(){
+			assert.equal(entities.decode(encodedXML), tc.input);
+		});
+		it("should default strict to XML encode " + encodedXML, function(){
+			assert.equal(entities.decodeStrict(encodedXML), tc.input);
+		});
+
 		var encodedHTML4 = entities.encodeHTML4(tc.input);
-		it("should HTML4 encode " + tc.input, function() {
+		it("should HTML4 encode " + tc.input, function(){
 			assert.equal(encodedHTML4, tc.html4);
 		});
-		it("should HTML4 decode " + encodedHTML4, function() {
+		it("should HTML4 decode " + encodedHTML4, function(){
 			assert.equal(entities.decodeHTML4(encodedHTML4), tc.input);
 		});
+
 		var encodedHTML5 = entities.encodeHTML5(tc.input);
-		it("should HTML5 encode " + tc.input, function() {
+		it("should HTML5 encode " + tc.input, function(){
 			assert.equal(encodedHTML5, tc.html5);
 		});
-		it("should HTML5 decode " + encodedHTML5, function() {
+		it("should HTML5 decode " + encodedHTML5, function(){
 			assert.equal(entities.decodeHTML5(encodedHTML5), tc.input);
 		});
 	});
 });
 
-describe("Decode test", function() {
+describe("Decode test", function(){
 	var testcases = [
 		{ input: "&",  output: "&" },
 		{ input: "&",  output: "&" },
@@ -55,14 +67,74 @@ describe("Decode test", function() {
 		{ input: ":",     output: ":" }
 	];
 	testcases.forEach(function(tc) {
-		it("should XML decode " + tc.input, function() {
+		it("should XML decode " + tc.input, function(){
 			assert.equal(entities.decodeXML(tc.input), tc.output);
 		});
-		it("should HTML4 decode " + tc.input, function() {
+		it("should HTML4 decode " + tc.input, function(){
 			assert.equal(entities.decodeHTML4(tc.input), tc.output);
 		});
-		it("should HTML5 decode " + tc.input, function() {
+		it("should HTML5 decode " + tc.input, function(){
 			assert.equal(entities.decodeHTML5(tc.input), tc.output);
 		});
 	});
 });
+
+var levels = ["xml", "html4", "html5"];
+
+describe("Documents", function(){
+	levels
+	.map(function(n){ return path.join("..", "entities", n); })
+	.map(require)
+	.forEach(function(doc, i){
+		describe("Decode", function(){
+			it(levels[i], function(){
+				Object.keys(doc).forEach(function(e){
+					for(var l = i; l < levels.length; l++){
+						assert.equal(entities.decode("&" + e, l), doc[e]);
+					}
+				});
+			});
+		});
+
+		describe("Decode strict", function(){
+			it(levels[i], function(){
+				Object.keys(doc).forEach(function(e){
+					if(e.substr(-1) !== ";"){
+						assert.equal(entities.decodeStrict("&" + e, i), "&" + e);
+						return;
+					}
+					for(var l = i; l < levels.length; l++){
+						assert.equal(entities.decodeStrict("&" + e, l), doc[e]);
+					}
+				});
+			});
+		});
+
+		describe("Encode", function(){
+			it(levels[i], function(){
+				Object.keys(doc).forEach(function(e){
+					if(e.substr(-1) !== ";") return;
+					for(var l = i; l < levels.length; l++){
+						assert.equal(entities.decode(entities.encode(doc[e], l), l), doc[e]);
+					}
+				});
+			});
+		});
+	});
+});
+
+var astral = {
+	"1D306": "\uD834\uDF06",
+	"1D11E": "\uD834\uDD1E"
+};
+
+describe("Astral entities", function(){
+	Object.keys(astral).forEach(function(c){
+		/*it("should decode " + astral[c], function(){
+			assert.equal(entities.decode("&#x" + c + ";"), astral[c]);
+		});*/
+		it("should encode " + astral[c], function(){
+			assert.equal(entities.encode(astral[c]), "&#x" + c + ";");
+		});
+	});
+});