activerecord-after-transaction 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c7628dfc2746e467f424e85396a743ef483bb63
-  data.tar.gz: fc7f8a21fce29ec827dda67d9c7ad4124845631b
+  metadata.gz: 4d937a12554cf957268da29fb08a5d9536e00192
+  data.tar.gz: 7c063d5cfd5b0850870aacdd089c80e872c1ba36
 SHA512:
-  metadata.gz: 5680857fc20de8921ec1f709bf07264a4951b6a5ec44ed879111ec99983cfcde671ca9cf08b2ad129c197b7883ef6ac397a766b802fde14a82b11e810be3d7b2
-  data.tar.gz: 8a64d651643698a3768d9c7a9a6b9b17ef6df7e1f3d3de24536d3f6c1908222b6368f0aed1625cf47508b99aefd401ac7b19f9845b54accb73331aec91491a4c
+  metadata.gz: 757ecfc0da2a9ba53e41fa8ec26925d5c74fd2d3707b18bbf5347dbc7c7d8e487d06dfe9085c09ad6f4c804590d30d946da437320dcc12400359570accef3f78
+  data.tar.gz: b9181c500ef091a5e8aa4be4cffea455d27f7372cd54b8636f60d4bbd09e704778d7f182cfda6283a2571877dc681f41eb8f28f83b44f7183e22b78830986127

data/.travis.yml

@@ -13,7 +13,7 @@ env:
     - ACTIVE_RECORD_VERSION=3.2.0
     - ACTIVE_RECORD_VERSION=4.0.0
     - ACTIVE_RECORD_VERSION=4.1.0
-    - ACTIVE_RECORD_VERSION=4.2.0.beta4
+    - ACTIVE_RECORD_VERSION=4.2.0.rc1
 
 script: "bundle exec rake spec"
 

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', "~> #{ENV['ACTION_RECORD_VERSION']}" if ENV['ACTION_RECORD_VERSION'].to_s != ''
+gem 'activerecord', "~> #{ENV['ACTIVE_RECORD_VERSION']}" if ENV['ACTIVE_RECORD_VERSION'].to_s != ''
 
 gem "sqlite3"
 gem "codeclimate-test-reporter", require: nil

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.4

data/lib/activerecord-after-transaction.rb

@@ -2,6 +2,10 @@ require 'active_record'
 require 'activerecord-after-transaction/version'
 require 'activerecord-after-transaction/methods'
 
-ActiveSupport.on_load :active_record do
-  include ActiveRecord::AfterTransaction::Methods
+if defined?(::Rails) 
+  require 'activerecord-after-transaction/railtie'
+else
+  ActiveSupport.on_load :active_record do
+    include ActiveRecord::AfterTransaction::Methods
+  end
 end

data/lib/activerecord-after-transaction/methods.rb

@@ -10,7 +10,9 @@ module ActiveRecord::AfterTransaction
     end
 
     def after_transaction(&block)
-      return block.call unless self.class.connection.open_transactions
+      return block.call if self.class.connection.open_transactions == 0
+      self.class.connection.add_transaction_record self
+
       @after_transaction_queue ||= []
       @after_transaction_queue.push block
       logger && logger.debug("Push #{block}")

data/lib/activerecord-after-transaction/railtie.rb

@@ -0,0 +1,12 @@
+require 'active_record/railtie'
+require 'activerecord-after-transaction/methods'
+
+module ActiveRecordAfterTransaction
+  class Railtie < Rails::Railtie
+    initializer "active_record.include_after_transaction", after: "active_record.set_configs" do |app|
+      ActiveSupport.on_load :active_record do
+        include ActiveRecord::AfterTransaction::Methods
+      end
+    end
+  end
+end

data/spec/after_transaction/methods_spec.rb

@@ -7,12 +7,12 @@ describe ActiveRecord::AfterTransaction::Methods do
       include ActiveRecord::AfterTransaction::Methods
     end
   end
-  subject { klass.new }
+  subject { klass.create! }
 
   shared_examples 'without error' do
     it 'does not raise error in the after_commit callback' do
       step = 1
-      subject.class_eval do
+      klass.class_eval do
         after_commit do
           step = 2
         end
@@ -24,7 +24,7 @@ describe ActiveRecord::AfterTransaction::Methods do
     end
     it 'does not raise error in the after_rollback callback' do
       step = 1
-      subject.class_eval do
+      klass.class_eval do
         after_rollback do
           step = 2
         end
@@ -83,7 +83,25 @@ describe ActiveRecord::AfterTransaction::Methods do
       subject.after_transaction do
         step = 2
       end
-      expect(step).to eq 1
+      expect(step).to eq 2
+    end
+  end
+  describe 'in another model transaction' do
+    let(:another_klass) do
+      create_tmp_model foo: :integer do
+        include ActiveRecord::AfterTransaction::Methods
+      end
+    end
+    it 'executes the proc after transaction' do
+      step = 1
+
+      another_klass.transaction do
+        subject.after_transaction do
+          step = 2
+        end
+        step = 3
+      end
+      expect(step).to eq 2
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-after-transaction
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Daisuke Taniwaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-08 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -69,6 +69,7 @@ files:
 - activerecord-after-transaction.gemspec
 - lib/activerecord-after-transaction.rb
 - lib/activerecord-after-transaction/methods.rb
+- lib/activerecord-after-transaction/railtie.rb
 - lib/activerecord-after-transaction/version.rb
 - spec/after_transaction/methods_spec.rb
 - spec/spec_helper.rb