Handle special characters in paths: .$+()

src/main/scala/com/thinkminimo/step/StepKernel.scala

@@ -54,12 +54,15 @@ trait StepKernel
       var names = new ListBuffer[String]
       var pos = 0
       var regex = new StringBuffer("^")
-      """:\w+|\*""".r.findAllIn(path).matchData foreach { md =>
+      val specialCharacters = List('.', '+', '(', ')')
+      """:\w+|[\*\.\+\(\)\$]""".r.findAllIn(path).matchData foreach { md =>
         regex.append(path.substring(pos, md.start))
         md.toString match {
           case "*" =>
             names += ":splat"
             regex.append("(.*?)")
+          case "." | "+" | "(" | ")" | "$" =>
+            regex.append("\\").append(md.toString)
           case x =>
             names += x
             regex.append("([^/?]+)")

src/test/scala/com/thinkminimo/step/RouteTest.scala

@@ -25,6 +25,30 @@ class RouteTestServlet extends Step {
   get("/mix-named-and-splat-params/:foo/*") {
     params(":foo")+":"+params(":splat")
   }
+
+  get("/dot-in-named-param/:foo/:bar") {
+    params(":foo")
+  }
+
+  get("/dot-outside-named-param/:file.:ext") {
+    List(":file", ":ext") foreach { x => response.setHeader(x, params(x)) }
+  }
+
+  get("/literal.dot.in.path") {
+    "matched literal dot"
+  }
+
+  get("/test$") {
+    "test$"
+  }
+
+  get("/te+st") {
+    "te+st"
+  }
+
+  get("/test(bar)") {
+    "test(bar)"
+  }
 }
 
 class RouteTest extends StepSuite with ShouldMatchers {
@@ -72,4 +96,40 @@ class RouteTest extends StepSuite with ShouldMatchers {
     }
   }
 
+  test("matches a dot ('.') as part of a named param") {
+    get("/dot-in-named-param/user@example.com/name") {
+      body should equal("user@example.com")
+    }
+  }
+
+  test("matches a literal dot ('.') outside of named params") {
+    get("/dot-outside-named-param/pony.jpg") {
+      header("file") should equal ("pony")
+      header("ext") should equal ("jpg")
+    }
+  }
+
+  test("literally matches . in paths") {
+    get("/literal.dot.in.path") {
+      body should equal("matched literal dot")
+    }
+  }
+
+  test("literally matches $ in paths") {
+    get("/test$") {
+      body should equal ("test$")
+    }
+  }
+
+  test("literally matches + in paths") {
+    get("/te+st") {
+      body should equal ("te+st")
+    }
+  }
+
+  test("literally matches () in paths") {
+    get("/test(bar)") {
+      body should equal ("test(bar)")
+    }
+  }
 }