@@ -3,4 +3,4 @@ require 'activerecord' ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', :dbfile => ':memory:' -) \ No newline at end of file +) config/environment.rb @@ -45,7 +45,7 @@ module Cash alias_method_chain :transaction, :cache_transaction end end - + def transaction_with_cache_transaction(&block) repository.transaction { transaction_without_cache_transaction(&block) } end lib/cash.rb @@ -51,7 +51,7 @@ module Cash result end end - + def decr(key, delta = 1, ttl = 0) repository.decr(cache_key(key), delta) || begin repository.add(cache_key(key), (result = yield).to_s, ttl, true) @@ -67,7 +67,7 @@ module Cash "#{name}/#{key.to_s.gsub(' ', '+')}" end end - + module InstanceMethods def expire self.class.expire(id) lib/cash/accessor.rb @@ -16,7 +16,7 @@ module Cash end end end - + def without_cache(&block) User.with_scope(:find => {:readonly => true}, &block) end lib/cash/finders.rb @@ -37,7 +37,7 @@ module Cash old_attribute_value_pairs, _ = old_and_new_attribute_value_pairs(object) remove_from_index_with_minimal_network_operations(old_attribute_value_pairs, object) end - + def delete(object) old_attribute_value_pairs, _ = old_and_new_attribute_value_pairs(object) key = cache_key(old_attribute_value_pairs) @@ -45,7 +45,7 @@ module Cash end end include Commands - + module Attributes def ttl @ttl ||= options[:ttl] || config.ttl @@ -68,7 +68,7 @@ module Cash end end include Attributes - + def serialize_object(object) primary_key? ? object : object.id end lib/cash/index.rb @@ -14,7 +14,7 @@ module Cash def perform(find_options = {}, get_options = {}) if cache_config = cacheable?(@options1, @options2, find_options) cache_keys, index = cache_keys(cache_config[0]), cache_config[1] - + misses, missed_keys, objects = hit_or_miss(cache_keys, index, get_options) format_results(cache_keys, choose_deserialized_objects_if_possible(missed_keys, cache_keys, misses, objects)) else @@ -59,7 +59,7 @@ module Cash end end end - + def hit_or_miss(cache_keys, index, options) misses, missed_keys = nil, nil objects = @active_record.get(cache_keys, options.merge(:ttl => index.ttl)) do |missed_keys| lib/cash/query/abstract.rb @@ -1,3 +1,3 @@ module Cash Request = {} -end \ No newline at end of file +end lib/cash/request.rb @@ -1,6 +1,6 @@ class Array alias_method :count, :size - + def to_hash keys_and_values_without_nils = reject { |key, value| value.nil? } shallow_flattened_keys_and_values_without_nils = keys_and_values_without_nils.inject([]) { |result, pair| result += pair } lib/cash/util/array.rb @@ -63,7 +63,7 @@ module Cash def remove_from_caches(object) indices.each { |index| index.remove(object) } end - + def expire_caches(object) indices.each { |index| index.delete(object) } end lib/cash/write_through.rb @@ -48,13 +48,13 @@ module Cash Story.count end end - + describe '#count(:all, :conditions => ...)' do before do Story.create!(:title => @title = 'title') $memcache.flush_all end - + it "populates the count correctly" do Story.count(:all, :conditions => { :title => @title }).should == 1 Story.fetch("title/#{@title}/count", :raw => true).should =~ /\s*1\s*/ spec/cash/calculations_spec.rb @@ -340,4 +340,4 @@ module Cash end end end -end \ No newline at end of file +end spec/cash/finders_spec.rb @@ -105,7 +105,7 @@ module Cash $memcache.get(@key).should == @value end end - + it "reads through the real cache if key has not been written to" do $memcache.set(@key, @value) @cache.transaction do spec/cash/transactional_spec.rb @@ -12,7 +12,7 @@ Spec::Runner.configure do |config| config.mock_with :rr config.before :suite do load File.join(dir, "../db/schema.rb") - + config = YAML.load(IO.read((File.expand_path(File.dirname(__FILE__) + "/../config/memcache.yml"))))['test'] $memcache = MemCache.new(config) $memcache.servers = config['servers'] spec/spec_helper.rb 2b2fcce814823b3df4080a623d6a2e7f96ee02ba pivotal pivotal@Toemang.local http://github.com/nkallen/cache-money/commit/71401f26d6b5531bd4fc18cfb450daa9392c1905 71401f26d6b5531bd4fc18cfb450daa9392c1905 2008-12-10T15:59:25-08:00 2008-12-10T15:59:25-08:00 brittspace c8b659a1637fbd1f5f75fb40277166b298d13531 pivotal pivotal@Toemang.local