0.1.00.1.0

2 files changed, 18 insertions, 3 deletions

diff --git a/cask/src/cask/endpoints/StaticEndpoints.scala b/cask/src/cask/endpoints/StaticEndpoints.scala
index 726af21..1d66b2c 100644
--- a/cask/src/cask/endpoints/StaticEndpoints.scala
+++ b/cask/src/cask/endpoints/StaticEndpoints.scala
@@ -3,14 +3,29 @@ package cask.endpoints
 import cask.main.Endpoint
 import cask.model.ParamContext
 
-class static(val path: String) extends Endpoint{
+class staticFiles(val path: String) extends Endpoint{
   type Output = String
   val methods = Seq("get")
   type Input = Seq[String]
   type InputParser[T] = QueryParamReader[T]
   override def subpath = true
   def wrapFunction(ctx: ParamContext, delegate: Delegate): Returned = {
-    delegate(Map()).map(t => cask.model.Static(t + "/" + ctx.remaining.mkString("/")))
+    delegate(Map()).map(t => cask.model.StaticFile(t + "/" + ctx.remaining.mkString("/")))
+  }
+
+  def wrapPathSegment(s: String): Input = Seq(s)
+}
+
+class staticResources(val path: String, resourceRoot: ClassLoader = getClass.getClassLoader) extends Endpoint{
+  type Output = String
+  val methods = Seq("get")
+  type Input = Seq[String]
+  type InputParser[T] = QueryParamReader[T]
+  override def subpath = true
+  def wrapFunction(ctx: ParamContext, delegate: Delegate): Returned = {
+    delegate(Map()).map(t =>
+      cask.model.StaticResource(t + "/" + ctx.remaining.mkString("/"), resourceRoot)
+    )
   }
 
   def wrapPathSegment(s: String): Input = Seq(s)
diff --git a/cask/src/cask/endpoints/WebSocketEndpoint.scala b/cask/src/cask/endpoints/WebSocketEndpoint.scala
index a795afd..89c05b9 100644
--- a/cask/src/cask/endpoints/WebSocketEndpoint.scala
+++ b/cask/src/cask/endpoints/WebSocketEndpoint.scala
@@ -38,7 +38,7 @@ object WebsocketResult{
   implicit class Listener(val value: WebSocketConnectionCallback) extends WebsocketResult
 }
 
-class websocket(val path: String, subpath: Boolean = false) extends cask.main.BaseEndpoint{
+class websocket(val path: String, override val subpath: Boolean = false) extends cask.main.BaseEndpoint{
   type Output = WebsocketResult
   val methods = Seq("websocket")
   type Input = Seq[String]