Use require_relative and rely on autoload instead of using require

This does a better job of testing the autoloads work, and ensures
files are loaded from the current rack directory.

Some files required rack.rb, and in those cases I didn't remove
the require, just replaced it with require_relative, since the
intent is to make sure all of rack is loaded if a file under
rack is loaded.

This has the potential to break code that does:

  require 'rack/content_type'
  Rack::ContentType.new(app)

If the rack library itself is never required.  This is because
the autoloads that rack.rb sets up would not be loaded. I'm not
sure if we want to support that, but if so we would want to keep
the requires and convert them to require_relative.

For core_ext/regexp, move the requires into the if < 2.4 block,
so that the file isn't loaded unless it is necessary.

1 files changed, 1 insertions, 6 deletions

diff --git a/lib/rack/static.rb b/lib/rack/static.rb
index 0338073f..8cb58b2f 100644
--- a/lib/rack/static.rb
+++ b/lib/rack/static.rb
@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require "rack/files"
-require "rack/utils"
-
-require_relative 'core_ext/regexp'
-
 module Rack
 
   # The Rack::Static middleware intercepts requests for static files
@@ -91,7 +86,7 @@ module Rack
   #         ]
   #
   class Static
-    using ::Rack::RegexpExtensions if RUBY_VERSION < '2.4'
+    (require_relative 'core_ext/regexp'; using ::Rack::RegexpExtensions) if RUBY_VERSION < '2.4'
 
     def initialize(app, options = {})
       @app = app