transaction_retry_continued 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f41000c855c9718808af7de74dc4acc436d76618af8b026d38b797713e7de025
-  data.tar.gz: 51ee0b37da0f5cf18af574ed42e7214f54a1198200b562bd2bb97f7a5af2cb5c
+  metadata.gz: 9593b4c28a4caca5aefedbd6543e7407b194216469bbab86f82e346afea00af1
+  data.tar.gz: 61ce1f23b2dbbc67af572171fcb5c369e9133d3aca95987d6148d333ee34bd76
 SHA512:
-  metadata.gz: 82d5871454e5541cf21988354f6e7dbe0a70c40bc789f61e286998617ba7bfffdebd6b52d5fab53a5d175d497d3b4148664e86d68462cc3f76bfcd584c31dc29
-  data.tar.gz: eee89ab0eaa1374b3e9d0d85554c4c8b702cfdd1fae55c6363ea6149f5150f8506f0ac059d849b53fc53c00c6fc5139bfba5c4bfaff05f33366d0e7d3069382a
+  metadata.gz: a502cf67b25e82cda4ab5aa3f1630a81b7e8effaf04cbbce10d1f94be7cba8768640c5d8ccd0da855909dc8156298b301cbfc802209bd69b4d33bc79ca8b7890
+  data.tar.gz: 817ecdee03df757c9f001e43fd68ef5943bad51435411234747ee4a8fe95a74b3a63b58d86094b099c69f5726ff8158654db6ec81687c814eb4dccf7839df23d

data/.github/workflows/main.yml

@@ -108,7 +108,7 @@ jobs:
       POSTGRESQL_DB_PASS: database
       POSTGRESQL_DB_NAME: transaction_retry_continued_test
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -116,6 +116,12 @@ jobs:
           bundler-cache: true
       - name: Run bundle update
         run: bundle update
+      - name: Setup Code Climate test-reporter
+        if: github.ref_name == 'master'
+        run: |
+          curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+          chmod +x ./cc-test-reporter
+          ./cc-test-reporter before-build
       - name: Start Mysql
         if: matrix.db == 'mysql2'
         run: |
@@ -158,20 +164,34 @@ jobs:
       - name: Shutdown database
         if: always() && (matrix.db == 'postgresql' || matrix.db == 'mysql2')
         run: docker stop database
-#      - name: Coveralls Parallel
-#        if: "${{ !env.ACT }}"
-#        uses: coverallsapp/github-action@master
-#        with:
-#          github-token: "${{ secrets.GITHUB_TOKEN }}"
-#          flag-name: run-${{ matrix.ruby }}-${{ matrix.activerecord }}-${{ matrix.db }}-${{ matrix.dbversion }}
-#          parallel: true
-#  finish:
-#    needs: test
-#    runs-on: ubuntu-latest
-#    steps:
-#      - name: Coveralls Finished
-#        if: "${{ !env.ACT }}"
-#        uses: coverallsapp/github-action@master
-#        with:
-#          github-token: "${{ secrets.GITHUB_TOKEN }}"
-#          parallel-finished: true
+      - name: Format coverage
+        if: github.ref_name == 'master'
+        run: |
+          ./cc-test-reporter format-coverage -t simplecov -o coverage/cc_resultset.json
+      - name: Upload reports' artifacts
+        if: success() || failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: coverage_artifact_ruby_${{ matrix.ruby }}_ar_${{ matrix.activerecord }}_db_${{ matrix.db }}
+          if-no-files-found: ignore
+          path: coverage
+          retention-days: 1
+  finish:
+    needs: test
+    runs-on: ubuntu-latest
+    if: github.ref_name == 'master'
+    steps:
+      - uses: actions/checkout@v4
+      - name: Download Code Climate test-reporter
+        run: |
+          curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+          chmod +x ./cc-test-reporter
+      - name: Download reports' artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: coverage_reports
+          pattern: coverage_artifact_*
+      - name: sum-coverage
+        run: |
+          ./cc-test-reporter sum-coverage coverage_reports/coverage_artifact_ruby*/cc_resultset.json -o coverage/codeclimate.json
+          ./cc-test-reporter upload-coverage -r ${{secrets.CC_TEST_REPORTER_ID}} -i coverage/codeclimate.json

data/.gitignore

@@ -4,3 +4,5 @@ Gemfile.lock
 pkg/*
 .idea
 test/log/*.log
+coverage
+gemfiles/*/Gemfile.*lock

data/Gemfile

@@ -1,23 +1,10 @@
 # frozen_string_literal: true
 
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 gemspec
 
-gemfile_local = File.expand_path '../Gemfile.local', __FILE__
+gemfile_local = File.expand_path 'Gemfile.local', __dir__
 eval File.read(gemfile_local), binding, gemfile_local if File.exist? gemfile_local
