cache_advance 1.1.5 → 2.0.0

data/VERSION

@@ -1 +1 @@
-1.1.5
+2.0.0

data/cache_advance.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{cache_advance}
-  s.version = "1.1.5"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aubrey Holland"]
-  s.date = %q{2010-03-01}
+  s.date = %q{2011-01-19}
   s.description = %q{hmm}
   s.email = %q{aubreyholland@gmail.com}
   s.extra_rdoc_files = [
@@ -24,13 +24,9 @@ Gem::Specification.new do |s|
      "VERSION",
      "cache_advance.gemspec",
      "lib/cache_advance.rb",
-     "lib/cache_advance/active_record_sweeper.rb",
      "lib/cache_advance/cache_set.rb",
-     "lib/cache_advance/cached_key_list.rb",
-     "lib/cache_advance/lock.rb",
      "lib/cache_advance/mapper.rb",
      "lib/cache_advance/named_cache.rb",
-     "lib/cache_advance/named_cache_configuration.rb",
      "rails/init.rb",
      "script/console",
      "test/active_record_sweeper_test.rb",
@@ -44,7 +40,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/aub/cache_advance/tree/master}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A declarative system for caching with ActiveRecord}
   s.test_files = [
     "test/active_record_sweeper_test.rb",
@@ -60,9 +56,10 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else
   end
 end
+

data/lib/cache_advance/cache_set.rb

@@ -9,7 +9,6 @@ module CacheAdvance
     end
     
     def setup_complete
-      
     end
     
     def apply(cache_name, request, options, &block)
@@ -39,19 +38,5 @@ module CacheAdvance
     def define_caches
       yield Mapper.new(self)
     end
-    
-    def create_sweepers
-      @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 |named_cache|
-        named_cache.expire_for(class_name)
-      end
-    end
-    
-    def sweeper_type=(type)
-      @sweeper_type = type
-    end
   end
 end

data/lib/cache_advance/named_cache.rb

@@ -1,21 +1,14 @@
 module CacheAdvance
   class NamedCache
 
-    ENABLED_CHECK_INTERVAL = 60
-    
     def initialize(name, params, cache_set, store)
       @name = name.to_s
       @params = params
       @cache_set = cache_set
       @store = store
-      @cached_key_list = CachedKeyList.new(@store, "#{@name}/STORED_CACHES", expiration_time)
-      @enabled_check_time = Time.now + ENABLED_CHECK_INTERVAL
-      @enabled = nil
     end
         
     def value_for(request, options, &block)
-      return block.call unless enabled?
-      
       key = key_for(request, options[:key])
       
       if (value = read_from_store(key))
@@ -32,52 +25,11 @@ module CacheAdvance
       result
     end
         
-    def expire_for(type)
-      if expiration_types.include?(type)
-        expire_all
-      end
-    end
-    
-    def expire_all
-      delete_all_from_store
-    end
-        
-    def all_cached_keys
-      @cached_key_list.all_keys
-    end
-    
-    def expiration_types
-      Array(@params[:expiration_types])
-    end
-    
-    def title
-      @params[:title] || @name.to_s
-    end
-    
-    def enabled=(state)
-      @enabled = !!state
-      @store.set(enabled_key, @enabled)
-    end
-    
-    def enabled?
-      if @enabled.nil? || Time.now >= @enabled_check_time
-        @enabled = [nil, true].include?(read_from_store(enabled_key, false))
-        @enabled_check_time = Time.now + ENABLED_CHECK_INTERVAL
-      end
-      @enabled
-    end
-    
     protected
         
-    def read_from_store(key, add_to_key_list=true)
+    def read_from_store(key)
       begin
-        data = @store.get(key)
-        # this is to prevent a situation where the cached key list forgets
-        # about keys that are actually cached.
-        if data && add_to_key_list
-          @cached_key_list.add_key(key)
-        end
-        data
+        @store.get(key)
       rescue MemCache::MemCacheError, Errno::ECONNREFUSED => exception
         log_memcache_error(exception)
         nil
@@ -87,33 +39,12 @@ module CacheAdvance
     def write_to_store(key, value)
       begin
         expiration_time ? @store.set(key, value, expiration_time) : @store.set(key, value)
-        @cached_key_list.add_key(key)
       rescue MemCache::MemCacheError, Errno::ECONNREFUSED => exception
         log_memcache_error(exception)
         nil
       end
     end
 
-    def delete_from_store(key)
-      begin
-        @store.delete(key)
-        @cached_key_list.delete_key(key)
-      rescue MemCache::MemCacheError, Errno::ECONNREFUSED => exception
-        log_memcache_error(exception)
-        nil
-      end
-    end
-        
-    def delete_all_from_store
-      begin
-        @cached_key_list.all_keys.each { |key| delete_from_store(key) }
-        @cached_key_list.clear
-      rescue MemCache::MemCacheError, Errno::ECONNREFUSED => exception
-        log_memcache_error(exception)
-        nil
-      end
-    end
-        
     def each_plugin
       @cache_set.plugins.each do |p|
         yield p
@@ -129,10 +60,6 @@ module CacheAdvance
       "#{@name}/#{suffix}/[#{qualifier_data}]".gsub(/\s/, '')
     end
         
-    def enabled_key
-      "#{@name}/ENABLED_STATUS"
-    end  
-      
     def expiration_time
       @params[:expiration_time]
     end

data/rails/init.rb

@@ -1,12 +1,8 @@
 require 'cache_advance'
-require 'cache_advance/active_record_sweeper'
 
 require "#{RAILS_ROOT}/config/caches"
 require 'dispatcher'
 
-# Setup the sweeper and cache types as appropriate for Rails.
-CacheAdvance.cache_set.sweeper_type = CacheAdvance::ActiveRecordSweeper
-
 CacheAdvance.caching_enabled = config.action_controller.perform_caching
 
 # This is the helper method that can be used in rails views/controllers/helpers.
@@ -35,18 +31,3 @@ ActionMailer::Base.helper do
     capture(&block)
   end
 end
-
-# This will get called after the standard rails environment is initialized.
-config.after_initialize do
-  if config.action_controller.perform_caching
-    # This hooks the sweepers into the observer system and adds it to the list.
-    CacheAdvance.cache_set.create_sweepers
-    ActiveRecord::Base.observers << CacheAdvance::ActiveRecordSweeper
-
-    # In development mode, the models we observe get reloaded with each request. Using
-    # this hook allows us to reload the observer relationships each time as well.
-    ActionController::Dispatcher.to_prepare(:cache_advance_reload) do
-      CacheAdvance::ActiveRecordSweeper.instance.reload_sweeper
-    end
-  end
-end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cache_advance
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: false
   segments: 
-  - 1
-  - 1
-  - 5
-  version: 1.1.5
+  - 2
+  - 0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Aubrey Holland
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-01 00:00:00 -05:00
+date: 2011-01-19 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -35,13 +36,9 @@ files:
 - VERSION
 - cache_advance.gemspec
 - lib/cache_advance.rb
-- lib/cache_advance/active_record_sweeper.rb
 - lib/cache_advance/cache_set.rb
-- lib/cache_advance/cached_key_list.rb
-- lib/cache_advance/lock.rb
 - lib/cache_advance/mapper.rb
 - lib/cache_advance/named_cache.rb
-- lib/cache_advance/named_cache_configuration.rb
 - rails/init.rb
 - script/console
 - test/active_record_sweeper_test.rb
@@ -61,23 +58,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A declarative system for caching with ActiveRecord

data/lib/cache_advance/active_record_sweeper.rb

@@ -1,32 +0,0 @@
-require 'rubygems'
-gem 'activerecord'
-require 'active_record/observer'
-
-module CacheAdvance
-  class ActiveRecordSweeper < ::ActiveRecord::Observer
-
-    def self.initialize_observed(classes)
-      observe(classes)
-    end
-
-    def reload_sweeper
-      observed_classes.each do |klass| 
-        klass.name.constantize.add_observer(self)
-      end
-    end
-
-    def after_create(object)
-      expire_caches_for(object)
-    end
-
-    alias_method :after_update, :after_create
-    alias_method :after_destroy, :after_create
-
-    protected
-    
-    def expire_caches_for(object)
-      class_symbol = object.class.name.underscore.to_sym
-      CacheAdvance.cache_set.expire_for_class(class_symbol)
-    end
-  end
-end

data/lib/cache_advance/cached_key_list.rb

@@ -1,46 +0,0 @@
-module CacheAdvance
-  class CachedKeyList
-    def initialize(store, cache_key, expiration_time=nil)
-      @store, @cache_key, @expiration_time = store, cache_key, expiration_time
-    end
-    
-    def all_keys
-      key_list.keys
-    end
-    
-    def add_key(key)
-      Lock.new(@store).execute_locked(@cache_key) do
-        data = key_list
-        unless data.has_key?(key)
-          data[key] = @expiration_time.nil? ? nil : Time.now + @expiration_time
-          @store.set(@cache_key, data)
-        end
-      end
-    end
-    
-    def delete_key(key)
-      Lock.new(@store).execute_locked(@cache_key) do
-        data = key_list
-        if data.has_key?(key)
-          data.delete(key)
-          @store.set(@cache_key, data)
-        end
-      end
-    end
-    
-    def clear
-      @store.set(@cache_key, {})
-    end
-    
-    protected
-    
-    def key_list
-      list = @store.get(@cache_key) || {}
-      if @expiration_time
-        now = Time.now
-        list.delete_if { |k,v| v <= now }
-      end
-      list
-    end
-  end
-end

data/lib/cache_advance/lock.rb

@@ -1,40 +0,0 @@
-module CacheAdvance
-  class Lock
-
-    class LockAcquisitionFailureException < Exception; end
-    
-    DEFAULT_RETRIES = 5
-    DEFAULT_EXPIRATION_TIME = 30
-
-    def initialize(store)
-      @store = store
-    end
-    
-    def execute_locked(key, lock_expiry = DEFAULT_EXPIRATION_TIME, retries = DEFAULT_RETRIES)
-      begin
-        acquire(key, lock_expiry, retries)
-        yield
-      ensure
-        release_lock(key)
-      end
-    end
-    
-    def acquire(key, lock_expiry = DEFAULT_EXPIRATION_TIME, retries = DEFAULT_RETRIES)
-      retries.times do |count|
-        begin
-          return if @store.set("lock/#{key}", Process.pid, lock_expiry) == "STORED\r\n"
-        end
-        exponential_sleep(count) unless count == retries - 1
-      end
-      raise LockAcquisitionFailureException, "Couldn't acquire memcache lock for: #{key}"
-    end
-
-    def release_lock(key)
-      @store.delete("lock/#{key}")
-    end
-
-    def exponential_sleep(count)
-      sleep((2**count) / 10.0)
-    end
-  end
-end

data/lib/cache_advance/named_cache_configuration.rb

@@ -1,7 +0,0 @@
-module CacheAdvance
-  class NamedCacheConfiguration
-    def initialize(options)
-      @options = options
-    end
-  end
-end