taggable_cache 0.2.0 → 0.2.1

data/.travis.yml

@@ -1,2 +1,10 @@
+lang: ruby
+bundler_args: --without development
+before_install: 
+  - gem install bundler --pre
 rvm:
   - 1.9.3
+gemfile:
+  - gemfiles/Gemfile-rails.3.0.x
+  - gemfiles/Gemfile-rails.3.1.x
+  - gemfiles/Gemfile-rails.3.2.x

data/Gemfile

@@ -1,13 +1,17 @@
-source "http://rubygems.org"
+source :rubygems
 
 gemspec
 
 group :development do
   gem 'pry'
+  gem 'pry-nav'
 end
 
+gem 'rake'
 gem 'rspec-rails', :require => false
 gem 'rspec'
 gem 'capybara'
-gem 'combustion', '~> 0.3.1'
+gem 'combustion', :git => 'https://brain-geek@github.com/brain-geek/combustion.git' #, '~> 0.3.1'
 gem 'sqlite3'
+
+gem 'rails', '~> 3.2.0'

data/Gemfile.lock

@@ -1,19 +1,27 @@
+GIT
+  remote: https://brain-geek@github.com/brain-geek/combustion.git
+  revision: 3574c523d1ce6d8805ab2218c8d52257b5848640
+  specs:
+    combustion (0.3.2)
+      rails (>= 3.0.0)
+      thor (>= 0.14.6)
+
 PATH
   remote: .
   specs:
-    taggable_cache (0.2.0)
+    taggable_cache (0.2.1)
       rails (>= 3.0.8)
       redis (>= 2.2.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.1)
-      actionpack (= 3.2.1)
+    actionmailer (3.2.2)
+      actionpack (= 3.2.2)
       mail (~> 2.4.0)
-    actionpack (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
+    actionpack (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.1)
@@ -21,21 +29,21 @@ GEM
       rack-cache (~> 1.1)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.2)
-    activemodel (3.2.1)
-      activesupport (= 3.2.1)
+    activemodel (3.2.2)
+      activesupport (= 3.2.2)
       builder (~> 3.0.0)
