kasket 0.7.4 → 0.7.5

data/lib/kasket.rb

@@ -15,7 +15,7 @@ module Kasket
   class Version
     MAJOR = 0
     MINOR = 7
-    PATCH = 4
+    PATCH = 5
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 

data/lib/kasket/configuration_mixin.rb

@@ -9,7 +9,7 @@ module Kasket
   module ConfigurationMixin
 
     def without_kasket(&block)
-      old_value = @use_kasket || true
+      old_value = @use_kasket
       @use_kasket = false
       yield
     ensure
@@ -17,7 +17,7 @@ module Kasket
     end
 
     def use_kasket?
-      @use_kasket != false
+      @use_kasket == true
     end
 
     def kasket_parser
@@ -69,6 +69,7 @@ module Kasket
     end
 
     def has_kasket_on(*args)
+      @use_kasket = true
       attributes = args.sort! { |x, y| x.to_s <=> y.to_s }
       if attributes != [:id] && !kasket_indices.include?([:id])
         has_kasket_on(:id)

data/lib/kasket/write_mixin.rb

@@ -12,6 +12,12 @@ module Kasket
         remove_from_kasket(args[0])
         update_counters_without_kasket_clearing(*args)
       end
+
+      def transaction_with_kasket_disabled(*args)
+        without_kasket do 
+          transaction_without_kasket_disabled(*args) { yield } 
+        end
+      end
     end
 
     module InstanceMethods
@@ -66,8 +72,10 @@ module Kasket
       model_class.after_destroy :clear_kasket_indices
 
       model_class.alias_method_chain :reload, :kasket_clearing
+   
 
       class << model_class
+        alias_method_chain :transaction, :kasket_disabled
         alias_method_chain :update_counters, :kasket_clearing
       end
     end

data/test/transaction_test.rb

@@ -0,0 +1,27 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TransactionTest < ActiveSupport::TestCase
+  context "Transactions" do 
+    should "have kasket disabled" do
+      assert_equal true, Post.use_kasket?
+      Post.transaction do
+        assert_equal false, Post.use_kasket?
+      end
+      assert_equal true, Post.use_kasket?
+    end
+  end
+
+  context "Nested transactions" do
+    setup { Comment.has_kasket } 
+    should "disable kasket" do 
+      Post.transaction do
+        assert_equal true,  Comment.use_kasket?
+        assert_equal false, Post.use_kasket?
+        Comment.transaction do
+          assert_equal false, Post.use_kasket?
+          assert_equal false, Comment.use_kasket?
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kasket
 version: !ruby/object:Gem::Version 
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors: 
 - Mick Staugaard
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-27 00:00:00 -08:00
+date: 2010-02-02 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -99,6 +99,7 @@ files:
 - test/parser_test.rb
 - test/read_mixin_test.rb
 - test/test_models.rb
+- test/transaction_test.rb
 has_rdoc: true
 homepage: http://github.com/staugaard/kasket
 licenses: []
@@ -137,3 +138,4 @@ test_files:
 - test/parser_test.rb
 - test/read_mixin_test.rb
 - test/test_models.rb
+- test/transaction_test.rb