test_after_commit 0.0.1 → 0.1.0

data/Appraisals

@@ -10,3 +10,7 @@ appraise "32" do
   gem "activerecord", "~> 3.2.6"
 end
 
+appraise "40" do
+  gem "activerecord", "~> 4.0.0.beta1"
+  gem "rails-observers"
+end

data/Gemfile

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

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    test_after_commit (0.0.1)
+    test_after_commit (0.1.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     activemodel (3.0.15)
       activesupport (= 3.0.15)

data/Rakefile

@@ -6,7 +6,7 @@ task :spec do
 end
 
 task :default do
-  sh "bundle exec rake appraisal:install && bundle exec rake appraisal spec"
+  sh "bundle exec rake appraisal:install && bundle exec rake appraisal spec && REAL=1 bundle exec rake appraisal spec"
 end
 
 # extracted from https://github.com/grosser/project_template

data/Readme.md

@@ -8,12 +8,19 @@ Install
     # Gemfile
     gem 'test_after_commit', :group => :test
 
+TIPS
+====
+ - hooks do not re-raise errors (with or without this gem)
+
 Author
 ======
 
 Inspired by https://gist.github.com/1305285
 
+### [Contributors](https://github.com/grosser/test_after_commit/contributors)
+ - [James Le Cuirot](https://github.com/chewi)
+
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>
 License: MIT<br/>
-[![Build Status](https://secure.travis-ci.org/grosser/test_after_commit.png)](http://travis-ci.org/grosser/test_after_commit)
+[![Build Status](https://travis-ci.org/grosser/test_after_commit.png)](https://travis-ci.org/grosser/test_after_commit)

data/gemfiles/30.gemfile

@@ -1,6 +1,6 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "rake"
 gem "rspec", "~>2"

data/gemfiles/30.gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: /Users/mgrosser/code/tools/test_after_commit
   specs:
-    test_after_commit (0.0.0)
+    test_after_commit (0.0.1)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     activemodel (3.0.16)
       activesupport (= 3.0.16)

data/gemfiles/31.gemfile

@@ -1,6 +1,6 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "rake"
 gem "rspec", "~>2"

data/gemfiles/31.gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: /Users/mgrosser/code/tools/test_after_commit
   specs:
-    test_after_commit (0.0.0)
+    test_after_commit (0.0.1)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     activemodel (3.1.7)
       activesupport (= 3.1.7)

data/gemfiles/32.gemfile

@@ -1,6 +1,6 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "rake"
 gem "rspec", "~>2"

data/gemfiles/32.gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: /Users/mgrosser/code/tools/test_after_commit
   specs:
-    test_after_commit (0.0.0)
+    test_after_commit (0.0.1)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     activemodel (3.2.7)
       activesupport (= 3.2.7)

data/gemfiles/40.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "rspec", "~>2"
+gem "sqlite3"
+gem "appraisal"
+gem "activerecord", "~> 4.0.0.beta1"
+gem "rails-observers"
+
+gemspec :path=>"../"

data/gemfiles/40.gemfile.lock

@@ -0,0 +1,80 @@
+PATH
+  remote: /Users/mgrosser/code/tools/test_after_commit
+  specs:
+    test_after_commit (0.0.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (4.0.0.beta1)
+      activesupport (= 4.0.0.beta1)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.0.beta1)
+      activesupport (= 4.0.0.beta1)
+      builder (~> 3.1.0)
+    activerecord (4.0.0.beta1)
+      activemodel (= 4.0.0.beta1)
+      activerecord-deprecated_finders (~> 0.0.3)
+      activesupport (= 4.0.0.beta1)
+      arel (~> 4.0.0.beta1)
+    activerecord-deprecated_finders (0.0.3)
+    activesupport (4.0.0.beta1)
+      i18n (~> 0.6.2)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.33)
+    appraisal (0.5.1)
+      bundler
+      rake
+    arel (4.0.0.beta2)
+    atomic (1.0.1)
+    builder (3.1.4)
+    diff-lcs (1.2.1)
+    erubis (2.7.0)
+    i18n (0.6.4)
+    json (1.7.7)
+    minitest (4.6.2)
+    multi_json (1.6.1)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails-observers (0.1.1)
+      railties (~> 4.0.0.beta)
+    railties (4.0.0.beta1)
+      actionpack (= 4.0.0.beta1)
+      activesupport (= 4.0.0.beta1)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.17.0, < 2.0)
+    rake (10.0.3)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
+    sqlite3 (1.3.7)
+    thor (0.17.0)
+    thread_safe (0.1.0)
+      atomic
+    tzinfo (0.3.37)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 4.0.0.beta1)
+  appraisal
+  rails-observers
+  rake
+  rspec (~> 2)
+  sqlite3
+  test_after_commit!

data/lib/test_after_commit.rb

@@ -3,63 +3,64 @@ require 'test_after_commit/version'
 module TestAfterCommit
 end
 
-# https://gist.github.com/1305285 + removed RSpec specific code
+$PASS = 0
+
 ActiveRecord::ConnectionAdapters::DatabaseStatements.class_eval do
-  #
-  # Run the normal transaction method; when it's done, check to see if there
-  # is exactly one open transaction. If so, that's the transactional
-  # fixtures transaction; from the model's standpoint, the completed
-  # transaction is the real deal. Send commit callbacks to models.
-  #
-  # If the transaction block raises a Rollback, we need to know, so we don't
-  # call the commit hooks. Other exceptions don't need to be explicitly
-  # accounted for since they will raise uncaught through this method and
-  # prevent the code after the hook from running.
-  #
   def transaction_with_transactional_fixtures(*args)
-    return_value = nil
-    rolled_back  = false
-
+    @test_open_transactions ||= 0
     transaction_without_transactional_fixtures(*args) do
       begin
-        return_value = yield
-      rescue ActiveRecord::Rollback
-        rolled_back = true
-        raise
+        @test_open_transactions += 1
+        yield
+      rescue ActiveRecord::Rollback => e
+        raise e
+      else
+        if @test_open_transactions == 2
+          test_commit_records
+        end
+      ensure
+        @test_open_transactions -= 1
       end
     end
-
-    commit_transaction_records(false) if not rolled_back and open_transactions == 1
-
-    return_value
   end
   alias_method_chain :transaction, :transactional_fixtures
 
-  #
-  # The @_current_transaction_records is a stack of arrays, each one
-  # containing the records associated with the corresponding transaction
-  # in the transaction stack. This is used by the
-  # `rollback_transaction_records` method (to only send a rollback hook to
-  # models attached to the transaction being rolled back) but is usually
-  # ignored by the `commit_transaction_records` method. Here we
-  # monkey-patch it to temporarily replace the array with only the records
-  # for the top-of-stack transaction, so the real
-  # `commit_transaction_records` method only sends callbacks to those.
-  #
-  def commit_transaction_records_with_transactional_fixtures(commit = true)
-    return commit_transaction_records_without_transactional_fixtures if commit
-
-    preserving_current_transaction_records do
-      @_current_transaction_records = @_current_transaction_records.pop || []
-      commit_transaction_records_without_transactional_fixtures
+  def test_commit_records
+    if ActiveRecord::VERSION::MAJOR == 3
+      commit_transaction_records(false)
+    else
+      @transaction.commit_records
+      @transaction.records.clear # prevent duplicate .commit!
+      @transaction.instance_variable_get(:@state).set_state(nil)
     end
   end
-  alias_method_chain :commit_transaction_records, :transactional_fixtures
 
-  def preserving_current_transaction_records
-    old_current_transaction_records = @_current_transaction_records.dup
-    yield
-  ensure
-    @_current_transaction_records = old_current_transaction_records
+  if ActiveRecord::VERSION::MAJOR == 3
+    # The @_current_transaction_records is a stack of arrays, each one
+    # containing the records associated with the corresponding transaction
+    # in the transaction stack. This is used by the
+    # `rollback_transaction_records` method (to only send a rollback hook to
+    # models attached to the transaction being rolled back) but is usually
+    # ignored by the `commit_transaction_records` method. Here we
+    # monkey-patch it to temporarily replace the array with only the records
+    # for the top-of-stack transaction, so the real
+    # `commit_transaction_records` method only sends callbacks to those.
+    #
+    def commit_transaction_records_with_transactional_fixtures(commit = true)
+      return commit_transaction_records_without_transactional_fixtures if commit
+
+      preserving_current_transaction_records do
+        @_current_transaction_records = @_current_transaction_records.pop || []
+        commit_transaction_records_without_transactional_fixtures
+      end
+    end
+    alias_method_chain :commit_transaction_records, :transactional_fixtures
+
+    def preserving_current_transaction_records
+      old_current_transaction_records = @_current_transaction_records.dup
+      yield
+    ensure
+      @_current_transaction_records = old_current_transaction_records
+    end
   end
 end

data/lib/test_after_commit/version.rb

@@ -1,3 +1,3 @@
 module TestAfterCommit
-  VERSION = '0.0.1'
+  VERSION = '0.1.0'
 end

data/spec/database.rb

@@ -1,6 +1,10 @@
 # setup database
 require 'active_record'
 
+if ActiveRecord::VERSION::MAJOR > 3
+  require "rails/observers/activerecord/active_record"
+end
+
 ActiveRecord::Base.establish_connection(
   :adapter  => 'sqlite3',
   :database => ':memory:'
@@ -10,17 +14,21 @@ ActiveRecord::Migration.verbose = false
 
 ActiveRecord::Schema.define(:version => 1) do
   create_table "cars", :force => true do |t|
+    t.integer :counter, :default => 0, :null => false
+    t.timestamps
   end
 end
 
 class Car < ActiveRecord::Base
   after_commit :simple_after_commit
   after_commit :simple_after_commit_on_create, :on => :create
+  after_commit :save_once, :on => :create, :if => :do_after_create_save
   after_commit :simple_after_commit_on_update, :on => :update
+  after_commit :maybe_raise_errors
 
   after_save :trigger_rollback
 
-  attr_accessor :make_rollback
+  attr_accessor :make_rollback, :raise_error, :do_after_create_save
 
   def self.called(x=nil)
     @called ||= []
@@ -37,6 +45,18 @@ class Car < ActiveRecord::Base
 
   private
 
+  def save_once
+    update_attributes(:counter => 3) unless counter == 3
+    self.class.called :save_once
+  end
+
+  def maybe_raise_errors
+    if raise_error
+      # puts "MAYBE RAISE" # just debugging, but it really does not work ...
+      raise "Expected error"
+    end
+  end
+
   def simple_after_commit
     self.class.called :always
   end
@@ -49,3 +69,17 @@ class Car < ActiveRecord::Base
     self.class.called :update
   end
 end
+
+class CarObserver < ActiveRecord::Observer
+  cattr_accessor :recording
+
+  [:after_commit, :after_rollback].each do |action|
+    define_method action do |record|
+      return unless recording
+      Car.called << :observed_after_commit
+    end
+  end
+end
+
+Car.observers = :car_observer
+Car.instantiate_observers

data/spec/spec_helper.rb

@@ -1,3 +1,18 @@
 $LOAD_PATH.unshift 'lib'
 require File.expand_path '../database', __FILE__
-require 'test_after_commit'
+
+if ENV['REAL']
+  puts 'using real transactions'
+else
+  require 'test_after_commit'
+end
+
+RSpec.configure do |config|
+  unless ENV['REAL']
+    config.around do |example|
+      ActiveRecord::Base.transaction do # simulate transactional fixtures
+        example.call
+      end
+    end
+  end
+end

data/spec/test_after_commit_spec.rb

@@ -1,11 +1,9 @@
 require 'spec_helper'
 
 describe TestAfterCommit do
-  around do |example|
-    Car.transaction do # simulate transactional fixtures
-      Car.called.clear
-      example.call
-    end
+  before do
+    CarObserver.recording = false
+    Car.called.clear
   end
 
   it "has a VERSION" do
@@ -30,4 +28,52 @@ describe TestAfterCommit do
     car.save.should == nil
     Car.called.should == []
   end
+
+  it "does not fire multiple times in nested transactions" do
+    Car.transaction do
+      Car.transaction do
+        Car.create!
+        Car.called.should == []
+      end
+      Car.called.should == []
+    end
+    Car.called.should == [:create, :always]
+  end
+
+  it "does not raises errors" do
+    car = Car.new
+    car.raise_error = true
+    car.save!
+  end
+
+  it "can do 1 save in after_commit" do
+    if !ENV['REAL']
+      pending "this results in infinite loop in REAL mode except on 4.0 but works in tests except for rails 3.0"
+    end
+
+    car = Car.new
+    car.do_after_create_save = true
+    car.save!
+
+    expected = if ActiveRecord::VERSION::MAJOR >= 4
+      [:update, :always, :save_once, :always] # some kind of loop prevention ... investigate we must
+    else
+      [:save_once, :create, :always, :save_once, :create, :always]
+    end
+    Car.called.should == expected
+    car.counter.should == 3
+  end
+
+  context "Observer" do
+    before do
+      CarObserver.recording = true
+    end
+
+    it "should record commits" do
+      Car.transaction do
+        Car.create
+      end
+      Car.called.should == [:observed_after_commit, :create, :always]
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test_after_commit
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-03 00:00:00.000000000 Z
+date: 2013-03-16 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -29,6 +29,8 @@ files:
 - gemfiles/31.gemfile.lock
 - gemfiles/32.gemfile
 - gemfiles/32.gemfile.lock
+- gemfiles/40.gemfile
+- gemfiles/40.gemfile.lock
 - lib/test_after_commit.rb
 - lib/test_after_commit/version.rb
 - spec/database.rb
@@ -50,7 +52,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3378510041846892238
+      hash: -3018637931883165367
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -59,10 +61,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3378510041846892238
+      hash: -3018637931883165367
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: makes after_commit callbacks testable in Rails 3+ with transactional_fixtures