@@ -40,7 +40,7 @@ module Radiant Radiant::Config.initialize_cache end Radiant::Config.initialize_cache if Radiant::Config.stale_cache? - Rails.cache.fetch('Radiant::Config')[key] + Rails.cache.read('Radiant::Config')[key] end end @@ -59,11 +59,11 @@ module Radiant def initialize_cache Radiant::Config.ensure_cache_file Rails.cache.write('Radiant::Config',Radiant::Config.to_hash) - Rails.cache.write('Radiant.cache_mtime', File.mtime(Rails.cache.fetch('Radiant.cache_file'))) + Rails.cache.write('Radiant.cache_mtime', File.mtime(Rails.cache.read('Radiant.cache_file'))) end def cache_file_exists? - return false if Rails.cache.fetch('Radiant.cache_file').nil? + return false if Rails.cache.read('Radiant.cache_file').nil? File.file?(Rails.cache.read('Radiant.cache_file')) end @@ -73,9 +73,9 @@ module Radiant end def ensure_cache_file - Radiant::Cache::EntityStore.new if Radiant::Cache.entity_stores.blank? - Rails.cache.write('Radiant.cache_file', File.join(Radiant::Cache.entity_stores.first.root,'radiant_config_cache.txt')) - File.open(Rails.cache.fetch('Radiant.cache_file'), "wb+") {|f| f.write('')} + cache_file = File.join(Rails.root,'tmp','radiant_config_cache.txt') + Rails.cache.write('Radiant.cache_file', cache_file) + File.open(Rails.cache.read('Radiant.cache_file'), "wb+") {|f| f.write('')} end end app/models/radiant/config.rb @@ -48,9 +48,11 @@ describe Radiant::Config do it "should create a cache file when initializing the cache" do Radiant::Cache.clear - File.exist?(File.join(Radiant::Cache.entity_stores.first.root,'radiant_config_cache.txt')).should be_false + cache_file = File.join(Rails.root,'tmp','radiant_config_cache.txt') + File.delete(cache_file) + File.exist?(cache_file).should be_false Radiant::Config.initialize_cache - File.file?(File.join(Radiant::Cache.entity_stores.first.root,'radiant_config_cache.txt')).should be_true + File.file?(cache_file).should be_true end it "should find the value in the cache with []" do spec/models/radiant/config_spec.rb 6f7676cd450013e78b5bf40cc7a7a9443769363c Jim Gay jim@saturnflyer.com http://github.com/radiant/radiant/commit/981c1d689a64a32b6b76b4c9dd520c3089dca4de 981c1d689a64a32b6b76b4c9dd520c3089dca4de 2009-07-31T20:45:41-07:00 2009-07-31T20:45:41-07:00 Store config_cache file in tmp. Closes gh-9 f0285711a9c7fe8909f8c4e815f80bfb05cd46bb Jim Gay jim@saturnflyer.com