Browse Source

Updated benchmark config. Updated scruffy version.

sksamuel 11 years ago
parent
commit
0723ce0dcc

+ 5 - 5
scruffy/benchmark_config

@@ -1,5 +1,5 @@
 {
-  "framework": "scruffy",
+  "framework": "Scruffy",
   "tests": [{
     "default": {
       "setup_file": "setup",
@@ -11,16 +11,16 @@
       "approach": "Realistic",
       "classification": "Micro",
       "database": "MongoDB",
-      "framework": "scruffy",
+      "framework": "Scruffy",
       "language": "Scala",
       "orm": "Raw",
-      "platform": "scruffy",
+      "platform": "Netty",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "scruffy",
+      "display_name": "Scruffy",
       "notes": "",
-      "versus": "servlet"
+      "versus": "Netty"
     }
   }]
 }

+ 2 - 2
scruffy/build.sbt

@@ -4,10 +4,10 @@ organization := "com.sksamuel.scruffy"
 
 scalaVersion := "2.11.0"
 
-version := "1.0"
+version := "1.0.1"
 
 libraryDependencies ++= Seq(
-    "com.sksamuel.scruffy" %% "scruffy-server" % "1.3.11",
+    "com.sksamuel.scruffy" %% "scruffy-server" % "1.4.14",
     "org.mongodb" %% "casbah-core" % "2.7.1"
 )
 

+ 2 - 2
scruffy/src/main/scala/scruffy/examples/Main.scala

@@ -7,7 +7,7 @@ object Main extends App {
 
   val port = 8080
   val scruffy = new Scruffy(ScruffyConfiguration.port(port))
-  scruffy.mount(new Test1Route)
-  scruffy.mount(new Test6Route)
+  scruffy.mount(new Test1Endpoint)
+  scruffy.mount(new Test6Endpoint)
   scruffy.start().await()
 }

+ 13 - 0
scruffy/src/main/scala/scruffy/examples/Test1Endpoint.scala

@@ -0,0 +1,13 @@
+package scruffy.examples
+
+import com.sksamuel.scruffy.EndpointProvider
+
+/** @author Stephen Samuel */
+class Test1Endpoint extends EndpointProvider {
+
+  get("json").complete {
+    req => json(Message("Hello World"))
+  }
+}
+
+case class Message(message: String)

+ 0 - 14
scruffy/src/main/scala/scruffy/examples/Test1Route.scala

@@ -1,14 +0,0 @@
-package scruffy.examples
-
-import com.sksamuel.scruffy.RouteProvider
-import com.sksamuel.scruffy.http.MediaType
-
-/** @author Stephen Samuel */
-class Test1Route extends RouteProvider {
-
-  get("json").handler {
-    req => entity(Message("Hello World"), MediaType.ApplicationJson)
-  }
-}
-
-case class Message(message: String)

+ 3 - 3
scruffy/src/main/scala/scruffy/examples/Test6Route.scala → scruffy/src/main/scala/scruffy/examples/Test6Endpoint.scala

@@ -1,12 +1,12 @@
 package scruffy.examples
 
-import com.sksamuel.scruffy.RouteProvider
+import com.sksamuel.scruffy.EndpointProvider
 import com.sksamuel.scruffy.http.MediaType
 
 /** @author Stephen Samuel */
-class Test6Route extends RouteProvider {
+class Test6Endpoint extends EndpointProvider {
 
-  get("plaintext").handler {
+  get("plaintext").complete {
     req => entity("Hello, World!", MediaType.TextPlain)
   }