Cleanup and updated unit tests.

Author: bryce-anderson

Diff for: servlet_macros/src/main/scala/jaxed/servlet/Model.scala

@@ -1,6 +1,5 @@
 package jaxed.servlet
 
-import jaxed.{SinatraPathPatternParser, PathPattern}
 
 /**
  * @author Bryce Anderson

Diff for: servlet_macros/src/main/scala/jaxed/servlet/PathBuilder.scala

@@ -30,7 +30,7 @@ class RouteNode(path: String = "") extends Route with Filter with PathBuilder {
 
   protected val routes = new MutableList[Route]()
 
-  protected def runLeaves(context: ServletReqContext): Option[Any] = {
+  protected def searchLeaves(context: ServletReqContext): Option[Any] = {
     pathPattern(context.path).flatMap{ case (params, subPath) =>
       val subcontext = context.subPath(subPath, params)
       def searchList(it: Iterator[Route]): Option[Any] = {
@@ -47,7 +47,7 @@ class RouteNode(path: String = "") extends Route with Filter with PathBuilder {
   }
 
   override def handle(context: ServletReqContext): Option[Any] = {
-    val result = beforeFilter(context) orElse runLeaves(context)
+    val result = beforeFilter(context) orElse searchLeaves(context)
     afterFilter(context, result)
   }
 

Diff for: servlet_macros/src/main/scala/jaxed/servlet/RouteNode.scala

@@ -1,11 +1,12 @@
-package jaxed
+package jaxed.servlet
 
 /*
 This was lifted nearly entirely from the Scalatra project: pathPatternParsers.scala
  */
 
 import scala.util.matching.Regex
 import scala.util.parsing.combinator.RegexParsers
+import jaxed._
 
 /**
  * A path pattern optionally matches a request path and extracts path

Diff for: base/src/main/scala/jaxed/URLRouting.scala renamed to servlet_macros/src/main/scala/jaxed/servlet/URLRouting.scala

@@ -1,10 +1,9 @@
 package jaxed
-package servletmacros
+package servlet
 
 import org.specs2.mutable.Specification
 import javax.servlet.http.{HttpServletResponse, HttpServletRequest}
 import javax.ws.rs.GET
-import jaxed.servlet.{RouteNode, DoneResult}
 
 /**
  * @author Bryce Anderson
@@ -13,19 +12,19 @@ import jaxed.servlet.{RouteNode, DoneResult}
 
 class ServletReqContextSpec extends Specification {
 
-  class MockNode extends RouteNode with MockRenderer
+  class MockNode extends RouteNode
 
   "Servlet Macros" should {
-    val mocContext = ServletReqContext("/foo/bar", Get, Map("one" -> "two"), null, null)
+    val mocContext = new ServletReqContext("/foo/bar", Get, Map("one" -> "two"), null, null)
     "Run a route" in {
       class Test {
         @GET
         def getHello() = "Hello"
       }
 
        val node = new MockNode()
-       node.mapClass[Test]("foo/bar")
-      node.handle(mocContext) must_== Some(DoneResult("Hello"))
+       node.mapClass[Test]("/foo/bar")
+      node.handle(mocContext) must_== Some("Hello")
     }
 
     "Add a request" in {
@@ -35,8 +34,8 @@ class ServletReqContextSpec extends Specification {
       }
 
       val node = new MockNode()
-      node.mapClass[Test]("foo/bar")
-      node.handle(mocContext) must_== Some(DoneResult("Hello"))
+      node.mapClass[Test]("/foo/bar")
+      node.handle(mocContext) must_== Some("Hello")
     }
 
     "Add a response" in {
@@ -46,8 +45,8 @@ class ServletReqContextSpec extends Specification {
       }
 
       val node = new MockNode()
-      node.mapClass[Test]("foo/bar")
-      node.handle(mocContext) must_== Some(DoneResult("Hello"))
+      node.mapClass[Test]("/foo/bar")
+      node.handle(mocContext) must_== Some("Hello")
     }
   }