Merge pull request #2 from mjackson/tweaks

Small Tweaks

Author: sokra

lib/MemoryFileSystem.js

@@ -40,7 +40,7 @@ MemoryFileSystem.prototype.statSync = function(_path) {
 	var current = this.data;
 	for(var i = 0; i < path.length - 1; i++) {
 		if(!isDir(current[path[i]]))
-			throw new Error("Path doesn't exists " + _path);
+			throw new Error("Path doesn't exist " + _path);
 		current = current[path[i]];
 	}
 	if(_path === "/" || isDir(current[path[i]])) {
@@ -64,22 +64,22 @@ MemoryFileSystem.prototype.statSync = function(_path) {
 			isSocket: falseFn
 		};
 	} else
-		throw new Error("Path doesn't exists " + _path);
+		throw new Error("Path doesn't exist " + _path);
 };
 
 MemoryFileSystem.prototype.readFileSync = function(_path, encoding) {
 	var path = pathToArray(_path);
 	var current = this.data;
 	for(var i = 0; i < path.length - 1; i++) {
 		if(!isDir(current[path[i]]))
-			throw new Error("Path doesn't exists " + _path);
+			throw new Error("Path doesn't exist " + _path);
 		current = current[path[i]];
 	}
 	if(!isFile(current[path[i]])) {
 		if(isDir(current[path[i]]))
 			throw new Error("Cannot readFile on directory " + _path);
 		else
-			throw new Error("File doesn't exists " + _path);
+			throw new Error("File doesn't exist " + _path);
 	}
 	current = current[path[i]];
 	return encoding ? current.toString(encoding) : current;
@@ -91,14 +91,14 @@ MemoryFileSystem.prototype.readdirSync = function(_path) {
 	var current = this.data;
 	for(var i = 0; i < path.length - 1; i++) {
 		if(!isDir(current[path[i]]))
-			throw new Error("Path doesn't exists " + _path);
+			throw new Error("Path doesn't exist " + _path);
 		current = current[path[i]];
 	}
 	if(!isDir(current[path[i]])) {
 		if(isFile(current[path[i]]))
 			throw new Error("Cannot readdir on file " + _path);
 		else
-			throw new Error("File doesn't exists " + _path);
+			throw new Error("File doesn't exist " + _path);
 	}
 	return Object.keys(current[path[i]]).filter(Boolean);
 };
@@ -123,7 +123,7 @@ MemoryFileSystem.prototype.mkdirSync = function(_path) {
 	var current = this.data;
 	for(var i = 0; i < path.length - 1; i++) {
 		if(!isDir(current[path[i]]))
-			throw new Error("Path doesn't exists " + _path);
+			throw new Error("Path doesn't exist " + _path);
 		current = current[path[i]];
 	}
 	if(isDir(current[path[i]]))
@@ -140,7 +140,7 @@ MemoryFileSystem.prototype._remove = function(_path, name, testFn) {
 	var current = this.data;
 	for(var i = 0; i < path.length - 1; i++) {
 		if(!isDir(current[path[i]]))
-			throw new Error("Path doesn't exists " + _path);
+			throw new Error("Path doesn't exist " + _path);
 		current = current[path[i]];
 	}
 	if(!testFn(current[path[i]]))
@@ -164,7 +164,7 @@ MemoryFileSystem.prototype.writeFileSync = function(_path, content, encoding) {
 	var current = this.data;
 	for(var i = 0; i < path.length - 1; i++) {
 		if(!isDir(current[path[i]]))
-			throw new Error("Path doesn't exists " + _path);
+			throw new Error("Path doesn't exist " + _path);
 		current = current[path[i]];
 	}
 	if(isDir(current[path[i]]))
@@ -179,7 +179,7 @@ MemoryFileSystem.prototype.join = function(a, b) {
 	return a + "/" + b;
 };
 
-// sync functions
+// async functions
 
 ["stat", "readdir", "mkdirp", "mkdir", "rmdir", "unlink"].forEach(function(fn) {
 	MemoryFileSystem.prototype[fn] = function(path, callback) {
@@ -192,22 +192,20 @@ MemoryFileSystem.prototype.join = function(a, b) {
 	};
 });
 
-["readFile"].forEach(function(fn) {
-	MemoryFileSystem.prototype[fn] = function(path, optArg, callback) {
-		if(!callback) {
-			callback = optArg;
-			optArg = undefined;
-		}
-		try {
-			var result = this[fn + "Sync"](path, optArg);
-		} catch(e) {
-			return callback(e);
-		}
-		return callback(null, result);
-	};
-});
+MemoryFileSystem.prototype.readFile = function(path, optArg, callback) {
+	if(!callback) {
+		callback = optArg;
+		optArg = undefined;
+	}
+	try {
+		var result = this.readFileSync(path, optArg);
+	} catch(e) {
+		return callback(e);
+	}
+	return callback(null, result);
+};
 
-MemoryFileSystem.prototype.writeFile = function writeFile(path, content, encoding, callback) {
+MemoryFileSystem.prototype.writeFile = function (path, content, encoding, callback) {
 	if(!callback) {
 		callback = encoding;
 		encoding = undefined;