public
Description: Ruby on Rails
Homepage: http://rubyonrails.org
Clone URL: git://github.com/rails/rails.git
Revert "Lazy load cache and session stores"

This reverts commit 19895f087c338d8385dff9d272d30fb87cb10330.
dhh (author)
Thu Jun 12 17:52:33 -0700 2008
commit  6573f6a4bc1c2ebd26e0b4b3ef9fe1cde3219354
tree    3285bde79403e99cdf773f5a3d8467a59b0ed648
parent  a3caf28da3a22c1326d3d98dcf71483a8edaa55a
...
 
 
 
 
 
 
 
1
2
3
...
15
16
17
18
19
20
21
22
...
1
2
3
4
5
6
7
8
9
10
...
22
23
24
 
 
25
26
27
0
@@ -1,3 +1,10 @@
0
+require 'action_controller/session/cookie_store'
0
+require 'action_controller/session/drb_store'
0
+require 'action_controller/session/mem_cache_store'
0
+if Object.const_defined?(:ActiveRecord)
0
+ require 'action_controller/session/active_record_store'
0
+end
0
+
0
 module ActionController #:nodoc:
0
   module SessionManagement #:nodoc:
0
     def self.included(base)
0
@@ -15,8 +22,6 @@ module ActionController #:nodoc:
0
       # <tt>:p_store</tt>, <tt>:drb_store</tt>, <tt>:mem_cache_store</tt>, or
0
       # <tt>:memory_store</tt>) or your own custom class.
0
       def session_store=(store)
0
- require "action_controller/session/#{store.to_s}" if [:active_record_store, :drb_store, :mem_cache_store].include?(store)
0
-
0
         ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:database_manager] =
0
           store.is_a?(Symbol) ? CGI::Session.const_get(store == :drb_store ? "DRbStore" : store.to_s.camelize) : store
0
       end
...
1
2
3
4
5
6
...
1
2
 
3
4
5
0
@@ -1,6 +1,5 @@
0
 require 'fileutils'
0
 require 'abstract_unit'
0
-require "active_support/cache/memory_store"
0
 
0
 CACHE_DIR = 'test_cache'
0
 # Don't change '/../temp/' cavalierly or you might hose something you don't want hosed
...
1
2
3
4
 
5
6
7
...
1
2
3
 
4
5
6
7
0
@@ -1,7 +1,7 @@
0
 require 'abstract_unit'
0
 require 'action_controller/cgi_process'
0
 require 'action_controller/cgi_ext'
0
-require 'action_controller/session/mem_cache_store'
0
+
0
 
0
 class CGI::Session
0
   def cache
...
7
8
9
10
11
12
13
14
15
16
17
18
19
...
140
141
142
 
 
 
 
 
 
...
7
8
9
 
 
10
11
12
13
 
14
15
16
...
137
138
139
140
141
142
143
144
145
0
@@ -7,13 +7,10 @@ module ActiveSupport
0
 
0
       case store
0
       when Symbol
0
- require "active_support/cache/#{store.to_s}"
0
-
0
         store_class_name = (store == :drb_store ? "DRbStore" : store.to_s.camelize)
0
         store_class = ActiveSupport::Cache.const_get(store_class_name)
0
         store_class.new(*parameters)
0
       when nil
0
- require "active_support/cache/memory_store"
0
         ActiveSupport::Cache::MemoryStore.new
0
       else
0
         store
0
@@ -140,3 +137,9 @@ module ActiveSupport
0
     end
0
   end
0
 end
0
+
0
+require 'active_support/cache/file_store'
0
+require 'active_support/cache/memory_store'
0
+require 'active_support/cache/drb_store'
0
+require 'active_support/cache/mem_cache_store'
0
+require 'active_support/cache/compressed_mem_cache_store'
...
1
2
3
4
5
...
1
 
2
3
4
0
@@ -1,5 +1,4 @@
0
 require 'drb'
0
-require 'active_support/cache/memory_store'
0
 
0
 module ActiveSupport
0
   module Cache

Comments

    No one has commented yet.