From 8c87a3fa677099439697ca62288bee041c437fc0 Mon Sep 17 00:00:00 2001 From: Sdogruyol Date: Sun, 14 Feb 2016 18:52:49 +0200 Subject: [PATCH] Replace global macros with methods. Thanks @asterite --- spec/{macros_spec.cr => helpers_spec.cr} | 0 src/kemal/{macros.cr => helpers.cr} | 27 ++++++++++++------------ 2 files changed, 13 insertions(+), 14 deletions(-) rename spec/{macros_spec.cr => helpers_spec.cr} (100%) rename src/kemal/{macros.cr => helpers.cr} (54%) diff --git a/spec/macros_spec.cr b/spec/helpers_spec.cr similarity index 100% rename from spec/macros_spec.cr rename to spec/helpers_spec.cr diff --git a/src/kemal/macros.cr b/src/kemal/helpers.cr similarity index 54% rename from src/kemal/macros.cr rename to src/kemal/helpers.cr index b71bc18..cb657fa 100644 --- a/src/kemal/macros.cr +++ b/src/kemal/helpers.cr @@ -16,34 +16,33 @@ macro render(filename, layout) render {{layout}} end -macro add_handler(handler) - Kemal.config.add_handler {{handler}} +def add_handler(handler) + Kemal.config.add_handler handler end # Uses Kemal::Middleware::HTTPBasicAuth to easily add HTTP Basic Auth support. -macro basic_auth(username, password) - auth_handler = Kemal::Middleware::HTTPBasicAuth.new({{username}}, {{password}}) +def basic_auth(username, password) + auth_handler = Kemal::Middleware::HTTPBasicAuth.new(username, password) add_handler auth_handler end -macro public_folder(path) - Kemal.config.public_folder = {{path}} +def public_folder(path) + Kemal.config.public_folder = path end # Logs to output stream. # development: STDOUT in # production: kemal.log -macro log(message) - Kemal.config.logger.write "#{{{message}}}\n" +def log(message) + Kemal.config.logger.write "#{message}\n" end # Enables / Disables logging -macro logging(status) - Kemal.config.logging = {{status}} +def logging(status) + Kemal.config.logging = status end -macro logger(logger) - - Kemal.config.logger = {{logger}} - Kemal.config.add_handler {{logger}} +def logger(logger) + Kemal.config.logger = logger + Kemal.config.add_handler logger end