pgb_connection_reaper_rb 0.1.3 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdb17a5ea51eb80dc3d0aa206a2693ca9ef5f90ed0d37d2c2ce1a4a560e195a5
-  data.tar.gz: 7151fd012b7edd7f3d4b9fce6e1ffc30840da40bcb52ac94a47a7f174e70340c
+  metadata.gz: df4188fc6c40fca8a527004d05f2af6e9643e8cea1ab87e609ff8e8b30e95faa
+  data.tar.gz: 468bd15baffee28aa71d5881733892877388922151ae4e40863e5d8116cea451
 SHA512:
-  metadata.gz: e931b1ff99f27a8894585496abcffda720d672f2245d52f7e46ad9f872d05f59047f6814fd584c63edb1a4fbc1a8856068c970be8b7b36b0239a8c1ce702283f
-  data.tar.gz: 6ecf1855b0c6e10a5a0bc7e0bb86d8e3931b7eabfda52f53dbf732f9c946ec355c3c76ff3a39bbda2cee23229da6d12516dc951be507b4f4388a9a09594ccdb1
+  metadata.gz: abf64c4573c1b21563b0913bbb67f8c994e5f7d34f29481f77184662224bae66f79404071cd61563c34359afde35738071b5c0879613fadcbd9d8b2cc877213a
+  data.tar.gz: 75d765f2cf9d9436ada42ee4f29b4f10a8aacc1b30f9640330dbbf9e3f0e08a07c5b407329b087411a25e95e81c89f2398705db41daafe48c41f40f8ce752202

data/.github/workflows/ci.yml

@@ -0,0 +1,34 @@
+name: CI
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ['3.1', '3.2', '3.3']
+
+    name: Ruby ${{ matrix.ruby }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler: '2.5.11'
+          bundler-cache: true
+
+      - name: Install Appraisal dependencies
+        run: bundle exec appraisal install
+
+      - name: Run tests against all ActiveRecord versions
+        run: bundle exec appraisal rspec

data/.github/workflows/release.yml

@@ -0,0 +1,44 @@
+name: Release
+
+on:
+  workflow_dispatch:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    
+    steps:
+      - uses: actions/checkout@v4
+      
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.3
+          bundler: '2.5.11'
+          bundler-cache: true
+      
+      - name: Install Appraisal dependencies
+        run: bundle exec appraisal install
+      
+      - name: Run tests
+        run: bundle exec appraisal rspec
+
+  release:
+    needs: test
+    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: '2.5.11'
+          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,52 +1,91 @@
 PATH
   remote: .
   specs:
-    pgb_connection_reaper_rb (0.1.1)
-      activerecord (>= 4.2)
-      activesupport (>= 4.2)
+    pgb_connection_reaper_rb (0.2.2)
+      activerecord (>= 6.1)
+      activesupport (>= 6.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.8.4)
-      activesupport (= 7.0.8.4)
-    activerecord (7.0.8.4)
-      activemodel (= 7.0.8.4)
-      activesupport (= 7.0.8.4)
-    activesupport (7.0.8.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activemodel (7.2.2.2)
+      activesupport (= 7.2.2.2)
+    activerecord (7.2.2.2)
+      activemodel (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
+      timeout (>= 0.4.0)
+    activesupport (7.2.2.2)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    concurrent-ruby (1.3.4)
-    diff-lcs (1.5.0)
-    i18n (1.14.6)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+    appraisal (2.5.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    base64 (0.3.0)
+    benchmark (0.4.1)
+    bigdecimal (3.3.1)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.4)
+    diff-lcs (1.6.2)
+    drb (2.2.3)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    minitest (5.25.1)
+    logger (1.7.0)
+    minitest (5.26.0)
+    mutex_m (0.3.0)
     rake (12.3.3)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.1)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rspec (3.13.1)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.5)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.5)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.6)
+    securerandom (0.4.1)
+    sqlite3 (1.7.3-aarch64-linux)
+    sqlite3 (1.7.3-arm-linux)
+    sqlite3 (1.7.3-arm64-darwin)
+    sqlite3 (1.7.3-x86-linux)
+    sqlite3 (1.7.3-x86_64-darwin)
+    sqlite3 (1.7.3-x86_64-linux)
+    thor (1.4.0)
+    timeout (0.4.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
 
 PLATFORMS
-  ruby
+  aarch64-linux
+  arm-linux
+  arm64-darwin
+  x86-linux
+  x86_64-darwin
+  x86_64-linux
 
 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.5.11

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,19 +2,19 @@
 
 module PgbConnectionReaperRb
   module PostgreSQLAdapterExtension
-    def reconnect!
-      lock = if defined?(@lock)
-        # Rails 6+
-        @lock
-      else
-        # Rails 4.2
-        ActiveRecord::Base.connection_pool.instance_variable_get(:@mon_data)
-      end
-
-      lock.synchronize do
+    def reconnect!(**args)
+      # Rails 7.1+ handles locking and disconnect/connect cycle internally
+      if ActiveRecord.version >= Gem::Version.new("7.1.0")
         super
-        disconnect!
-        connect
+      else
+        # Rails 6.x and earlier: ensure thread-safe reconnection with manual lock
+        lock = defined?(@lock) ? @lock : ActiveRecord::Base.connection_pool.instance_variable_get(:@mon_data)
+        
+        lock.synchronize do
+          super
+          disconnect!
+          connect
+        end
       end
     end
   end

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.3'
+  VERSION = '0.2.2'
 end

data/pgb_connection_reaper_rb.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary       = 'Gem for forcing cycling disconnections for Rails connections to PGBouncer'
   spec.homepage      = 'https://github.com/surgeventures/pgb_connection_reaper_rb'
   spec.license       = 'MIT'
-  spec.required_ruby_version = '>= 2.5.0'
+  spec.required_ruby_version = '>= 3.1.0'
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = 'https://github.com/surgeventures/pgb_connection_reaper_rb'
@@ -26,7 +26,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord', '>= 4.2'
-  spec.add_dependency 'activesupport', '>= 4.2'
+  spec.add_dependency 'activerecord', '>= 6.1'
+  spec.add_dependency 'activesupport', '>= 6.1'
   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.3
+  version: 0.2.2
 platform: ruby
 authors:
 - Anton Borisov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-25 00:00:00.000000000 Z
+date: 2025-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -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,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".tool-versions"
 - ".travis.yml"
+- Appraisals
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -93,14 +111,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !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