pgb_connection_reaper_rb 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 572afe18ef474649611a89d55319a6dfd2889c404b5f81be1a8e3319bd1be2a2
-  data.tar.gz: 89f5fe8ef74bad4c3530a31adb380c9effaac7edbe31c2eeb35524945650b1bc
+  metadata.gz: 04357ed005c13e58c917f88aedbb0683ee95f0774568167af39b414e72883c0c
+  data.tar.gz: 58bf334081b392d3b8ae58b8ae44adecf4caa4281abf6ccfa1365c25059f126c
 SHA512:
-  metadata.gz: 41ec26720b292406771b9efed8ed88ac9442042caa62f753c763e4079d5864e55f6b5099910255455b96853e9e78839205e1a461fad9f1d42249ef0e299d227a
-  data.tar.gz: fe22aff3a0c69b48668b30c4bd667de385bd301e25a07cba073cdcc0efc5e6cbe8798f0f2971cbdb030830e7c58a644bc09f5849628c0823093b603da38f1f7e
+  metadata.gz: e00e07841d134493600258d17d97d201e8a92d0326a84957c0feba5289a807dd09dfc78edfad45d10ffa262c590c9fd66720f4a163420f447f4e1eaa94dd49d9
+  data.tar.gz: c9062ac547b6c76d1c4ea5cc384511e2e475c87c0d7cabf298ee6d4c61ef6b65912f47c832bbd86aee1d7cb73ce844971f846b96022f02629ecb7ca1b3d4f6c5

data/.github/workflows/release.yml

@@ -0,0 +1,19 @@
+name: Release
+
+on:
+  workflow_dispatch:
+jobs:
+  release:
+    permissions:
+      contents: write
+      id-token: write
+
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.3
+          bundler-cache: true
+      - uses: rubygems/release-gem@v1

data/.gitignore

@@ -9,3 +9,6 @@
 
 # rspec failure tracking
 .rspec_status
+
+# appraisal generated gemfiles
+/gemfiles/

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.4.1

data/Appraisals

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+# Test against different ActiveRecord versions
+appraise "activerecord-6.1" do
+  gem "activerecord", "~> 6.1.0"
+  gem "activesupport", "~> 6.1.0"
+  # Fix for Ruby 3.4+ compatibility with ActiveRecord 6.1
+  gem "logger", "< 1.6.0"
+  gem "base64"
+end
+
+appraise "activerecord-7.0" do
+  gem "activerecord", "~> 7.0.0"
+  gem "activesupport", "~> 7.0.0"
+  # Fix for Ruby 3.4+ compatibility with ActiveRecord 7.0
+  gem "logger", "< 1.6.0"
+end
+
+appraise "activerecord-7.1" do
+  gem "activerecord", "~> 7.1.0"
+  gem "activesupport", "~> 7.1.0"
+end

data/Gemfile

@@ -7,3 +7,10 @@ gemspec
 
 gem 'rake', '~> 12.0'
 gem 'rspec', '~> 3.0'
+gem 'sqlite3', '~> 1.4'
+
+# Required for Ruby 3.4+ compatibility with ActiveSupport 7.0.x
+gem 'mutex_m'
+gem 'logger'
+gem 'bigdecimal'
+gem 'benchmark'

data/Gemfile.lock

@@ -1,28 +1,49 @@
 PATH
   remote: .
   specs:
-    pgb_connection_reaper_rb (0.1.0)
+    pgb_connection_reaper_rb (0.2.1)
       activerecord (>= 4.2)
       activesupport (>= 4.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.8.2)
-      activesupport (= 7.0.8.2)
-    activerecord (7.0.8.2)
-      activemodel (= 7.0.8.2)
-      activesupport (= 7.0.8.2)
-    activesupport (7.0.8.2)
+    activemodel (7.1.5.2)
+      activesupport (= 7.1.5.2)
+    activerecord (7.1.5.2)
+      activemodel (= 7.1.5.2)
+      activesupport (= 7.1.5.2)
+      timeout (>= 0.4.0)
+    activesupport (7.1.5.2)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
+      mutex_m
+      securerandom (>= 0.3)
       tzinfo (~> 2.0)
