0.4.0

com-lihaoyi · Dec 18, 2019 · e5862ee · e5862ee
1 parent 91783e1
commit e5862ee
Show file tree

Hide file tree

Showing 29 changed files with 41 additions and 44 deletions.
diff --git a/build.sc b/build.sc
@@ -49,7 +49,7 @@ object cask extends CaskModule {
   def ivyDeps = Agg(
     ivy"org.scala-lang:scala-reflect:${scalaVersion()}",
     ivy"io.undertow:undertow-core:2.0.13.Final",
-    ivy"com.lihaoyi::upickle:0.8.0"
+    ivy"com.lihaoyi::upickle:0.9.0"
   )
   def compileIvyDeps = Agg(ivy"com.lihaoyi::acyclic:0.2.0")
   def scalacOptions = Seq("-P:acyclic:force")
@@ -68,7 +68,8 @@ object cask extends CaskModule {
       )
       def ivyDeps = Agg(
         ivy"com.lihaoyi::sourcecode:0.1.8",
-        ivy"com.lihaoyi::pprint:0.5.5"
+        ivy"com.lihaoyi::pprint:0.5.5",
+        ivy"com.lihaoyi::geny:0.2.0"
       )
     }
 
@@ -94,7 +95,7 @@ object cask extends CaskModule {
     def testFrameworks = Seq("utest.runner.Framework")
     def ivyDeps = Agg(
       ivy"com.lihaoyi::utest::0.7.1",
-      ivy"com.lihaoyi::requests::0.2.0"
+      ivy"com.lihaoyi::requests::0.3.0"
     )
   }
 }

diff --git a/cask/src/cask/endpoints/JsonEndpoint.scala b/cask/src/cask/endpoints/JsonEndpoint.scala
@@ -72,7 +72,7 @@ class postJson(val path: String, override val subpath: Boolean = false)
         ))}
     } yield obj.toMap
     obj match{
-      case Left(r) => Result.Success(r.map(Response.Data.StringData))
+      case Left(r) => Result.Success(r.map(Response.Data.WritableData(_)))
       case Right(params) => delegate(params)
     }
   }

diff --git a/cask/src/cask/model/Response.scala b/cask/src/cask/model/Response.scala
@@ -50,21 +50,15 @@ object Response {
     implicit class UnitData(s: Unit) extends Data{
       def write(out: OutputStream) = ()
     }
-    implicit class StringData(s: String) extends Data{
-      def write(out: OutputStream) = out.write(s.getBytes)
+    implicit class WritableData[T](s: T)(implicit f: T => geny.Writable) extends Data{
+      def write(out: OutputStream) = f(s).writeBytesTo(out)
     }
     implicit class NumericData[T: Numeric](s: T) extends Data{
       def write(out: OutputStream) = out.write(s.toString.getBytes)
     }
     implicit class BooleanData(s: Boolean) extends Data{
       def write(out: OutputStream) = out.write(s.toString.getBytes)
     }
-    implicit class BytesData(b: Array[Byte]) extends Data{
-      def write(out: OutputStream) = out.write(b)
-    }
-    implicit class StreamData(b: InputStream) extends Data{
-      def write(out: OutputStream) = Util.transferTo(b, out)
-    }
   }
 }
 

diff --git a/docs/pages/1 - Cask: a Scala HTTP micro-framework.md b/docs/pages/1 - Cask: a Scala HTTP micro-framework.md
@@ -222,7 +222,7 @@ the relevant headers or status code for you.
 Cask doesn't come bundled with HTML templating functionality, but it makes it
 really easy to use community-standard libraries like
 [Scalatags](https://github.com/lihaoyi/scalatags) to render your HTML. Simply
-adding the relevant `ivy"com.lihaoyi::scalatags:0.7.0"` dependency to your
+adding the relevant `ivy"com.lihaoyi::scalatags:0.8.0"` dependency to your
 `build.sc` file is enough to render Scalatags templates:
 
 $$$scalatags

diff --git a/example/compress/build.sc b/example/compress/build.sc
@@ -11,7 +11,7 @@ trait AppModule extends ScalaModule{
 
     def ivyDeps = Agg(
       ivy"com.lihaoyi::utest::0.7.1",
-      ivy"com.lihaoyi::requests::0.2.0",
+      ivy"com.lihaoyi::requests::0.3.0",
     )
   }
 }
