taggable_cache 0.1.1 → 0.2.0

data/Gemfile

@@ -8,5 +8,6 @@ end
 
 gem 'rspec-rails', :require => false
 gem 'rspec'
+gem 'capybara'
 gem 'combustion', '~> 0.3.1'
 gem 'sqlite3'

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    taggable_cache (0.1.1)
-      redis
+    taggable_cache (0.2.0)
+      rails (>= 3.0.8)
+      redis (>= 2.2.2)
 
 GEM
   remote: http://rubygems.org/
@@ -36,12 +37,22 @@ GEM
       multi_json (~> 1.0)
     arel (3.0.0)
     builder (3.0.0)
+    capybara (1.1.2)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (~> 2.0)
+      xpath (~> 0.1.4)
+    childprocess (0.3.1)
+      ffi (~> 1.0.6)
     coderay (0.9.8)
     combustion (0.3.1)
       rails (>= 3.1.0)
       thor (>= 0.14.6)
     diff-lcs (1.1.3)
     erubis (2.7.0)
+    ffi (1.0.11)
     hike (1.2.1)
     i18n (0.6.0)
     journey (1.0.1)
@@ -54,6 +65,7 @@ GEM
       ruby_parser (>= 2.3.1)
     mime-types (1.17.2)
     multi_json (1.0.4)
+    nokogiri (1.5.0)
     polyglot (0.3.3)
     pry (0.9.7.4)
       coderay (~> 0.9.8)
@@ -101,6 +113,12 @@ GEM
       rspec (~> 2.8.0)
     ruby_parser (2.3.1)
       sexp_processor (~> 3.0)
+    rubyzip (0.9.6.1)
+    selenium-webdriver (2.19.0)
+      childprocess (>= 0.2.5)
+      ffi (~> 1.0.9)
+      multi_json (~> 1.0.4)
+      rubyzip
     sexp_processor (3.0.10)
     slop (2.1.0)
     sprockets (2.1.2)
@@ -114,11 +132,14 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.31)
+    xpath (0.1.4)
+      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  capybara
   combustion (~> 0.3.1)
   pry
   rspec

data/README.rdoc

