taggable_cache 0.2.1 → 0.3.0

data/.travis.yml

@@ -5,6 +5,5 @@ before_install:
 rvm:
   - 1.9.3
 gemfile:
-  - gemfiles/Gemfile-rails.3.0.x
   - gemfiles/Gemfile-rails.3.1.x
-  - gemfiles/Gemfile-rails.3.2.x
+  - gemfiles/Gemfile-rails.3.2.x

data/Gemfile

@@ -11,7 +11,7 @@ gem 'rake'
 gem 'rspec-rails', :require => false
 gem 'rspec'
 gem 'capybara'
-gem 'combustion', :git => 'https://brain-geek@github.com/brain-geek/combustion.git' #, '~> 0.3.1'
+gem 'combustion'
 gem 'sqlite3'
 
 gem 'rails', '~> 3.2.0'

data/Gemfile.lock

@@ -1,16 +1,8 @@
-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.1)
-      rails (>= 3.0.8)
+    taggable_cache (0.3.0)
+      rails (>= 3.1.0)
       redis (>= 2.2.2)
 
 GEM
@@ -55,6 +47,9 @@ GEM
     childprocess (0.3.1)
       ffi (~> 1.0.6)
     coderay (1.0.5)
+    combustion (0.3.2)
+      rails (>= 3.0.0)
+      thor (>= 0.14.6)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     ffi (1.0.11)
@@ -142,7 +137,7 @@ PLATFORMS
 
 DEPENDENCIES
   capybara
-  combustion!
+  combustion
   pry
   pry-nav
   rails (~> 3.2.0)

data/gemfiles/Gemfile-rails.3.1.x

@@ -6,7 +6,7 @@ gem 'rake'
 gem 'rspec-rails', :require => false
 gem 'rspec'
 gem 'capybara'
-gem 'combustion', :git => 'https://brain-geek@github.com/brain-geek/combustion.git'
+gem 'combustion'
 gem 'sqlite3'
 
 

data/gemfiles/Gemfile-rails.3.2.x

@@ -6,7 +6,7 @@ gem 'rake'
 gem 'rspec-rails', :require => false
 gem 'rspec'
 gem 'capybara'
-gem 'combustion', :git => 'https://brain-geek@github.com/brain-geek/combustion.git'
+gem 'combustion'
 gem 'sqlite3'
 
 

data/lib/taggable_cache/dynamic_store.rb

@@ -0,0 +1,5 @@
+require "redis"
+
+class TaggableCache::DynamicStore < TaggableCache::Store
+  
+end

data/lib/taggable_cache/railtie.rb

@@ -27,6 +27,10 @@ ActiveSupport::Cache::Store.class_eval do
     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
 
@@ -40,7 +44,6 @@ 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    

data/lib/taggable_cache/spectator.rb

@@ -4,6 +4,7 @@ class TaggableCache::Spectator < ActiveRecord::Observer
   end
 
   alias :after_update :event
-  alias :after_destroy :event
+  alias :before_update :event
+  alias :before_destroy :event
   alias :after_create :event
 end

data/lib/taggable_cache/store.rb

@@ -1,4 +1,5 @@
 require "redis"
+require "digest/md5"
 
 class TaggableCache::Store
   def initialize
@@ -14,6 +15,10 @@ class TaggableCache::Store
       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
@@ -21,6 +26,7 @@ class TaggableCache::Store
 
   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
@@ -34,4 +40,45 @@ class TaggableCache::Store
       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

data/lib/taggable_cache/version.rb

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

data/spec/integration/rails_cache_spec.rb

@@ -46,7 +46,7 @@ describe 'TaggableCache::Rails::Cache' do
       Rails.cache.read('lorem').should be_nil
     end
 
-    pending "scope change" do
+    describe  "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'
@@ -80,7 +80,7 @@ describe 'TaggableCache::Rails::Cache' do
         page.name = 'jack'
         page.save!
 
-        Rails.cache.read('lorem').should be_nil        
+        Rails.cache.read('lorem').should be_nil
       end
     end
   end

