From 6573f6a4bc1c2ebd26e0b4b3ef9fe1cde3219354 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Thu, 12 Jun 2008 19:52:33 -0500
Subject: [PATCH] Revert "Lazy load cache and session stores"

This reverts commit 19895f087c338d8385dff9d272d30fb87cb10330.
---
 actionpack/lib/action_controller/session_management.rb   | 9 +++++++--
 actionpack/test/controller/caching_test.rb               | 1 -
 .../test/controller/session/mem_cache_store_test.rb      | 2 +-
 activesupport/lib/active_support/cache.rb                | 9 ++++++---
 activesupport/lib/active_support/cache/drb_store.rb      | 1 -
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/actionpack/lib/action_controller/session_management.rb b/actionpack/lib/action_controller/session_management.rb
index ad1013b37925..80a3ddd2c574 100644
--- a/actionpack/lib/action_controller/session_management.rb
+++ b/actionpack/lib/action_controller/session_management.rb
@@ -1,3 +1,10 @@
+require 'action_controller/session/cookie_store'
+require 'action_controller/session/drb_store'
+require 'action_controller/session/mem_cache_store'
+if Object.const_defined?(:ActiveRecord)
+  require 'action_controller/session/active_record_store'
+end
+
 module ActionController #:nodoc:
   module SessionManagement #:nodoc:
     def self.included(base)
@@ -15,8 +22,6 @@ module ClassMethods
       # <tt>:p_store</tt>, <tt>:drb_store</tt>, <tt>:mem_cache_store</tt>, or
       # <tt>:memory_store</tt>) or your own custom class.
       def session_store=(store)
-        require "action_controller/session/#{store.to_s}" if [:active_record_store, :drb_store, :mem_cache_store].include?(store)
-
         ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:database_manager] =
           store.is_a?(Symbol) ? CGI::Session.const_get(store == :drb_store ? "DRbStore" : store.to_s.camelize) : store
       end
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 89e12ddae380..14cf0a86a122 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -1,6 +1,5 @@
 require 'fileutils'
 require 'abstract_unit'
-require "active_support/cache/memory_store"
 
 CACHE_DIR = 'test_cache'
 # Don't change '/../temp/' cavalierly or you might hose something you don't want hosed
diff --git a/actionpack/test/controller/session/mem_cache_store_test.rb b/actionpack/test/controller/session/mem_cache_store_test.rb
index 079a870ece02..a7d48431f8e9 100644
--- a/actionpack/test/controller/session/mem_cache_store_test.rb
+++ b/actionpack/test/controller/session/mem_cache_store_test.rb
@@ -1,7 +1,7 @@
 require 'abstract_unit'
 require 'action_controller/cgi_process'
 require 'action_controller/cgi_ext'
-require 'action_controller/session/mem_cache_store'
+
 
 class CGI::Session
   def cache
diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index 07c83774dfe0..2f1143e61052 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -7,13 +7,10 @@ def self.lookup_store(*store_option)
 
       case store
       when Symbol
-        require "active_support/cache/#{store.to_s}"
-
         store_class_name = (store == :drb_store ? "DRbStore" : store.to_s.camelize)
         store_class = ActiveSupport::Cache.const_get(store_class_name)
         store_class.new(*parameters)
       when nil
-        require "active_support/cache/memory_store"
         ActiveSupport::Cache::MemoryStore.new
       else
         store
@@ -140,3 +137,9 @@ def delete_matched(matcher, options = nil) #:nodoc:
     end
   end
 end
+
+require 'active_support/cache/file_store'
+require 'active_support/cache/memory_store'
+require 'active_support/cache/drb_store'
+require 'active_support/cache/mem_cache_store'
+require 'active_support/cache/compressed_mem_cache_store'
diff --git a/activesupport/lib/active_support/cache/drb_store.rb b/activesupport/lib/active_support/cache/drb_store.rb
index f06f08f566bf..b80c2ee4d53a 100644
--- a/activesupport/lib/active_support/cache/drb_store.rb
+++ b/activesupport/lib/active_support/cache/drb_store.rb
@@ -1,5 +1,4 @@
 require 'drb'
-require 'active_support/cache/memory_store'
 
 module ActiveSupport
   module Cache