-    concurrent-ruby (1.2.3)
+    appraisal (2.5.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    base64 (0.3.0)
+    benchmark (0.4.1)
+    bigdecimal (3.2.3)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.4)
     diff-lcs (1.5.0)
-    i18n (1.14.5)
+    drb (2.2.3)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    minitest (5.23.1)
+    logger (1.7.0)
+    mini_portile2 (2.8.9)
+    minitest (5.25.5)
+    mutex_m (0.3.0)
     rake (12.3.3)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -37,6 +58,11 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
+    securerandom (0.4.1)
+    sqlite3 (1.7.3)
+      mini_portile2 (~> 2.8.0)
+    thor (1.4.0)
+    timeout (0.4.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
 
@@ -44,9 +70,15 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  appraisal (~> 2.4)
+  benchmark
+  bigdecimal
+  logger
+  mutex_m
   pgb_connection_reaper_rb!
   rake (~> 12.0)
   rspec (~> 3.0)
+  sqlite3 (~> 1.4)
 
 BUNDLED WITH
-   2.1.4
+   2.7.2

data/README.md

@@ -35,10 +35,40 @@ Or install it yourself as:
       idle_timeout: 300
   ```    
 
+## Compatibility
+
+This gem supports:
+- **Ruby**: 3.1+
+- **ActiveRecord**: 6.1+, 7.0+, 7.1+, 7.2+
+- **Rails**: 6.1+, 7.0+, 7.1+, 7.2+
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
+### Testing Multiple ActiveRecord Versions
+
+This project uses [Appraisal](https://github.com/thoughtbot/appraisal) to test against multiple ActiveRecord versions:
+
+```bash
+# Install appraisal gemfiles
+bundle exec appraisal install
+
+# Run tests against all ActiveRecord versions
+bundle exec appraisal rspec
+
+# Run tests against a specific ActiveRecord version
+bundle exec appraisal activerecord-7.1 rspec
+bundle exec appraisal activerecord-7.0 rspec
+bundle exec appraisal activerecord-6.1 rspec
+```
+
+Available appraisal configurations:
+- `activerecord-6.1` - ActiveRecord 6.1.x
+- `activerecord-7.0` - ActiveRecord 7.0.x  
+- `activerecord-7.1` - ActiveRecord 7.1.x
+- `activerecord-7.2` - ActiveRecord 7.2.x
+
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing

data/Rakefile

@@ -5,4 +5,10 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
+begin
+  require 'appraisal/task'
+rescue LoadError
+  # appraisal not available
+end
+
 task default: :spec

data/lib/pgb_connection_reaper_rb/postgresql_adapter_extension.rb

@@ -2,8 +2,16 @@
 
 module PgbConnectionReaperRb
   module PostgreSQLAdapterExtension
-    def reconnect!
-      @lock.synchronize do
+    def reconnect!(**args)
+      lock = if defined?(@lock)
+        # Rails 6+
+        @lock
+      else
+        # Rails 4.2
+        ActiveRecord::Base.connection_pool.instance_variable_get(:@mon_data)
+      end
+
+      lock.synchronize do
         super
         disconnect!
         connect

data/lib/pgb_connection_reaper_rb/reaper.rb

@@ -14,13 +14,13 @@ module PgbConnectionReaperRb
 
     attr_reader :connected_at, :pgb_ttl
 
-    def reconnect!(*args)
-      super(*args)
+    def reconnect!(**args)
+      super
       @connected_at = Concurrent.monotonic_time
     end
 
-    def verify!(*args)
-      super(*args)
+    def verify!()
+      super
       reconnect! if eligible?
     end
 

data/lib/pgb_connection_reaper_rb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgbConnectionReaperRb
-  VERSION = '0.1.1'
+  VERSION = '0.2.1'
 end

data/pgb_connection_reaper_rb.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activerecord', '>= 4.2'
   spec.add_dependency 'activesupport', '>= 4.2'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'appraisal', '~> 2.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgb_connection_reaper_rb
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Anton Borisov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-20 00:00:00.000000000 Z
+date: 2025-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
 description:
 email:
 - anton.borisov@fresha.com
@@ -59,10 +73,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".tool-versions"
 - ".travis.yml"
+- Appraisals
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -100,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Gem for forcing cycling disconnections for Rails connections to PGBouncer