ar_after_transaction 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca30487c699cc7613223724f89d5ab79cf7dc882b529d8864cb62b3fe8a4e236
-  data.tar.gz: a4e3f03ae30f349acd3193a8f9aedcf23f3c15715d3dc8fc345ed7c43210471e
+  metadata.gz: 260f2ee697d717537bd14d2fa30261d9270092be1efce392b10baea6c604f996
+  data.tar.gz: 96c6489521d2f4224d5a9544978c106f4ef698340900b20b60112fbda5465236
 SHA512:
-  metadata.gz: 88dbdac2ce6163067a3f1b33427fbade19b0ec4d3310ca15a3a37db686a701cc81cf79fc2ffb4f513a5b6de7aca34d75067576df3ebc968a09fbfd885a11a1e7
-  data.tar.gz: 7e15342f954edfb228ce60991bb15b3227d8e0ed85b5d5241b8301e57da1a70cf82cc9cf8167b39e167b71355bb54331d1f9aeff570979e2330299d98360a696
+  metadata.gz: 1a03f6148f86af85473b2f709152234a07e38c04e22f366e79582880411e7455ede71a49f454870cbce1d1ce833f410d925fa29a19effc08e77ceec48c9cf539
+  data.tar.gz: 96f2a7bc147a02f58c8b10597bd559dc86574195f465f9a22db136685951fe6f65def1c273bfb759452c1f07339e67aaaf3f5b90b04f1f44a18fd23fa4fbe530

data/Readme.md

