ar_after_transaction 0.1.1 → 0.2.0

data/Gemfile

@@ -1,9 +1,11 @@
-source 'http://rubygems.org'
+source :rubygems
 
-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 'activerecord', '~>2', :require => 'active_record'
+
+group :dev do
+  gem 'rake'
+  gem 'rspec', '~>2'
+  gem 'jeweler'
+  gem 'mysql'
+  gem 'activesupport', :require => 'active_support'
+end

data/Gemfile.lock

@@ -4,6 +4,7 @@ GEM
     activerecord (2.3.9)
       activesupport (= 2.3.9)
     activesupport (2.3.9)
+    diff-lcs (1.1.2)
     gemcutter (0.6.1)
     git (1.2.5)
     jeweler (1.4.0)
@@ -13,19 +14,24 @@ GEM
     json_pure (1.4.6)
     mysql (2.8.1)
     rake (0.8.7)
-    rspec (1.3.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.0)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
-    sqlite3-ruby (1.3.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord
+  activerecord (~> 2)
   activesupport
   jeweler
   mysql
   rake
-  rspec (~> 1.3)
-  sqlite3-ruby
+  rspec (~> 2)

data/Rakefile

@@ -1,15 +1,18 @@
+require 'rspec/core/rake_task'
+
 task :default => :spec
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new {|t| t.spec_opts = ['--color --backtrace']}
+
+RSpec::Core::RakeTask.new do |t|
+  t.rspec_opts = ['--color']
+end
 
 begin
   require 'jeweler'
-  project_name = 'ar_after_transaction'
   Jeweler::Tasks.new do |gem|
-    gem.name = project_name
+    gem.name = 'ar_after_transaction'
     gem.summary = "Execute irreversible actions only when transactions are not rolled back"
-    gem.email = "grosser.michael@gmail.com"
-    gem.homepage = "http://github.com/grosser/#{project_name}"
+    gem.email = "michael@grosser.it"
+    gem.homepage = "http://github.com/grosser/#{gem.name}"
     gem.authors = ["Michael Grosser"]
     gem.add_dependency ['activerecord']
   end

data/Readme.md

@@ -2,7 +2,16 @@ 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.
 
-Its great for just-in-time callbacks:
+Install
+=======
+    rails plugin install git://github.com/grosser/ar_after_transaction
+or
+    gem install ar_after_transaction
+
+
+Usage
+=====
+### just-in-time callbacks
     class User
       after_create :do_stuff, :oops
 
@@ -18,7 +27,7 @@ Its great for just-in-time callbacks:
       end
     end
 
-Or general 'this should be rolled back when in a transaction code like jobs:
+### General 'this should be rolled back when in a transaction' code like jobs
 
     class Resque
       def revertable_enqueue(*args)
@@ -27,25 +36,26 @@ Or general 'this should be rolled back when in a transaction code like jobs:
         end
       end
     end
-    
-Alternative: after_commit hook in Rails 3, can replace the first usage:
-
-    class User
-      after_commit :send_an_email :on=>:create
-      ater_create :do_stuff, :oops
-      ...
-    end
 
-after_transaction will perform the given block imediatly if no transactions are open.
+### When not in a transaction
+after_transaction will perform the given block immediately
 
+### Transactional fixtures <-> normally_open_transactions
+after_transaction assumes zero open transactions.<br/>
+If you use transactional fixtures you should change it in test mode.
 
-    rails plugin install git://github.com/grosser/ar_after_transaction
-    gem install ar_after_transaction
+    # config/environments/test.rb
+    config.after_initialize do
+      ActiveRecord::Base.normally_open_transactions = 1
+    end
 
-TODO
-=====
- - find out if we are in test mode with or without transactions (atm assumes depth of 1 for 'test' env)
+### Rails 3: after_commit hook can replace the first usage example:
 
+    class User
+      after_commit :send_an_email :on=>:create
+      after_create :do_stuff, :oops
+      ...
+    end
 
 Authors
 =======
@@ -53,9 +63,8 @@ Authors
 
 ### [Contributors](http://github.com/grosser/ar_after_transaction/contributors)
  - [Bogdan Gusiev](http://gusiev.com)
+ - [Benedikt Deicke](http://blog.synatic.net)
 
-
-[Michael Grosser](http://pragmatig.wordpress.com)  
-grosser.michael@gmail.com  
-Hereby placed under public domain, do what you want, just do not hold me accountable...
-
+[Michael Grosser](http://grosser.it)<br/>
+michael@grosser.it<br/>
+Hereby placed under public domain, do what you want, just do not hold me accountable...

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/ar_after_transaction.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ar_after_transaction}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-10-14}
-  s.email = %q{grosser.michael@gmail.com}
+  s.date = %q{2011-02-15}
+  s.email = %q{michael@grosser.it}
   s.files = [
     "Gemfile",
      "Gemfile.lock",
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/grosser/ar_after_transaction}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{Execute irreversible actions only when transactions are not rolled back}
   s.test_files = [
     "spec/setup_database.rb",
@@ -36,10 +36,9 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activerecord>, [">= 0"])
     else
       s.add_dependency(%q<activerecord>, [">= 0"])

data/lib/ar_after_transaction.rb

@@ -5,18 +5,14 @@ module ARAfterTransaction
 
   def self.included(base)
     base.extend(ClassMethods)
-
-    class << base
-      alias_method_chain :transaction, :callbacks
-    end
   end
 
   module ClassMethods
-    @@after_transaction_hooks = []
+    @@after_transaction_callbacks = []
 
-    def transaction_with_callbacks(&block)
+    def transaction(&block)
       clean = true
-      transaction_without_callbacks(&block)
+      super(&block)
     rescue Exception
       clean = false
       raise
@@ -29,25 +25,29 @@ module ARAfterTransaction
 
     def after_transaction(&block)
       if transactions_open?
-        @@after_transaction_hooks << block
+        @@after_transaction_callbacks << block
       else
         yield
       end
     end
 
+    def normally_open_transactions
+      @normally_open_transactions ||= 0
+    end
+
+    def normally_open_transactions=(value)
+      @normally_open_transactions = value
+    end
+
     private
 
     def transactions_open?
       connection.open_transactions > normally_open_transactions
     end
 
-    def normally_open_transactions
-      Rails.env.test? ? 1 : 0
-    end
-
     def delete_after_transaction_callbacks
-      result = @@after_transaction_hooks
-      @@after_transaction_hooks = []
+      result = @@after_transaction_callbacks
+      @@after_transaction_callbacks = []
       result
     end
   end

data/spec/ar_after_transaction_spec.rb

@@ -33,7 +33,7 @@ end
 
 describe ARAfterTransaction do
   before do
-    Rails.env = 'development'
+    User.normally_open_transactions = nil
     User.send(:transactions_open?).should == false
     User.test_stack.clear
     User.test_callbacks.clear
@@ -57,6 +57,16 @@ describe ARAfterTransaction do
     User.test_stack.should == [:normal]
   end
 
+  it "clears transation callbacks when transaction fails" do
+    User.test_callbacks = [:do_after, :do_normal, :oops]
+    lambda{
+      User.create!
+    }.should raise_error(AnExpectedError)
+    User.test_callbacks = [:do_normal]
+    User.create!
+    User.test_stack.should == [:normal, :normal]
+  end
+
   it "executes when no transaction is open" do
     user = User.new
     user.do_after
@@ -65,7 +75,7 @@ describe ARAfterTransaction do
   end
 
   it "executes when open transactions are normal" do
-    Rails.env = 'test'
+    User.normally_open_transactions = 1
     User.test_callbacks = [:do_after, :do_normal]
     User.create!
     User.test_stack.should == [:after, :normal]
@@ -88,4 +98,15 @@ describe ARAfterTransaction do
     }.should raise_error(AnExpectedError)
     User.test_stack.should == [:normal, :normal]
   end
+
+  describe :normally_open_transactions do
+    it "uses 0 by default" do
+      User.normally_open_transactions.should == 0
+    end
+
+    it "can set normally open transactions" do
+      User.normally_open_transactions = 5
+      User.normally_open_transactions.should == 5
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,26 +1,4 @@
 require 'rubygems'
 $LOAD_PATH << "lib"
 require "init"
-require "spec/setup_database"
-
-class FakeEnv
-  def initialize(env)
-    @env = env
-  end
-
-  def test?
-    @env == 'test'
-  end
-end
-
-module Rails
-  def self.env
-    @@env
-  end
-
-  def self.env=(env)
-    @@env = FakeEnv.new(env)
-  end
-
-  self.env = 'development'
-end
+require "spec/setup_database"

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ar_after_transaction
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,23 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-14 00:00:00 +02:00
+date: 2011-02-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
   prerelease: false
+  version_requirements: *id001
+  type: :runtime
   name: activerecord
 description: 
-email: grosser.michael@gmail.com
+email: michael@grosser.it
 executables: []
 
 extensions: []
@@ -59,23 +62,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Execute irreversible actions only when transactions are not rolled back