From ac93da36a0c62b01058566095d858b5755c72eb8 Mon Sep 17 00:00:00 2001 From: Stefan Sundin Date: Wed, 1 Jan 2020 20:49:42 -0800 Subject: [PATCH 1/2] Fix additional Ruby 2.7 keyword warnings. --- sinatra-contrib/lib/sinatra/reloader.rb | 4 ++-- sinatra-contrib/lib/sinatra/respond_with.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sinatra-contrib/lib/sinatra/reloader.rb b/sinatra-contrib/lib/sinatra/reloader.rb index 9b12c6c91b..0949681332 100644 --- a/sinatra-contrib/lib/sinatra/reloader.rb +++ b/sinatra-contrib/lib/sinatra/reloader.rb @@ -269,7 +269,7 @@ def run!(*args) # # Note: We are using #compile! so we don't interfere with extensions # changing #route. - def compile!(verb, path, block, options = {}) + def compile!(verb, path, block, **options) source_location = block.respond_to?(:source_location) ? block.source_location.first : caller_files[1] signature = super @@ -302,7 +302,7 @@ def use(middleware, *args, &block) # Does everything Sinatra::Base#add_filter does, but it also tells # the +Watcher::List+ for the Sinatra application to watch the defined # filter. - def add_filter(type, path = nil, options = {}, &block) + def add_filter(type, path = nil, **options, &block) source_location = block.respond_to?(:source_location) ? block.source_location.first : caller_files[1] result = super diff --git a/sinatra-contrib/lib/sinatra/respond_with.rb b/sinatra-contrib/lib/sinatra/respond_with.rb index 05459298ee..605c26795b 100644 --- a/sinatra-contrib/lib/sinatra/respond_with.rb +++ b/sinatra-contrib/lib/sinatra/respond_with.rb @@ -221,7 +221,7 @@ def rendering_method(engine) private - def compile!(verb, path, block, options = {}) + def compile!(verb, path, block, **options) options[:provides] ||= respond_to if respond_to super end From 4ac42bb3e4dec3c8b76def10b1c658ab53b4b759 Mon Sep 17 00:00:00 2001 From: Jordan Owens Date: Fri, 13 Mar 2020 01:23:43 -0400 Subject: [PATCH 2/2] Fix another keyword warning --- sinatra-contrib/lib/sinatra/namespace.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sinatra-contrib/lib/sinatra/namespace.rb b/sinatra-contrib/lib/sinatra/namespace.rb index 07b53f7f89..2998651966 100644 --- a/sinatra-contrib/lib/sinatra/namespace.rb +++ b/sinatra-contrib/lib/sinatra/namespace.rb @@ -332,7 +332,7 @@ def prefixed_path(a, b) def prefixed(method, pattern = nil, conditions = {}, &block) default = %r{(?:/.*)?} if method == :before or method == :after pattern, conditions = compile pattern, conditions, default - result = base.send(method, pattern, conditions, &block) + result = base.send(method, pattern, **conditions, &block) invoke_hook :route_added, method.to_s.upcase, pattern, block result end