From 8ddf4f938e3a746e47bf791f97e6d06715923747 Mon Sep 17 00:00:00 2001
From: namusyaka <namusyaka@gmail.com>
Date: Sat, 14 Mar 2020 06:21:43 +0900
Subject: [PATCH] Sinatra::Contrib dependency updates. Fixes #1207 (#1411)

* Remove backports
* Work around Object#try and String#underscore
---
 sinatra-contrib/lib/sinatra/contrib.rb       | 32 ++++++++++----------
 sinatra-contrib/lib/sinatra/contrib/setup.rb |  8 ++---
 sinatra-contrib/sinatra-contrib.gemspec      |  1 -
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/sinatra-contrib/lib/sinatra/contrib.rb b/sinatra-contrib/lib/sinatra/contrib.rb
index 2f61b297a3..e27888b368 100644
--- a/sinatra-contrib/lib/sinatra/contrib.rb
+++ b/sinatra-contrib/lib/sinatra/contrib.rb
@@ -7,32 +7,32 @@ module Contrib
     # or breaks if external dependencies are missing. Will extend
     # Sinatra::Application by default.
     module Common
-      register :ConfigFile
-      register :MultiRoute
-      register :Namespace
-      register :RespondWith
+      register :ConfigFile, 'sinatra/config_file'
+      register :MultiRoute, 'sinatra/multi_route'
+      register :Namespace, 'sinatra/namespace'
+      register :RespondWith, 'sinatra/respond_with'
 
-      helpers :Capture
-      helpers :ContentFor
-      helpers :Cookies
-      helpers :EngineTracking
-      helpers :JSON
-      helpers :LinkHeader
-      helpers :Streaming
-      helpers :RequiredParams
+      helpers :Capture, 'sinatra/capture'
+      helpers :ContentFor, 'sinatra/content_for'
+      helpers :Cookies, 'sinatra/cookies'
+      helpers :EngineTracking, 'sinatra/engine_tracking'
+      helpers :JSON, 'sinatra/json'
+      helpers :LinkHeader, 'sinatra/link_header'
+      helpers :Streaming, 'sinatra/streaming'
+      helpers :RequiredParams, 'sinatra/required_params'
     end
 
     ##
     # Other extensions you don't want to be loaded unless needed.
     module Custom
-      # register :Compass
-      register :Reloader
+      # register :Compass, 'sinatra/compass'
+      register :Reloader, 'sinatra/reloader'
     end
 
     ##
     # Stuff that aren't Sinatra extensions, technically.
-    autoload :Extension
-    autoload :TestHelpers
+    autoload :Extension, 'sinatra/extension'
+    autoload :TestHelpers, 'sinatra/test_helpers'
   end
 
   register Sinatra::Contrib::Common
diff --git a/sinatra-contrib/lib/sinatra/contrib/setup.rb b/sinatra-contrib/lib/sinatra/contrib/setup.rb
index 0c94c40cbb..61e4f87279 100644
--- a/sinatra-contrib/lib/sinatra/contrib/setup.rb
+++ b/sinatra-contrib/lib/sinatra/contrib/setup.rb
@@ -1,6 +1,5 @@
 require 'sinatra/base'
 require 'sinatra/contrib/version'
-require 'backports/rails/string' # for String#underscore
 
 module Sinatra
   module Contrib
@@ -9,16 +8,15 @@ def extensions
         @extensions ||= {:helpers => [], :register => []}
       end
 
-      def register(name, path = nil)
+      def register(name, path)
         autoload name, path, :register
       end
 
-      def helpers(name, path = nil)
+      def helpers(name, path)
         autoload name, path, :helpers
       end
 
-      def autoload(name, path = nil, method = nil)
-        path ||= "sinatra/#{name.to_s.underscore}"
+      def autoload(name, path, method = nil)
         extensions[method] << name if method
         Sinatra.autoload(name, path)
       end
diff --git a/sinatra-contrib/sinatra-contrib.gemspec b/sinatra-contrib/sinatra-contrib.gemspec
index dfd110e5b2..e969e3e40f 100644
--- a/sinatra-contrib/sinatra-contrib.gemspec
+++ b/sinatra-contrib/sinatra-contrib.gemspec
@@ -38,7 +38,6 @@ EOF
 
   s.add_dependency "sinatra", version
   s.add_dependency "mustermann", "~> 1.0"
-  s.add_dependency "backports", ">= 2.8.2"
   s.add_dependency "tilt", "~> 2.0"
   s.add_dependency "rack-protection", version
   s.add_dependency "multi_json"