@@ -1,6 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/ar_after_transaction.png)](http://badge.fury.io/rb/ar_after_transaction)
-[![Build Status](https://travis-ci.org/grosser/ar_after_transaction.png)](https://travis-ci.org/grosser/ar_after_transaction)
-[![Dependency Status](https://gemnasium.com/grosser/ar_after_transaction.png)](https://gemnasium.com/grosser/ar_after_transaction)
+![CI](https://github.com/grosser/ar_after_transaction/workflows/CI/badge.svg)
 
 Do something only after the currently open transactions have finished.
 
@@ -9,36 +8,44 @@ Normally everything gets rolled back when a transaction fails, but you cannot ro
 Install
 =======
 
-    gem install ar_after_transaction
+```bash
+gem install ar_after_transaction
+```
 
 
 Usage
 =====
+
 ### just-in-time callbacks
-    class User
-      after_create :do_stuff, :oops
-
-      def do_stuff
-        after_transaction do
-          send_an_email # cannot be rolled back
-        end
-        comments.create(...) # will be rolled back
-      end
-
-      def oops
-        raise "do the rolback!"
-      end
+
+```ruby
+class User
+  after_create :do_stuff, :oops
+
+  def do_stuff
+    after_transaction do
+      send_an_email # cannot be rolled back
     end
+    comments.create(...) # will be rolled back
+  end
+
+  def oops
+    raise "do the rolback!"
+  end
+end
+```
 
 ### General 'this should be rolled back when in a transaction' code like jobs
 
-    class Resque
-      def revertable_enqueue(*args)
-        ActiveRecord::Base.after_transaction do
-          enqueue(*args)
-        end
-      end
+```ruby
+class Resque
+  def revertable_enqueue(*args)
+    ActiveRecord::Base.after_transaction do
+      enqueue(*args)
     end
+  end
+end
+```
 
 ### When not in a transaction
 after_transaction will perform the given block immediately
@@ -47,25 +54,30 @@ after_transaction will perform the given block immediately
 after_transaction assumes zero open transactions.<br/>
 If you use transactional fixtures you should change it in test mode.
 
-    # config/environments/test.rb
-    config.after_initialize do
-      ActiveRecord::Base.normally_open_transactions = 1
-    end
+```ruby
+# config/environments/test.rb
+config.after_initialize do
+  ActiveRecord::Base.normally_open_transactions = 1
+end
+```
 
 ### 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
+```ruby
+class User
+  after_commit :send_an_email on: :create
+  after_create :do_stuff, :oops
+  ...
+end
+```
 
 Alternative
 ===========
+
 Rails 3+
  - basic support is built in, use it if you can!
  - `after_commit :foo`
- - `after_commit :bar, :on => :create / :update`
+ - `after_commit :bar, on: :create / :update`
  - [after_commit everywhere](https://dev.to/evilmartians/rails-aftercommit-everywhere--4j9g)
 
 
@@ -86,6 +98,7 @@ Authors
  - [Michael Wu](https://github.com/michaelmwu)
  - [C.W.](https://github.com/compwron)
  - [Ben Weintraub](https://github.com/benweint)
+ - [Vladimir Temnikov](https://github.com/vladimirtemnikov)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>

data/lib/ar_after_transaction.rb

@@ -1,72 +1,30 @@
+# frozen_string_literal: true
+
 require 'active_record'
 require 'ar_after_transaction/version'
 
 module ARAfterTransaction
   module ClassMethods
-    def self.extended( base )
-      base.class_eval do
-        class << self
-          alias_method :transaction_without_after, :transaction
-          alias_method :transaction, :transaction_with_after
-        end
-      end
-    end
-
-    def transaction_with_after(**args)
-      clean = true
-      transaction_without_after(**args) do
-        begin
-          yield
-        rescue ActiveRecord::Rollback
-          clean = false
-          raise
-        end
-      end
-    rescue Exception
-      clean = false
-      raise
-    ensure
-      unless transactions_open?
-        callbacks = delete_after_transaction_callbacks
-        callbacks.each(&:call) if clean
-      end
-    end
-
     def after_transaction(&block)
-      if transactions_open?
-        connection.after_transaction_callbacks ||= []
-        connection.after_transaction_callbacks << block
-      else
-        yield
-      end
+      connection.after_transaction(&block)
     end
 
     def normally_open_transactions
-      @@normally_open_transactions ||= 0
+      connection.normally_open_transactions ||= 0
     end
 
-    def normally_open_transactions=(value)
-      @@normally_open_transactions = value
-    end
+    delegate :normally_open_transactions=, to: :connection
 
     private
 
     def transactions_open?
-      pool = connection_pool
-      return false unless pool && pool.active_connection?
-      connection.open_transactions > normally_open_transactions
-    end
-
-    def delete_after_transaction_callbacks
-      result = connection.after_transaction_callbacks || []
-      connection.after_transaction_callbacks = []
-      result
+      connection.send :transactions_open?
     end
   end
 
   module InstanceMethods
     def after_transaction(&block)
-      self.class.after_transaction(&block)
+      self.class.connection.after_transaction(&block)
     end
   end
 end
@@ -76,10 +34,57 @@ module ARAfterTransactionConnection
     base.class_eval do
       attr_accessor :normally_open_transactions
       attr_accessor :after_transaction_callbacks
+
+      alias_method :transaction_without_after, :transaction
+      alias_method :transaction, :transaction_with_after
     end
   end
+
+  def transaction_with_after(**args)
+    clean = true
+    transaction_without_after(**args) do
+      begin
+        yield
+      rescue ActiveRecord::Rollback
+        clean = false
+        raise
+      end
+    end
+  rescue StandardError
+    clean = false
+    raise
+  ensure
+    unless transactions_open?
+      callbacks = delete_after_transaction_callbacks
+      callbacks.each(&:call) if clean
+    end
+  end
+
+  def after_transaction(&block)
+    if transactions_open?
+      self.after_transaction_callbacks ||= []
+      self.after_transaction_callbacks << block
+    else
+      yield
+    end
+  end
+
+  private
+
+  def transactions_open?
+    return false unless active?
+
+    self.normally_open_transactions ||= 0
+    open_transactions > normally_open_transactions
+  end
+
+  def delete_after_transaction_callbacks
+    result = after_transaction_callbacks || []
+    self.after_transaction_callbacks = []
+    result
+  end
 end
 
-ActiveRecord::Base.send(:extend, ARAfterTransaction::ClassMethods)
-ActiveRecord::Base.send(:include, ARAfterTransaction::InstanceMethods)
-ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:include, ARAfterTransactionConnection)
+ActiveRecord::Base.extend ARAfterTransaction::ClassMethods
+ActiveRecord::Base.include ARAfterTransaction::InstanceMethods
+ActiveRecord::ConnectionAdapters::AbstractAdapter.include ARAfterTransactionConnection

data/lib/ar_after_transaction/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ARAfterTransaction
-  VERSION = Version = '0.6.1'
-end
+  VERSION = Version = '0.7.0'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar_after_transaction
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-13 00:00:00.000000000 Z
+date: 2020-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,9 +29,9 @@ dependencies:
         version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
-  name: wwtd
+  name: bump
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -45,7 +45,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bump
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -101,7 +101,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: wwtd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="