Kemalyst update (#2897)

* update to 0.10.0 * update to latest kemalyst * use new controller * fix bug in fortunes * remove unneeded quotes
TechEmpower · Jun 26, 2017 · 4e1abeba15e92c9ca1798bfe33169a6bc3d3892d · 4e1abeb
1 parent 6b9a388
commit 4e1abeba15e92c9ca1798bfe33169a6bc3d3892d
diff --git a/frameworks/Crystal/kemalyst/config/application.cr b/frameworks/Crystal/kemalyst/config/application.cr
@@ -11,7 +11,7 @@ Kemalyst::Application.config do |config|
  config.reuse_port = true

  # Disable unused middleware
-  config.handlers = [] of HTTP::Handler
+  config.handlers.clear
  config.handlers << Kemalyst::Handler::Error.instance
  config.handlers << Kemalyst::Handler::Params.instance
  config.handlers << Middleware::CustomHeaders.instance
diff --git a/frameworks/Crystal/kemalyst/config/routes.cr b/frameworks/Crystal/kemalyst/config/routes.cr
@@ -2,9 +2,9 @@ require "../src/controllers/*"

 include Kemalyst::Handler

-get "/plaintext", test, plaintext
-get "/json", test, json
-get "/db", test, db
-get "/queries", test, queries
-get "/updates", test, updates
-get "/fortunes", test, fortunes
+get "/plaintext", benchmark, plaintext
+get "/json", benchmark, json
+get "/db", benchmark, db
+get "/queries", benchmark, queries
+get "/updates", benchmark, updates
+get "/fortunes", benchmark, fortunes
diff --git a/frameworks/Crystal/kemalyst/kemalyst b/frameworks/Crystal/kemalyst/kemalyst
diff --git a/frameworks/Crystal/kemalyst/shard.lock b/frameworks/Crystal/kemalyst/shard.lock
@@ -10,7 +10,7 @@ shards:

  kemalyst:
    github: kemalyst/kemalyst
-    version: 0.9.1
+    version: 0.10.2

  kemalyst-model:
    github: kemalyst/kemalyst-model
@@ -40,6 +40,10 @@ shards:
    github: ysbaddaden/pool
    version: 0.2.3

+  quartz-mailer:
+    github: amber-crystal/quartz-mailer
+    commit: 9361ae75f178cb62585aa1b6047a2269f553d2d5
+
  radix:
    github: luislavena/radix
    version: 0.3.8
diff --git a/frameworks/Crystal/kemalyst/shard.yml b/frameworks/Crystal/kemalyst/shard.yml
@@ -9,7 +9,7 @@ license: MIT
 dependencies:
  kemalyst:
    github: kemalyst/kemalyst
-    version: ~> 0.9.0
+    version: ~> 0.10.0

  kemalyst-model:
    github: kemalyst/kemalyst-model
diff --git a/frameworks/Crystal/kemalyst/src/controllers/benchmark_controller.cr b/frameworks/Crystal/kemalyst/src/controllers/benchmark_controller.cr
@@ -0,0 +1,64 @@
+require "../models/*"
+
+class BenchmarkController < Kemalyst::Controller
+  def plaintext
+    text "Hello, World!"
+  end
+
+  def json
+    results = {message: "Hello, World!"}
+    json results.to_json
+  end
+
+  def db
+    results = {} of Symbol => Int32
+    if world = World.find rand(1..10_000)
+      results = {id: world.id, randomNumber: world.randomNumber}
+    end
+    json results.to_json
+  end
+
+  def queries
+    queries = params["queries"].as(String)
+    queries = queries.to_i? || 1
+    queries = queries.clamp(1..500)
+
+    results = (1..queries).map do
+      if world = World.find rand(1..10_000)
+        {id: world.id, randomNumber: world.randomNumber}
+      end
+    end
+
+    json results.to_json
+  end
+
+  def updates
+    queries = params["queries"].as(String)
+    queries = queries.to_i? || 1
+    queries = queries.clamp(1..500)
+
+    results = (1..queries).map do
+      world = World.find rand(1..10_000)
+      if world
+        world.randomNumber = rand(1..10_000)
+        world.save
+        {id: world.id, randomNumber: world.randomNumber}
+      end
+    end
+
+    json results.to_json
+  end
+
+  def fortunes
+    fortune = Fortune.new
+    fortune.id = 0
+    fortune.message = "Additional fortune added at request time."
+
+    fortunes = Fortune.all
+    fortunes << fortune
+    fortunes.sort_by! { |fortune| fortune.message.not_nil! }
+
+    html render("fortune/index.slang", "main.slang")
+  end
+end
+
diff --git a/frameworks/Crystal/kemalyst/src/controllers/test_controller.cr b/frameworks/Crystal/kemalyst/src/controllers/test_controller.cr