From ef58194129a1dc0a96286c271b71455d37712b42 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sat, 26 Sep 2009 11:37:42 -0500
Subject: Move Rails::Static into ActionDispatch

---
 railties/lib/rails/initializer.rb |  2 +-
 railties/lib/rails/rack/static.rb | 47 +++------------------------------------
 2 files changed, 4 insertions(+), 45 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/initializer.rb b/railties/lib/rails/initializer.rb
index e6f42f643c..72d23f2642 100644
--- a/railties/lib/rails/initializer.rb
+++ b/railties/lib/rails/initializer.rb
@@ -272,7 +272,7 @@ module Rails
   # Include middleware to serve up static assets
   Initializer.default.add :initialize_static_server do
     if configuration.frameworks.include?(:action_controller) && configuration.serve_static_assets
-      configuration.middleware.insert(0, Rails::Rack::Static, Rails.public_path)
+      configuration.middleware.insert(0, ActionDispatch::Static, Rails.public_path)
     end
   end
 
diff --git a/railties/lib/rails/rack/static.rb b/railties/lib/rails/rack/static.rb
index 25b6cadbfc..d6b8face27 100644
--- a/railties/lib/rails/rack/static.rb
+++ b/railties/lib/rails/rack/static.rb
@@ -1,46 +1,5 @@
-require 'rack/utils'
+require 'action_dispatch'
 
-module Rails
-  module Rack
-    class Static
-      FILE_METHODS = %w(GET HEAD).freeze
-
-      def initialize(app, root)
-        @app = app
-        @file_server = ::Rack::File.new(root)
-      end
-
-      def call(env)
-        path        = env['PATH_INFO'].chomp('/')
-        method      = env['REQUEST_METHOD']
-
-        if FILE_METHODS.include?(method)
-          if file_exist?(path)
-            return @file_server.call(env)
-          else
-            cached_path = directory_exist?(path) ? "#{path}/index" : path
-            cached_path += ::ActionController::Base.page_cache_extension
-
-            if file_exist?(cached_path)
-              env['PATH_INFO'] = cached_path
-              return @file_server.call(env)
-            end
-          end
-        end
-
-        @app.call(env)
-      end
-
-      private
-        def file_exist?(path)
-          full_path = File.join(@file_server.root, ::Rack::Utils.unescape(path))
-          File.file?(full_path) && File.readable?(full_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)
-        end
-    end
-  end
+module Rails::Rack
+  Static = Deprecation::DeprecatedConstantProxy.new('Rails::Rack::Static', ActionDispatch::Static)
 end
-- 
cgit v1.2.3