openstax_transaction_retry 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c9efa231f44b802b7971bc7f31fb06e0f01bb47c40d16fd56a4c0843f99c72f
-  data.tar.gz: 8b415b5023c270aa9dec5000eb0c60f2d2dbb0f26fd5b4f489b20c7d6842b9f9
+  metadata.gz: 8454103b320f693e3cab50ae57dc9de433089328baa396405dc89b19d58cac14
+  data.tar.gz: 4d7404ecbfb74328d6d75052f1ef9bbd6732476021cfb40467dab5a2d27f90f4
 SHA512:
-  metadata.gz: 155c201291db2070d61814d2ea73dbdc69c58d284552a7bd84c1be367a3b33aa5e9dfc78cd8be24aa8e1d51f1cac15f74087da33b1314d91d72b19bd7682c28b
-  data.tar.gz: 5ca4998b159bf2a83a9839d4cb2f57aeb20a16c33730320e233a7733af712189fea737b969628937c88c97c553520a062042a913ab0d65dc43c31930be85447e
+  metadata.gz: 8febebd64c85b5a9c25a875489bafb728a246549a8784895c49320ecdf15163bf3e703eba6050888df496fb7d27a3cf97a822cd57653e739fdf1e3bb5be74a63
+  data.tar.gz: 1dcd1c4e8c8f71b567d0acc08a24d72f56111a5d40a0b7d1ec41346fe53240bf71bdc6229231ceb744c07640217a18f74ce2bd5451d9762a73f84ddc2763d010

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 3.0
   SuggestExtensions: false
   NewCops: enable
   Exclude:

data/lib/open_stax_transaction_retry/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OpenStaxTransactionRetry
-  VERSION = '1.2.0'
+  VERSION = '2.0.0'
 end

data/open_stax_transaction_retry.gemspec

@@ -11,13 +11,12 @@ Gem::Specification.new do |s|
   s.homepage    = 'https://github.com/openstax/transaction_retry'
   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 (as long as you are using new drivers mysql2, pg, sqlite3).'
-  s.required_ruby_version = '>= 2.6'
+  s.required_ruby_version = '>= 3.0'
 
-  s.files         = `git ls-files`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.files         = `git ls-files -z`.split("\x0").reject { |f| f == 'd' || f.start_with?('test') }
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'activerecord', '>= 5.1'
-  s.add_runtime_dependency 'transaction_isolation', '>= 1.0.5'
+  s.add_dependency 'activerecord', '>= 6'
+  s.add_dependency 'openstax_transaction_isolation', '>= 2'
   s.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstax_transaction_retry
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Nathan Stitt
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-28 00:00:00.000000000 Z
+date: 2025-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6'
 - !ruby/object:Gem::Dependency
-  name: transaction_isolation
+  name: openstax_transaction_isolation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: '2'
 description: Retries database transaction on deadlock and transaction serialization
   errors. Supports MySQL, PostgreSQL and SQLite (as long as you are using new drivers
   mysql2, pg, sqlite3).
@@ -58,22 +58,10 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- d
 - lib/open_stax_transaction_retry.rb
 - lib/open_stax_transaction_retry/active_record/base.rb
 - lib/open_stax_transaction_retry/version.rb
 - open_stax_transaction_retry.gemspec
-- test/db/all.rb
-- test/db/db.rb
-- test/db/migrations.rb
-- test/db/queued_job.rb
-- 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
 homepage: https://github.com/openstax/transaction_retry
 licenses: []
 metadata:
@@ -86,14 +74,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.7
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Retries database transaction on deadlock and transaction serialization errors.

data/d

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

data/test/db/all.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_record'
-require_relative 'db'
-require_relative 'migrations'
-require_relative 'queued_job'

