Changeset 8393 for branches/2-1-caching/railties/lib

Timestamp:

12/15/07 01:35:55 (1 year ago)

Author:

david

Message:

The initial, rough batch of work

Files:

• branches/2-1-caching/railties/lib/initializer.rb (modified) (7 diffs)

branches/2-1-caching/railties/lib/initializer.rb

@@ -59 +59 @@
-
-    # Sequentially step through all of the available initialization routines,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    def process
-      check_ruby_version
@@ -93 +71 @@
-      initialize_encoding
-      initialize_database
+
+      initialize_cache
+      initialize_framework_caches
+
-      initialize_logger
-      initialize_framework_logging
+
-      initialize_framework_views
-      initialize_dependency_mechanism
-      initialize_whiny_nils
-directories
+session_directory
-      initialize_framework_settings
-
@@ -236 +219 @@
-    end
-
+    def initialize_cache
+      unless defined?(RAILS_CACHE)
+        silence_warnings { Object.const_set "RAILS_CACHE", ActiveSupport::Cache.lookup_store(configuration.cache_store) }
+      end
+    end
+
+    def initialize_framework_caches
+      if configuration.frameworks.include?(:action_controller)
+        ActionController::Base.cache_store ||= RAILS_CACHE
+      end
+    end
+
-    # If the +RAILS_DEFAULT_LOGGER+ constant is already set, this initialization
-    # routine does nothing. If the constant is not set, and Configuration#logger
@@ -274 +269 @@
-        framework.to_s.camelize.constantize.const_get("Base").logger ||= RAILS_DEFAULT_LOGGER
-      end
+      
+      RAILS_CACHE.logger ||= RAILS_DEFAULT_LOGGER
-    end
-
@@ -306 +303 @@
-    end
-
-directories
+session_directory
-      if configuration.frameworks.include?(:action_controller)
-        session_path = "#{configuration.root_path}/tmp/sessions/"
-        ActionController::Base.session_options[:tmpdir] = File.exist?(session_path) ? session_path : Dir::tmpdir
-
-        cache_path = "#{configuration.root_path}/tmp/cache/"
-        if File.exist?(cache_path)
-          ActionController::Base.fragment_cache_store = :file_store, cache_path
-        end
-      end
-    end
@@ -414 +406 @@
-    # used directly.
-    attr_accessor :logger
+
+    # The specific cache store to use. By default, the ActiveSupport::Cache::Store will be used.
+    attr_accessor :cache_store
-
-    # The root of the application's views. (Defaults to <tt>app/views</tt>.)
@@ -644 +639 @@
-        Plugin::Loader
-      end
+      
+      def default_cache_store
+        if File.exist?("#{root_path}/tmp/cache/")
+          [ :file_store, "#{root_path}/tmp/cache/" ]
+        else
+          :memory_store
+        end
+      end
-  end
-end