Merge remote-tracking branch 'upstream/master'

Conflicts:
	package.json

Author: Kris Reeves

.travis.yml

@@ -1,5 +1,5 @@
 language: node_js
 node_js:
-  - 0.4
   - 0.6
-  - 0.7
+  - 0.8
+  - 0.9

lib/FeedHandler.js

@@ -79,7 +79,9 @@ FeedHandler.prototype.onend = function() {
 		}
 	}
 	this.dom = feed;
-	DomHandler.prototype._handleCallback.call(this);
+	DomHandler.prototype._handleCallback.call(
+		this, feedRoot ? null : Error("couldn't find root of feed")
+	);
 };
 
 module.exports = FeedHandler;

lib/Parser.js

@@ -4,7 +4,7 @@ function Parser(cbs, options){
 	this._options = options || defaultOpts;
 	this._cbs = cbs || defaultCbs;
 	this._buffer = "";
-	this._tagSep = "";
+	this._tagSep = ">";
 	this._stack = [];
 	this._wroteSpecial = false;
 	this._contentFlags = 0;
@@ -248,9 +248,9 @@ Parser.prototype._parseTags = function(force){
 			if(this._contentFlags !== 0){
 				this._writeSpecial(rawData, ">");
 			}
-			else if(rawData !== "" && this._cbs.ontext){
+			else if(this._cbs.ontext){
 				if(this._tagSep === ">") rawData += ">"; //it's the second > in a row
-				this._cbs.ontext(rawData);
+				if(rawData !== "") this._cbs.ontext(rawData);
 			}
 		}
 	}
@@ -266,6 +266,7 @@ Parser.prototype._writeCDATA = function(data){
 		}
 		this._contentFlags ^= SpecialTags[ElementType.CDATA];
 		if(this._cbs.oncdataend) this._cbs.oncdataend();
+		this._wroteSpecial = false;
     }
     else if(this._cbs.ontext) this._cbs.ontext(data + this._tagSep);
 };

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "htmlparser2",
 	"description": "Performance-optimized forgiving HTML/XML/RSS parser",
-	"version": "2.5.1",
+	"version": "2.5.2",
 	"author": "Felix Boehm <[email protected]>",
 	"keywords": ["html", "parser", "streams", "xml", "dom", "rss", "feed", "atom"],
 	"contributors": ["Chris Winberry <[email protected]>"],
@@ -29,4 +29,4 @@
 		"type": "MIT",
 		"url": "http://github.com/tautologistics/node-htmlparser/raw/master/LICENSE"
 	}]
-}
+}

tests/00-runtests.js

@@ -1,49 +1,49 @@
 var fs = require("fs"),
-	assert = require("assert");
+    path = require("path"),
+    assert = require("assert");
 
 var runCount = 0,
