Refactored path variable substitution - fixes #78

src/utilities/VariableProcessor.js

@@ -14,9 +14,6 @@ var VariableProcessor = jsface.Class({
 	$statics: {
 		ENV_REGEX: /\{\{([a-z0-9\-._]+)\}\}/ig,
 
-		// negative match for 4 digit numbers to weed out port number matches
-		PATH_REGEX: /\:(?![0-9]{4})+(([a-z0-9\-._]+))/,
-
 		FUNCTION_REGEX: /\{\{\$([a-z0-9\-._]+)\}\}/ig
 	},
 
@@ -30,8 +27,13 @@ var VariableProcessor = jsface.Class({
 	// updates request url by the replacing it with pathVariables
 	_processPathVariable: function(request) {
 		if (typeof request.pathVariables !== undefined) {
-			request.url = this._findReplace(request.url, request.pathVariables, this.PATH_REGEX);
-		}
+            var sourceObject = request.pathVariables;
+            // for each path variable - do a simple find replace
+            _und.each(_und.keys(sourceObject), function(key) {
+                var s = request.url;
+                request.url = s.replace(":" + key, sourceObject[key]);
+            }, this);
+        }
 	},
 
 	// updates request properties by the replacing them with function variables

tests/utilities/VariableProcessor.js

@@ -104,15 +104,24 @@ describe("Variable Processor", function() {
 
 	it("should replace available path variables correctly", function() {
 		var sampleReq = this.collectionJson.requests[0];
+        var anotherSample = this.collectionJson.requests[1];
 
-		sampleReq.url = "http://localhost:3000/blog/:user/posts/:post_id";
-		sampleReq.pathVariables = {user: "foo", post_id: 10};
+		sampleReq.url = "http://localhost:3000/blog/:user/posts/";
+		sampleReq.pathVariables = {user: "foo"};
+
+        anotherSample.url = "http://localhost:26069/values/one:two@three:four/resource/pathone/pathtwo/pathlast";
+        anotherSample.pathVariables = {};
 
 		VariableProcessor.processRequestVariables(sampleReq, {
 			envJson: this.environmentJson
 		});
 
-		assert.equal(sampleReq.transformed.url, "http://localhost:3000/blog/foo/posts/10");
+		VariableProcessor.processRequestVariables(anotherSample, {
+			envJson: this.environmentJson
+		});
+
+		assert.equal(sampleReq.transformed.url, "http://localhost:3000/blog/foo/posts/");
+		assert.equal(anotherSample.transformed.url, "http://localhost:26069/values/one:two@three:four/resource/pathone/pathtwo/pathlast");
 	});
 
 	it("should replace function variables correctly", function() {