Start with some tests!

Author: SpaceK33z

.eslintrc

@@ -1,6 +1,7 @@
 {
     "env": {
-        "node": true
+        "node": true,
+        "mocha": true
     },
     "rules": {
         "indent": [2, "tab", { "SwitchCase": 1 }],

lib/GetFilenameFromUrl.js

@@ -0,0 +1,21 @@
+var pathJoin = require("./PathJoin");
+
+function getFilenameFromUrl(publicPath, outputPath, url) {
+	// publicPrefix is the folder our bundle should be in
+	var localPrefix = publicPath || "/";
+	if(url.indexOf(localPrefix) !== 0) {
+		if(/^(https?:)?\/\//.test(localPrefix)) {
+			localPrefix = "/" + localPrefix.replace(/^(https?:)?\/\/[^\/]+\//, "");
+			// fast exit if another directory requested
+			if(url.indexOf(localPrefix) !== 0) return false;
+		} else return false;
+	}
+	// get filename from request
+	var filename = url.substr(localPrefix.length);
+	if(filename.indexOf("?") >= 0) {
+		filename = filename.substr(0, filename.indexOf("?"));
+	}
+	return filename ? pathJoin(outputPath, filename) : outputPath;
+}
+
+module.exports = getFilenameFromUrl;

lib/PathJoin.js

@@ -0,0 +1,5 @@
+function pathJoin(a, b) {
+	return a == "/" ? "/" + b : (a || "") + "/" + b;
+}
+
+module.exports = pathJoin;

middleware.js

@@ -5,6 +5,8 @@
 var MemoryFileSystem = require("memory-fs");
 var mime = require("mime");
 var parseRange = require("range-parser");
+var getFilenameFromUrl = require("./lib/GetFilenameFromUrl");
+var pathJoin = require("./lib/PathJoin");
 
 var HASH_REGEXP = /[0-9a-f]{10,}/;
 
@@ -146,28 +148,6 @@ module.exports = function(compiler, options) {
 		}
 	}
 
-	function pathJoin(a, b) {
-		return a == "/" ? "/" + b : (a || "") + "/" + b;
-	}
-
-	function getFilenameFromUrl(url) {
-		// publicPrefix is the folder our bundle should be in
-		var localPrefix = options.publicPath || "/";
-		if(url.indexOf(localPrefix) !== 0) {
-			if(/^(https?:)?\/\//.test(localPrefix)) {
-				localPrefix = "/" + localPrefix.replace(/^(https?:)?\/\/[^\/]+\//, "");
-				// fast exit if another directory requested
-				if(url.indexOf(localPrefix) !== 0) return false;
-			} else return false;
-		}
-		// get filename from request
-		var filename = url.substr(localPrefix.length);
-		if(filename.indexOf("?") >= 0) {
-			filename = filename.substr(0, filename.indexOf("?"));
-		}
-		return filename ? pathJoin(compiler.outputPath, filename) : compiler.outputPath;
-	}
-
 	function handleRangeHeaders(content, req, res) {
 		res.setHeader('Accept-Ranges', 'bytes');
 		if(req.headers.range) {
@@ -210,7 +190,7 @@ module.exports = function(compiler, options) {
 			return goNext();
 		}
 
-		var filename = getFilenameFromUrl(req.url);
+		var filename = getFilenameFromUrl(options.publicPath, compiler.outputPath, req.url);
 		if(filename === false) return goNext();
 
 		// in lazy mode, rebuild on bundle request
@@ -261,7 +241,7 @@ module.exports = function(compiler, options) {
 		}
 	}
 
-	webpackDevMiddleware.getFilenameFromUrl = getFilenameFromUrl;
+	webpackDevMiddleware.getFilenameFromUrl = getFilenameFromUrl.bind(this, options.publicPath, compiler.outputPath);
 
 	webpackDevMiddleware.waitUntilValid = function(callback) {
 		callback = callback || function() {};

package.json

@@ -12,7 +12,9 @@
     "range-parser": "^1.0.3"
   },
   "devDependencies": {
-    "eslint": "^3.4.0"
+    "eslint": "^3.4.0",
+    "mocha": "^3.0.2",
+    "should": "^11.1.0"
   },
   "license": "MIT",
   "engines": {
@@ -24,9 +26,15 @@
     "type": "git",
     "url": "https://github.com/webpack/webpack-dev-middleware.git"
   },
+  "files": [
+    "middleware.js",
+    "lib/"
+  ],
   "scripts": {
-    "lint": "eslint *.js",
+    "lint": "eslint *.js test",
+    "pretest": "npm run -s lint",
+    "test": "mocha --harmony --full-trace --check-leaks",
     "beautify": "npm run lint -- --fix",
-    "travis": "npm run lint && node middleware.js"
+    "travis": "npm test && node middleware.js"
   }
 }

test/GetFilenameFromUrl.test.js

@@ -0,0 +1,61 @@
+var should = require("should");
+var getFilenameFromUrl = require("../lib/GetFilenameFromUrl");
+
+function testUrl(options) {
+	var url = getFilenameFromUrl(options.publicPath, options.outputPath, options.url);
+	should.strictEqual(url, options.expected);
+}
+
+describe("GetFilenameFromUrl", function() {
+	it("should handle urls", function() {
+		var results = [
+			{
+				url: "/foo.js",
+				outputPath: "/",
+				publicPath: "/",
+				expected: "/foo.js"
+			}, {
+				url: "/0.19dc5d417382d73dd190.hot-update.js",
+				outputPath: "/",
+				publicPath: "http://localhost:8080/",
+				expected: "/0.19dc5d417382d73dd190.hot-update.js"
+			}, {
+				url: "/bar.js",
+				outputPath: "/",
+				publicPath: "https://localhost:8080/",
+				expected: "/bar.js"
+			}, {
+				url: "/test.html?foo=bar",
+				outputPath: "/",
+				publicPath: "/",
+				expected: "/test.html",
+			}, {
+				url: "/a.js",
+				outputPath: "/dist",
+				publicPath: "/",
+				expected: "/dist/a.js",
+			}, {
+				url: "/b.js",
+				outputPath: "/",
+				publicPath: undefined,
+				expected: "/b.js",
+			}, {
+				url: "/b.js",
+				outputPath: undefined,
+				publicPath: undefined,
+				expected: "/b.js",
+			}, {
+				url: "/more/complex/path.js",
+				outputPath: "/a",
+				publicPath: "/",
+				expected: "/a/more/complex/path.js",
+			}, {
+				url: "c.js",
+				outputPath: "/dist",
+				publicPath: "/",
+				expected: false, // publicPath is not in url, so it should fail
+			}
+		];
+		results.forEach(testUrl);
+	});
+});