config/cached_models.rb lib/cached_models.rb @@ -1,3 +1,5 @@ +* Made independent of Rails + * Allow test suite to work without any active cache server * Enhanced AssociationCollection test coverage CHANGELOG @@ -1,3 +1,2 @@ # Include hook code here -require File.dirname(__FILE__) + '/lib/active_record' if ActionController::Base.perform_caching - +require 'cached_models' init.rb @@ -1,10 +1,7 @@ module ActiveRecord class Base - class << self - def rails_cache - ::Rails.cache - end - end + @@rails_cache = nil + mattr_reader :rails_cache protected def rails_cache lib/active_record/base.rb @@ -4,11 +4,13 @@ class BaseTest < Test::Unit::TestCase fixtures :authors def test_should_have_cache - assert_equal RAILS_CACHE, ActiveRecord::Base.rails_cache + assert_equal RAILS_CACHE, ActiveRecord::Base.rails_cache if defined? Rails + assert_kind_of ActiveSupport::Cache::Store, ActiveRecord::Base.rails_cache end def test_should_wrap_rails_cache - assert_equal RAILS_CACHE, Post.new.send(:rails_cache) + assert_equal RAILS_CACHE, Post.new.send(:rails_cache) if defined? Rails + assert_kind_of ActiveSupport::Cache::Store, Post.new.send(:rails_cache) end def test_reflection_cache_key @@ -27,4 +29,11 @@ class BaseTest < Test::Unit::TestCase author.send(:cache_delete, Author.reflections[:cached_posts]) assert_equal({:cached_posts => false}, author.send(:cached_associations)) end + + def test_should_load_without_rails + configuration = File.dirname(__FILE__) + '/../../config/cached_models.rb' + options = eval IO.read(configuration), binding, configuration + cache = ActiveSupport::Cache.lookup_store(options) + assert_kind_of ActiveSupport::Cache::Store, cache + end end test/active_record/base_test.rb 1f5037f17c4da12cdb2ae00159bbdf5bdd846084 Luca Guidi guidi.luca@gmail.com http://github.com/jodosha/cached-models/commit/41bc59415a278cd4139199ec2f61494ce51e8caa 41bc59415a278cd4139199ec2f61494ce51e8caa 2008-10-06T02:47:57-07:00 2008-10-06T02:47:57-07:00 Made independent of Rails 315f4844aaa4d770ea1f21ea9c61bc3784bdcada Luca Guidi guidi.luca@gmail.com