-#
-# group :test do
-#   gem 'transaction_isolation', git: 'https://github.com/alittlebit/transaction_isolation'
-#   # Use the gem instead of a dated version bundled with Ruby
-#   gem 'minitest', '5.3.4'
-#   gem 'simplecov', :require => false
-# end
-#
-# group :development do
-#   gem 'transaction_isolation', git: 'https://github.com/alittlebit/transaction_isolation'
-#   gem 'rake'
-#   # enhance irb
-#   gem 'awesome_print', :require => false
-#   gem 'pry', :require => false
-# end
+
+gem 'rubocop', '~> 1.64'

data/README.md

@@ -1,3 +1,8 @@
+[![Gem Version](https://badge.fury.io/rb/transaction_retry_continued.svg)](https://badge.fury.io/rb/transaction_retry_continued)
+[![Maintainability](https://api.codeclimate.com/v1/badges/2a527711b8077f4be2a2/maintainability)](https://codeclimate.com/github/iagopiimenta/transaction_retry_continued/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/2a527711b8077f4be2a2/test_coverage)](https://codeclimate.com/github/iagopiimenta/transaction_retry_continued/test_coverage)
+[![CI PR Builds](https://github.com/iagopiimenta/transaction_retry_continued/actions/workflows/main.yml/badge.svg)](https://github.com/iagopiimenta/transaction_retry_continued/actions/workflows/main.yml)
+
 # Transaction Retry Continued
 
 > This is a community-driven continuation of the [`transaction_retry`](https://github.com/qertoip/transaction_retry) gem
@@ -31,7 +36,7 @@ __It works out of the box with Ruby on Rails__.
 If you have a standalone ActiveRecord-based project you'll need to call:
 
 ```ruby
-    TransactionRetry.apply_activerecord_patch     # after connecting to the database
+TransactionRetry.apply_activerecord_patch     # after connecting to the database
 ```
 
 ## Database deadlock and serialization errors that are retried
@@ -83,13 +88,23 @@ This gem was initially developed for and successfully works in production at [Ko
 
 Run tests on the selected database (mysql2 by default):
 
-    db=mysql2 bundle exec rake test
-    db=postgresql bundle exec rake test
-    db=sqlite3 bundle exec rake test
+```bash
+# passing desired database, active record version and ruby version
+docker compose run -e db=sqlite3 -e BUNDLE_GEMFILE=gemfiles/activerecord-7.0/Gemfile.sqlite3 ruby_2_5 bash -c ./docker/test-ruby.sh
+
+# db options: mysql2, postgresql, sqlite3
+# active record version options: 5.2, 6.0, 6.1, 7.0
+# ruby version options: 2.5, 2.7, 3.0, 3.1
+```
 
-Run tests on all supported databases:
+Run tests on all supported databases by ruby version:
 
-    ./tests
+```bash
+docker compose up ruby_2_5
+docker compose up ruby_2_7
+docker compose up ruby_3_0
+docker compose up ruby_3_1
+```
 
 Database configuration is hardcoded in test/db/db.rb; feel free to improve this and submit a pull request.
 
@@ -99,8 +114,8 @@ You should be very suspicious about any gem that monkey patches your stock Ruby
 
 This gem is carefully written to not be more intrusive than it needs to be:
 
- * wraps ActiveRecord::Base#transaction class method using alias_method to add new behaviour
- * introduces two new private class methods in ActiveRecord::Base (with names that should never collide)
+- wraps ActiveRecord::Base#transaction class method using alias_method to add new behaviour
+- introduces two new private class methods in ActiveRecord::Base (with names that should never collide)
 
 ## License
 

data/Rakefile

@@ -1,11 +1,13 @@
-require "bundler/gem_tasks"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
 
 require 'rake/testtask'
 
 Rake::TestTask.new do |t|
-  t.libs += ["test", "lib"]
+  t.libs += %w[test lib]
   t.pattern = 'test/integration/**/*_test.rb'
   t.verbose = true
 end
 
-task :default => [:test]
+task default: [:test]

data/docker/ruby-2.5/Dockerfile

@@ -0,0 +1,6 @@
+FROM ruby:2.5-slim
+
+RUN apt-get update &&\
+    apt-get install -y build-essential git sqlite3 libsqlite3-dev mariadb-client libmariadb-dev postgresql-client libpq-dev &&\
+    apt-get clean &&\
+    rm -rf /var/lib/apt/lists/*

data/docker/ruby-2.7/Dockerfile

@@ -0,0 +1,6 @@
+FROM ruby:2.7-slim
+
+RUN apt-get update &&\
+    apt-get install -y build-essential git sqlite3 libsqlite3-dev mariadb-client libmariadb-dev postgresql-client libpq-dev &&\
+    apt-get clean &&\
+    rm -rf /var/lib/apt/lists/*

data/docker/ruby-3.0/Dockerfile

@@ -0,0 +1,6 @@
+FROM ruby:3.0-slim
+
+RUN apt-get update &&\
+    apt-get install -y build-essential git sqlite3 libsqlite3-dev mariadb-client libmariadb-dev postgresql-client libpq-dev &&\
+    apt-get clean &&\
+    rm -rf /var/lib/apt/lists/*

data/docker/ruby-3.1/Dockerfile

@@ -0,0 +1,6 @@
+FROM ruby:3.0-slim
+
+RUN apt-get update &&\
+    apt-get install -y build-essential git sqlite3 libsqlite3-dev mariadb-client libmariadb-dev postgresql-client libpq-dev &&\
+    apt-get clean &&\
+    rm -rf /var/lib/apt/lists/*

data/docker/test-ruby-2.5.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+# fix conflicts between different ruby versions
+rm -rf gemfiles/**/Gemfile.*.lock
+
+gemfiles=(
+  "gemfiles/activerecord-5.2/Gemfile.sqlite3"
+  "gemfiles/activerecord-6.0/Gemfile.sqlite3"
+  "gemfiles/activerecord-6.1/Gemfile.sqlite3"
+
+  "gemfiles/activerecord-5.2/Gemfile.mysql2"
+  "gemfiles/activerecord-6.0/Gemfile.mysql2"
+  "gemfiles/activerecord-6.1/Gemfile.mysql2"
+
+  "gemfiles/activerecord-5.2/Gemfile.postgresql"
+  "gemfiles/activerecord-6.0/Gemfile.postgresql"
+  "gemfiles/activerecord-6.1/Gemfile.postgresql"
+)
+
+for gemfile in "${gemfiles[@]}"; do
+  database=$(echo $gemfile | cut -d'.' -f3)
+
+  echo BUNDLE_GEMFILE=$gemfile db=$database bundle exec rake test
+  BUNDLE_GEMFILE=$gemfile bundle install
+  BUNDLE_GEMFILE=$gemfile db=$database bundle exec rake test
+done

data/docker/test-ruby-2.7.sh

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+# fix conflicts between different ruby versions
+rm -rf gemfiles/**/Gemfile.*.lock
+
+gemfiles=(
+  "gemfiles/activerecord-5.2/Gemfile.sqlite3"
+  "gemfiles/activerecord-6.0/Gemfile.sqlite3"
+  "gemfiles/activerecord-6.1/Gemfile.sqlite3"
+  "gemfiles/activerecord-7.0/Gemfile.sqlite3"
+
+  "gemfiles/activerecord-5.2/Gemfile.mysql2"
+  "gemfiles/activerecord-6.0/Gemfile.mysql2"
+  "gemfiles/activerecord-6.1/Gemfile.mysql2"
+  "gemfiles/activerecord-7.0/Gemfile.mysql2"
+
+  "gemfiles/activerecord-5.2/Gemfile.postgresql"
+  "gemfiles/activerecord-6.0/Gemfile.postgresql"
+  "gemfiles/activerecord-6.1/Gemfile.postgresql"
+  "gemfiles/activerecord-7.0/Gemfile.postgresql"
+)
+
+for gemfile in "${gemfiles[@]}"; do
+  database=$(echo $gemfile | cut -d'.' -f3)
+
+  echo BUNDLE_GEMFILE=$gemfile db=$database bundle exec rake test
+  BUNDLE_GEMFILE=$gemfile bundle install
+  BUNDLE_GEMFILE=$gemfile db=$database bundle exec rake test
+done

data/docker/test-ruby-3.0.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+# fix conflicts between different ruby versions
+rm -rf gemfiles/**/Gemfile.*.lock
+
+gemfiles=(
+  "gemfiles/activerecord-6.0/Gemfile.sqlite3"
+  "gemfiles/activerecord-6.1/Gemfile.sqlite3"
+  "gemfiles/activerecord-7.0/Gemfile.sqlite3"
+
+  "gemfiles/activerecord-6.0/Gemfile.mysql2"
+  "gemfiles/activerecord-6.1/Gemfile.mysql2"
+  "gemfiles/activerecord-7.0/Gemfile.mysql2"
+
+  "gemfiles/activerecord-6.0/Gemfile.postgresql"
+  "gemfiles/activerecord-6.1/Gemfile.postgresql"
+  "gemfiles/activerecord-7.0/Gemfile.postgresql"
+)
+
+for gemfile in "${gemfiles[@]}"; do
+  database=$(echo $gemfile | cut -d'.' -f3)
+
+  echo BUNDLE_GEMFILE=$gemfile db=$database bundle exec rake test
+  BUNDLE_GEMFILE=$gemfile bundle install
+  BUNDLE_GEMFILE=$gemfile db=$database bundle exec rake test
+done

data/docker/test-ruby-3.1.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+# fix conflicts between different ruby versions
+rm -rf gemfiles/**/Gemfile.*.lock
+
+gemfiles=(
+  "gemfiles/activerecord-6.0/Gemfile.sqlite3"
+  "gemfiles/activerecord-6.1/Gemfile.sqlite3"
+  "gemfiles/activerecord-7.0/Gemfile.sqlite3"
+
+  "gemfiles/activerecord-6.0/Gemfile.mysql2"
+  "gemfiles/activerecord-6.1/Gemfile.mysql2"
+  "gemfiles/activerecord-7.0/Gemfile.mysql2"
+
+  "gemfiles/activerecord-6.0/Gemfile.postgresql"
+  "gemfiles/activerecord-6.1/Gemfile.postgresql"
+  "gemfiles/activerecord-7.0/Gemfile.postgresql"
+)
+
+for gemfile in "${gemfiles[@]}"; do
+  database=$(echo $gemfile | cut -d'.' -f3)
+
+  echo BUNDLE_GEMFILE=$gemfile db=$database bundle exec rake test
+  BUNDLE_GEMFILE=$gemfile bundle install
+  BUNDLE_GEMFILE=$gemfile db=$database bundle exec rake test
+done

data/docker/test-ruby.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+# fix conflicts between different ruby versions
+rm -rf gemfiles/**/Gemfile.*.lock
+
+echo BUNDLE_GEMFILE=$BUNDLE_GEMFILE db=$db bundle exec rake test
+     BUNDLE_GEMFILE=$BUNDLE_GEMFILE bundle install
+     BUNDLE_GEMFILE=$BUNDLE_GEMFILE db=$db bundle exec rake test

data/docker-compose.yml

@@ -0,0 +1,60 @@
+services:
+  ruby_2_5: &ruby_2_5
+    working_dir: /app
+    build:
+      context: .
+      dockerfile: docker/ruby-2.5/Dockerfile
+    volumes:
+      - .:/app
+    command: bash -c "bundle install && bundle exec rake test"
+    environment:
+      POSTGRESQL_DB_HOST: postgres
+      POSTGRESQL_DB_USER: transaction_retry_continued
+      POSTGRESQL_DB_PASS: database
+      POSTGRESQL_DB_NAME: transaction_isolation_continued_test
+      MYSQL_DB_HOST: mysql
+      MYSQL_DB_USER: root
+      MYSQL_DB_PASS: database
+      MYSQL_DB_NAME: transaction_isolation_continued_test
+    depends_on:
+      - mysql
+      - postgres
+  ruby_2_7:
+    <<: *ruby_2_5
+    build:
+      context: .
+      dockerfile: docker/ruby-2.7/Dockerfile
+  ruby_3_0:
+    <<: *ruby_2_5
+    command: ./docker/test-ruby-3.0.sh
+    build:
+      context: .
+      dockerfile: docker/ruby-3.0/Dockerfile
+  ruby_3_1:
+    <<: *ruby_2_5
+    command: ./docker/test-ruby-3.1.sh
+    build:
+      context: .
+      dockerfile: docker/ruby-3.1/Dockerfile
+  postgres:
+    image: postgres:9.6
+    environment:
+      POSTGRES_USER: transaction_retry_continued
+      POSTGRES_PASSWORD: database
+      POSTGRES_DB: transaction_isolation_continued_test
+    ports:
+      - "5432:5432"
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -q" ]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+  mysql:
+    image: biarms/mysql:5.7
+    environment:
+      MYSQL_ROOT_PASSWORD: database
+      MYSQL_DATABASE: transaction_isolation_continued_test
+    ports:
+      - "3306:3306"
+    healthcheck:
+      test: "mysqladmin ping --host=0.0.0.0 --password=database --silent"

data/gemfiles/Gemfile.base

@@ -1,6 +1,9 @@
 source 'https://rubygems.org'
 gemspec path: Dir.getwd
 
-gem 'transaction_isolation', git: 'https://github.com/iagopiimenta/transaction_isolation_continued', branch: 'setup-git-workflow'
+gem 'transaction_isolation_continued'
 
-File.exist?(gemfile_local = File.expand_path('./Gemfile.local', Dir.getwd)) and eval File.read(gemfile_local), binding, gemfile_local
+File.exist?(gemfile_local = File.expand_path('../Gemfile.local', __FILE__)) and eval File.read(gemfile_local), binding, gemfile_local
+
+gem 'simplecov'
+gem 'simplecov_json_formatter'

data/lib/transaction_retry/active_record/base.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
+require 'English'
 require 'active_record/base'
 
 module TransactionRetry
   module ActiveRecord
     module Base
-
-      def self.included( base )
-        base.extend( ClassMethods )
+      def self.included(base)
+        base.extend(ClassMethods)
         base.class_eval do
           class << self
             alias_method :transaction_without_retry, :transaction
@@ -13,70 +15,68 @@ module TransactionRetry
           end
         end
       end
-      
+
       module ClassMethods
-        
         def transaction_with_retry(**objects, &block)
           retry_count = 0
 
           opts = if objects.is_a? Hash
-            objects
-          else
-            {}
-          end
+                   objects
+                 else
+                   {}
+                 end
 
           retry_on = opts.delete(:retry_on)
           max_retries = opts.delete(:max_retries) || TransactionRetry.max_retries
 
           begin
             transaction_without_retry(**objects, &block)
-          rescue *[::ActiveRecord::TransactionIsolationConflict, *retry_on]
+          rescue ::ActiveRecord::TransactionIsolationConflict, *retry_on
             raise if retry_count >= max_retries
             raise if tr_in_nested_transaction?
-            
+
             retry_count += 1
             postfix = { 1 => 'st', 2 => 'nd', 3 => 'rd' }[retry_count] || 'th'
 
-            type_s = case $!
-            when ::ActiveRecord::TransactionIsolationConflict
-              "Transaction isolation conflict"
-            else
-              $!.class.name
-            end
+            type_s = case $ERROR_INFO
+                     when ::ActiveRecord::TransactionIsolationConflict
+                       'Transaction isolation conflict'
+                     else
+                       $ERROR_INFO.class.name
+                     end
 
-            logger.warn "#{type_s} detected. Retrying for the #{retry_count}-#{postfix} time..." if logger
-            tr_exponential_pause( retry_count )
+            logger&.warn "#{type_s} detected. Retrying for the #{retry_count}-#{postfix} time..."
+            tr_exponential_pause(retry_count)
             retry
           end
         end
-        
-        private
 
-          # Sleep 0, 1, 2, 4, ... seconds up to the TransactionRetry.max_retries.
-          # Cap the sleep time at 32 seconds.
-          # An ugly tr_ prefix is used to minimize the risk of method clash in the future.
-          def tr_exponential_pause( count )
-            seconds = TransactionRetry.wait_times[count-1] || 32
+        private
 
-            if TransactionRetry.fuzz
-              fuzz_factor = [seconds * 0.25, 1].max
+        # Sleep 0, 1, 2, 4, ... seconds up to the TransactionRetry.max_retries.
+        # Cap the sleep time at 32 seconds.
+        # An ugly tr_ prefix is used to minimize the risk of method clash in the future.
+        def tr_exponential_pause(count)
+          seconds = TransactionRetry.wait_times[count - 1] || 32
 
-              seconds += rand * (fuzz_factor * 2) - fuzz_factor
-            end
+          if TransactionRetry.fuzz
+            fuzz_factor = [seconds * 0.25, 1].max
 
-            sleep( seconds ) if seconds > 0
-          end
-        
-          # Returns true if we are in the nested transaction (the one with :requires_new => true).
-          # Returns false otherwise.
-          # An ugly tr_ prefix is used to minimize the risk of method clash in the future.
-          def tr_in_nested_transaction?
-            connection.open_transactions != 0
+            seconds += rand * (fuzz_factor * 2) - fuzz_factor
           end
 
+          sleep(seconds) if seconds.positive?
+        end
+
+        # Returns true if we are in the nested transaction (the one with :requires_new => true).
+        # Returns false otherwise.
+        # An ugly tr_ prefix is used to minimize the risk of method clash in the future.
+        def tr_in_nested_transaction?
+          connection.open_transactions != 0
+        end
       end
     end
   end
 end
 
-ActiveRecord::Base.send( :include, TransactionRetry::ActiveRecord::Base )
+ActiveRecord::Base.include TransactionRetry::ActiveRecord::Base

data/lib/transaction_retry/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module TransactionRetry
-  VERSION = "1.1.0"
+  VERSION = '1.2.0'
 end

data/lib/transaction_retry.rb

@@ -1,10 +1,11 @@
-require "active_record"
-require "transaction_isolation"
+# frozen_string_literal: true
 
-require_relative "transaction_retry/version"
+require 'active_record'
+require 'transaction_isolation'
 
-module TransactionRetry
+require_relative 'transaction_retry/version'
 
+module TransactionRetry
   # Must be called after ActiveRecord established a connection.
   # Only then we know which connection adapter is actually loaded and can be enhanced.
   # Please note ActiveRecord does not load unused adapters.
@@ -13,7 +14,7 @@ module TransactionRetry
     require_relative 'transaction_retry/active_record/base'
   end
 
-  if defined?( ::Rails )
+  if defined?(::Rails)
     # Setup applying the patch after Rails is initialized.
     class Railtie < ::Rails::Railtie
       config.after_initialize do
@@ -26,7 +27,7 @@ module TransactionRetry
     @@max_retries ||= 3
   end
 
-  def self.max_retries=( n )
+  def self.max_retries=(n)
     @@max_retries = n
   end
 
@@ -34,7 +35,7 @@ module TransactionRetry
     @@wait_times ||= [0, 1, 2, 4, 8, 16, 32]
   end
 
-  def self.wait_times=( array_of_seconds )
+  def self.wait_times=(array_of_seconds)
     @@wait_times = array_of_seconds
   end
 
@@ -42,8 +43,7 @@ module TransactionRetry
     @@fuzz ||= true
   end
 
-  def self.fuzz=( val )
+  def self.fuzz=(val)
     @@fuzz = val
   end
-
 end

data/lib/transaction_retry_continued.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'transaction_retry'

data/test/db/all.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_record'
 require_relative 'db'
 require_relative 'migrations'

data/test/db/db.rb

@@ -1,37 +1,37 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 
 module TransactionRetry
   module Test
     module Db
-
       def self.connect_to_mysql2
         ::ActiveRecord::Base.establish_connection(
-          :adapter => "mysql2",
-          :database => ENV['MYSQL_DB_NAME'],
-          :host => ENV['MYSQL_DB_HOST'],
-          :user => 'root',
-          :password => ENV['MYSQL_DB_PASS']
+          adapter: 'mysql2',
+          database: ENV['MYSQL_DB_NAME'],
+          host: ENV['MYSQL_DB_HOST'],
+          user: 'root',
+          password: ENV['MYSQL_DB_PASS']
         )
       end
 
       def self.connect_to_postgresql
         ::ActiveRecord::Base.establish_connection(
-          :adapter => "postgresql",
-          :database => ENV['POSTGRESQL_DB_NAME'],
-          :host => ENV['POSTGRESQL_DB_HOST'],
-          :user => ENV['POSTGRESQL_DB_USER'],
-          :password => ENV['POSTGRESQL_DB_PASS']
+          adapter: 'postgresql',
+          database: ENV['POSTGRESQL_DB_NAME'],
+          host: ENV['POSTGRESQL_DB_HOST'],
+          user: ENV['POSTGRESQL_DB_USER'],
+          password: ENV['POSTGRESQL_DB_PASS']
         )
       end
 
       def self.connect_to_sqlite3
         ActiveRecord::Base.establish_connection(
-          :adapter => "sqlite3",
-          :database => ":memory:",
-          :verbosity => "silent"
+          adapter: 'sqlite3',
+          database: ':memory:',
+          verbosity: 'silent'
         )
       end
-
     end
   end
 end

data/test/db/migrations.rb

@@ -1,20 +1,19 @@
+# frozen_string_literal: true
+
 module TransactionRetry
   module Test
     module Migrations
-
       def self.run!
         c = ::ActiveRecord::Base.connection
 
         # Queued Jobs
-        
-        c.create_table "queued_jobs", :force => true do |t|
-          t.text     "job",                               :null => false
-          t.integer  "status",     :default => 0,         :null => false
+
+        c.create_table 'queued_jobs', force: true do |t|
+          t.text     'job', null: false
+          t.integer  'status', default: 0, null: false
           t.timestamps
         end
-
       end
-
     end
   end
 end

data/test/db/queued_job.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class QueuedJob < ActiveRecord::Base
 end

data/test/integration/active_record/base/transaction_with_retry_test.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 
 require 'test_helper'
 
@@ -16,22 +16,22 @@ class TransactionWithRetryTest < MiniTest::Unit::TestCase
     TransactionRetry.wait_times = @original_wait_times
     QueuedJob.delete_all
   end
-  
+
   def test_does_not_break_transaction
     ActiveRecord::Base.transaction do
-      QueuedJob.create!( :job => 'is fun!' )
-      assert_equal( 1, QueuedJob.count )
+      QueuedJob.create!(job: 'is fun!')
+      assert_equal(1, QueuedJob.count)
     end
-    assert_equal( 1, QueuedJob.count )
+    assert_equal(1, QueuedJob.count)
     QueuedJob.first.destroy
   end
 
   def test_does_not_break_transaction_rollback
     ActiveRecord::Base.transaction do
-      QueuedJob.create!( :job => 'gives money!' )
+      QueuedJob.create!(job: 'gives money!')
       raise ActiveRecord::Rollback
     end
-    assert_equal( 0, QueuedJob.count )
+    assert_equal(0, QueuedJob.count)
   end
 
   def test_retries_transaction_on_transaction_isolation_conflict
@@ -40,30 +40,29 @@ class TransactionWithRetryTest < MiniTest::Unit::TestCase
     ActiveRecord::Base.transaction do
       if first_run
         first_run = false
-        message = "Deadlock found when trying to get lock"
-        raise ActiveRecord::TransactionIsolationConflict.new( message )
+        message = 'Deadlock found when trying to get lock'
+        raise ActiveRecord::TransactionIsolationConflict, message
       end
-      QueuedJob.create!( :job => 'is cool!' )
+      QueuedJob.create!(job: 'is cool!')
     end
-    assert_equal( 1, QueuedJob.count )
-    
+    assert_equal(1, QueuedJob.count)
+
     QueuedJob.first.destroy
   end
 
   def test_does_not_retry_on_unknown_error
     first_run = true
 
-    assert_raises( CustomError ) do
+    assert_raises(CustomError) do
       ActiveRecord::Base.transaction do
         if first_run
           first_run = false
-          message = "Deadlock found when trying to get lock"
-          raise CustomError, "random error"
+          raise CustomError, 'random error'
         end
-        QueuedJob.create!( :job => 'is cool!' )
+        QueuedJob.create!(job: 'is cool!')
       end
     end
-    assert_equal( 0, QueuedJob.count )
+    assert_equal(0, QueuedJob.count)
   end
 
   def test_retries_on_custom_error
@@ -72,13 +71,12 @@ class TransactionWithRetryTest < MiniTest::Unit::TestCase
     ActiveRecord::Base.transaction(retry_on: CustomError) do
       if first_run
         first_run = false
-        message = "Deadlock found when trying to get lock"
-        raise CustomError, "random error"
+        raise CustomError, 'random error'
       end
-      QueuedJob.create!( :job => 'is cool!' )
+      QueuedJob.create!(job: 'is cool!')
     end
-    assert_equal( 1, QueuedJob.count )
-    
+    assert_equal(1, QueuedJob.count)
+
     QueuedJob.first.destroy
   end
 
@@ -86,50 +84,47 @@ class TransactionWithRetryTest < MiniTest::Unit::TestCase
     TransactionRetry.max_retries = 1
     run = 0
 
-    assert_raises( ActiveRecord::TransactionIsolationConflict ) do
+    assert_raises(ActiveRecord::TransactionIsolationConflict) do
       ActiveRecord::Base.transaction do
         run += 1
-        message = "Deadlock found when trying to get lock"
-        raise ActiveRecord::TransactionIsolationConflict.new( message )
+        message = 'Deadlock found when trying to get lock'
+        raise ActiveRecord::TransactionIsolationConflict, message
       end
     end
-    
-    assert_equal( 2, run )  # normal run + one retry
+
+    assert_equal(2, run)  # normal run + one retry
 
     TransactionRetry.max_retries = 3
 
     run = 0
 
-    assert_raises( ActiveRecord::TransactionIsolationConflict ) do
+    assert_raises(ActiveRecord::TransactionIsolationConflict) do
       ActiveRecord::Base.transaction(max_retries: 1) do
         run += 1
-        message = "Deadlock found when trying to get lock"
-        raise ActiveRecord::TransactionIsolationConflict.new( message )
+        message = 'Deadlock found when trying to get lock'
+        raise ActiveRecord::TransactionIsolationConflict, message
       end
     end
-    
-    assert_equal( 2, run )  # normal run + one retry
+
+    assert_equal(2, run)  # normal run + one retry
   end
 
   def test_does_not_retry_nested_transaction
     first_try = true
 
     ActiveRecord::Base.transaction do
-
-      assert_raises( ActiveRecord::TransactionIsolationConflict ) do
-        ActiveRecord::Base.transaction( :requires_new => true ) do
+      assert_raises(ActiveRecord::TransactionIsolationConflict) do
+        ActiveRecord::Base.transaction(requires_new: true) do
           if first_try
             first_try = false
-            message = "Deadlock found when trying to get lock"
-            raise ActiveRecord::TransactionIsolationConflict.new( message )
+            message = 'Deadlock found when trying to get lock'
+            raise ActiveRecord::TransactionIsolationConflict, message
           end
-          QueuedJob.create!( :job => 'is cool!' )
+          QueuedJob.create!(job: 'is cool!')
         end
       end
-      
     end
-      
-    assert_equal( 0, QueuedJob.count )
-  end
 
+    assert_equal(0, QueuedJob.count)
+  end
 end

data/test/library_setup.rb

@@ -1,21 +1,23 @@
+# frozen_string_literal: true
+
 # Prepares application to be tested (requires files, connects to db, resets schema and data, applies patches, etc.)
 
 # Initialize database
 require 'db/all'
 
 case ENV['db']
-  when 'mysql2'
-    TransactionRetry::Test::Db.connect_to_mysql2
-  when 'postgresql'
-    TransactionRetry::Test::Db.connect_to_postgresql
-  when 'sqlite3'
-    TransactionRetry::Test::Db.connect_to_sqlite3
-  else
-    TransactionRetry::Test::Db.connect_to_mysql2
+when 'mysql2'
+  TransactionRetry::Test::Db.connect_to_mysql2
+when 'postgresql'
+  TransactionRetry::Test::Db.connect_to_postgresql
+when 'sqlite3'
+  TransactionRetry::Test::Db.connect_to_sqlite3
+else
+  TransactionRetry::Test::Db.connect_to_mysql2
 end
 
 require 'logger'
-ActiveRecord::Base.logger = Logger.new( File.expand_path( "#{File.dirname( __FILE__ )}/log/test.log" ) )
+ActiveRecord::Base.logger = Logger.new(File.expand_path("#{File.dirname(__FILE__)}/log/test.log"))
 
 TransactionRetry::Test::Migrations.run!
 

data/test/test_helper.rb

@@ -1,9 +1,12 @@
-# Load test coverage tool (must be loaded before any code)
-#require 'simplecov'
-#SimpleCov.start do
-#  add_filter '/test/'
-#  add_filter '/config/'
-#end
+# frozen_string_literal: true
+
+require 'simplecov'
+require 'simplecov_json_formatter'
+SimpleCov.formatter = SimpleCov::Formatter::JSONFormatter
+
+SimpleCov.start do
+  add_filter '/test/'
+end
 
 # Load and initialize the application to be tested
 require 'library_setup'

data/test/test_runner.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 # Load all tests
-Dir.glob( "./**/*_test.rb" ).each { |test_file| require test_file }
+Dir.glob('./**/*_test.rb').sort.each { |test_file| require test_file }

data/transaction_retry_continued.gemspec

@@ -1,23 +1,24 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "transaction_retry/version"
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+require 'transaction_retry/version'
 
 Gem::Specification.new do |s|
-  s.name        = "transaction_retry_continued"
+  s.name        = 'transaction_retry_continued'
   s.version     = TransactionRetry::VERSION
-  s.authors     = ["Iago Pimenta"]
-  s.homepage    = "https://github.com/iagopiimenta/transaction_retry_continued"
-  s.summary     = %q{Retries database transaction on deadlock and transaction serialization errors. Supports MySQL, PostgreSQL and SQLite.}
-  s.description = %q{Retries database transaction on deadlock and transaction serialization errors. Supports MySQL, PostgreSQL and SQLite.}
+  s.authors     = ['Iago Pimenta']
+  s.homepage    = 'https://github.com/iagopiimenta/transaction_retry_continued'
+  s.summary     = 'Retries database transaction on deadlock and transaction serialization errors. Supports MySQL, PostgreSQL and SQLite.'
+  s.description = 'Retries database transaction on deadlock and transaction serialization errors. Supports MySQL, PostgreSQL and SQLite.'
   s.required_ruby_version = '>= 2.5'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = ['lib']
 
-  s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'minitest', '5.3.4'
-  s.add_runtime_dependency "activerecord", ">= 5.2"
-  s.add_runtime_dependency "transaction_isolation_continued", ">= 1.0"
-end
+  s.add_development_dependency 'rake', '~> 13.0'
+  s.add_runtime_dependency 'activerecord', '>= 5.2'
+  s.add_runtime_dependency 'transaction_isolation_continued', '>= 1.0'
+end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: transaction_retry_continued
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Iago Pimenta
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-14 00:00:00.000000000 Z
+date: 2024-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: 5.3.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: 5.3.4
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.3.4
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.3.4
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -79,7 +79,16 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- d
+- docker-compose.yml
+- docker/ruby-2.5/Dockerfile
+- docker/ruby-2.7/Dockerfile
+- docker/ruby-3.0/Dockerfile
+- docker/ruby-3.1/Dockerfile
+- docker/test-ruby-2.5.sh
+- docker/test-ruby-2.7.sh
+- docker/test-ruby-3.0.sh
+- docker/test-ruby-3.1.sh
+- docker/test-ruby.sh
 - gemfiles/Gemfile.base
 - gemfiles/activerecord-5.2/Gemfile.base
 - gemfiles/activerecord-5.2/Gemfile.mysql2
@@ -108,10 +117,8 @@ files:
 - test/integration/active_record/base/transaction_with_retry_test.rb
 - test/library_setup.rb
 - test/log/.gitkeep
-- test/test_console.rb
 - test/test_helper.rb
 - test/test_runner.rb
-- tests
 - transaction_retry_continued.gemspec
 homepage: https://github.com/iagopiimenta/transaction_retry_continued
 licenses: []
@@ -144,6 +151,5 @@ test_files:
 - test/integration/active_record/base/transaction_with_retry_test.rb
 - test/library_setup.rb
 - test/log/.gitkeep
-- test/test_console.rb
 - test/test_helper.rb
 - test/test_runner.rb

data/d

@@ -1 +0,0 @@
-bundle exec ruby test/test_console.rb

data/test/test_console.rb

@@ -1,11 +0,0 @@
-# Ensure that LOAD_PATH is the same as when running "rake test"; normally rake takes care of that
-$LOAD_PATH << File.expand_path( ".", File.dirname( __FILE__ ) )
-$LOAD_PATH << File.expand_path( "./lib", File.dirname( __FILE__ ) )
-$LOAD_PATH << File.expand_path( "./test", File.dirname( __FILE__ ) )
-
-# Boot the app
-require_relative 'library_setup'
-
-# Fire the console
-require 'pry'
-binding.pry

data/tests

@@ -1,6 +0,0 @@
-
-db=mysql2 bundle exec rake
-
-db=postgresql bundle exec rake
-
-db=sqlite3 bundle exec rake