@@ -8,14 +8,11 @@ See example in spec/internal.
 
 == Build Status {<img src="https://secure.travis-ci.org/brain-geek/taggable-cache.png"/>}[http://travis-ci.org/brain-geek/taggable-cache]
 
-== Dependency Status {<img src="https://gemnasium.com/brain-geek/taggable-cache.png?travis"/>}[https://gemnasium.com/brain-geek/taggable-cache]
-
 == Contributing to taggable-cache
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
 * Fork the project.
-* Start a feature/bugfix branch.
 * Commit and push until you are happy with your contribution.
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.

data/lib/taggable_cache.rb

@@ -1,4 +1,5 @@
 module TaggableCache
 end
 
-require 'taggable_cache/store'
+require 'taggable_cache/store'
+require 'taggable_cache/railtie' if defined?(Rails)

data/lib/taggable_cache/rails/observer.rb

@@ -1,11 +1,11 @@
-class TaggableCache::Rails::Observer < ActiveRecord::Observer
-  def event(model)
-    Rails.cache.taggable.get(model, model.class).each do |m|
-      Rails.cache.delete(m)
+module TaggableCache::Rails
+  class Observer < ActiveRecord::Observer
+    def event(model)
+      Rails.cache.delete_by_tags(model, model.class)
     end
-  end
 
-  alias :after_update :event
-  alias :after_destroy :event
-  alias :after_create :event
+    alias :after_update :event
+    alias :after_destroy :event
+    alias :after_create :event
+  end
 end

data/lib/taggable_cache/railtie.rb

@@ -0,0 +1,37 @@
+ActiveSupport::Cache::Store.class_eval do
+  def taggable
+    @taggable ||= ::TaggableCache::Store.new
+  end
+
+  alias_method :original_write, :write
+
+  def write(name, value, options = nil)
+    if !options.nil? && options.has_key?(:depends_on) 
+      add_tags(name, *options[:depends_on])
+    end
+
+    original_write(name, value, options)
+  end
+
+  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
+  end
+end
+
+ActionController::Base.class_eval do
+  def depends_on(*params)
+    key_name = fragment_cache_key(::ActionController::Caching::Actions::ActionCachePath.new(self).path)
+    Rails.cache.add_tags(key_name, *params)
+  end
+end
+
+module TaggableCache
+  class Railtie < ::Rails::Railtie
+  end  
+end

data/lib/taggable_cache/version.rb

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

data/spec/internal/app/controller/action_caching_controller.rb

@@ -0,0 +1,15 @@
+class ActionCachingController < ActionController::Base
+  caches_action :index
+
+  def index
+    Page.load_lot_of_data
+
+    depends_on Page
+
+    render :text => 'sdfsd'
+  end
+
+  def expire
+    expire_action :action => :index
+  end
+end

data/spec/internal/app/controller/fragment_caching_controller.rb

@@ -0,0 +1,8 @@
+class FragmentCachingController < ActionController::Base
+  def index
+  end
+
+  def expire
+    expire_fragment 'cache_entry'
+  end
+end

data/spec/internal/app/models/simple_observer.rb

@@ -1,3 +1,5 @@
+require 'taggable_cache/rails/observer'
+
 class SimpleObserver < TaggableCache::Rails::Observer
   observe Page
 end

data/spec/internal/app/views/fragment_caching/index.html.erb

@@ -0,0 +1,3 @@
+<% cache 'cache_entry', :depends_on => [Page] do %>
+  <% Page.load_lot_of_data %>
+<% end %>

data/spec/internal/config/initializers/taggable.rb

@@ -1,11 +1,3 @@
-#combustion uses rails file cache, so we make magic on it
-require 'taggable_cache/rails'
-
-ActiveSupport::Cache::FileStore.class_eval do
-  include TaggableCache::Rails::Cache
-end
-
 #Listing all models with enabled taggable cache
-# TaggableCache::Rails::Observer.observe Page
 
 Combustion::Application.config.active_record.observers = :simple_observer

data/spec/internal/config/routes.rb

@@ -1,3 +1,3 @@
 Rails.application.routes.draw do
-  #
+  match ':controller/:action'
 end

data/spec/rails_cache_spec.rb

@@ -1,16 +1,20 @@
 require File.join(File.dirname(__FILE__), 'spec_helper.rb')
 
-describe TaggableCache::Rails::Cache do
+describe 'TaggableCache::Rails::Cache' do
   before :all do
     @object = TaggableCache::Store.new
     Redis.new.flushall
+    @page_object = Page.create
+  end
 
-    @page_object = Page.create    
+  before :each do 
+    Rails.cache.delete 'key'
+    Rails.cache.delete 'lorem'
   end
 
   describe "taggable hooked on Rails.cache.write" do
     it "adds key to store" do
-      Rails.cache.write 'key', 'value', :depends_on => [@page_object]
+      Rails.cache.write('key', 'value', :depends_on => [@page_object])
 
       @object.get(@page_object).should == ['key']
     end
@@ -18,7 +22,7 @@ describe TaggableCache::Rails::Cache do
 
   describe "taggable hooked as observer" do
     it "detects object change" do
-      Rails.cache.write 'key', 'value', :depends_on => [@page_object]
+      Rails.cache.write('key', 'value', :depends_on => [@page_object])
 
       Rails.cache.read('key').should == 'value'
 
@@ -30,7 +34,7 @@ describe TaggableCache::Rails::Cache do
     end
 
     it "detects model change" do
-      Rails.cache.write 'lorem', 'impsum', :depends_on => [Page]
+      Rails.cache.write('lorem', 'impsum', :depends_on => [Page])
 
       Rails.cache.read('lorem').should == 'impsum'
 

data/spec/requests/action_caching_controller_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe ActionCachingController do
+  before :each do 
+    get 'action_caching/expire'
+    @url = 'action_caching/index'
+  end
+
+  it "should be successful" do
+    Page.should_receive :load_lot_of_data
+    get @url
+    response.status.should be(200)      
+  end
+
+  it "should run second test without cache" do
+    Page.should_receive(:load_lot_of_data).once
+    get @url
+    response.status.should be(200)
+
+    get @url
+    response.status.should be(200)
+
+    Page.should_receive(:load_lot_of_data).once
+    Page.create
+    get @url
+    response.status.should be(200)
+  end
+end

data/spec/requests/fragment_caching_controller_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe FragmentCachingController do
+  before :each do 
+    get 'fragment_caching/expire'
+    @url = 'fragment_caching/index'
+  end
+
+  it "should be successful" do
+    Page.should_receive :load_lot_of_data
+    get @url
+    response.status.should be(200)      
+  end
+
+  it "should run second test without cache" do
+    Page.should_receive(:load_lot_of_data).once
+    get @url
+    response.status.should be(200)
+
+    get @url
+    response.status.should be(200)
+
+    Page.should_receive(:load_lot_of_data).once
+    Page.create
+    get @url
+    response.status.should be(200)
+  end
+end

data/spec/spec_helper.rb

@@ -1,12 +1,14 @@
 require 'rubygems'
 require 'bundler'
-require 'taggable_cache'
-
 Bundler.require :default, :development
 
+require 'capybara/rspec'
+
 Combustion.initialize!
 
 require 'rspec/rails'
+require 'capybara/rails'
+require 'taggable_cache/railtie'
 
 RSpec.configure do |config|
   config.use_transactional_fixtures = true

data/taggable-cache.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = "1.8.15"
   s.summary = "This gem simplifies cache expiration in rails by providing depends_on option to rails cache."
 
-  s.add_dependency(%q<redis>, [">= 0"])
+  s.add_dependency(%q<rails>, [">= 3.0.8"])
+  s.add_dependency(%q<redis>, [">= 2.2.2"])
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taggable_cache
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,17 +11,28 @@ bindir: bin
 cert_chain: []
 date: 2012-02-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &72497550 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.8
+  type: :runtime
+  prerelease: false
+  version_requirements: *72497550
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70787970 !ruby/object:Gem::Requirement
+  requirement: &72496880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70787970
+  version_requirements: *72496880
 description: This gem simplifies cache expiration in rails
 email: brain-geek@yandex.ua
 executables: []
@@ -30,7 +41,6 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- .document
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -38,15 +48,16 @@ files:
 - LICENSE.txt
 - README.rdoc
 - Rakefile
-- config.ru
 - lib/taggable_cache.rb
-- lib/taggable_cache/rails.rb
-- lib/taggable_cache/rails/cache.rb
 - lib/taggable_cache/rails/observer.rb
+- lib/taggable_cache/railtie.rb
 - lib/taggable_cache/store.rb
 - lib/taggable_cache/version.rb
+- spec/internal/app/controller/action_caching_controller.rb
+- spec/internal/app/controller/fragment_caching_controller.rb
 - spec/internal/app/models/page.rb
 - spec/internal/app/models/simple_observer.rb
+- spec/internal/app/views/fragment_caching/index.html.erb
 - spec/internal/config/database.yml
 - spec/internal/config/initializers/taggable.rb
 - spec/internal/config/routes.rb
@@ -54,6 +65,8 @@ files:
 - spec/internal/public/favicon.ico
 - spec/models/page_spec.rb
 - spec/rails_cache_spec.rb
+- spec/requests/action_caching_controller_spec.rb
+- spec/requests/fragment_caching_controller_spec.rb
 - spec/spec_helper.rb
 - spec/taggable-cache/store_spec.rb
 - taggable-cache.gemspec
@@ -72,7 +85,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 737530259
+      hash: -828411823
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -81,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 737530259
+      hash: -828411823
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/config.ru

@@ -1,7 +0,0 @@
-require 'rubygems'
-require 'bundler'
-
-Bundler.require :default, :development
-
-Combustion.initialize!
-run Combustion::Application

data/lib/taggable_cache/rails.rb

@@ -1,5 +0,0 @@
-module TaggableCache::Rails
-end
-
-require 'taggable_cache/rails/cache'
-require 'taggable_cache/rails/observer'

data/lib/taggable_cache/rails/cache.rb

@@ -1,15 +0,0 @@
-module TaggableCache::Rails::Cache
-  def taggable
-    @taggable ||= ::TaggableCache::Store.new
-  end
-
-  def write(name, value, options = nil)
-    if !options.nil? && options.has_key?(:depends_on) 
-      taggable.add(name, *options[:depends_on])
-      #@taggable.
-      options.delete(:depends_on)
-    end
-
-    super(name, value, options)
-  end
-end