taggable_cache 0.4.1 → 0.4.2

data/.rvmrc

@@ -0,0 +1 @@
+rvm use 1.9.3-falcon

data/.travis.yml

@@ -8,9 +8,4 @@ gemfile:
 env:
   - CACHE_STORE=redis
   - CACHE_STORE=memcached
-  - CACHE_STORE=file_store
-matrix:
-  exclude:
-    - rvm: 1.9.3
-      gemfile: gemfiles/Gemfile-rails.3.1.x
-      env: CACHE_STORE=redis
+  - CACHE_STORE=file_store

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+= Taggable cache 0.4.2
+
+- Internal refactoring
+- Added Rails.cache.expire_all method
+
 = Taggable cache 0.4.1
 
 - Fixed support for redis cache store with rails 3.2

data/README.rdoc

@@ -2,7 +2,9 @@
 
 This gem simplifies cache expiration in rails by adding depends_on helper, which expires cache element when depending object is changed/deleted.
 
+= Build Status {<img src="https://secure.travis-ci.org/brain-geek/taggable-cache.png"/>}[http://travis-ci.org/brain-geek/taggable-cache]
 = How to use
+For taggable-cache you must have redis server for data about tags. Cache storage can be anything, but gem uses redis for its own storage.
 
 Controller(action caching):
 
@@ -38,7 +40,13 @@ Usage with cells gem:
     end
   end
 
-== Build Status {<img src="https://secure.travis-ci.org/brain-geek/taggable-cache.png"/>}[http://travis-ci.org/brain-geek/taggable-cache]
+If you are using redis for cache, it is recommended to set default expire_ttl value:
+
+    config.cache_store = ActiveSupport::Cache::RedisStore.new(:expire_in => 16.hours.to_i)
+
+== What is supported
+
+Rails 3.1.x and 3.2.x are supported. Tested with ruby 1.9.3, but should work on 1.8.7. As cache storage you can use redis, memcached and file store caches. 
 
 == Contributing to taggable-cache
  

data/gemfiles/Gemfile-rails.3.1.x

@@ -4,4 +4,4 @@ eval(IO.read(filename), binding)
 gem 'taggable_cache', :path => '..'
 
 gem 'rails', '~> 3.1.0'
-gem 'redis-store', '~>1.1.0'
+gem 'redis-rails', '~>3.1.0'

data/gemfiles/Gemfile.shared

@@ -4,7 +4,7 @@ gem 'rake'
 gem 'rspec-rails', :require => false
 gem 'rspec'
 gem 'capybara'
-gem 'combustion'
+gem "combustion", "~> 0.3.2"
 gem 'sqlite3'
 
 gem 'memcache-client'

data/lib/taggable_cache/extensions/action_controller.rb

@@ -0,0 +1,26 @@
+module TaggableCache
+  module ActionControllerExtension
+    extend ActiveSupport::Concern
+    def self.included(base)
+      base.class_eval do
+        def depends_on(*keys)
+          _process_action_callbacks.find_all{|x| 
+              (x.kind == :around) && 
+              (x.raw_filter.is_a? ActionController::Caching::Actions::ActionCacheFilter) }.each do |callback|
+            cache_path = callback.raw_filter.instance_variable_get('@cache_path')
+
+            path_options = if cache_path.respond_to?(:call)
+              instance_exec(self, &cache_path)
+            else
+              cache_path
+            end
+
+            path_options = ::ActionController::Caching::Actions::ActionCachePath.new(self, path_options || {}).path
+
+            Rails.cache.add_tags(fragment_cache_key(path_options), *keys)
+          end
+        end        
+      end
+    end
+  end  
+end

data/lib/taggable_cache/extensions/active_record.rb

@@ -0,0 +1,32 @@
+module TaggableCache
+  module ActiveRecordExtension
+    extend ActiveSupport::Concern
+    included do
+      # Future subclasses will pick up the model extension
+      class << self
+        def inherited_with_taggable(kls)
+          inherited_without_taggable kls
+          kls.send(:include, TaggableCache::ActiveRecordModelExtension) if kls.superclass == ActiveRecord::Base
+        end
+        alias_method_chain :inherited, :taggable
+      end
+
+      # Existing subclasses pick up the model extension as well
+      self.descendants.each do |kls|
+        kls.send(:include, TaggableCache::ActiveRecordModelExtension) if kls.superclass == ActiveRecord::Base
+      end
+    end
+  end
+
+
+  module ActiveRecordModelExtension
+    extend ActiveSupport::Concern
+    def self.included(base)
+        [:after_update, :before_update, :before_destroy, :after_create].each do |event|
+          base.send(event, Proc.new do |model|
+                  Rails.cache.delete_by_tags(model, model.class)
+                end)
+      end
+    end
+  end
+end

data/lib/taggable_cache/extensions/cache_store.rb

@@ -0,0 +1,56 @@
+module TaggableCache
+  module CacheStoreExtension
+    extend ActiveSupport::Concern
+    def self.included(base)
+      base.class_eval do
+        def taggable
+          @taggable ||= ::TaggableCache::Store::Redis.new
+        end
+        
+        def write_with_taggable(name, value, options = nil)
+          if !options.nil? && options.has_key?(:depends_on) 
+            add_tags(name, *options[:depends_on])
+          end
+
+          write_without_taggable(name, value, options)
+        end
+
+        alias_method_chain :write, :taggable
+
+        def add_tags(key, *params)
+          taggable.add(key, *params)
+        end
+
+        def delete_by_tags(*params)
+          taggable.get(*params).each do |m|
+            self.delete(m)
+          end
+
+          taggable.get_scope(*(params.delete_if{|a| not a.is_a? ActiveRecord::Base})).each do |m|
+            self.delete(m)
+          end
+        end
+
+        def expire_all
+          #Load all the models
+          Dir.glob(Rails.root + '/app/models/*.rb').each {|file| require file}
+          
+          ActiveRecord::Base.subclasses.each do |cls|
+            delete_by_tags cls
+
+            pk_name = cls.primary_key
+
+            return if cls.unscoped.first.nil? #There is no sence in continuing, if model is empty
+
+            last_id = cls.order(pk_name).last.try(pk_name.to_sym)
+            first_id = 1
+
+            (first_id..last_id).each do |id|
+              delete_by_tags({:cls => cls, :id => id})
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/taggable_cache/railtie.rb

@@ -1,4 +1,6 @@
-require 'taggable_cache/extensions'
+require 'taggable_cache/extensions/action_controller'
+require 'taggable_cache/extensions/active_record'
+require 'taggable_cache/extensions/cache_store'
 
 module TaggableCache
   class Railtie < ::Rails::Railtie

data/lib/taggable_cache/store/base.rb

@@ -0,0 +1,59 @@
+module TaggableCache::Store
+  class Base
+    def id_for(obj)
+      if obj.is_a? Class
+        obj.to_s.downcase
+      elsif obj.is_a? ActiveRecord::Base
+        if obj.persisted?
+          "#{obj.class.to_s.downcase}-#{obj.id}" 
+        else
+          id_for(obj.class)
+        end
+      elsif obj.is_a? Arel::SelectManager
+        "query-keys-#{Digest::MD5.hexdigest(obj.to_sql)}"
+      elsif obj.is_a? ActiveRecord::Relation
+        id_for(obj.arel)
+      elsif obj.is_a? Hash
+        if obj.include?(:cls) && obj.include?(:id)
+          "#{obj[:cls].to_s.downcase}-#{obj[:id]}"
+        else
+          nil
+        end
+      else
+        nil
+      end
+    end
+
+    def is_scope?(scope)
+      (scope.is_a? ActiveRecord::Relation) || (scope.is_a? Arel::SelectManager)
+    end
+
+    def in_scope?(scope, object)
+      return false unless object.persisted?
+
+      query = scope.where(scope.froms.first[:id].eq(object.id)).to_sql
+
+      object.class.connection.select_all(query).length > 0
+    end
+
+    def initialize
+      raise ActionController::NotImplemented.new      
+    end
+
+    def add(tag, *members)
+      raise ActionController::NotImplemented.new
+    end
+
+    def get(*members)
+      raise ActionController::NotImplemented.new
+    end
+
+    def add_scope(tag, scope)
+      raise ActionController::NotImplemented.new
+    end
+
+    def get_scope(*members)
+      raise ActionController::NotImplemented.new
+    end
+  end
+end

data/lib/taggable_cache/store/redis.rb

@@ -0,0 +1,55 @@
+require "redis"
+require "digest/md5"
+
+module TaggableCache::Store
+  class Redis < TaggableCache::Store::Base
+    def initialize
+      @redis = ::Redis.new  :host => ENV['REDIS_HOST'] || '127.0.0.1',
+                            :port => ENV['REDIS_PORT'] ? ENV['REDIS_PORT'].to_i : 6379
+    end
+
+    def add(tag, *members)
+      members.each do |element|
+        add_scope(tag, element) if is_scope? element
+        ident = id_for(element)
+        @redis.sadd ident, tag unless ident.nil?
+      end
+    end
+
+    def get(*members)
+      keys = members.map { |tag| id_for(tag) }
+      elements = @redis.sunion(keys)
+      @redis.del(keys)
+      elements.flatten.compact
+    end
+
+    def add_scope(tag, scope)
+      scope = scope.arel if scope.is_a? ActiveRecord::Relation
+      table_name = scope.froms.first.name
+      query_fingerprint = Digest::MD5.hexdigest(scope.to_sql)
+
+      @redis.sadd "#{table_name}-scopes", "#{query_fingerprint}"
+      @redis.set "query-#{query_fingerprint}", Marshal.dump(scope)
+    end
+
+    def get_scope(*members)
+      keys = members.delete_if{|a| not a.is_a? ActiveRecord::Base }.map do |object|
+
+        table_redis_key = "#{object.class.table_name}-scopes"
+
+        @redis.smembers(table_redis_key).map do |scope_key|
+          scope = Marshal.restore(@redis.get("query-#{scope_key}"))
+
+          if in_scope?(scope, object)
+            ident = "query-keys-#{scope_key}"
+            elements = @redis.smembers(ident)
+            @redis.del(ident)
+            elements
+          end
+        end
+      end
+      
+      keys.flatten.compact
+    end
+  end
+end

data/lib/taggable_cache/store.rb

@@ -1,85 +1,2 @@
-require "redis"
-require "digest/md5"
-
-class TaggableCache::Store
-  def initialize
-    @redis = Redis.new  :host => ENV['REDIS_HOST'] || '127.0.0.1',
-                        :port => ENV['REDIS_PORT'] ? ENV['REDIS_PORT'].to_i : 6379
-  end
-
-  def id_for(obj)
-    if obj.is_a? Class
-      obj.to_s.downcase
-    elsif obj.is_a? ActiveRecord::Base
-      if obj.persisted?
-        "#{obj.class.to_s.downcase}-#{obj.id}" 
-      else
-        id_for(obj.class)
-      end
-    elsif obj.is_a? Arel::SelectManager
-      "query-keys-#{Digest::MD5.hexdigest(obj.to_sql)}"
-    elsif obj.is_a? ActiveRecord::Relation
-      id_for(obj.arel)
-    else
-      nil
-    end
-  end
-
-  def add(tag, *members)
-    members.each do |element|
-      add_scope(tag, element) if is_scope? element
-      ident = id_for(element)
-      @redis.sadd ident, tag unless ident.nil?
-    end
-  end
-
-  def get(*members)
-    members.map do |tag|
-      ident = id_for(tag)
-      elements = @redis.smembers(ident)
-      @redis.del(ident)
-      elements
-    end.flatten.compact
-  end
-
-  def is_scope?(scope)
-    (scope.is_a? ActiveRecord::Relation) || (scope.is_a? Arel::SelectManager)
-  end
-
-  def add_scope(tag, scope)
-    scope = scope.arel if scope.is_a? ActiveRecord::Relation
-    table_name = scope.froms.first.name
-    query_fingerprint = Digest::MD5.hexdigest(scope.to_sql)
-
-    @redis.sadd "#{table_name}-scopes", "#{query_fingerprint}"
-    @redis.set "query-#{query_fingerprint}", Marshal.dump(scope)
-  end
-
-  def in_scope(scope, object)
-    return false unless object.persisted?
-
-    query = scope.where(scope.froms.first[:id].eq(object.id)).to_sql
-
-    object.class.connection.select_all(query).length > 0
-  end
-
-  def get_scope(*members)
-    keys = members.delete_if{|a| not a.is_a? ActiveRecord::Base }.map do |object|
-
-      table_redis_key = "#{object.class.table_name}-scopes"
-
-      @redis.smembers(table_redis_key).map do |scope_key|
-        scope = Marshal.restore(@redis.get("query-#{scope_key}"))
-
-        if in_scope(scope, object)
-          ident = "query-keys-#{scope_key}"
-          elements = @redis.smembers(ident)
-          @redis.del(ident)
-          elements
-        end
-      end
-    end
-    
-    keys.flatten.compact
-  end
-end
+require 'taggable_cache/store/base'
+require 'taggable_cache/store/redis'

data/lib/taggable_cache/version.rb

@@ -1,3 +1,3 @@
 module TaggableCache
-  VERSION = "0.4.1" # This is for the gem and does not conflict with the rest of the functionality
+  VERSION = "0.4.2" # This is for the gem and does not conflict with the rest of the functionality
 end

data/spec/integration/rails_cache_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
 
 describe 'TaggableCache::Rails::Cache' do
   before :all do
-    @object = TaggableCache::Store.new
+    @object = TaggableCache::Store::Redis.new
     @page_object = Page.create
   end
 

data/spec/taggable-cache/expire_all_spec.rb

@@ -0,0 +1,39 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
+
+describe TaggableCache::Store do
+  it "should expire all present cache entries with depends_on" do
+    Rails.cache.write 'expireme', 'value', :depends_on => Page
+    Rails.cache.read('expireme').should == 'value'
+
+    Rails.cache.expire_all
+
+    Rails.cache.read('expireme').should be_nil
+  end
+
+  it "should not expire cache entries without depends_on" do
+    Rails.cache.write 'expireme', 'value2', :depends_on => Page    
+    Rails.cache.read('expireme').should == 'value2'
+
+    Rails.cache.expire_all
+
+    Rails.cache.read('expireme').should be_nil
+  end
+
+  it "should expire cache entries, elements for which were already deleted" do
+    page = Page.new
+    page.save!
+
+    #creating second one
+    Page.new.save!
+
+    Rails.cache.write("new_page_contents", 'lorem ipsum di amet', :depends_on => page)
+
+    page.delete # delete does not call any callbacks
+
+    Rails.cache.read('new_page_contents').should == 'lorem ipsum di amet'
+
+    Rails.cache.expire_all
+
+    Rails.cache.read('new_page_contents').should be_nil
+  end
+end

data/spec/taggable-cache/settings_spec.rb

@@ -9,7 +9,7 @@ describe TaggableCache::Store do
   it "should fall back to defaults if no settings given" do
     Redis.should_receive(:new).with(:host => '127.0.0.1', :port => 6379)
 
-    TaggableCache::Store.new
+    TaggableCache::Store::Redis.new
   end
 
   it "should use ENV settings" do
@@ -18,6 +18,6 @@ describe TaggableCache::Store do
 
     Redis.should_receive(:new).with(:host => 'hostname.lvh.me', :port => 1234)
 
-    TaggableCache::Store.new
+    TaggableCache::Store::Redis.new
   end
 end

data/spec/taggable-cache/store_spec.rb

@@ -4,13 +4,13 @@ describe TaggableCache::Store do
   describe "connection to redis" do
   	it "should use default settings" do
       Redis.should_receive(:new)
-      TaggableCache::Store.new
+      TaggableCache::Store::Redis.new
   	end
   end
 
   describe "adding tags" do
     before :all do
-      @object = TaggableCache::Store.new
+      @object = TaggableCache::Store::Redis.new
       @redis = Redis.new
       @redis.flushall
     end
@@ -39,6 +39,19 @@ describe TaggableCache::Store do
 
         @object.id_for(Page.order(:id)).should_not == @object.id_for(Page.order(:name).arel)
       end
+
+      it "should try to parse well-formatted hash to AR object key" do
+        key = @object.id_for(page = Page.create)
+        key.should == @object.id_for({:cls => :page, :id => page.id})
+        key.should == @object.id_for({:cls => Page, :id => page.id})
+      end
+
+      it "should ignore bad-formatted hashes" do
+        @object.id_for({:cls => :page}).should be_nil
+        @object.id_for({:cls => Page}).should be_nil
+        @object.id_for({:id => 543}).should be_nil
+        @object.id_for({:sdfasdf => 345}).should be_nil
+      end
     end
 
     describe "is_scope?" do
@@ -74,17 +87,17 @@ describe TaggableCache::Store do
         @redis.smembers("query-keys-#{key}").should == ['tag_scoped']
       end
 
-      it "should process 'in_scope' right way" do
+      it "should process 'in_scope?' right way" do
         bob = Page.create(:name => 'bob')
         jack = Page.create(:name => 'jack')
 
-        @object.in_scope(Page.where(:name => 'bob'), bob).should be_true
-        @object.in_scope(Page.where(:name => 'bob'), jack).should be_false
+        @object.in_scope?(Page.where(:name => 'bob'), bob).should be_true
+        @object.in_scope?(Page.where(:name => 'bob'), jack).should be_false
 
-        @object.in_scope(Page.order(:id), Page.create).should be_true
+        @object.in_scope?(Page.order(:id), Page.create).should be_true
 
         #unsaved obj(without id)
-        @object.in_scope(Page.order(:id), Page.new).should be_false
+        @object.in_scope?(Page.order(:id), Page.new).should be_false
       end
 
       describe "get_scope" do

data/taggable-cache.gemspec

@@ -9,8 +9,7 @@ Gem::Specification.new do |s|
   s.version = TaggableCache::VERSION
 
   s.authors = ["Alex Rozumey"]
-  s.date = "2012-02-09"
-  s.description = "This gem simplifies cache expiration in rails"
+  s.description = "It makes cache expiration in rails much simpler"
   s.email = "brain-geek@yandex.ua"
 
   s.extra_rdoc_files = [
@@ -26,7 +25,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/brain-geek/taggable-cache"
   s.licenses = ["MIT"]
   s.rubygems_version = "1.8.15"
-  s.summary = "This gem simplifies cache expiration in rails by providing depends_on option to rails cache."
+  s.summary = "This gem simplifies cache expiration in rails by expanding rails cache methods."
 
   #s.add_dependency(%q<rails>, [">= 3.1.0"])
   s.add_dependency(%q<railties>, [">= 3.1.0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taggable_cache
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-09 00:00:00.000000000 Z
+date: 2012-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &76511480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *76511480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &76535640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *76535640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &76533890 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *76533890
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &76532140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,8 +69,13 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *76532140
-description: This gem simplifies cache expiration in rails
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+description: It makes cache expiration in rails much simpler
 email: brain-geek@yandex.ua
 executables: []
 extensions: []
@@ -64,6 +84,7 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - .gitignore
+- .rvmrc
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
@@ -74,9 +95,13 @@ files:
 - gemfiles/Gemfile-rails.3.2.x
 - gemfiles/Gemfile.shared
 - lib/taggable_cache.rb
-- lib/taggable_cache/extensions.rb
+- lib/taggable_cache/extensions/action_controller.rb
+- lib/taggable_cache/extensions/active_record.rb
+- lib/taggable_cache/extensions/cache_store.rb
 - lib/taggable_cache/railtie.rb
 - lib/taggable_cache/store.rb
+- lib/taggable_cache/store/base.rb
+- lib/taggable_cache/store/redis.rb
 - lib/taggable_cache/version.rb
 - spec/integration/rails_cache_spec.rb
 - spec/internal/app/controller/action_caching_controller.rb
@@ -89,6 +114,7 @@ files:
 - spec/requests/action_caching_controller_spec.rb
 - spec/requests/fragment_caching_controller_spec.rb
 - spec/spec_helper.rb
+- spec/taggable-cache/expire_all_spec.rb
 - spec/taggable-cache/settings_spec.rb
 - spec/taggable-cache/store_spec.rb
 - taggable-cache.gemspec
@@ -107,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 648391631
+      hash: -997136803
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -116,12 +142,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 648391631
+      hash: -997136803
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: This gem simplifies cache expiration in rails by providing depends_on option
-  to rails cache.
+summary: This gem simplifies cache expiration in rails by expanding rails cache methods.
 test_files: []

data/lib/taggable_cache/extensions.rb

@@ -1,92 +0,0 @@
-module TaggableCache
-  module CacheStoreExtension
-    extend ActiveSupport::Concern
-    def self.included(base)
-      base.class_eval do
-        def taggable
-          @taggable ||= ::TaggableCache::Store.new
-        end
-        
-        def write_with_taggable(name, value, options = nil)
-          if !options.nil? && options.has_key?(:depends_on) 
-            add_tags(name, *options[:depends_on])
-          end
-
-          write_without_taggable(name, value, options)
-        end
-
-        alias_method_chain :write, :taggable
-
-        def add_tags(key, *params)
-          taggable.add(key, *params)
-        end
-
-        def delete_by_tags(*params)
-          taggable.get(*params).each do |m|
-            self.delete(m)
-          end
-
-          taggable.get_scope(*(params.delete_if{|a| not a.is_a? ActiveRecord::Base})).each do |m|
-            self.delete(m)
-          end
-        end
-      end
-    end
-  end
-
-  module ActionControllerExtension
-    extend ActiveSupport::Concern
-    def self.included(base)
-      base.class_eval do
-        def depends_on(*keys)
-          _process_action_callbacks.find_all{|x| 
-              (x.kind == :around) && 
-              (x.raw_filter.is_a? ActionController::Caching::Actions::ActionCacheFilter) }.each do |callback|
-            cache_path = callback.raw_filter.instance_variable_get('@cache_path')
-
-            path_options = if cache_path.respond_to?(:call)
-              instance_exec(self, &cache_path)
-            else
-              cache_path
-            end
-
-            path_options = ::ActionController::Caching::Actions::ActionCachePath.new(self, path_options || {}).path
-
-            Rails.cache.add_tags(fragment_cache_key(path_options), *keys)
-          end
-        end        
-      end
-    end
-  end  
-
-  module ActiveRecordExtension
-    extend ActiveSupport::Concern
-    included do
-      # Future subclasses will pick up the model extension
-      class << self
-        def inherited_with_taggable(kls)
-          inherited_without_taggable kls
-          kls.send(:include, TaggableCache::ActiveRecordModelExtension) if kls.superclass == ActiveRecord::Base
-        end
-        alias_method_chain :inherited, :taggable
-      end
-
-      # Existing subclasses pick up the model extension as well
-      self.descendants.each do |kls|
-        kls.send(:include, TaggableCache::ActiveRecordModelExtension) if kls.superclass == ActiveRecord::Base
-      end
-    end
-  end
-
-
-  module ActiveRecordModelExtension
-    extend ActiveSupport::Concern
-    def self.included(base)
-        [:after_update, :before_update, :before_destroy, :after_create].each do |event|
-          base.send(event, Proc.new do |model|
-                  Rails.cache.delete_by_tags(model, model.class)
-                end)
-      end
-    end
-  end
-end