test/.gitignore test/README test/Rakefile test/app/controllers/application.rb test/app/controllers/welcome_controller.rb test/app/helpers/application_helper.rb test/app/helpers/welcome_helper.rb test/app/views/layouts/application.html.erb test/app/views/welcome/with_layout.html.erb test/app/views/welcome/without_layout.html.erb test/config/boot.rb test/config/database.yml test/config/environment.rb test/config/environments/development.rb test/config/environments/production.rb test/config/environments/test.rb test/config/initializers/inflections.rb test/config/initializers/load_plugin.rb test/config/initializers/mime_types.rb test/config/initializers/new_rails_defaults.rb test/config/pez.yml test/config/plugins.yml test/config/routes.rb test/db/schema.rb test/doc/README_FOR_APP test/lib/tasks/rspec.rake test/log/development.log test/public/404.html test/public/422.html test/public/500.html test/public/dispatch.cgi test/public/dispatch.fcgi test/public/dispatch.rb test/public/favicon.ico test/public/images/rails.png test/public/javascripts/application.js test/public/javascripts/controls.js test/public/javascripts/dragdrop.js test/public/javascripts/effects.js test/public/javascripts/prototype.js test/public/robots.txt test/script/about test/script/autospec test/script/console test/script/dbconsole test/script/destroy test/script/generate test/script/performance/benchmarker test/script/performance/profiler test/script/performance/request test/script/plugin test/script/process/inspector test/script/process/reaper test/script/process/spawner test/script/runner test/script/server test/script/spec test/script/spec_server test/spec/controllers/welcome_controller_spec.rb test/spec/helpers/welcome_helper_spec.rb test/spec/rcov.opts test/spec/spec.opts test/spec/spec_helper.rb test/stories/all.rb test/stories/helper.rb @@ -1,4 +1,4 @@ -require "has_cache" +require File.dirname(__FILE__) + "/lib/has_cache" require "digest/md5" # ActiveRecord only calls after_initialize callbacks only if is init.rb @@ -60,8 +60,8 @@ module SimplesIdeias::Cached::ActionPack contents = render_to_string(:layout => cache_layout) render :text => contents, :layout => !cache_layout end - - Cache.write(key, contents, options) if ActionController::Base.perform_caching + debugger + Cache.write(key, contents, options) if ::ActionController::Base.perform_caching end end end @@ -82,7 +82,7 @@ module SimplesIdeias::Cached::ActionPack cache_name = File.join('block', *cache_name.to_s.split('/')) # Executes the block if no cache was found - if ActionController::Base.perform_caching + if ::ActionController::Base.perform_caching concat Cache.fetch(cache_name, options) { capture(&block) }, block.binding else concat capture(&block), block.binding lib/action_pack.rb 24e8ebcfc11d64eeec889e6e10291c8037443192 Nando Vieira fnando.vieira@gmail.com http://github.com/fnando/has_cache/commit/bb648c8701f1ad351176c5928baf34b2b98d86d4 bb648c8701f1ad351176c5928baf34b2b98d86d4 2008-10-28T18:35:48-07:00 2008-10-28T18:35:48-07:00 Added some specs to validate controller cache 0faded751306e7f671ef40e26944409efd09f943 Nando Vieira fnando.vieira@gmail.com