diff --git a/example/compress2/build.sc b/example/compress2/build.sc
@@ -10,7 +10,7 @@ trait AppModule extends ScalaModule{
 
     def ivyDeps = Agg(
       ivy"com.lihaoyi::utest::0.7.1",
-      ivy"com.lihaoyi::requests::0.2.0",
+      ivy"com.lihaoyi::requests::0.3.0",
     )
   }
 }
diff --git a/example/compress3/build.sc b/example/compress3/build.sc
@@ -10,7 +10,7 @@ trait AppModule extends ScalaModule{
 
     def ivyDeps = Agg(
       ivy"com.lihaoyi::utest::0.7.1",
-      ivy"com.lihaoyi::requests::0.2.0",
+      ivy"com.lihaoyi::requests::0.3.0",
     )
   }
 }
diff --git a/example/cookies/build.sc b/example/cookies/build.sc
@@ -10,7 +10,7 @@ trait AppModule extends ScalaModule{
 
     def ivyDeps = Agg(
       ivy"com.lihaoyi::utest::0.7.1",
-      ivy"com.lihaoyi::requests::0.2.0",
+      ivy"com.lihaoyi::requests::0.3.0",
     )
   }
 }
diff --git a/example/decorated/build.sc b/example/decorated/build.sc
@@ -10,7 +10,7 @@ trait AppModule extends ScalaModule{
 
     def ivyDeps = Agg(
       ivy"com.lihaoyi::utest::0.7.1",
-      ivy"com.lihaoyi::requests::0.2.0",
+      ivy"com.lihaoyi::requests::0.3.0",
     )
   }
 }
diff --git a/example/decorated2/build.sc b/example/decorated2/build.sc
@@ -10,7 +10,7 @@ trait AppModule extends ScalaModule{
 
     def ivyDeps = Agg(
       ivy"com.lihaoyi::utest::0.7.1",
-      ivy"com.lihaoyi::requests::0.2.0",
+      ivy"com.lihaoyi::requests::0.3.0",
     )
   }
 }
diff --git a/example/endpoints/build.sc b/example/endpoints/build.sc
@@ -10,7 +10,7 @@ trait AppModule extends ScalaModule{
 
     def ivyDeps = Agg(
       ivy"com.lihaoyi::utest::0.7.1",
-      ivy"com.lihaoyi::requests::0.2.0",
+      ivy"com.lihaoyi::requests::0.3.0",
     )
   }
 }
diff --git a/example/formJsonPost/build.sc b/example/formJsonPost/build.sc
@@ -10,7 +10,7 @@ trait AppModule extends ScalaModule{
 
     def ivyDeps = Agg(
       ivy"com.lihaoyi::utest::0.7.1",
-      ivy"com.lihaoyi::requests::0.2.0",
+      ivy"com.lihaoyi::requests::0.3.0",
     )
   }
 }
diff --git a/example/httpMethods/build.sc b/example/httpMethods/build.sc
@@ -10,7 +10,7 @@ trait AppModule extends ScalaModule{
 
     def ivyDeps = Agg(
       ivy"com.lihaoyi::utest::0.7.1",
-      ivy"com.lihaoyi::requests::0.2.0",
+      ivy"com.lihaoyi::requests::0.3.0",
     )
   }
 }
diff --git a/example/minimalApplication/build.sc b/example/minimalApplication/build.sc
@@ -10,7 +10,7 @@ trait AppModule extends ScalaModule{
 
     def ivyDeps = Agg(
       ivy"com.lihaoyi::utest::0.7.1",
-      ivy"com.lihaoyi::requests::0.2.0",
+      ivy"com.lihaoyi::requests::0.3.0",
     )
   }
 }
