Merge branch 'master' of github.com:lihaoyi/cask

cask/src/cask/endpoints/WebEndpoints.scala

@@ -44,6 +44,9 @@ class delete(val path: String, override val subpath: Boolean = false) extends We
   val methods = Seq("delete")
 }
 class route(val path: String, val methods: Seq[String], override val subpath: Boolean = false) extends WebEndpoint
+class options(val path: String, override val subpath: Boolean = false) extends WebEndpoint{
+  val methods = Seq("options")
+}
 
 abstract class QueryParamReader[T]
   extends ArgReader[Seq[String], T, cask.model.Request]{

cask/src/cask/package.scala

@@ -35,6 +35,7 @@ package object cask {
   type postJson = endpoints.postJson
   type getJson = endpoints.getJson
   type postForm = endpoints.postForm
+  type options = endpoints.options
 
   // main
   type MainRoutes = main.MainRoutes

example/httpMethods/app/src/HttpMethods.scala

@@ -16,5 +16,11 @@ object HttpMethods extends cask.MainRoutes{
     "security_by_obscurity"
   }
 
+  @cask.route("/api", methods = Seq("options"))
+  def cors(request: cask.Request) = {
+    "allow_cors"
+  }
+
+
   initialize()
 }

example/httpMethods/app/test/src/ExampleTests.scala

@@ -23,6 +23,7 @@ object ExampleTests extends TestSuite{
       requests.put(s"$host/login", check = false).statusCode ==> 405
       requests.delete(s"$host/session").text() ==> "delete_the_session"
       requests.get.copy(verb="secretmethod")(s"$host/session").text() ==> "security_by_obscurity"
+      requests.options(s"$host/api").text() ==> "allow_cors"
     }
   }
 }

readme.md

@@ -49,6 +49,7 @@ courtesy of EJ Technologies
 ### 0.7.13
 
 - Update Castor to 0.1.8
+- Add `@cask.options` decorator
 
 ### 0.7.11