data/spec/taggable-cache/store_spec.rb

@@ -32,6 +32,86 @@ describe TaggableCache::Store do
       it "should return nil if unknown is passed" do
         @object.id_for(123).should be_nil
       end
+
+      it "should make hash of arel/AR::relation object" do
+        @object.id_for(Page.order(:id)).should == @object.id_for(Page.order(:id).arel)
+        @object.id_for(Page.order(:id)).should_not be_nil
+
+        @object.id_for(Page.order(:id)).should_not == @object.id_for(Page.order(:name).arel)
+      end
+    end
+
+    describe "is_scope?" do
+      it "is not AR object or class" do
+        @object.is_scope?(Page).should be_false
+        @object.is_scope?(Page.create).should be_false
+      end
+
+      it "is arel object or AR relation" do
+        @object.is_scope?(Page.order(:id)).should be_true
+        @object.is_scope?(Page.order(:id).arel).should be_true
+      end
+    end
+
+    describe "scope flow" do
+      before :each do 
+        @redis.flushall
+      end
+
+      it "should add scope to model-specific set" do
+        @redis.smembers('pages-scopes').should == []
+        @object.add('tag_name', Page.where('name' => 'bob'))
+        @redis.smembers('pages-scopes').count.should == 1
+      end
+
+      it "should be a marshalized arel object in model-specific set" do
+        Page.create(:name => 'bob')
+        @object.add('tag_scoped', Page.where('name' => 'bob'))
+        key = @redis.smembers('pages-scopes').first
+        query = @redis.get("query-#{key}")
+        Marshal.restore(query).should be_kind_of Arel::SelectManager
+
+        @redis.smembers("query-keys-#{key}").should == ['tag_scoped']
+      end
+
+      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.order(:id), Page.create).should be_true
+
+        #unsaved obj(without id)
+        @object.in_scope(Page.order(:id), Page.new).should be_false
+      end
+
+      describe "get_scope" do
+        it "should return keys and leave nothing behind" do
+          #query to get all keys
+          p = Page.create
+          page = Page.order(:id) 
+
+          @object.add('tag_name', page)
+          @object.get_scope(p).should == ['tag_name']
+          @object.get_scope(p).should == []
+        end
+
+        it "should do multi-get" do
+          bob = Page.create(:name => 'bob')
+          jack = Page.create(:name => 'jack')
+          ian = Page.create(:name => 'ian')
+
+          @object.add('bob', Page.where(:name => 'bob'))
+          @object.add('jack', Page.where(:name => 'jack'))
+          @object.add('ian', Page.where(:name => 'ian'))
+
+          @object.get_scope(bob,jack).should == ['bob', 'jack']
+          @object.get_scope(bob,jack).should == []
+          @object.get_scope(ian).should == ['ian']
+        end
+      end
     end
 
     describe "Redis interaction" do

data/taggable-cache.gemspec

@@ -28,7 +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<rails>, [">= 3.0.8"])
+  s.add_dependency(%q<rails>, [">= 3.1.0"])
   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.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,18 +13,18 @@ date: 2012-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &81044650 !ruby/object:Gem::Requirement
+  requirement: &71322420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.8
+        version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *81044650
+  version_requirements: *71322420
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &81044090 !ruby/object:Gem::Requirement
+  requirement: &71321470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *81044090
+  version_requirements: *71321470
 description: This gem simplifies cache expiration in rails
 email: brain-geek@yandex.ua
 executables: []
@@ -48,10 +48,10 @@ 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/dynamic_store.rb
 - lib/taggable_cache/railtie.rb
 - lib/taggable_cache/spectator.rb
 - lib/taggable_cache/store.rb
@@ -85,7 +85,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -685870733
+      hash: -516926623
 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: -685870733
+      hash: -516926623
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: This gem simplifies cache expiration in rails by providing depends_on option

data/gemfiles/Gemfile-rails.3.0.x

@@ -1,13 +0,0 @@
-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'