From fdf38b23c8b7b8baddca707b5177b019c6cd853a Mon Sep 17 00:00:00 2001 From: Sdogruyol Date: Sun, 24 Jan 2016 13:31:07 +0200 Subject: [PATCH] Update kemal.cr --- spec/view_spec.cr | 80 ++++++++++++++++---------------- src/kemal.cr | 2 +- src/kemal/static_file_handler.cr | 4 +- 3 files changed, 43 insertions(+), 43 deletions(-) diff --git a/spec/view_spec.cr b/spec/view_spec.cr index 9cef43d..0794df9 100644 --- a/spec/view_spec.cr +++ b/spec/view_spec.cr @@ -1,40 +1,40 @@ -require "./spec_helper" - -macro render_with_base_and_layout(filename) - render "spec/asset/#{{{filename}}}", "spec/asset/layout.ecr" -end - -describe "Views" do - # it "renders file" do - # kemal = Kemal::Handler.new - # kemal.add_route "GET", "/view/:name" do |env| - # render "spec/asset/hello.ecr" - # end - # request = HTTP::Request.new("GET", "/view/world") - # io_with_context = create_request_and_return_io(kemal, request) - # client_response = HTTP::Client::Response.from_io(io_with_context, decompress: false) - # client_response.body.should contain("Hello world") - # end - - # it "renders file with dynamic variables" do - # kemal = Kemal::Handler.new - # kemal.add_route "GET", "/view/:name" do |env| - # render_with_base_and_layout "hello.ecr" - # end - # request = HTTP::Request.new("GET", "/view/world") - # io_with_context = create_request_and_return_io(kemal, request) - # client_response = HTTP::Client::Response.from_io(io_with_context, decompress: false) - # client_response.body.should contain("Hello world") - # end - # - # it "renders layout" do - # kemal = Kemal::Handler.new - # kemal.add_route "GET", "/view/:name" do |env| - # render "spec/asset/hello.ecr", "spec/asset/layout.ecr" - # end - # request = HTTP::Request.new("GET", "/view/world") - # io_with_context = create_request_and_return_io(kemal, request) - # client_response = HTTP::Client::Response.from_io(io_with_context, decompress: false) - # client_response.body.should contain("Hello world") - # end -end +# require "./spec_helper" +# +# macro render_with_base_and_layout(filename) +# render "spec/asset/#{{{filename}}}", "spec/asset/layout.ecr" +# end +# +# describe "Views" do +# it "renders file" do +# kemal = Kemal::Handler.new +# kemal.add_route "GET", "/view/:name" do |env| +# render "spec/asset/hello.ecr" +# end +# request = HTTP::Request.new("GET", "/view/world") +# io_with_context = create_request_and_return_io(kemal, request) +# client_response = HTTP::Client::Response.from_io(io_with_context, decompress: false) +# client_response.body.should contain("Hello world") +# end +# +# it "renders file with dynamic variables" do +# kemal = Kemal::Handler.new +# kemal.add_route "GET", "/view/:name" do |env| +# render_with_base_and_layout "hello.ecr" +# end +# request = HTTP::Request.new("GET", "/view/world") +# io_with_context = create_request_and_return_io(kemal, request) +# client_response = HTTP::Client::Response.from_io(io_with_context, decompress: false) +# client_response.body.should contain("Hello world") +# end +# +# it "renders layout" do +# kemal = Kemal::Handler.new +# kemal.add_route "GET", "/view/:name" do |env| +# render "spec/asset/hello.ecr", "spec/asset/layout.ecr" +# end +# request = HTTP::Request.new("GET", "/view/world") +# io_with_context = create_request_and_return_io(kemal, request) +# client_response = HTTP::Client::Response.from_io(io_with_context, decompress: false) +# client_response.body.should contain("Hello world") +# end +# end diff --git a/src/kemal.cr b/src/kemal.cr index 9a4a233..0a5e347 100644 --- a/src/kemal.cr +++ b/src/kemal.cr @@ -28,7 +28,7 @@ at_exit do get "/__kemal__/:image" do |env| image = env.params["image"] file_path = File.expand_path("libs/kemal/images/#{image}", Dir.current) - env.add_header "Content-Type", "application/octet-stream" + env.response.headers.add "Content-Type", "application/octet-stream" File.read(file_path) if File.exists? file_path end diff --git a/src/kemal/static_file_handler.cr b/src/kemal/static_file_handler.cr index faee53f..c31d367 100644 --- a/src/kemal/static_file_handler.cr +++ b/src/kemal/static_file_handler.cr @@ -1,6 +1,6 @@ class Kemal::StaticFileHandler < HTTP::StaticFileHandler - def call(request) - return call_next(request) if request.path.not_nil! == "/" + def call(context) + return call_next(context) if context.request.path.not_nil! == "/" super end end