@@ -50,7 +50,6 @@ class ApplicationController < ActionController::Base if !session session :session => new end - CachedModel.cache_reset @current_user = nil end app/controllers/application.rb @@ -15,7 +15,7 @@ end # # Typo decides which Blog object to use by searching for a Blog base_url that # matches the base_url computed for each request. -class Blog < CachedModel +class Blog < ActiveRecord::Base include ConfigManager extend ActiveSupport::Memoizable app/models/blog.rb @@ -1,6 +1,6 @@ require 'net/http' -class TextFilter < CachedModel +class TextFilter < ActiveRecord::Base serialize :filters serialize :params app/models/text_filter.rb @@ -1,6 +1,6 @@ require 'digest/sha1' -class User < CachedModel +class User < ActiveRecord::Base belongs_to :profile belongs_to :text_filter has_many :notifications, :foreign_key => 'notify_user_id' app/models/user.rb @@ -44,8 +44,6 @@ Rails::Initializer.run do |config| vendor/sparklines/lib vendor/uuidtools/lib vendor/mocha/lib - vendor/memcache-client/lib - vendor/cached_model/lib vendor/rails/railties vendor/rails/railties/lib vendor/rails/actionpack/lib @@ -191,8 +189,3 @@ if RAILS_ENV != 'test' end FLICKR_KEY='84f652422f05b96b29b9a960e0081c50' - -#require 'memcache_util' -require 'cached_model' -CachedModel.use_local_cache = true -CachedModel.use_memcache = false config/environment.rb @@ -17,7 +17,6 @@ describe 'ArticlesController' do IPSocket.stub!(:getaddress).and_return do raise SocketError.new("getaddrinfo: Name or service not known") end - CachedModel.cache_reset controller.send(:reset_blog_ids) end spec/controllers/articles_controller_spec.rb @@ -28,7 +28,6 @@ end describe "The default blog" do it "should pick up updates after a cache clear" do a = Blog.default - CachedModel.cache_reset b = blogs(:default) b.blog_name = "some other name" c = Blog.default spec/models/blog_spec.rb @@ -11,10 +11,6 @@ describe Comment do :ip => '1.2.3.4'}.merge(options)) end - before(:each) do - CachedModel.cache_reset - end - describe '#permalink_url' do it 'should render permalink to comment in public part' do c = feedback(:old_comment) spec/models/comment_spec.rb @@ -15,7 +15,6 @@ Spec::Runner.configure do |config| tags text_filters triggers users } config.before(:each) do - CachedModel.cache_reset Localization.lang = :default end spec/spec_helper.rb @@ -22,7 +22,6 @@ class Test::Unit::TestCase yield(STARTED, name) @_result = result begin - CachedModel.cache_reset setup __send__(@method_name) rescue Test::Unit::AssertionFailedError => e test/test_helper.rb vendor/cached_model/History.txt vendor/cached_model/LICENSE.txt vendor/cached_model/Manifest.txt vendor/cached_model/README.txt vendor/cached_model/Rakefile vendor/cached_model/lib/cached_model.rb vendor/cached_model/test/test_cached_model.rb vendor/memcache-client/History.txt vendor/memcache-client/LICENSE.txt vendor/memcache-client/Manifest.txt vendor/memcache-client/README.txt vendor/memcache-client/Rakefile vendor/memcache-client/lib/memcache.rb vendor/memcache-client/lib/memcache_util.rb vendor/memcache-client/test/test_mem_cache.rb ede85f5658455f040dd704425149378f21a3fb65 Frédéric de Villamil frederic@de-villamil.com http://github.com/fdv/typo/commit/e31bcef30dc34005d3c715d2fbd9f20a6d3a5473 e31bcef30dc34005d3c715d2fbd9f20a6d3a5473 2009-06-04T10:45:48-07:00 2009-06-04T10:45:48-07:00 Removing cached_model + memcache, useless since we're now doing static caching. First step for Typo diet 0dc8719ded5cc99d712143835cde96159901ab04 Frédéric de Villamil frederic@de-villamil.com