data/test/db/db.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-require 'fileutils'
-
-module OpenStaxTransactionRetry
-  module Test
-    module Db
-      def self.connect_to_mysql2
-        ::ActiveRecord::Base.establish_connection(
-          adapter: 'mysql2',
-          database: 'transaction_retry_test',
-          username: ENV.fetch('DB_USERNAME'),
-          password: ENV.fetch('DB_PASSWORD', nil)
-        )
-      end
-
-      def self.connect_to_postgresql
-        ::ActiveRecord::Base.establish_connection(
-          adapter: 'postgresql',
-          host: ENV.fetch('DB_HOST', nil),
-          port: ENV.fetch('DB_PORT', nil),
-          database: ENV.fetch('DB_NAME', nil),
-          user: ENV.fetch('DB_USERNAME', nil),
-          password: ENV.fetch('DB_PASSWORD', nil)
-        )
-      end
-
-      def self.connect_to_sqlite3
-        ActiveRecord::Base.establish_connection(
-          adapter: 'sqlite3',
-          database: ':memory:',
-          verbosity: 'silent'
-        )
-      end
-    end
-  end
-end

data/test/db/migrations.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module OpenStaxTransactionRetry
-  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
-          t.timestamps
-        end
-      end
-    end
-  end
-end

data/test/db/queued_job.rb

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

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

@@ -1,209 +0,0 @@
-# frozen_string_literal: true
-
-require 'test_helper'
-
-class TransactionWithRetryTest < Minitest::Test
-  class CustomError < StandardError
-  end
-
-  def setup
-    @original_max_retries = OpenStaxTransactionRetry.max_retries
-    @original_wait_times = OpenStaxTransactionRetry.wait_times
-    @original_retry_on = OpenStaxTransactionRetry.retry_on
-    @original_before_retry = OpenStaxTransactionRetry.before_retry
-  end
-
-  def teardown
-    OpenStaxTransactionRetry.max_retries = @original_max_retries
-    OpenStaxTransactionRetry.wait_times = @original_wait_times
-    OpenStaxTransactionRetry.retry_on = @original_retry_on
-    OpenStaxTransactionRetry.before_retry = @original_before_retry
-    QueuedJob.delete_all
-  end
-
-  def test_does_not_break_transaction
-    ActiveRecord::Base.transaction do
-      QueuedJob.create!(job: 'is fun!')
-      assert_equal(1, QueuedJob.count)
-    end
-    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!')
-      raise ActiveRecord::Rollback
-    end
-    assert_equal(0, QueuedJob.count)
-  end
-
-  def test_retries_transaction_on_transaction_isolation_conflict
-    first_run = true
-
-    ActiveRecord::Base.transaction do
-      if first_run
-        first_run = false
-        message = 'Deadlock found when trying to get lock'
-        raise ActiveRecord::TransactionIsolationConflict, message
-      end
-      QueuedJob.create!(job: 'is cool!')
-    end
-    assert_equal(1, QueuedJob.count)
-
-    QueuedJob.first.destroy
-  end
-
-  def test_does_not_retry_on_unknown_error
-    first_run = true
-
-    assert_raises(CustomError) do
-      ActiveRecord::Base.transaction do
-        if first_run
-          first_run = false
-          raise CustomError, 'random error'
-        end
-        QueuedJob.create!(job: 'is cool!')
-      end
-    end
-    assert_equal(0, QueuedJob.count)
-  end
-
-  def test_retries_on_custom_error
-    first_run = true
-    ActiveRecord::Base.transaction(retry_on: CustomError) do
-      if first_run
-        first_run = false
-        raise CustomError, 'random error'
-      end
-      QueuedJob.create!(job: 'is cool!')
-    end
-    assert_equal(1, QueuedJob.count)
-    QueuedJob.first.destroy
-  end
-
-  def test_retries_on_configured_retry_on
-    OpenStaxTransactionRetry.retry_on = CustomError
-    first_run = true
-    ActiveRecord::Base.transaction do
-      if first_run
-        first_run = false
-        raise CustomError, 'random error'
-      end
-      QueuedJob.create!(job: 'is cool!')
-    end
-    assert_equal(1, QueuedJob.count)
-    QueuedJob.first.destroy
-  end
-
-  def test_retries_transaction_on_transaction_isolation_when_retry_on_set
-    OpenStaxTransactionRetry.retry_on = CustomError
-    first_run = true
-    ActiveRecord::Base.transaction do
-      if first_run
-        first_run = false
-        message = 'Deadlock found when trying to get lock'
-        raise ActiveRecord::TransactionIsolationConflict, message
-      end
-      QueuedJob.create!(job: 'is cool!')
-    end
-    assert_equal(1, QueuedJob.count)
-    QueuedJob.first.destroy
-  end
-
-  def test_does_not_retry_transaction_more_than_max_retries_times
-    OpenStaxTransactionRetry.max_retries = 1
-    run = 0
-
-    assert_raises(ActiveRecord::TransactionIsolationConflict) do
-      ActiveRecord::Base.transaction do
-        run += 1
-        message = 'Deadlock found when trying to get lock'
-        raise ActiveRecord::TransactionIsolationConflict, message
-      end
-    end
-
-    assert_equal(2, run)  # normal run + one retry
-
-    OpenStaxTransactionRetry.max_retries = 3
-
-    run = 0
-
-    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, message
-      end
-    end
-
-    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
-          if first_try
-            first_try = false
-            message = 'Deadlock found when trying to get lock'
-            raise ActiveRecord::TransactionIsolationConflict, message
-          end
-          QueuedJob.create!(job: 'is cool!')
-        end
-      end
-    end
-
-    assert_equal(0, QueuedJob.count)
-  end
-
-  def test_run_custom_lambda_before_retry
-    code_run = false
-    retry_id = nil
-    error_instance = nil
-    first_try = true
-    lambda_code = lambda do |retry_num, error|
-      code_run = true
-      retry_id = retry_num
-      error_instance = error
-    end
-
-    ActiveRecord::Base.transaction(before_retry: lambda_code) do
-      if first_try
-        first_try = false
-        raise ActiveRecord::TransactionIsolationConflict
-      end
-      QueuedJob.create!(job: 'is cool!')
-    end
-    assert_equal 1, QueuedJob.count
-    assert code_run
-    assert_equal 1, retry_id
-    assert_equal ActiveRecord::TransactionIsolationConflict, error_instance.class
-  end
-
-  def test_run_custom_global_lambda_before_retry
-    code_run = false
-    retry_id = nil
-    error_instance = nil
-    OpenStaxTransactionRetry.before_retry = lambda { |retry_num, error|
-      code_run = true
-      retry_id = retry_num
-      error_instance = error
-    }
-    first_try = true
-
-    ActiveRecord::Base.transaction do
-      if first_try
-        first_try = false
-        raise ActiveRecord::TransactionIsolationConflict
-      end
-      QueuedJob.create!(job: 'is cool!')
-    end
-    assert_equal 1, QueuedJob.count
-    assert code_run
-    assert_equal 1, retry_id
-    assert_equal ActiveRecord::TransactionIsolationConflict, error_instance.class
-  end
-end

