makes route accept other deliminating tokens

Author: justinbmeyer

route/route.js

@@ -59,12 +59,13 @@ steal('can/observe', 'can/util/string/deparam', function() {
         // Extract the variable names and replace with `RegExp` that will match
 		// an atual URL with values.
 		var names = [],
-			test = url.replace(matcher, function( whole, name ) {
-				names.push(name)
+			test = url.replace(matcher, function( whole, name, i ) {
+				names.push(name);
+				var next = "\\"+( url.substr(i+whole.length,1) || "&" )
 				// a name without a default value HAS to have a value
 				// a name that has a default value can be empty
 				// The `\\` is for string-escaping giving single `\` for `RegExp` escaping.
-				return "([^\\/\\&]"+(defaults[name] ? "*" : "+")+")"
+				return "([^" +next+"]"+(defaults[name] ? "*" : "+")+")"
 			});
 
 		// Add route in a form that can be easily figured out.

route/route_test.js

@@ -407,3 +407,14 @@ test("param order matching", function(){
 	equals(res,"/task2")
 })
 
+test("dashes in routes", function(){
+	can.route.routes = {};
+	can.route(":foo-:bar");
+	
+	var obj = can.route.deparam("abc-def");
+	same(obj, {
+		foo : "abc",
+		bar : "def",
+		route: ":foo-:bar"
+	});
+})