diff --git a/example/minimalApplication2/build.sc b/example/minimalApplication2/build.sc
@@ -10,7 +10,7 @@ trait AppModule extends ScalaModule{
 
     def ivyDeps = Agg(
       ivy"com.lihaoyi::utest::0.7.1",
-      ivy"com.lihaoyi::requests::0.2.0",
+      ivy"com.lihaoyi::requests::0.3.0",
     )
   }
 }
diff --git a/example/redirectAbort/build.sc b/example/redirectAbort/build.sc
@@ -10,7 +10,7 @@ trait AppModule extends ScalaModule{
 
     def ivyDeps = Agg(
       ivy"com.lihaoyi::utest::0.7.1",
-      ivy"com.lihaoyi::requests::0.2.0",
+      ivy"com.lihaoyi::requests::0.3.0",
     )
   }
 }
diff --git a/example/scalatags/app/src/Scalatags.scala b/example/scalatags/app/src/Scalatags.scala
@@ -3,10 +3,12 @@ import scalatags.Text.all._
 object Scalatags extends cask.MainRoutes{
   @cask.get("/")
   def hello() = {
-    "<!doctype html>" + html(
-      body(
-        h1("Hello World"),
-        p("I am cow")
+    doctype("html")(
+      html(
+        body(
+          h1("Hello World"),
+          p("I am cow")
+        )
       )
     )
   }

diff --git a/example/scalatags/build.sc b/example/scalatags/build.sc
@@ -4,15 +4,15 @@ import mill._, scalalib._
 trait AppModule extends ScalaModule{
   def scalaVersion = "2.13.0"
   def ivyDeps = Agg[Dep](
-    ivy"com.lihaoyi::scalatags:0.7.0",
+    ivy"com.lihaoyi::scalatags:0.8.1",
   )
 
   object test extends Tests{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
       ivy"com.lihaoyi::utest::0.7.1",
-      ivy"com.lihaoyi::requests::0.2.0",
+      ivy"com.lihaoyi::requests::0.3.0",
     )
   }
 }
diff --git a/example/staticFiles/build.sc b/example/staticFiles/build.sc
@@ -12,7 +12,7 @@ trait AppModule extends ScalaModule{
 
     def ivyDeps = Agg(
       ivy"com.lihaoyi::utest::0.7.1",
-      ivy"com.lihaoyi::requests::0.2.0",
+      ivy"com.lihaoyi::requests::0.3.0",
     )
 
     def forkWorkingDir = build.millSourcePath

diff --git a/example/staticFiles2/build.sc b/example/staticFiles2/build.sc
@@ -12,7 +12,7 @@ trait AppModule extends ScalaModule{
 
     def ivyDeps = Agg(
       ivy"com.lihaoyi::utest::0.7.1",
-      ivy"com.lihaoyi::requests::0.2.0",
+      ivy"com.lihaoyi::requests::0.3.0",
     )
 
     def forkWorkingDir = build.millSourcePath

diff --git a/example/todo/build.sc b/example/todo/build.sc
@@ -6,15 +6,15 @@ trait AppModule extends ScalaModule{
   def ivyDeps = Agg[Dep](
     ivy"org.xerial:sqlite-jdbc:3.18.0",
     ivy"io.getquill::quill-jdbc:3.4.10",
-    ivy"com.lihaoyi::scalatags:0.7.0",
+    ivy"com.lihaoyi::scalatags:0.8.1",
   )
 
   object test extends Tests{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
       ivy"com.lihaoyi::utest::0.7.1",
-      ivy"com.lihaoyi::requests::0.2.0",
+      ivy"com.lihaoyi::requests::0.3.0",
     )
   }
 }
diff --git a/example/todoApi/build.sc b/example/todoApi/build.sc
@@ -10,7 +10,7 @@ trait AppModule extends ScalaModule{
 
     def ivyDeps = Agg(
       ivy"com.lihaoyi::utest::0.7.1",
-      ivy"com.lihaoyi::requests::0.2.0",
+      ivy"com.lihaoyi::requests::0.3.0",
     )
   }
 }
diff --git a/example/todoDb/build.sc b/example/todoDb/build.sc
@@ -13,7 +13,7 @@ trait AppModule extends ScalaModule{
 
     def ivyDeps = Agg(
       ivy"com.lihaoyi::utest::0.7.1",
-      ivy"com.lihaoyi::requests::0.2.0",
+      ivy"com.lihaoyi::requests::0.3.0",
     )
   }
 }
diff --git a/example/twirl/build.sc b/example/twirl/build.sc
@@ -7,7 +7,7 @@ trait AppModule extends ScalaModule with mill.twirllib.TwirlModule{
 
   def generatedSources = T{ Seq(compileTwirl().classes) }
   def ivyDeps = Agg[Dep](
-    ivy"com.lihaoyi::scalatags:0.7.0",
+    ivy"com.lihaoyi::scalatags:0.8.1",
     ivy"com.typesafe.play::twirl-api:${twirlVersion()}",
   )
 
@@ -16,7 +16,7 @@ trait AppModule extends ScalaModule with mill.twirllib.TwirlModule{
 
     def ivyDeps = Agg(
       ivy"com.lihaoyi::utest::0.7.1",
-      ivy"com.lihaoyi::requests::0.2.0",
+      ivy"com.lihaoyi::requests::0.3.0",
     )
   }
 }
diff --git a/example/variableRoutes/build.sc b/example/variableRoutes/build.sc
@@ -10,7 +10,7 @@ trait AppModule extends ScalaModule{
 
     def ivyDeps = Agg(
       ivy"com.lihaoyi::utest::0.7.1",
-      ivy"com.lihaoyi::requests::0.2.0",
+      ivy"com.lihaoyi::requests::0.3.0",
     )
   }
 }
