From 6998a6f70d80b0525952ad51d17529ece117d962 Mon Sep 17 00:00:00 2001 From: Andrew Blake Date: Thu, 25 Mar 2021 08:23:53 +0000 Subject: [PATCH] Condition use of ruby2_keywords to avoid introducing gem dependency --- lib/sinatra/base.rb | 3 +-- sinatra.gemspec | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb index 642721aba9..64e0d01170 100644 --- a/lib/sinatra/base.rb +++ b/lib/sinatra/base.rb @@ -8,7 +8,6 @@ require 'mustermann' require 'mustermann/sinatra' require 'mustermann/regular' -require 'ruby2_keywords' # stdlib dependencies require 'thread' @@ -1950,7 +1949,7 @@ def self.delegate(*methods) Delegator.target.send(method_name, *args, &block) end # ensure keyword argument passing is compatible with ruby >= 2.7 - ruby2_keywords method_name + ruby2_keywords(method_name) if respond_to?(:ruby2_keywords, true) private method_name end end diff --git a/sinatra.gemspec b/sinatra.gemspec index c20d887ea0..93a22ae4b5 100644 --- a/sinatra.gemspec +++ b/sinatra.gemspec @@ -47,5 +47,4 @@ EOF s.add_dependency 'tilt', '~> 2.0' s.add_dependency 'rack-protection', version s.add_dependency 'mustermann', '~> 1.0' - s.add_dependency 'ruby2_keywords', '~> 0.0.4' end