kasket 2.1.2 → 2.2.0

data/lib/kasket.rb

@@ -34,11 +34,13 @@ module Kasket
       Arel::SelectManager.send(:include, Kasket::SelectManagerMixin)
     end
 
-    ActiveRecord::Associations::BelongsToAssociation.send(:include, Kasket::ReloadAssociationMixin)
-    if ActiveRecord::VERSION::MAJOR == 2 || AR30
-      ActiveRecord::Associations::BelongsToPolymorphicAssociation.send(:include, Kasket::ReloadAssociationMixin)
+    if options[:assoliations_reload_hack]
+      ActiveRecord::Associations::BelongsToAssociation.send(:include, Kasket::ReloadAssociationMixin)
+      if ActiveRecord::VERSION::MAJOR == 2 || AR30
+        ActiveRecord::Associations::BelongsToPolymorphicAssociation.send(:include, Kasket::ReloadAssociationMixin)
+      end
+      ActiveRecord::Associations::HasOneThroughAssociation.send(:include, Kasket::ReloadAssociationMixin)
     end
-    ActiveRecord::Associations::HasOneThroughAssociation.send(:include, Kasket::ReloadAssociationMixin)
   end
 
   def self.cache_store=(options)

data/lib/kasket/version.rb

@@ -2,8 +2,8 @@
 module Kasket
   class Version
     MAJOR = 2
-    MINOR = 1
-    PATCH = 2
+    MINOR = 2
+    PATCH = 0
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
     PROTOCOL = 3
   end

data/test/reload_test.rb

@@ -1,49 +1,6 @@
 require File.expand_path("helper", File.dirname(__FILE__))
 
 class ReloadTest < ActiveSupport::TestCase
-  context "Loading a polymorphic belongs_to" do
-    should "not clear cache when loading nil" do
-      @post = Post.first
-      @post.poly = nil
-      @post.save!
-      Kasket.expects(:clear_local).never
-      assert_nil @post.poly
-    end
-
-    context "that is uncached" do
-      setup do
-        @post = Post.first
-        @post.poly = Blog.first
-        @post.save!
-        assert @post.poly
-      end
-
-      should "not clear local when it is unloaded" do
-        Kasket.expects(:clear_local).never
-        assert Post.first.poly
-      end
-
-      should "not clear local when it is loaded" do
-        Kasket.expects(:clear_local).never
-        assert @post.poly.reload
-      end
-    end
-
-    context "that is cached" do
-      setup do
-        @post = Post.first
-        @post.poly = Comment.first
-        @post.save!
-        assert @post.poly
-      end
-
-      should "clear local when it is loaded" do
-        Kasket.expects(:clear_local)
-        @post.poly.reload
-      end
-    end
-  end
-
   context "Reloading a model" do
     setup do
       @post = Post.first
@@ -57,40 +14,4 @@ class ReloadTest < ActiveSupport::TestCase
     end
   end
 
-  context "Reloading a belongs_to association" do
-    setup do
-      @post = Comment.first.post
-      assert @post
-      assert @post.title
-    end
-
-    should "clear local cache" do
-      Kasket.expects(:clear_local)
-      @post.reload
-    end
-
-    should "reload via true" do
-      @comment = Comment.first
-      assert_equal "few_comments", @comment.post.title
-
-      Post.update_all("title = 'yyy'", :id => @comment.post_id)
-
-      assert_equal "few_comments", @comment.post.title
-      @comment.post(true) # it does not blow up
-      #assert_equal "yyy", @comment.post(true).title # TODO broken in all rails versions...
-    end
-  end
-
-  context "Reloading a has_one_through association" do
-    setup do
-      @author = Comment.first.author
-      assert @author
-      assert @author.name
-    end
-
-    should "clear local cache" do
-      Kasket.expects(:clear_local)
-      @author.reload
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kasket
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-29 00:00:00.000000000 Z
+date: 2012-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -183,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2508183767050411783
+      hash: 3681071488185082983
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2508183767050411783
+      hash: 3681071488185082983
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24