test_after_commit 0.1.0 → 0.1.1

data/.travis.yml

@@ -1,4 +1,15 @@
+language: ruby
 rvm:
   - ree
-  - 1.9.2
   - 1.9.3
+  - 2.0.0
+gemfile:
+  - gemfiles/30.gemfile
+  - gemfiles/31.gemfile
+  - gemfiles/32.gemfile
+  - gemfiles/40.gemfile
+matrix:
+  exclude:
+    - rvm: ree
+      gemfile: gemfiles/40.gemfile
+script: "bundle exec rake spec"

data/Gemfile

@@ -2,6 +2,7 @@ source "https://rubygems.org"
 gemspec
 
 gem 'rake'
+gem 'bump'
 gem 'rspec', '~>2'
 gem 'sqlite3'
 gem 'appraisal'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    test_after_commit (0.1.0)
+    test_after_commit (0.1.1)
 
 GEM
   remote: https://rubygems.org/
@@ -21,17 +21,18 @@ GEM
       rake
     arel (2.0.10)
     builder (2.1.2)
-    diff-lcs (1.1.3)
+    bump (0.3.12)
+    diff-lcs (1.2.1)
     i18n (0.5.0)
     rake (0.9.2)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
+    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.6)
     tzinfo (0.3.33)
 
@@ -41,6 +42,7 @@ PLATFORMS
 DEPENDENCIES
   activerecord
   appraisal
+  bump
   rake
   rspec (~> 2)
   sqlite3

data/Rakefile

@@ -1,5 +1,6 @@
 require 'bundler/gem_tasks'
 require 'appraisal'
+require 'bump/tasks'
 
 task :spec do
   sh "rspec spec/"
@@ -8,20 +9,3 @@ end
 task :default do
   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
-rule /^version:bump:.*/ do |t|
-  sh "git status | grep 'nothing to commit'" # ensure we are not dirty
-  index = ['major', 'minor','patch'].index(t.name.split(':').last)
-  file = 'lib/test_after_commit/version.rb'
-
-  version_file = File.read(file)
-  old_version, *version_parts = version_file.match(/(\d+)\.(\d+)\.(\d+)/).to_a
-  version_parts[index] = version_parts[index].to_i + 1
-  version_parts[2] = 0 if index < 2 # remove patch for minor
-  version_parts[1] = 0 if index < 1 # remove minor for major
-  new_version = version_parts * '.'
-  File.open(file,'w'){|f| f.write(version_file.sub(old_version, new_version)) }
-
-  sh "bundle && git add #{file} Gemfile.lock && git commit -m 'bump version to #{new_version}'"
-end

data/gemfiles/30.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/test_after_commit
   specs:
-    test_after_commit (0.0.1)
+    test_after_commit (0.1.0)
 
 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.0.1)
+    test_after_commit (0.1.0)
 
 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.0.1)
+    test_after_commit (0.1.0)
 
 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.0.1)
+    test_after_commit (0.1.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/test_after_commit.rb

@@ -11,13 +11,14 @@ ActiveRecord::ConnectionAdapters::DatabaseStatements.class_eval do
     transaction_without_transactional_fixtures(*args) do
       begin
         @test_open_transactions += 1
-        yield
+        result = yield
       rescue ActiveRecord::Rollback => e
         raise e
       else
         if @test_open_transactions == 2
           test_commit_records
         end
+        result
       ensure
         @test_open_transactions -= 1
       end

data/lib/test_after_commit/version.rb

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

data/spec/database.rb

@@ -15,11 +15,14 @@ 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.integer :car_id
     t.timestamps
   end
 end
 
 class Car < ActiveRecord::Base
+  has_many :cars
+
   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
@@ -83,3 +86,8 @@ end
 
 Car.observers = :car_observer
 Car.instantiate_observers
+
+class Bar < ActiveRecord::Base
+  self.table_name = "cars"
+  has_many :bars, :foreign_key => :car_id
+end

data/spec/test_after_commit_spec.rb

@@ -64,6 +64,16 @@ describe TestAfterCommit do
     car.counter.should == 3
   end
 
+  it "returns on create and on create of associations" do
+    Car.create!.class.should == Car
+    Car.create!.cars.create.class.should == 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
+  end
+
   context "Observer" do
     before do
       CarObserver.recording = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test_after_commit
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-16 00:00:00.000000000 Z
+date: 2013-03-21 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -52,7 +52,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3018637931883165367
+      hash: -3932025956405055829
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -61,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3018637931883165367
+      hash: -3932025956405055829
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25