Modified ActionDispatch::Static to allow passing multiple roots

1 files changed, 50 insertions, 10 deletions

diff --git a/actionpack/lib/action_dispatch/middleware/static.rb b/actionpack/lib/action_dispatch/middleware/static.rb
index d7e88a54e4..c2d686f514 100644
--- a/actionpack/lib/action_dispatch/middleware/static.rb
+++ b/actionpack/lib/action_dispatch/middleware/static.rb
@@ -2,11 +2,43 @@ require 'rack/utils'
 
 module ActionDispatch
   class Static
+    class FileHandler
+      def initialize(at, root)
+        @at = at.chomp("/")
+        @file_server = ::Rack::File.new(root)
+      end
+
+      def file_exist?(path)
+        (path = full_readable_path(path)) && File.file?(path)
+      end
+
+      def directory_exist?(path)
+        (path = full_readable_path(path)) && File.directory?(path)
+      end
+
+      def call(env)
+        env["PATH_INFO"].gsub!(/^#{@at}/, "")
+        @file_server.call(env)
+      end
+
+      private
+        def includes_path?(path)
+          @at == "" || path =~ /^#{@at}/
+        end
+
+        def full_readable_path(path)
+          return unless includes_path?(path)
+          path = path.gsub(/^#{@at}/, "")
+          File.join(@file_server.root, ::Rack::Utils.unescape(path))
+        end
+    end
+
     FILE_METHODS = %w(GET HEAD).freeze
 
-    def initialize(app, root)
+    def initialize(app, roots)
       @app = app
-      @file_server = ::Rack::File.new(root)
+      roots = normalize_roots(roots)
+      @file_handlers = file_handlers(roots)
     end
 
     def call(env)
@@ -14,15 +46,15 @@ module ActionDispatch
       method = env['REQUEST_METHOD']
 
       if FILE_METHODS.include?(method)
-        if file_exist?(path)
-          return @file_server.call(env)
+        if file_handler = file_exist?(path)
+          return file_handler.call(env)
         else
           cached_path = directory_exist?(path) ? "#{path}/index" : path
           cached_path += ::ActionController::Base.page_cache_extension
 
-          if file_exist?(cached_path)
+          if file_handler = file_exist?(cached_path)
             env['PATH_INFO'] = cached_path
-            return @file_server.call(env)
+            return file_handler.call(env)
           end
         end
       end
@@ -32,13 +64,21 @@ module ActionDispatch
 
     private
       def file_exist?(path)
-        full_path = File.join(@file_server.root, ::Rack::Utils.unescape(path))
-        File.file?(full_path) && File.readable?(full_path)
+        @file_handlers.detect { |f| f.file_exist?(path) }
       end
 
       def directory_exist?(path)
-        full_path = File.join(@file_server.root, ::Rack::Utils.unescape(path))
-        File.directory?(full_path) && File.readable?(full_path)
+        @file_handlers.detect { |f| f.directory_exist?(path) }
+      end
+
+      def normalize_roots(roots)
+        roots.is_a?(Hash) ? roots : { "/" => roots.chomp("/") }
+      end
+
+      def file_handlers(roots)
+        roots.map do |at, root|
+          FileHandler.new(at, root)
+        end
       end
   end
 end