test_after_commit 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0771c33d6db21be88b98458395d484ee9414352a
-  data.tar.gz: 154e46ea5761f401201401913c2af9dc9ebf698e
+  metadata.gz: 0c6a0f9af37b262aa154f706d6c1cd365bb09814
+  data.tar.gz: c796d6a95a93bedfb11597f3aa691de3582c6883
 SHA512:
-  metadata.gz: 9188eaac46d1ea76037eebbde65b5ee700d173ab597a9e0e04165fcc689875c3382a84acdc474dbccd7949ed75cfa2958975547552136a548b53670209d783aa
-  data.tar.gz: 0cbf8d71596dfd913df0160e1a5932b7bbc844472cab2e968cb5f075b1ae1597f73e4fcad5837adbbaca6a3a784367a10831b781141b5bcf99415c2bf257ad17
+  metadata.gz: 68ce3977a1cf2200cda9321b773b34c13b390673c91aca9b20b400eb38bab23351a4c2c9e7c133e23a2bb530768933a85578118c1d052aab96ad996af431495b
+  data.tar.gz: 51cb9ce5298a091819895566921a7736621ec11c897391f9e1cadfe93f7a4e1e5a9a194f989921380f19007799473992dc3058fdf34d10555194d2b8e82fac58

data/.travis.yml

@@ -1,3 +1,4 @@
+bundler_args: ""
 language: ruby
 rvm:
   - ree

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    test_after_commit (0.2.1)
+    test_after_commit (0.2.2)
 
 GEM
   remote: https://rubygems.org/

data/Readme.md

@@ -41,6 +41,7 @@ Inspired by https://gist.github.com/1305285
 
 ### [Contributors](https://github.com/grosser/test_after_commit/contributors)
  - [James Le Cuirot](https://github.com/chewi)
+ - [emirose](https://github.com/emirose)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>

data/gemfiles/30.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/test_after_commit
   specs:
-    test_after_commit (0.2.0)
+    test_after_commit (0.2.1)
 
 GEM
   remote: https://rubygems.org/

data/gemfiles/31.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/test_after_commit
   specs:
-    test_after_commit (0.2.0)
+    test_after_commit (0.2.1)
 
 GEM
   remote: https://rubygems.org/

data/gemfiles/32.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/test_after_commit
   specs:
-    test_after_commit (0.2.0)
+    test_after_commit (0.2.1)
 
 GEM
   remote: https://rubygems.org/

data/gemfiles/40.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/test_after_commit
   specs:
-    test_after_commit (0.2.0)
+    test_after_commit (0.2.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/test_after_commit.rb

@@ -63,3 +63,14 @@ ActiveRecord::ConnectionAdapters::DatabaseStatements.class_eval do
     end
   end
 end
+
+if ActiveRecord::VERSION::MAJOR >= 4
+  # disable parts of the sync code that starts looping
+  ActiveRecord::Base.class_eval do
+    alias_method :sync_with_transaction_state_with_state, :sync_with_transaction_state
+    def sync_with_transaction_state
+      @reflects_state[0] = true
+      sync_with_transaction_state_with_state
+    end
+  end
+end

data/lib/test_after_commit/version.rb

@@ -1,3 +1,3 @@
 module TestAfterCommit
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/spec/database.rb

@@ -30,7 +30,20 @@ ActiveRecord::Schema.define(:version => 1) do
   end
 end
 
+module Called
+  def called(x=nil)
+    @called ||= []
+    if x
+      @called << x
+    else
+      @called
+    end
+  end
+end
+
 class Car < ActiveRecord::Base
+  extend Called
+
   has_many :cars
 
   after_commit :simple_after_commit
@@ -43,15 +56,6 @@ class Car < ActiveRecord::Base
 
   attr_accessor :make_rollback, :raise_error, :do_after_create_save
 
-  def self.called(x=nil)
-    @called ||= []
-    if x
-      @called << x
-    else
-      @called
-    end
-  end
-
   def trigger_rollback
     raise ActiveRecord::Rollback if make_rollback
   end
@@ -96,6 +100,7 @@ class CarObserver < ActiveRecord::Observer
     define_method action do |record|
       return unless recording
       Car.called << :observed_after_commit
+      Untracked.create!
     end
   end
 end
@@ -108,6 +113,23 @@ class Bar < ActiveRecord::Base
   has_many :bars, :foreign_key => :car_id
 end
 
+class MultiBar < ActiveRecord::Base
+  extend Called
+
+  self.table_name = "cars"
+
+  after_commit :one, :on => :create
+  after_commit :two, :on => :create
+
+  def one
+    self.class.called << :one
+  end
+
+  def two
+    self.class.called << :two
+  end
+end
+
 class Address < ActiveRecord::Base
   has_many :people
 
@@ -134,3 +156,7 @@ class Person < ActiveRecord::Base
     address.update_attributes(:number_of_residents => address.number_of_residents + 1)
   end
 end
+
+class Untracked < ActiveRecord::Base
+  self.table_name = "cars"
+end

data/spec/test_after_commit_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
 describe TestAfterCommit do
+  def rails4?
+    ActiveRecord::VERSION::MAJOR >= 4
+  end
+
   before do
     CarObserver.recording = false
     Car.called.clear
@@ -67,7 +71,7 @@ describe TestAfterCommit do
     car.do_after_create_save = true
     car.save!
 
-    expected = if ActiveRecord::VERSION::MAJOR >= 4
+    expected = if rails4?
       [:update, :always, :save_once, :always] # some kind of loop prevention ... investigate we must
     else
       [:save_once, :create, :always, :save_once, :create, :always]
@@ -78,12 +82,17 @@ describe TestAfterCommit do
 
   it "returns on create and on create of associations" do
     Car.create!.class.should == Car
-    Car.create!.cars.create.class.should == Car
+    Car.create!.cars.create.class.should == (rails4? ? NilClass : Car)
   end
 
   it "returns on create and on create of associations without after_commit" do
     Bar.create!.class.should == Bar
-    Bar.create!.bars.create.class.should == Bar
+    Bar.create!.bars.create.class.should == (rails4? ? NilClass : Bar)
+  end
+
+  it "calls callbacks in correct order" do
+    MultiBar.create!
+    MultiBar.called.should == [:two, :one]
   end
 
   context "Observer" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test_after_commit
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-10-31 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it