@@ -9,4 +9,5 @@ TAGS public/tmp spec/datasets/tmp *.tmproj -cache \ No newline at end of file +cache +.idea \ No newline at end of file .gitignore @@ -2,6 +2,7 @@ === Edge +* Set Radiant::Config to cache info in the Rails.cache [Jim Gay] * Markup fixes [Justin Blecher, Alex Wallace] * Use Rails for time zone handling [Kunal Shah, Josh French] * Allow extensions to declare dependencies [Josh French] @@ -48,7 +49,7 @@ Cribbs] Allan] * Don't raise exception on unauthenticated request to /admin/logout. [Josh French] -* Reverse view paths order in extension loader. [Sean Cribbs, Brent +* Reverse view paths order in extension loader. [Sean Cribbs, Brent Kroeker] * Remove obviated Ruby 1.8.7 compatibility patch. [Sean Cribbs] * Adjust StandardTags#relative_url_for for case when relative_url_root CHANGELOG @@ -30,12 +30,17 @@ module Radiant # for published date on the page edit screen class Config < ActiveRecord::Base set_table_name "config" + after_save :update_cache class << self def [](key) if table_exists? - pair = find_by_key(key) - pair.value if pair + unless Radiant::Config.cache_file_exists? + Radiant::Config.ensure_cache_file + Radiant::Config.initialize_cache + end + Radiant::Config.initialize_cache if Radiant::Config.stale_cache? + Rails.cache.fetch('Radiant::Config')[key] end end @@ -50,6 +55,28 @@ module Radiant def to_hash Hash[ *find(:all).map { |pair| [pair.key, pair.value] }.flatten ] end + + 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'))) + end + + def cache_file_exists? + return false if Rails.cache.fetch('Radiant.cache_file').nil? + File.file?(Rails.cache.read('Radiant.cache_file')) + end + + def stale_cache? + return true unless Radiant::Config.cache_file_exists? + Rails.cache.read('Radiant.cache_mtime') != File.mtime(Rails.cache.read('Radiant.cache_file')) + 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('')} + end end def value=(param) @@ -63,5 +90,9 @@ module Radiant self[:value] end end + + def update_cache + Radiant::Config.initialize_cache + end end end app/models/radiant/config.rb @@ -30,7 +30,6 @@ config.action_controller.allow_forgery_protection = false # ActionMailer::Base.deliveries array. config.action_mailer.delivery_method = :test -config.gem "rspec", :version => "1.2.6", :lib => false -config.gem "rspec-rails", :version => "1.2.6", :lib => false +config.gem "rspec-rails", :version => "~>1.2.6", :lib => false config.gem "webrat", :version => "~>0.4.4", :lib => false config.gem "cucumber", :version => "~>0.3.9", :lib => false \ No newline at end of file config/environments/test.rb @@ -2,10 +2,14 @@ require File.dirname(__FILE__) + "/../../spec_helper" describe Radiant::Config do before :each do + Radiant::Config.initialize_cache @config = Radiant::Config set('test', 'cool') set('foo', 'bar') end + after :each do + Radiant::Cache.clear + end describe "before the table exists, as in case of before bootstrap" do before :each do @@ -22,6 +26,41 @@ describe Radiant::Config do @config['test'] = 'cool' end end + + it "should create a cache of all records in a hash with Radiant::Config.initialize_cache" do + Rails.cache.read('Radiant::Config').should == Radiant::Config.to_hash + end + + it "should recreate the cache after a record is saved" do + Radiant::Config.create!(:key => 'cache', :value => 'true') + Rails.cache.read('Radiant::Config').should == Radiant::Config.to_hash + end + + it "should update the mtime on the cache file after a record is saved" do + File.should_receive(:open).with(Rails.cache.read('Radiant.cache_file'), "wb+").at_least(:once) + Radiant::Config['mtime'] = 'now' + end + + it "should record the cache file mtime when the cache is initialized" do + Radiant::Config.initialize_cache + Rails.cache.read('Radiant.cache_mtime').should == File.mtime(Rails.cache.fetch('Radiant.cache_file')) + end + + 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 + Radiant::Config.initialize_cache + File.file?(File.join(Radiant::Cache.entity_stores.first.root,'radiant_config_cache.txt')).should be_true + end + + it "should find the value in the cache with []" do + Radiant::Config['test'].should === Rails.cache.read('Radiant::Config')['test'] + end + + it "should set the value in the database with []=" do + Radiant::Config['new-db-key'] = 'db-value' + Radiant::Config.find_by_key('new-db-key').value.should == 'db-value' + end it "should return the value of a key with the bracket accessor" do @config['test'].should == 'cool' @@ -68,6 +107,6 @@ describe Radiant::Config do def set(key, value) setting = Radiant::Config.find_by_key(key) setting.destroy if setting - Radiant::Config.new(:key => key, :value => value).save + Radiant::Config.create!(:key => key, :value => value) end end \ No newline at end of file spec/models/radiant/config_spec.rb d7fd64b1fe7345b9e2cbd49fc5ef48da3cf2d8a0 Jim Gay jim@saturnflyer.com http://github.com/radiant/radiant/commit/4f2ba63484ce8ef7ef3b3f482317eea7d87879d5 4f2ba63484ce8ef7ef3b3f482317eea7d87879d5 2009-06-29T18:40:46-07:00 2009-03-14T20:15:40-07:00 move Radiant::Config to Rails.cache 8b72ab4d5cdb201e449af91a7d96efeda6e8f313 Jim Gay jim@saturnflyer.com