aub-cache_advance 1.0.3 → 1.0.4

data/cache_advance.gemspec

@@ -1,5 +1,5 @@
 Gem::Specification.new do |s|
-  s.version = '1.0.3'
+  s.version = '1.0.4'
   s.date = %q{2009-01-08}
  
   s.name = %q{cache_advance}

data/lib/cache_advance/cache_set.rb

@@ -3,8 +3,6 @@ module CacheAdvance
     attr_reader :named_caches
     attr_reader :qualifiers
     attr_reader :plugins
-    attr_accessor :sweeper_type
-    attr_accessor :cache
     
     def initialize
       @named_caches = {}
@@ -13,9 +11,9 @@ module CacheAdvance
     end
     
     def apply(cache_name, request, options, &block)
-      cache = @named_caches[cache_name]
-      raise UnknownNamedCacheException if cache.nil?
-      cache.value_for(request, options, &block)
+      named_cache = @named_caches[cache_name]
+      raise UnknownNamedCacheException if named_cache.nil?
+      named_cache.value_for(request, options, &block)
     end
     
     def add_qualifier(name, proc)
@@ -27,7 +25,7 @@ module CacheAdvance
     end
     
     def add_named_cache(name, options)
-      @named_caches[name] = NamedCache.new(name, options, self, cache)
+      @named_caches[name] = NamedCache.new(name, options, self, @cache)
     end
     
     def define_caches
@@ -35,13 +33,21 @@ module CacheAdvance
     end
     
     def create_sweepers
-      sweeper_type.initialize_observed(@named_caches.values.map { |c| c.expiration_types }.flatten.compact.uniq)
+      @sweeper_type.initialize_observed(@named_caches.values.map { |c| c.expiration_types }.flatten.compact.uniq)
     end
     
     def expire_for_class(class_name)
-      @named_caches.values.each do |cache|
-        cache.expire_for(class_name)
+      @named_caches.values.each do |named_cache|
+        named_cache.expire_for(class_name)
       end
     end
+    
+    def cache_type=(type)
+      @cache = type.new
+    end
+    
+    def sweeper_type=(type)
+      @sweeper_type = type
+    end
   end
 end

data/lib/cache_advance/named_cache.rb

@@ -26,14 +26,16 @@ module CacheAdvance
       key = key_for(request, options[:key])
 
       if (cache = @cache.read(key))
-        call_plugins('after_read', key, request, cache)
+        each_plugin { |p| p.send('after_read', @name, key, request, cache) if p.respond_to?('after_read') }
         return cache
       end
-      
+
+      each_plugin { |p| p.send('before_render', @name, key, request) if p.respond_to?('before_render') }
       result = block.call
-      call_plugins('before_write', key, request, cache)
-      @cache.write(key, result, rails_options)      
-      call_plugins('after_write', key, request, cache)
+      each_plugin { |p| p.send('after_render', @name, key, request, result) if p.respond_to?('after_render') }
+      each_plugin { |p| p.send('before_write', @name, key, request, result) if p.respond_to?('before_write') }
+      @cache.write(key, result, rails_options)
+      each_plugin { |p| p.send('after_write', @name, key, request, result) if p.respond_to?('after_write') }
       
       add_to_cached_keys_list(key)
       
@@ -75,8 +77,10 @@ module CacheAdvance
     
     protected
         
-    def call_plugins(method, key, request, data)
-      @cache_set.plugins.each { |p| p.send(method, @name, key, request, data) if p.respond_to?(method) }
+    def each_plugin
+      @cache_set.plugins.each do |p|
+        yield p
+      end
     end
     
     def add_to_cached_keys_list(key)

data/rails/init.rb

@@ -1,6 +1,11 @@
 require 'cache_advance'
 require 'cache_advance/active_record_sweeper'
 require 'cache_advance/rails_cache'
+
+# Setup the sweeper and cache types as appropriate for Rails.
+CacheAdvance::Caches.sweeper_type = CacheAdvance::ActiveRecordSweeper
+CacheAdvance::Caches.cache_type = CacheAdvance::RailsCache
+
 require 'config/caches'
 require 'dispatcher'
 
@@ -15,11 +20,7 @@ end
 
 # This will get called after the standard rails environment is initialized.
 config.after_initialize do
-  
-  # Setup the sweeper_type and cache as appropriate for Rails.
-  CacheAdvance::Caches.sweeper_type = CacheAdvance::ActiveRecordSweeper
-  CacheAdvance::Caches.cache = CacheAdvance::RailsCache.new
-  
+    
   # This hooks the sweepers into the observer system and adds it to the list. 
   CacheAdvance::Caches.create_sweepers
   ActiveRecord::Base.observers << CacheAdvance::ActiveRecordSweeper

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aub-cache_advance
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Aubrey Holland