-	testCount = 0;
+	testCount = 0,
+	done = false;
+
+[
+ "./01-events.js",
+ "./02-stream.js",
+ "./03-feed.js"
+]
+.map(require)
+.forEach(function (test){
+	console.log("\nStarting", test.dir, "\n----");
+
+	var dir = path.resolve(__dirname, test.dir);
 
-function runTests(test){
 	//read files, load them, run them
-	fs.readdirSync(__dirname + test.dir
-	).map(function(file){
-		if(file[0] === ".") return false;
-		if(file.substr(-5) === ".json") return JSON.parse(
-			fs.readFileSync(__dirname + test.dir + file)
-		);
-		return require(__dirname + test.dir + file);
-	}).forEach(function(file){
-		if(!file) return;
-		var second = false;
-		
+	var f = fs
+	.readdirSync(dir)
+	.filter(RegExp.prototype.test, /^[^\._]/) //ignore all files with a leading dot or underscore
+	.map(function(name){
+		return path.resolve(dir, name);
+	})
+	.map(require)
+	.forEach(function(file){
 		runCount++;
 
 		console.log("Testing:", file.name);
 
+		var second = false; //every test runs twice
 		test.test(file, function(err, dom){
 			assert.ifError(err);
 			assert.deepEqual(file.expected, dom, "didn't get expected output");
 
 			if(second){
-				runCount--;
 				testCount++;
+				if(!--runCount && done){
+					console.log("Total tests:", testCount);
+				}
 			}
 			else second = true;
 		});
 	});
-	console.log("->", test.dir.slice(1, -1), "started");
-}
-
-//run all tests
-[
- "./02-feed.js",
- "./03-events.js",
- "./05-stream.js"
-].map(require).forEach(runTests);
+});
 
-//log the results
-(function check(){
-	if(runCount !== 0) return process.nextTick(check);
-	console.log("Total tests:", testCount);
-}());
+var done = true; //started all tests

tests/03-events.js renamed to tests/01-events.js

@@ -1,7 +1,7 @@
 var helper = require("./test-helper.js"),
 	sliceArr = Array.prototype.slice;
 
-exports.dir = "/Events/";
+exports.dir = "Events";
 
 exports.test = function(test, cb){
 	var tokens = [], cbs;

tests/05-stream.js renamed to tests/02-stream.js

@@ -3,7 +3,7 @@ var helper = require("./test-helper.js"),
 	sliceArr = Array.prototype.slice,
 	fs = require("fs");
 
-exports.dir = "/Stream/";
+exports.dir = "Stream";
 
 exports.test = function(test, cb){
 	var tokens = [],
@@ -26,7 +26,7 @@ exports.test = function(test, cb){
 					event: name,
 					data: sliceArr.apply(arguments)
 				});
-			}
+			};
 		}});
 	}
 	else {
@@ -41,12 +41,12 @@ exports.test = function(test, cb){
 			}
 		};
 		helper.EVENTS.forEach(function(name){
-			stream._events[name] = function(){
+			stream.on(name, function(){
 				tokens.push({
 					event: name,
 					data: sliceArr.apply(arguments)
 				});
-			}
+			});
 		});
 	}
 	fs.createReadStream(__dirname + test.file).pipe(stream);

tests/02-feed.js renamed to tests/03-feed.js

@@ -7,7 +7,7 @@ var helper = require("./test-helper.js"),
 		xmlMode: true
 	};
 
-exports.dir = "/Feeds/";
+exports.dir = "Feeds";
 
 exports.test = function(test, cb){
 	var handler = new FeedHandler(function(err, dom){

tests/Events/05-cdata-special.json

@@ -0,0 +1,97 @@
+{
+  "name": "CDATA",
+  "options": {
+    "handler": {},
+    "parser": {}
+  },
+  "html": "<script>/*<![CDATA[*/ asdf ><asdf></adsf><> fo/*]]>*/</script>",
+  "expected": [
+    {
+      "event": "opentagname",
+      "data": [
+        "script"
+      ]
+    },
+    {
+      "event": "opentag",
+      "data": [
+        "script",
+        {}
+      ]
+    },
+    {
+      "event": "text",
+      "data": [
+        "/*"
+      ]
+    },
+    {
+      "event": "cdatastart",
+      "data": []
+    },
+    {
+      "event": "text",
+      "data": [
+        "*/ asdf >"
+      ]
+    },
+    {
+      "event": "text",
+      "data": [
+        "<"
+      ]
+    },
+    {
+      "event": "text",
+      "data": [
+        "asdf>"
+      ]
+    },
+    {
+      "event": "text",
+      "data": [
+        "<"
+      ]
+    },
+    {
+      "event": "text",
+      "data": [
+        "/adsf>"
+      ]
+    },
+    {
+      "event": "text",
+      "data": [
+        "<"
+      ]
+    },
+    {
+      "event": "text",
+      "data": [
+        ">"
+      ]
+    },
+    {
+      "event": "text",
+      "data": [
+        " fo/*"
+      ]
+    },
+    {
+      "event": "cdataend",
+      "data": []
+    },
+    {
+      "event": "text",
+      "data": [
+        "*/"
+      ]
+    },
+    {
+      "event": "closetag",
+      "data": [
+        "script"
+      ]
+    }
+  ]
+}

tests/Events/06-leading-lt.json

@@ -0,0 +1,22 @@
+{
+  "name": "leading lt",
+  "options": {
+    "handler": {},
+    "parser": {}
+  },
+  "html": ">a>",
+  "expected": [
+    {
+      "event": "text",
+      "data": [
+        ">"
+      ]
+    },
+    {
+      "event": "text",
+      "data": [
+        "a>"
+      ]
+    }
+  ]
+}