Fix filter for directories. Update Node Modules to newer versions.

lib/apidoc.js

@@ -227,7 +227,7 @@ function createOutputFiles(parsedFiles, parsedFilenames, packageInfos)
 	if( ! options.simulate) wrench.mkdirSyncRecursive(options.dest);
 
 	app.debug("copy template " + options.template + " to: " + options.dest);
-	if( ! options.simulate) wrench.copyDirSyncRecursive(options.template, options.dest);
+	if( ! options.simulate) wrench.copyDirSyncRecursive(options.template, options.dest, { forceDelete: true });
 
 	// api_data
 	var json = JSON.stringify(blocks, null, 2);

lib/utils/find_files.js

@@ -1,3 +1,5 @@
+var fs = require("fs");
+var path = require("path");
 var wrench = require("wrench");
 
 /**
@@ -27,6 +29,10 @@ function findFiles(options)
 		// RegExp Include Filter
 		var length = regExpIncludeFilters.length;
 		files = files.filter(function(filename) {
+			// Not include Directories like "dirname.js"
+			var fullFilename = path.join(options.src, filename);
+			if(fs.statSync(fullFilename).isDirectory()) return 0;
+			// Apply every filter
 			for(var i = 0; i < length; i += 1)
 			{
 				if(regExpIncludeFilters[i].test(filename)) return 1;
@@ -45,6 +51,7 @@ function findFiles(options)
 		// RegExp Exclude Filter
 		length = regExpExcludeFilters.length;
 		files = files.filter(function(filename) {
+		// Apply every filter
 			for(var i = 0; i < length; i += 1)
 			{
 				if(regExpExcludeFilters[i].test(filename)) return 0;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "apidoc",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "RESTful web API Documentation Generator",
   "author": "Peter Rottmann <[email protected]>",
   "license": "MIT",
@@ -22,18 +22,18 @@
     "node": ">= 0.8.0"
   },
   "dependencies": {
-    "wrench": "~1.4.4",
+    "wrench": "~1.5.1",
     "underscore": "~1.4.4",
     "semver": "~1.1.4",
-    "lodash": "~1.1.1",
+    "lodash": "~1.2.0",
     "node-markdown": "~0.1.1",
-    "optimist": "~0.3.7",
+    "optimist": "~0.5.0",
     "colors": "~0.6.0-1"
   },
   "devDependencies": {
     "grunt": "~0.4.1",
     "grunt-contrib-clean": "~0.4.1",
-    "grunt-contrib-jshint": "~0.4.3",
+    "grunt-contrib-jshint": "~0.5.4",
     "grunt-simple-mocha": "~0.4.0",
     "should": "~1.2.2"
   }

test/apidoc_test.js

@@ -49,6 +49,7 @@ describe("apiDoc", function() {
 	// compare
 	it("case 1: created files should equal to fixtures", function(done) {
 		var timeRegExp = /"time"\:\s"(.*)"/g;
+		var versionRegExp = /"version"\:\s"(.*)"/g;
 		var slashesRegExp = /\\\\/g;
 		fixtureFiles.forEach(function(name) {
 			var fixtureContent = fs.readFileSync("test/fixtures/" + name, "utf8");
@@ -58,10 +59,14 @@ describe("apiDoc", function() {
 			fixtureContent = fixtureContent.replace(/\r\n/g, "\n");
 			createdContent = createdContent.replace(/\r\n/g, "\n");
 
-			// creation time remove.
+			// creation time remove (never equal)
 			fixtureContent = fixtureContent.replace(timeRegExp, "");
 			createdContent = createdContent.replace(timeRegExp, "");
 
+			// creation time remove (or fixtures must be updated every time the version change)
+			fixtureContent = fixtureContent.replace(versionRegExp, "");
+			createdContent = createdContent.replace(versionRegExp, "");
+
 			// windows path \\ to /
 			fixtureContent = fixtureContent.replace(slashesRegExp, "/");
 			createdContent = createdContent.replace(slashesRegExp, "/");