simple_cacheable 1.3.0 → 1.3.1

data/lib/cacheable.rb

@@ -29,7 +29,6 @@ module Cacheable
           class_eval <<-EOF
             after_commit :expire_attribute_cache, :on => :update
             after_commit :expire_all_attribute_cache, :on => :update
-
           EOF
 
           attributes.each do |attribute|
@@ -85,20 +84,45 @@ module Cacheable
                 end
               EOF
             else
-              reverse_association = association.klass.reflect_on_all_associations(:belongs_to).find { |reverse_association|
-                reverse_association.options[:polymorphic] ? reverse_association.name == association.options[:as] : reverse_association.klass == self
-              }
-              association.klass.class_eval <<-EOF
-                after_commit :expire_#{association_name}_cache
-
-                def expire_#{association_name}_cache
-                  if respond_to? :cached_#{reverse_association.name}
-                    cached_#{reverse_association.name}.expire_association_cache(:#{association_name})
-                  else
-                    #{reverse_association.name}.expire_association_cache(:#{association_name})
+              if through_reflection_name = association.options[:through]
+                through_association = self.reflect_on_association(through_reflection_name)
+
+                # FIXME it should be the only reflection but I'm not 100% positive
+                reverse_through_association = through_association.klass.reflect_on_all_associations(:belongs_to).first
+
+                reverse_association = association.klass.reflect_on_all_associations(:belongs_to).find { |reverse_association|
+                  reverse_association.options[:polymorphic] ? reverse_association.name == association.source_reflection.options[:as] : reverse_association.klass == self
+                }
+
+                association.klass.class_eval <<-EOF
+                  after_commit :expire_#{association_name}_cache
+
+                  def expire_#{association_name}_cache
+                    if respond_to? :cached_#{reverse_association.name}
+                      # cached_viewable.expire_association_cache
+                      cached_#{reverse_association.name}.expire_association_cache(:#{association_name})
+                    else
+                      #{reverse_association.name}.#{reverse_through_association.name}.expire_association_cache(:#{association_name})
+                    end
                   end
-                end
-              EOF
+                EOF
+              else
+                reverse_association = association.klass.reflect_on_all_associations(:belongs_to).find { |reverse_association|
+                  reverse_association.options[:polymorphic] ? reverse_association.name == association.options[:as] : reverse_association.klass == self
+                }
+                association.klass.class_eval <<-EOF
+                  after_commit :expire_#{association_name}_cache
+
+                  def expire_#{association_name}_cache
+                    if respond_to? :cached_#{reverse_association.name}
+                      # cached_viewable.expire_association_cache
+                      cached_#{reverse_association.name}.expire_association_cache(:#{association_name})
+                    else
+                      #{reverse_association.name}.expire_association_cache(:#{association_name})
+                    end
+                  end
+                EOF
+              end
 
               class_eval <<-EOF
                 def cached_#{association_name}
@@ -125,6 +149,7 @@ module Cacheable
   def expire_model_cache
     expire_key_cache if self.class.cached_key
     expire_attribute_cache if self.class.cached_indices.present?
+    expire_all_attribute_cache if self.class.cached_indices.present?
     expire_method_cache if self.class.cached_methods.present?
   end
 

data/lib/cacheable/version.rb

@@ -1,3 +1,3 @@
 module Cacheable
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/spec/cacheable_spec.rb

@@ -8,6 +8,8 @@ describe Cacheable do
     @account = @user.create_account
     @post1 = @user.posts.create(:title => 'post1')
     @post2 = @user.posts.create(:title => 'post2')
+    @image1 = @post1.images.create
+    @image2 = @post1.images.create
     @comment1 = @post1.comments.create
     @comment2 = @post1.comments.create
   end
@@ -162,6 +164,32 @@ describe Cacheable do
         @user.cached_account.should == @account
       end
     end
+
+    context "has_many through" do
+      it "should not cache associations" do
+        Rails.cache.read("users/#{@user.id}/association/images").should be_nil
+      end
+
+      it "should cache User#images" do
+        @user.cached_images.should == [@image1, @image2]
+        Rails.cache.read("users/#{@user.id}/association/images").should == [@image1, @image2]
+      end
+
+      it "should cache User#images multiple times" do
+        @user.cached_images
+        @user.cached_images.should == [@image1, @image2]
+      end
+
+      context "expiry" do
+        it "should have the correct collection" do
+          @image3 = @post1.images.create
+          Rails.cache.read("users/#{@user.id}/association/images").should be_nil
+          @user.cached_images.should == [@image1, @image2, @image3]
+          Rails.cache.read("users/#{@user.id}/association/images").should == [@image1, @image2, @image3]
+        end
+      end
+    end
+
   end
 
   context "expire_model_cache" do
@@ -200,6 +228,13 @@ describe Cacheable do
       Rails.cache.read("posts/#{@post1.id}/association/comments").should be_nil
     end
 
+    it "should delete has_many through with_association cache" do
+      @user.cached_images
+      Rails.cache.read("users/#{@user.id}/association/images").should_not be_nil
+      @image2.save
+      Rails.cache.read("users/#{@user.id}/association/images").should be_nil
+    end
+
     it "should delete has_one with_association cache" do
       @user.cached_account
       Rails.cache.read("users/#{@user.id}/association/account").should_not be_nil

data/spec/models/image.rb

@@ -0,0 +1,5 @@
+class Image < ActiveRecord::Base
+
+  belongs_to :viewable, :polymorphic => true
+
+end

data/spec/models/post.rb

@@ -4,9 +4,11 @@ class Post < ActiveRecord::Base
   belongs_to :user
   has_many :comments, :as => :commentable
 
+  has_many :images, :as => :viewable
+
   model_cache do
     with_key
     with_attribute :user_id
-    with_association :user, :comments
+    with_association :user, :comments, :images
   end
 end

data/spec/models/user.rb

@@ -3,12 +3,13 @@ class User < ActiveRecord::Base
 
   has_many :posts
   has_one :account
+  has_many :images, through: :posts
 
   model_cache do
     with_key
     with_attribute :login
     with_method :last_post
-    with_association :posts, :account
+    with_association :posts, :account, :images
   end
 
   def last_post

data/spec/spec_helper.rb

@@ -50,6 +50,11 @@ RSpec.configure do |config|
         t.integer :commentable_id
         t.string :commentable_type
       end
+
+      create_table :images do |t|
+        t.integer :viewable_id
+        t.string :viewable_type
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_cacheable
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-03 00:00:00.000000000 Z
+date: 2012-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -79,6 +79,7 @@ files:
 - spec/cacheable_spec.rb
 - spec/models/account.rb
 - spec/models/comment.rb
+- spec/models/image.rb
 - spec/models/post.rb
 - spec/models/user.rb
 - spec/spec_helper.rb
@@ -96,7 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3153492415612619050
+      hash: -672054861354724444
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -105,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3153492415612619050
+      hash: -672054861354724444
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -116,6 +117,7 @@ test_files:
 - spec/cacheable_spec.rb
 - spec/models/account.rb
 - spec/models/comment.rb
+- spec/models/image.rb
 - spec/models/post.rb
 - spec/models/user.rb
 - spec/spec_helper.rb