Removed ActionDispatch::FileHandler abstraction.

This class was originally added to support multiple file roots.
Since this feature no longer exists, the extra abstraction is unnecessary.

actionpack/lib/action_dispatch/middleware/static.rb

@@ -2,10 +2,11 @@
 require 'active_support/core_ext/uri'
 
 module ActionDispatch
-  class FileHandler
-    def initialize(root, cache_control)
+  class Static
+    def initialize(app, root, cache_control=nil)
+      @app           = app
       @root          = root.chomp('/')
-      @compiled_root = /^#{Regexp.escape(root)}/
+      @compiled_root = /^#{Regexp.escape(@root)}/
       @file_server   = ::Rack::File.new(@root, cache_control)
     end
 
@@ -24,7 +25,16 @@ def match?(path)
     end
 
     def call(env)
-      @file_server.call(env)
+      case env['REQUEST_METHOD']
+      when 'GET', 'HEAD'
+        path = env['PATH_INFO'].chomp('/')
+        if match = match?(path)
+          env["PATH_INFO"] = match
+          return @file_server.call(env)
+        end
+      end
+
+      @app.call(env)
     end
 
     def ext
@@ -43,24 +53,4 @@ def escape_glob_chars(path)
       path.gsub(/[*?{}\[\]]/, "\\\\\\&")
     end
   end
-
-  class Static
-    def initialize(app, path, cache_control=nil)
-      @app = app
-      @file_handler = FileHandler.new(path, cache_control)
-    end
-
-    def call(env)
-      case env['REQUEST_METHOD']
-      when 'GET', 'HEAD'
-        path = env['PATH_INFO'].chomp('/')
-        if match = @file_handler.match?(path)
-          env["PATH_INFO"] = match
-          return @file_handler.call(env)
-        end
-      end
-
-      @app.call(env)
-    end
-  end
 end