From 62946fd987d80c708c119f697cf386a148ea7898 Mon Sep 17 00:00:00 2001
From: sdogruyol <dogruyolserdar@gmail.com>
Date: Fri, 12 May 2017 16:18:50 -0700
Subject: [PATCH] Modularize handlers

---
 spec/handler_spec.cr         | 13 +++++++++++++
 src/kemal/config.cr          | 10 ++++++++--
 src/kemal/helpers/helpers.cr |  4 ++--
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/spec/handler_spec.cr b/spec/handler_spec.cr
index 079acdf..b9c4c17 100644
--- a/spec/handler_spec.cr
+++ b/spec/handler_spec.cr
@@ -120,4 +120,17 @@ describe "Handler" do
     client_response = call_request_on_app(request)
     client_response.body.should eq "OnlyExcludePost"
   end
+
+  it "adds a handler at given position" do
+    post_handler = PostOnlyHandler.new
+    add_handler post_handler, 1
+    Kemal.config.handlers[1].should eq post_handler
+  end
+
+  it "assigns custom handlers" do
+    post_only_handler = PostOnlyHandler.new
+    post_exclude_handler = PostExcludeHandler.new
+    Kemal.config.handlers = [post_only_handler, post_exclude_handler]
+    Kemal.config.handlers.should eq [post_only_handler, post_exclude_handler]
+  end
 end
diff --git a/src/kemal/config.cr b/src/kemal/config.cr
index 683f721..ee3ac5f 100644
--- a/src/kemal/config.cr
+++ b/src/kemal/config.cr
@@ -17,6 +17,7 @@ module Kemal
     property host_binding, ssl, port, env, public_folder, logging, running,
       always_rescue, serve_static : (Bool | Hash(String, Bool)), server, extra_options,
       shutdown_message
+    getter custom_handler_position
 
     def initialize
       @host_binding = "0.0.0.0"
@@ -59,9 +60,14 @@ module Kemal
       HANDLERS
     end
 
-    def add_handler(handler : HTTP::Handler | HTTP::WebSocketHandler)
+    def handlers=(handlers : Array(HTTP::Handler))
+      clear
+      handlers.each { |handler| HANDLERS << handler }
+    end
+
+    def add_handler(handler : HTTP::Handler | HTTP::WebSocketHandler, position = Kemal.config.custom_handler_position)
       setup
-      HANDLERS.insert @custom_handler_position, handler
+      HANDLERS.insert position, handler
       @custom_handler_position = @custom_handler_position + 1
     end
 
diff --git a/src/kemal/helpers/helpers.cr b/src/kemal/helpers/helpers.cr
index cbc0120..b270c51 100644
--- a/src/kemal/helpers/helpers.cr
+++ b/src/kemal/helpers/helpers.cr
@@ -8,8 +8,8 @@
 # - Kemal::StaticFileHandler
 # - Here goes custom handlers
 # - Kemal::RouteHandler
-def add_handler(handler)
-  Kemal.config.add_handler handler
+def add_handler(handler, position = Kemal.config.custom_handler_position)
+  Kemal.config.add_handler handler, position
 end
 
 # Sets public folder from which the static assets will be served.