@@ -22,4 +22,11 @@ Spec::Rake::SpecTask.new(:coverage) do |t| end desc "Default task is to run specs" -task :default => :spec \ No newline at end of file +task :default => :spec + +namespace :britt do + desc 'Removes trailing whitespace' + task :space do + sh %{find . -name '*.rb' -exec sed -i '' 's/ *$//g' {} \\;} + end +end \ No newline at end of file Rakefile @@ -8,7 +8,6 @@ REFACTOR * Clarify terminology around cache/key/index, etc. INFRASTRUCTURE -* rake britt:space NEW FEATURES * Incorporate local_cache TODO @@ -3,9 +3,9 @@ ActiveRecord::Schema.define(:version => 1) do t.string "title", "subtitle" t.string "type" end - + create_table "characters", :force => true do |t| t.integer "story_id" t.string "name" end -end \ No newline at end of file +end db/schema.rb @@ -41,6 +41,6 @@ module Cache module ClassMethods def transaction_with_cache_transaction(&block) repository.transaction { transaction_without_cache_transaction(&block) } - end + end end -end \ No newline at end of file +end lib/cache.rb @@ -126,4 +126,4 @@ module Cache cache.send @name, @key, *@args end end -end \ No newline at end of file +end lib/cache/buffered.rb @@ -61,4 +61,4 @@ module Cache end end end -end \ No newline at end of file +end lib/cache/config.rb @@ -33,4 +33,4 @@ module Cache end end end -end \ No newline at end of file +end lib/cache/finders.rb @@ -40,19 +40,19 @@ module Cache def ttl @ttl ||= options[:ttl] || config.ttl end - + def order @order ||= options[:order] || :asc end - + def limit options[:limit] end - + def buffer options[:buffer] end - + def window options[:limit] && options[:limit] + options[:buffer] end @@ -60,7 +60,7 @@ module Cache def serialize_object(object) primary_key? ? object : object.id end - + def matches?(query) query.calculation? || (query.order == ['id', order] && @@ -131,7 +131,7 @@ module Cache end [key, cache_value, cache_hit] end - + def truncate_if_necessary(objects) objects.slice(0, window || objects.size) end @@ -155,7 +155,7 @@ module Cache def index_is_stale?(old_attribute_value_pairs, new_attribute_value_pairs) old_attribute_value_pairs != new_attribute_value_pairs end - + def remove_from_index_with_minimal_network_operations(attribute_value_pairs, object) if primary_key? remove_object_from_primary_key_cache(attribute_value_pairs, object) @@ -167,7 +167,7 @@ module Cache def remove_object_from_primary_key_cache(attribute_value_pairs, object) set(cache_key(attribute_value_pairs), [], :ttl => ttl) end - + def remove_object_from_cache(attribute_value_pairs, object) return if invalid_cache_key?(attribute_value_pairs) @@ -177,7 +177,7 @@ module Cache objects = resize_if_necessary(attribute_value_pairs, objects) set(key, objects, :ttl => ttl) end - + def resize_if_necessary(attribute_value_pairs, objects) conditions = Hash[*attribute_value_pairs.flatten] key = cache_key(attribute_value_pairs) @@ -185,7 +185,7 @@ module Cache if limit && objects.size < limit && objects.size < count find_every_without_cache(:select => :id, :conditions => conditions).collect do |object| serialize_object(object) - end + end else objects end lib/cache/index.rb @@ -50,4 +50,4 @@ module Cache end end -end \ No newline at end of file +end lib/cache/lock.rb @@ -6,7 +6,7 @@ module Cache def self.perform(*args) new(*args).perform end - + def initialize(active_record, options1, options2) @active_record, @options1, @options2 = active_record, options1, options2 || {} end @@ -27,7 +27,7 @@ module Cache end DESC = /DESC/i - + def order @order ||= begin if order_sql = @options1[:order] || @options2[:order] @@ -38,15 +38,15 @@ module Cache end end end - + def limit @limit ||= @options1[:limit] || @options2[:limit] end - + def offset @offset ||= @options1[:offset] || @options2[:offset] || 0 end - + def calculation? false end @@ -63,7 +63,7 @@ module Cache end end end - + def cache_keys(attribute_value_pairs) attribute_value_pairs.flatten.join('/') end @@ -91,7 +91,7 @@ module Cache VALUE = /'?(\d+|\?|(?:(?:[^']|'')*))'?/ # Matches: 123, ?, '123', '12''3' KEY_EQ_VALUE = /^\(?#{TABLE_AND_COLUMN}\s+=\s+#{VALUE}\)?$/ # Matches: KEY = VALUE, (KEY = VALUE) ORDER = /^#{TABLE_AND_COLUMN}\s*(ASC|DESC)?$/i # Matches: COLUMN ASC, COLUMN DESC, COLUMN - + def parse_indices_from_condition(conditions = '', *values) values = values.dup conditions.split(AND).inject([]) do |indices, condition| @@ -112,12 +112,12 @@ module Cache def format_results(cache_keys, objects) return objects if objects.blank? - + objects = convert_to_array(cache_keys, objects) objects = apply_limits_and_offsets(objects, @options1) deserialize_objects(objects) end - + def serialize_objects(index, objects) Array(objects).collect { |missed| index.serialize_object(missed) } end @@ -150,4 +150,4 @@ module Cache end end end -end \ No newline at end of file +end lib/cache/query/abstract.rb @@ -2,7 +2,7 @@ module Cache module Query class Calculation < Abstract delegate :calculate_without_cache, :to => :@active_record - + def initialize(active_record, operation, column, options1, options2) super(active_record, options1, options2) @operation, @column = operation, column @@ -11,7 +11,7 @@ module Cache def perform super({}, :raw => true) end - + def calculation? true end @@ -20,15 +20,15 @@ module Cache def miss(_, __) calculate_without_cache(@operation, @column, @options1) end - + def uncacheable calculate_without_cache(@operation, @column, @options1) end - + def format_results(_, objects) objects.to_i end - + def serialize_objects(_, objects) objects.to_s end @@ -42,4 +42,4 @@ module Cache end end end -end \ No newline at end of file +end lib/cache/query/calculation.rb @@ -25,12 +25,12 @@ module Cache def cache_keys(attribute_value_pairs) @ids.collect { |id| "id/#{id}" } end - - + + def miss(missing_keys, options) find_from_keys(*missing_keys) end - + def uncacheable find_from_ids_without_cache(@original_ids, @options1) end @@ -48,4 +48,4 @@ module Cache end end end -end \ No newline at end of file +end lib/cache/query/primary_key.rb @@ -2,10 +2,10 @@ module Cache module Query class Select < Abstract delegate :find_every_without_cache, :to => :@active_record - + protected def miss(_, miss_options) - find_every_without_cache(miss_options) + find_every_without_cache(miss_options) end def uncacheable @@ -13,4 +13,4 @@ module Cache end end end -end \ No newline at end of file +end lib/cache/query/select.rb @@ -36,4 +36,4 @@ module Cache @cache = @cache.pop end end -end \ No newline at end of file +end lib/cache/transactional.rb @@ -1,3 +1,3 @@ class Array alias_method :count, :size -end \ No newline at end of file +end lib/cache/util/array.rb @@ -62,4 +62,4 @@ module Cache end end end -end \ No newline at end of file +end lib/cache/write_through.rb @@ -130,4 +130,4 @@ module Cache end end end -end \ No newline at end of file +end spec/cache/accessor_spec.rb @@ -48,8 +48,8 @@ module Cache lambda { Story.find(1, 2, 3) }.should raise_error(ActiveRecord::RecordNotFound) end end - - + + describe '#find(nil)' do it 'raises an error' do lambda { Story.find(nil) }.should raise_error(ActiveRecord::RecordNotFound) @@ -187,4 +187,4 @@ module Cache end end end -end \ No newline at end of file +end spec/cache/active_record_spec.rb @@ -53,4 +53,4 @@ module Cache end end end -end \ No newline at end of file +end spec/cache/calculations_spec.rb @@ -12,7 +12,7 @@ module Cache Story.find(story.id).should == story end end - + describe '#find(object)' do it 'uses the objects quoted id' do story = Story.create! @@ -135,7 +135,7 @@ module Cache Story.find(:first, :conditions => { :title => story.title, :id => story.id }).should == story end end - + describe 'on unindexed attribtes' do it 'uses the database, not the cache' do story = Story.create! @@ -167,7 +167,7 @@ module Cache end end end - + describe '#find(1, :conditions => ...)' do it "does not use the database" do story = Story.create! @@ -176,7 +176,7 @@ module Cache Character.send :with_scope, :find => { :conditions => { :story_id => story.id } } do Character.find(character.id, :conditions => { :name => name }).should == character end - end + end end end @@ -210,7 +210,7 @@ module Cache end end end - + describe '#find(:all)' do it "uses the database, not the cache" do character = Character.create! @@ -260,7 +260,7 @@ module Cache end end end - + describe '#find_by_attr' do describe 'on indexed attributes' do describe '#find_by_id(id)' do @@ -295,34 +295,34 @@ module Cache end end end - + describe 'when the cache is not populated' do before do @story = Story.create!(:title => 'title') $memcache.flush_all end - + describe '#find(:first, ...)' do it 'populates the cache' do Story.find(:first, :conditions => { :title => @story.title }) Story.fetch("title/#{@story.title}").should == [@story.id] end end - + describe '#find_by_attr' do it 'populates the cache' do Story.find_by_title(@story.title) Story.fetch("title/#{@story.title}").should == [@story.id] end end - + describe '#find(:all, :conditions => ...)' do it 'populates the cache' do Story.find(:all, :conditions => { :title => @story.title }) Story.fetch("title/#{@story.title}").should == [@story.id] end end - + describe '#find(1)' do it 'populates the cache' do Story.find(@story.id) @@ -333,4 +333,4 @@ module Cache end end end -end \ No newline at end of file +end spec/cache/finders_spec.rb @@ -84,4 +84,4 @@ module Cache end end end -end \ No newline at end of file +end spec/cache/lock_spec.rb @@ -5,7 +5,7 @@ module Cache before :suite do FairyTale = Class.new(Story) end - + describe '#create!' do describe 'the records are written-through in sorted order', :shared => true do describe 'when there are not already records matching the index' do @@ -14,25 +14,25 @@ module Cache FairyTale.get("title/#{fairy_tale.title}").should == [fairy_tale.id] end end - + describe 'when there are already records matching the index' do before do @fairy_tale1 = FairyTale.create!(:title => 'title') FairyTale.get("title/#{@fairy_tale1.title}").should == sorted_and_serialized_records(@fairy_tale1) end - + describe 'when the index is populated' do it 'appends to the index' do fairy_tale2 = FairyTale.create!(:title => @fairy_tale1.title) FairyTale.get("title/#{@fairy_tale1.title}").should == sorted_and_serialized_records(@fairy_tale1, fairy_tale2) end end - + describe 'when the index is not populated' do before do $memcache.flush_all end - + it 'initializes the index' do fairy_tale2 = FairyTale.create!(:title => @fairy_tale1.title) FairyTale.get("title/#{@fairy_tale1.title}").should == sorted_and_serialized_records(@fairy_tale1, fairy_tale2) @@ -40,26 +40,26 @@ module Cache end end end - + describe 'when the order is ascending' do it_should_behave_like 'the records are written-through in sorted order' - + before :all do FairyTale.index :title, :order => :asc end - + def sorted_and_serialized_records(*records) records.collect(&:id).sort end end - + describe 'when the order is descending' do it_should_behave_like 'the records are written-through in sorted order' - + before :all do FairyTale.index :title, :order => :desc end - + def sorted_and_serialized_records(*records) records.collect(&:id).sort.reverse end @@ -70,12 +70,12 @@ module Cache before :each do @fairy_tales = [FairyTale.create!(:title => @title = 'title'), FairyTale.create!(:title => @title)] end - + describe 'when the order is ascending' do before :all do FairyTale.index :title, :order => :asc end - + describe "#find(..., :order => 'id ASC')" do describe 'when the cache is populated' do it 'does not use the database' do @@ -88,7 +88,7 @@ module Cache FairyTale.find(:all, :conditions => { :title => @title }, :order => '`stories`.`id`').should == @fairy_tales end end - + describe 'when the cache is not populated' do it 'populates the cache' do $memcache.flush_all @@ -97,7 +97,7 @@ module Cache end end end - + describe "#find(..., :order => 'id DESC')" do describe 'when the cache is populated' do it 'uses the database, not the cache' do @@ -105,7 +105,7 @@ module Cache FairyTale.find(:all, :conditions => { :title => @title }, :order => 'id DESC').should == @fairy_tales.reverse end end - + describe 'when the cache is not populated' do it 'does not populate the cache' do $memcache.flush_all @@ -115,12 +115,12 @@ module Cache end end end - + describe 'when the order is descending' do before :all do FairyTale.index :title, :order => :desc end - + describe "#find(..., :order => 'id DESC')" do describe 'when the cache is populated' do it 'does not use the database' do @@ -163,4 +163,4 @@ module Cache end end end -end \ No newline at end of file +end spec/cache/order_spec.rb @@ -76,7 +76,7 @@ module Cache @cache.get_multi(['key1', 'key2']).should == { 'key1' => @value, 'key2' => @value } end end - + describe 'when there are misses' do it 'only returns results for hits' do @cache.set('key1', @value) @@ -94,7 +94,7 @@ module Cache end $memcache.get(@key).should == @value end - + describe 'when there is a return in the transaction' do it 'commits to the real cache' do $memcache.get(@key).should == nil @@ -196,7 +196,7 @@ module Cache end end end - + describe '#get_multi' do describe 'when a hit value is the empty array' do it 'returns a hash' do @@ -207,7 +207,7 @@ module Cache end end end - + describe 'when everything is a hit' do it 'returns a hash' do @cache.transaction do @@ -217,7 +217,7 @@ module Cache end end end - + describe 'when there are misses' do it 'only returns results for hits' do @cache.transaction do @@ -290,7 +290,7 @@ module Cache $memcache.get_multi(['key1', 'key2']).should == {} end end - + it "get is memoized" do @cache.set(@key, @value) @cache.transaction do @@ -570,4 +570,4 @@ module Cache end end end -end \ No newline at end of file +end spec/cache/transactional_spec.rb @@ -192,4 +192,4 @@ module Cache end end end -end \ No newline at end of file +end spec/cache/window_spec.rb @@ -127,7 +127,7 @@ module Cache Story.get(cache_key).should == [story2.id] end end - + describe 'when the object is a new record' do it 'does nothing' do story1 = Story.new @@ -209,4 +209,4 @@ module Cache end end end -end \ No newline at end of file +end spec/cache/write_through_spec.rb @@ -50,4 +50,4 @@ Spec::Runner.configure do |config| index :subtitle end end -end \ No newline at end of file +end spec/spec_helper.rb 72d4a545844bf819798aa64d8916443c8c39340e Nick Kallen nkallen@nick-kallens-computer-2.local http://github.com/brynary/cache-money/commit/679414a5b118e8ac15ed34921dc557e23460254e 679414a5b118e8ac15ed34921dc557e23460254e 2008-11-23T20:10:50-08:00 2008-11-23T20:10:50-08:00 britspaaaaaaaaaaaaaaaaaaaaaaaaaaaace 5dda8a0ff6b8949038f962a4e1f12b99e2e09808 Nick Kallen nkallen@nick-kallens-computer-2.local