diff --git a/example/websockets/build.sc b/example/websockets/build.sc
@@ -10,7 +10,7 @@ trait AppModule extends ScalaModule{
 
     def ivyDeps = Agg(
       ivy"com.lihaoyi::utest::0.7.1",
-      ivy"com.lihaoyi::requests::0.2.0",
+      ivy"com.lihaoyi::requests::0.3.0",
       ivy"org.asynchttpclient:async-http-client:2.5.2"
     )
   }

diff --git a/example/websockets2/build.sc b/example/websockets2/build.sc
@@ -10,7 +10,7 @@ trait AppModule extends ScalaModule{
 
     def ivyDeps = Agg(
       ivy"com.lihaoyi::utest::0.7.1",
-      ivy"com.lihaoyi::requests::0.2.0",
+      ivy"com.lihaoyi::requests::0.3.0",
       ivy"org.asynchttpclient:async-http-client:2.5.2"
     )
   }

diff --git a/example/websockets3/build.sc b/example/websockets3/build.sc
@@ -10,7 +10,7 @@ trait AppModule extends ScalaModule{
 
     def ivyDeps = Agg(
       ivy"com.lihaoyi::utest::0.7.1",
-      ivy"com.lihaoyi::requests::0.2.0",
+      ivy"com.lihaoyi::requests::0.3.0",
       ivy"org.asynchttpclient:async-http-client:2.5.2"
     )
   }

diff --git a/example/websockets4/build.sc b/example/websockets4/build.sc
@@ -10,7 +10,7 @@ trait AppModule extends ScalaModule{
 
     def ivyDeps = Agg(
       ivy"com.lihaoyi::utest::0.7.1",
-      ivy"com.lihaoyi::requests::0.2.0",
+      ivy"com.lihaoyi::requests::0.3.0",
       ivy"org.asynchttpclient:async-http-client:2.5.2"
     )
   }