-    activerecord (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-      arel (~> 3.0.0)
+    activerecord (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-    activesupport (3.2.1)
+    activeresource (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+    activesupport (3.2.2)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (3.0.0)
+    arel (3.0.2)
     builder (3.0.0)
     capybara (1.1.2)
       mime-types (>= 1.16)
@@ -46,50 +54,47 @@ GEM
       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)
+    coderay (1.0.5)
     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)
+    journey (1.0.3)
     json (1.6.5)
-    mail (2.4.1)
+    mail (2.4.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    method_source (0.6.7)
-      ruby_parser (>= 2.3.1)
+    method_source (0.7.1)
     mime-types (1.17.2)
-    multi_json (1.0.4)
+    multi_json (1.1.0)
     nokogiri (1.5.0)
     polyglot (0.3.3)
-    pry (0.9.7.4)
-      coderay (~> 0.9.8)
-      method_source (~> 0.6.7)
-      ruby_parser (>= 2.3.1)
-      slop (~> 2.1.0)
+    pry (0.9.8.4)
+      coderay (~> 1.0.5)
+      method_source (~> 0.7.1)
+      slop (>= 2.4.4, < 3)
+    pry-nav (0.1.0)
+      pry (~> 0.9.8.1)
     rack (1.4.1)
-    rack-cache (1.1)
+    rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.1)
-      actionmailer (= 3.2.1)
-      actionpack (= 3.2.1)
-      activerecord (= 3.2.1)
-      activeresource (= 3.2.1)
-      activesupport (= 3.2.1)
+    rails (3.2.2)
+      actionmailer (= 3.2.2)
+      actionpack (= 3.2.2)
+      activerecord (= 3.2.2)
+      activeresource (= 3.2.2)
+      activesupport (= 3.2.2)
       bundler (~> 1.0)
-      railties (= 3.2.1)
-    railties (3.2.1)
-      actionpack (= 3.2.1)
-      activesupport (= 3.2.1)
+      railties (= 3.2.2)
+    railties (3.2.2)
+      actionpack (= 3.2.2)
+      activesupport (= 3.2.2)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -111,16 +116,13 @@ GEM
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec (~> 2.8.0)
-    ruby_parser (2.3.1)
-      sexp_processor (~> 3.0)
     rubyzip (0.9.6.1)
-    selenium-webdriver (2.19.0)
+    selenium-webdriver (2.20.0)
       childprocess (>= 0.2.5)
-      ffi (~> 1.0.9)
-      multi_json (~> 1.0.4)
+      ffi (~> 1.0)
+      multi_json (~> 1.0)
       rubyzip
-    sexp_processor (3.0.10)
-    slop (2.1.0)
+    slop (2.4.4)
     sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -131,7 +133,7 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
+    tzinfo (0.3.32)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
@@ -140,8 +142,11 @@ PLATFORMS
 
 DEPENDENCIES
   capybara
-  combustion (~> 0.3.1)
+  combustion!
   pry
+  pry-nav
+  rails (~> 3.2.0)
+  rake
   rspec
   rspec-rails
   sqlite3

data/gemfiles/Gemfile-rails.3.0.x

@@ -0,0 +1,13 @@
+source :rubygems
+
+gem 'taggable_cache', :path => '..'
+
+gem 'rake'
+gem 'rspec-rails', :require => false
+gem 'rspec'
+gem 'capybara'
+gem 'combustion', :git => 'https://brain-geek@github.com/brain-geek/combustion.git'
+gem 'sqlite3'
+
+
+gem 'rails', '~> 3.0.0'

data/gemfiles/Gemfile-rails.3.1.x

@@ -0,0 +1,13 @@
+source :rubygems
+
+gem 'taggable_cache', :path => '..'
+
+gem 'rake'
+gem 'rspec-rails', :require => false
+gem 'rspec'
+gem 'capybara'
+gem 'combustion', :git => 'https://brain-geek@github.com/brain-geek/combustion.git'
+gem 'sqlite3'
+
+
+gem 'rails', '~> 3.1.0'

data/gemfiles/Gemfile-rails.3.2.x

@@ -0,0 +1,13 @@
+source :rubygems
+
+gem 'taggable_cache', :path => '..'
+
+gem 'rake'
+gem 'rspec-rails', :require => false
+gem 'rspec'
+gem 'capybara'
+gem 'combustion', :git => 'https://brain-geek@github.com/brain-geek/combustion.git'
+gem 'sqlite3'
+
+
+gem 'rails', '~> 3.2.0'

data/lib/taggable_cache/railtie.rb

@@ -1,3 +1,9 @@
+require 'active_record'
+require 'action_controller'
+require 'rails'
+
+require 'taggable_cache/spectator'
+
 ActiveSupport::Cache::Store.class_eval do
   def taggable
     @taggable ||= ::TaggableCache::Store.new
@@ -33,5 +39,10 @@ end
 
 module TaggableCache
   class Railtie < ::Rails::Railtie
+    initializer "taggable_cache" do |app|
+      # binding.pry
+      ActiveRecord::Base.observers << TaggableCache::Spectator
+      ActiveRecord::Base.add_observer TaggableCache::Spectator.instance
+    end    
   end  
 end

data/lib/taggable_cache/spectator.rb

@@ -0,0 +1,9 @@
+class TaggableCache::Spectator < ActiveRecord::Observer
+  def event(model)
+    Rails.cache.delete_by_tags(model, model.class)
+  end
+
+  alias :after_update :event
+  alias :after_destroy :event
+  alias :after_create :event
+end

data/lib/taggable_cache/version.rb

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

data/lib/taggable_cache.rb

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

data/spec/integration/rails_cache_spec.rb

@@ -0,0 +1,87 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
+
+describe 'TaggableCache::Rails::Cache' do
+  before :all do
+    @object = TaggableCache::Store.new
+    @page_object = Page.create
+  end
+
+  before :each do 
+    Redis.new.flushall
+  end
+
+  describe "Rails.cache.write integration" do
+    it "adds key to store" do
+      Rails.cache.write('key', 'value', :depends_on => [@page_object])
+
+      @object.get(@page_object).should == ['key']
+    end
+
+    it "does simple writes" do
+      Rails.cache.write 'ipsum', 'lorem'
+      Rails.cache.read('ipsum').should == 'lorem'
+    end    
+  end
+
+  describe "Activerecord integration" do    
+    it "object change" do
+      Rails.cache.write('key', 'value', :depends_on => [@page_object])
+
+      Rails.cache.read('key').should == 'value'
+
+      #save should trigger deleting depending cache entries
+      @page_object.name = @page_object.name.to_s + '1'
+      @page_object.save!
+
+      Rails.cache.read('key').should be_nil
+    end
+
+    it "model change" do
+      Rails.cache.write('lorem', 'impsum', :depends_on => [Page])
+
+      Rails.cache.read('lorem').should == 'impsum'
+
+      Page.create
+
+      Rails.cache.read('lorem').should be_nil
+    end
+
+    pending "scope change" do
+      it "should not drop if changes are unrelated" do
+        Rails.cache.write('lorem', 'impsum', :depends_on => [Page.where(:name => 'bob')])
+        Rails.cache.read('lorem').should == 'impsum'
+
+        page = Page.create(:name => 'jack')
+        page.name = 'alice'
+        page.save!
+        Page.delete(page.id)
+
+        Rails.cache.read('lorem').should == 'impsum'
+      end
+
+      it "should drop if object has been in scope before changes" do
+        page = Page.create(:name => 'jack')
+
+        Rails.cache.write('lorem', 'impsum', :depends_on => [Page.where(:name => 'jack')])
+        Rails.cache.read('lorem').should == 'impsum'
+
+        page.name = 'alice'
+        page.save!
+
+        Rails.cache.read('lorem').should be_nil
+      end
+
+      it "should drop if object is now in scope" do
+        page = Page.create(:name => 'joe')
+
+        Rails.cache.write('lorem', 'impsum', :depends_on => [Page.where(:name => 'jack')])
+        Rails.cache.read('lorem').should == 'impsum'
+
+        page.name = 'jack'
+        page.save!
+
+        Rails.cache.read('lorem').should be_nil        
+      end
+    end
+  end
+end

data/spec/taggable-cache/store_spec.rb

@@ -12,11 +12,10 @@ describe TaggableCache::Store do
     before :all do
       @object = TaggableCache::Store.new
       @redis = Redis.new
-      #clean up all redis data
       @redis.flushall
     end
 
-    describe "queque names" do
+    describe "id_for" do
       it "should use id and model name if saved activerecord object" do
         page = Page.create
         @object.id_for(page).should == "page-#{page.id}"
@@ -35,45 +34,47 @@ describe TaggableCache::Store do
       end
     end
 
-    describe "add data to redis" do
-      it "should push data" do
-        o1 = Object.new
-        o2 = Object.new
+    describe "Redis interaction" do
+      describe "add data" do
+        it "should push data" do
+          o1 = Object.new
+          o2 = Object.new
 
-        @object.should_receive(:id_for).with(o1).and_return('member1')
-        @object.should_receive(:id_for).with(o2).and_return('member2')
-        @object.should_receive(:id_for).with(nil).and_return(nil)
+          @object.should_receive(:id_for).with(o1).and_return('member1')
+          @object.should_receive(:id_for).with(o2).and_return('member2')
+          @object.should_receive(:id_for).with(nil).and_return(nil)
 
-        @object.add('tag_name', o1, nil, o2)
+          @object.add('tag_name', o1, nil, o2)
 
-        @redis.smembers(nil).should == []
-        @redis.smembers('member1').should == ['tag_name']
-        @redis.smembers('member2').should == ['tag_name']
+          @redis.smembers(nil).should == []
+          @redis.smembers('member1').should == ['tag_name']
+          @redis.smembers('member2').should == ['tag_name']
+        end
       end
-    end
 
-    describe "get data from redis" do
-      it "should return keys and leave nothing behind" do
-        page = Page.create
+      describe "get data" do
+        it "should return keys and leave nothing behind" do
+          page = Page.create
 
-        @object.add('tag_name', page)
-        @redis.smembers("page-#{page.id}").should == ['tag_name']
-        
-        @object.get(page).should == ['tag_name']
-        @redis.smembers("page-#{page.id}").should be_empty
-      end
+          @object.add('tag_name', page)
+          @redis.smembers("page-#{page.id}").should == ['tag_name']
+          
+          @object.get(page).should == ['tag_name']
+          @redis.smembers("page-#{page.id}").should be_empty
+        end
 
-      it "should do multi-get" do
-        page = Page.create
+        it "should do multi-get" do
+          page = Page.create
 
-        @object.add('tag_name', page)
-        @object.add('tag2', Page)
-        @redis.smembers("page-#{page.id}").should == ['tag_name']
-        @redis.smembers("page").should == ['tag2']
-        
-        @object.get(page, Page).should == ['tag_name', 'tag2']
-        @redis.smembers("page-#{page.id}").should be_empty
-        @redis.smembers("page").should be_empty
+          @object.add('tag_name', page)
+          @object.add('tag2', Page)
+          @redis.smembers("page-#{page.id}").should == ['tag_name']
+          @redis.smembers("page").should == ['tag2']
+          
+          @object.get(page, Page).should == ['tag_name', 'tag2']
+          @redis.smembers("page-#{page.id}").should be_empty
+          @redis.smembers("page").should be_empty
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taggable_cache
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &72497550 !ruby/object:Gem::Requirement
+  requirement: &81044650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *72497550
+  version_requirements: *81044650
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &72496880 !ruby/object:Gem::Requirement
+  requirement: &81044090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *72496880
+  version_requirements: *81044090
 description: This gem simplifies cache expiration in rails
 email: brain-geek@yandex.ua
 executables: []
@@ -48,23 +48,23 @@ files:
 - LICENSE.txt
 - README.rdoc
 - Rakefile
+- gemfiles/Gemfile-rails.3.0.x
+- gemfiles/Gemfile-rails.3.1.x
+- gemfiles/Gemfile-rails.3.2.x
 - lib/taggable_cache.rb
-- lib/taggable_cache/rails/observer.rb
 - lib/taggable_cache/railtie.rb
+- lib/taggable_cache/spectator.rb
 - lib/taggable_cache/store.rb
 - lib/taggable_cache/version.rb
+- spec/integration/rails_cache_spec.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
 - spec/internal/db/schema.rb
 - 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
@@ -85,7 +85,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -828411823
+      hash: -685870733
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -94,10 +94,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -828411823
+      hash: -685870733
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: This gem simplifies cache expiration in rails by providing depends_on option

data/lib/taggable_cache/rails/observer.rb

@@ -1,11 +0,0 @@
-module TaggableCache::Rails
-  class Observer < ActiveRecord::Observer
-    def event(model)
-      Rails.cache.delete_by_tags(model, model.class)
-    end
-
-    alias :after_update :event
-    alias :after_destroy :event
-    alias :after_create :event
-  end
-end

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

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

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

@@ -1,3 +0,0 @@
-#Listing all models with enabled taggable cache
-
-Combustion::Application.config.active_record.observers = :simple_observer

data/spec/models/page_spec.rb

@@ -1,4 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
-
-describe Page do
-end

data/spec/rails_cache_spec.rb

@@ -1,51 +0,0 @@
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
-
-describe 'TaggableCache::Rails::Cache' do
-  before :all do
-    @object = TaggableCache::Store.new
-    Redis.new.flushall
-    @page_object = Page.create
-  end
-
-  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])
-
-      @object.get(@page_object).should == ['key']
-    end
-  end
-
-  describe "taggable hooked as observer" do
-    it "detects object change" do
-      Rails.cache.write('key', 'value', :depends_on => [@page_object])
-
-      Rails.cache.read('key').should == 'value'
-
-      #save should trigger deleting depending cache entries
-      @page_object.name = @page_object.name.to_s + '1'
-      @page_object.save!
-
-      Rails.cache.read('key').should be_nil
-    end
-
-    it "detects model change" do
-      Rails.cache.write('lorem', 'impsum', :depends_on => [Page])
-
-      Rails.cache.read('lorem').should == 'impsum'
-
-      Page.create
-
-      Rails.cache.read('lorem').should be_nil
-    end
-
-    it "does simple writes" do
-      Rails.cache.write 'ipsum', 'lorem'
-      Rails.cache.read('ipsum').should == 'lorem'
-    end
-  end
-end