cache-machine 0.1.8 → 0.1.9

data/README.rdoc

@@ -1,4 +1,5 @@
 = cache-machine
+http://img195.imageshack.us/img195/5371/cachemachinefinal2.png
 
 An ActiveRecord mixin that helps managing cached content in a Ruby on Rails application with complex data update dependencies.
 
@@ -17,20 +18,20 @@ Cache Machine depends only on the Rails.cache API and is thereby library agnosti
 = Usage
 
   # Fetch cache of venues collection on model_instance.
-  @neighborhood.fetch_cache_of(:venues) { @neighborhood.venues }
+  @neighborhood.fetch_cache_of(:venues) { venues }
 
   # Specify format.
-  @neighborhood.fetch_cache_of(:venues, :format => :json) { @neighborhood.venues.to_json }
+  @neighborhood.fetch_cache_of(:venues, :format => :json) { venues.to_json }
 
   # Paginated content.
-  @neighborhood.fetch_cache_of(:venues, :page => 2) { @neighborhood.venues.paginate(:page => 2) }
+  @neighborhood.fetch_cache_of(:venues, :page => 2) { venues.paginate(:page => 2) }
 
 In you target model define <b>cache map</b>:
 
-  acts_as_cache_machine_for :venues  => [:hotspots, :today_events],
-                            :cities  => [:venues],
-                            :streets => :hotspots,
-                            :users
+  cache_map :venues  => [:hotspots, :today_events],
+            :cities  => [:venues],
+            :streets => :hotspots,
+            :users
 
 This example shows you how changes of one collection affect on invalidation process.
 For each record of your target model:
@@ -124,6 +125,9 @@ Want to see collection timestamp?
   # For timestamps.
   @lady_gaga.reset_timestamp_of :events
 
+  # You can reset all associated caches using map.
+  @lady_gaga.delete_all_caches
+
 == Cache formats
 Cache Machine invalidates cache using a couple of keys with the different formats.
 Default formats are:

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/cache-machine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cache-machine}
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sergei Zinin", "Kevin Goslar"]
-  s.date = %q{2011-09-11}
+  s.date = %q{2011-10-13}
   s.description = %q{A Ruby on Rails framework to support cache management based on explicitely modeled caching dependencies.}
   s.email = %q{kgoslar@partyearth.com}
   s.extra_rdoc_files = [

data/lib/cache_machine/cache.rb

@@ -37,6 +37,7 @@ module CacheMachine
         include CacheMachine::Cache::Map
         cache_associated(associations)
       end
+      alias :cache_map :acts_as_cache_machine_for
 
       # Returns timestamp of class collection.
       def timestamp format = nil

data/lib/cache_machine/cache/map.rb

@@ -38,7 +38,14 @@ module CacheMachine
         # Called only when <tt>has_many :through</tt> collection changed.
         def delete_association_cache_on record, reflection
           pk = record.class.primary_key
-          self.joins(reflection.name).where(reflection.table_name => { pk => record.send(pk) }).each do |cache_source_record|
+
+          joining = unless reflection.options[:source_type]
+            reflection.through_reflection ? { reflection.through_reflection.name => reflection.source_reflection.name } : reflection.name
+          else
+            reflection.name
+          end
+
+          self.joins(joining).where(reflection.table_name => { pk => record.send(pk) }).find_each do |cache_source_record|
             cache_source_record.delete_cache_of reflection.name
           end
         end
@@ -131,6 +138,13 @@ module CacheMachine
           Rails.cache.fetch(cache_key, :expires_in => expires_in, &block)
         end
 
+        # Removes all caches using map.
+        def delete_all_caches
+          self.class.cache_map.keys.each do |cached_collection|
+            delete_cache_of cached_collection
+          end
+        end
+
         # Recursively deletes cache by map for +_member+.
         def delete_cache_of _member
           delete_cache_of_only _member
@@ -179,6 +193,7 @@ module CacheMachine
           # Deletes cache of associated collection what contains +record+.
           # Called only when <tt>has_many :through</tt> collection changed.
           def delete_association_cache_on record
+
             # Find all associations with +record+ by its class.
             associations = self.class.reflect_on_all_associations.find_all { |association| association.klass == record.class }
 

data/lib/cache_machine/logger.rb

@@ -19,12 +19,16 @@ module CacheMachine
       # Call like this in your your code, best in development.rb: ActiveRecord::CacheMachine::Logger.level = :info
       def level= value
         @@level = LOGGING_LEVELS[value] or raise "CACHE_MACHINE: Unknown log level: '#{value}'."
-        puts "CACHE_MACHINE: Setting log level to '#{value}'."
+        if @@level <= LOGGING_LEVELS[:info]
+          puts "CACHE_MACHINE: Setting log level to '#{value}'.\n"
+        end
       end
 
       # Logs the given entry with the given log level.
       def write level, text
-        puts text if @@level <= (LOGGING_LEVELS[level] or raise "CACHE_MACHINE: Unknown log level: '#{level}'.")
+        if @@level <= (LOGGING_LEVELS[level] or raise "CACHE_MACHINE: Unknown log level: '#{level}'.")
+          puts text
+        end
       end
     end
   end

data/spec/lib/cache_machine_spec.rb

@@ -70,11 +70,11 @@ describe CacheMachine do
   class Cacher < ActiveRecord::Base
     set_table_name TARGET_TABLE_NAME
 
-    acts_as_cache_machine_for :polymorphics,
-                              :child_cachers,
-                              :has_many_cacheables => :dependent_cache,
-                              :has_many_through_cacheables => :dependent_cache,
-                              :has_and_belongs_to_many_cacheables => :dependent_cache
+    cache_map :polymorphics,
+              :child_cachers,
+              :has_many_cacheables => :dependent_cache,
+              :has_many_through_cacheables => :dependent_cache,
+              :has_and_belongs_to_many_cacheables => :dependent_cache
 
     define_timestamp(:dynamic_timestamp) { execute_timestamp }
     define_timestamp(:static_timestamp)
@@ -125,7 +125,19 @@ describe CacheMachine do
     end
   end
 
-  describe "deletes cache" do
+  context "deletes cache" do
+
+    describe "#delete_all_caches" do
+      it "removes all caches using map" do
+        subject.fetch_cache_of(:polymorphics) { 'cache' }
+        subject.fetch_cache_of(:dependent_cache) { 'cache' }
+
+        subject.delete_all_caches
+
+        subject.fetch_cache_of(:polymorphics) { 'new cache' }.should == 'new cache'
+        subject.fetch_cache_of(:dependent_cache) { 'new cache' }.should == 'new cache'
+      end
+    end
 
     context "of polymorphic associations" do
       it "works" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cache-machine
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Sergei Zinin
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-11 00:00:00 Z
+date: 2011-10-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails