ar_after_transaction 0.1.0 → 0.1.1

data/Gemfile

@@ -1,6 +1,9 @@
 source 'http://rubygems.org'
 
 gem 'rake'
+gem 'rspec', '~>1.3'
+gem 'jeweler'
 gem 'activerecord', :require => 'active_record'
+gem 'mysql'
 gem 'activesupport', :require => 'active_support'
-gem 'sqlite3-ruby', :require => 'sqlite3'
+gem 'sqlite3-ruby', :require => 'sqlite3'

data/Gemfile.lock

@@ -0,0 +1,31 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activerecord (2.3.9)
+      activesupport (= 2.3.9)
+    activesupport (2.3.9)
+    gemcutter (0.6.1)
+    git (1.2.5)
+    jeweler (1.4.0)
+      gemcutter (>= 0.1.0)
+      git (>= 1.2.5)
+      rubyforge (>= 2.0.0)
+    json_pure (1.4.6)
+    mysql (2.8.1)
+    rake (0.8.7)
+    rspec (1.3.0)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
+    sqlite3-ruby (1.3.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord
+  activesupport
+  jeweler
+  mysql
+  rake
+  rspec (~> 1.3)
+  sqlite3-ruby

data/Readme.md

@@ -1,4 +1,4 @@
-Perform stuff (only) after the currently open transactions have finished.
+Do something only after the currently open transactions have finished.
 
 Normally everything gets rolled back when a transaction fails, but you cannot roll back sending an email or adding a job to Resque.
 
@@ -10,7 +10,7 @@ Its great for just-in-time callbacks:
         after_transaction do
           send_an_email # cannot be rolled back
         end
-        comments.build(...) # can be rolled back
+        comments.create(...) # will be rolled back
       end
 
       def oops
@@ -24,11 +24,11 @@ Or general 'this should be rolled back when in a transaction code like jobs:
       def revertable_enqueue(*args)
         ActiveRecord::Base.after_transaction do
           enqueue(*args)
-       end
+        end
       end
     end
     
-There is a after_commit hook in Rails 3, which can replace the first usage:
+Alternative: after_commit hook in Rails 3, can replace the first usage:
 
     class User
       after_commit :send_an_email :on=>:create
@@ -36,7 +36,7 @@ There is a after_commit hook in Rails 3, which can replace the first usage:
       ...
     end
 
-after_transaction will behave like it would not exist if you are not in an transaction when calling it.
+after_transaction will perform the given block imediatly if no transactions are open.
 
 
     rails plugin install git://github.com/grosser/ar_after_transaction
@@ -47,9 +47,12 @@ TODO
  - find out if we are in test mode with or without transactions (atm assumes depth of 1 for 'test' env)
 
 
-Author
-======
-Original idea and code comes from: Jeremy Kemper @ https://rails.lighthouseapp.com/projects/8994/tickets/2991-after-transaction-patch 
+Authors
+=======
+[Original idea and code](https://rails.lighthouseapp.com/projects/8994/tickets/2991-after-transaction-patch) from [Jamis Buck](http://weblog.jamisbuck.org/) (post by Jeremy Kemper)
+
+### [Contributors](http://github.com/grosser/ar_after_transaction/contributors)
+ - [Bogdan Gusiev](http://gusiev.com)
 
 
 [Michael Grosser](http://pragmatig.wordpress.com)  

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/ar_after_transaction.gemspec

@@ -5,14 +5,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ar_after_transaction}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-08-28}
+  s.date = %q{2010-10-14}
   s.email = %q{grosser.michael@gmail.com}
   s.files = [
     "Gemfile",
+     "Gemfile.lock",
      "Rakefile",
      "Readme.md",
      "VERSION",

data/lib/ar_after_transaction.rb

@@ -22,8 +22,8 @@ module ARAfterTransaction
       raise
     ensure
       unless transactions_open?
-        execute_after_transaction_callbacks if clean
-        clear_transaction_callbacks
+        callbacks = delete_after_transaction_callbacks
+        callbacks.each(&:call) if clean
       end
     end
 
@@ -45,12 +45,10 @@ module ARAfterTransaction
       Rails.env.test? ? 1 : 0
     end
 
-    def execute_after_transaction_callbacks
-      @@after_transaction_hooks.each { |hook| hook.call }
-    end
-
-    def clear_transaction_callbacks
-      @@after_transaction_hooks.clear
+    def delete_after_transaction_callbacks
+      result = @@after_transaction_hooks
+      @@after_transaction_hooks = []
+      result
     end
   end
 
@@ -59,4 +57,4 @@ module ARAfterTransaction
   end
 end
 
-ActiveRecord::Base.send(:include, ARAfterTransaction)
+ActiveRecord::Base.send(:include, ARAfterTransaction)

data/spec/ar_after_transaction_spec.rb

@@ -15,6 +15,9 @@ class User
 
   def do_after
     after_transaction do
+      ActiveRecord::Base.transaction do
+        # nested transaction should not cause infinitive recursion
+      end
       self.class.test_stack << :after
     end
   end
@@ -85,4 +88,4 @@ describe ARAfterTransaction do
     }.should raise_error(AnExpectedError)
     User.test_stack.should == [:normal, :normal]
   end
-end
+end

data/spec/setup_database.rb

@@ -3,7 +3,7 @@ ActiveRecord::Base.establish_connection(
   :database => "ar_after_transaction"
 )
 
-ActiveRecord::Base.connection.execute('drop table users')
+ActiveRecord::Base.connection.execute('drop table if exists users')
 ActiveRecord::Schema.define(:version => 1) do
   create_table :users do |t|
     t.string :name
@@ -15,4 +15,4 @@ end
 #ActiveRecord::Base.logger = Logger.new(STDOUT)
 
 class User < ActiveRecord::Base
-end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,12 +14,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-28 00:00:00 +02:00
+date: 2010-10-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activerecord
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
@@ -29,6 +27,8 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
+  prerelease: false
+  name: activerecord
 description: 
 email: grosser.michael@gmail.com
 executables: []
@@ -39,6 +39,7 @@ extra_rdoc_files: []
 
 files: 
 - Gemfile
+- Gemfile.lock
 - Rakefile
 - Readme.md
 - VERSION