data/test/library_setup.rb

@@ -1,27 +0,0 @@
-# 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.fetch('db', 'sqlite3')
-when 'mysql2'
-  OpenStaxTransactionRetry::Test::Db.connect_to_mysql2
-when 'postgresql'
-  OpenStaxTransactionRetry::Test::Db.connect_to_postgresql
-when 'sqlite3'
-  OpenStaxTransactionRetry::Test::Db.connect_to_sqlite3
-else
-  raise "Unknown database: #{ENV.fetch('db', nil)}"
-end
-
-require 'logger'
-ActiveRecord::Base.logger = Logger.new(File.expand_path("#{File.dirname(__FILE__)}/log/test.log"))
-
-OpenStaxTransactionRetry::Test::Migrations.run!
-
-# Load the code that will be tested
-require 'open_stax_transaction_retry'
-
-OpenStaxTransactionRetry.apply_activerecord_patch

data/test/test_console.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-# 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 # rubocop:disable Lint/Debugger

data/test/test_helper.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-# Load test coverage tool (must be loaded before any code)
-# require 'simplecov'
-# SimpleCov.start do
-#  add_filter '/test/'
-#  add_filter '/config/'
-# end
-
-# Load and initialize the application to be tested
-require 'library_setup'
-
-# Load test frameworks
-require 'minitest/autorun'

data/test/test_runner.rb

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

data/tests

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