ar_after_transaction 0.2.6 → 0.3.0

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source "https://rubygems.org"
 
 gemspec
 

data/Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    ar_after_transaction (0.2.6)
+    ar_after_transaction (0.3.0)
       activerecord
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activerecord (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.9)
-      i18n (~> 0.6)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
     appraisal (0.5.1)
       bundler
@@ -26,7 +26,7 @@ GEM
     bump (0.3.5)
     diff-lcs (1.1.3)
     i18n (0.6.1)
-    multi_json (1.3.7)
+    multi_json (1.7.3)
     rake (10.0.2)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
@@ -37,7 +37,7 @@ GEM
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.0)
     sqlite3 (1.3.6)
-    tzinfo (0.3.35)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby

data/Readme.md

@@ -77,6 +77,7 @@ Authors
  - [Bogdan Gusiev](http://gusiev.com)
  - [Benedikt Deicke](http://blog.synatic.net)
  - [Tyler Rick](https://github.com/TylerRick)
+ - [michaelmwu](https://github.com/michaelmwu)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>

data/gemfiles/rails2.gemfile

@@ -1,6 +1,6 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "appraisal"
 gem "bump"

data/gemfiles/rails2.gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: /Users/mgrosser/code/tools/ar_after_transaction
   specs:
-    ar_after_transaction (0.2.5)
+    ar_after_transaction (0.2.6)
       activerecord
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     activerecord (2.3.14)
       activesupport (= 2.3.14)

data/gemfiles/rails3.gemfile

@@ -1,6 +1,6 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "appraisal"
 gem "bump"

data/gemfiles/rails3.gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: /Users/mgrosser/code/tools/ar_after_transaction
   specs:
-    ar_after_transaction (0.2.5)
+    ar_after_transaction (0.2.6)
       activerecord
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     activemodel (3.2.8)
       activesupport (= 3.2.8)

data/lib/ar_after_transaction.rb

@@ -3,11 +3,16 @@ require 'ar_after_transaction/version'
 
 module ARAfterTransaction
   module ClassMethods
-    @@after_transaction_callbacks = []
-
-    def transaction(*args, &block)
+    def transaction(*args)
       clean = true
-      super
+      super(*args) do
+        begin
+          yield
+        rescue ActiveRecord::Rollback
+          clean = false
+          raise
+        end
+      end
     rescue Exception
       clean = false
       raise
@@ -20,7 +25,8 @@ module ARAfterTransaction
 
     def after_transaction(&block)
       if transactions_open?
-        @@after_transaction_callbacks << block
+        connection.after_transaction_callbacks ||= []
+        connection.after_transaction_callbacks << block
       else
         yield
       end
@@ -41,8 +47,8 @@ module ARAfterTransaction
     end
 
     def delete_after_transaction_callbacks
-      result = @@after_transaction_callbacks
-      @@after_transaction_callbacks = []
+      result = connection.after_transaction_callbacks || []
+      connection.after_transaction_callbacks = []
       result
     end
   end
@@ -54,5 +60,15 @@ module ARAfterTransaction
   end
 end
 
+module ARAfterTransactionConnection
+  def self.included(base)
+    base.class_eval do
+      attr_accessor :normally_open_transactions
+      attr_accessor :after_transaction_callbacks
+    end
+  end
+end
+
 ActiveRecord::Base.send(:extend, ARAfterTransaction::ClassMethods)
 ActiveRecord::Base.send(:include, ARAfterTransaction::InstanceMethods)
+ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:include, ARAfterTransactionConnection)

data/lib/ar_after_transaction/version.rb

@@ -1,3 +1,3 @@
 module ARAfterTransaction
-  VERSION = Version = '0.2.6'
+  VERSION = Version = '0.3.0'
 end

data/spec/ar_after_transaction_spec.rb

@@ -29,6 +29,10 @@ class User
   def oops
     raise AnExpectedError
   end
+
+  def raise_rollback
+    raise ActiveRecord::Rollback
+  end
 end
 
 describe ARAfterTransaction do
@@ -57,7 +61,23 @@ describe ARAfterTransaction do
     User.test_stack.should == [:normal]
   end
 
-  it "clears transation callbacks when transaction fails" do
+  it "does not execute when transaction gets rolled back by ActiveRecord::Rollback raised in an after_create callback" do
+    User.test_callbacks = [:do_after, :do_normal, :raise_rollback]
+    user = User.create!
+    User.test_stack.should == [:normal]
+  end
+
+  it "does not execute when transaction gets rolled back by ActiveRecord::Rollback outside of the model" do
+    User.test_callbacks = [:do_after, :do_normal]
+    user = nil
+    ActiveRecord::Base.transaction do
+      user = User.create!
+      raise ActiveRecord::Rollback
+    end
+    User.test_stack.should == [:normal]
+  end
+
+  it "clears transaction callbacks when transaction fails" do
     User.test_callbacks = [:do_after, :do_normal, :oops]
     lambda{
       User.create!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar_after_transaction
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -64,7 +64,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3939892965249242623
+      hash: -2540261946806490361
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -73,10 +73,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3939892965249242623
+      hash: -2540261946806490361
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Execute irreversible actions only when transactions are not rolled back