fishplate 7.0.6 → 7.1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83ff9b7684e57defeeed309327a423e8021a5260d34cec6d977546eee75c613b
-  data.tar.gz: 370ac6d882b60cc4559166b793a0c8b15e7c856f38aa722ecf60335eb651b104
+  metadata.gz: 9a18d28d81bb5e5f6fe8b79c9c697d1c38aa719b666d8fb7b59212da0fab58f0
+  data.tar.gz: 7dc9d7f7ef38f6d0bb49e041071ead174fff2f9f6aaaa2a503e916976d2f9150
 SHA512:
-  metadata.gz: c2b5ea9687bcca4807dc176de33ea8f42a8770c9ba425b77b396476beaab3f3ff84e1490fe93c13bcfc89534b304e958248c7a6687c5698849d61009b76cd5ee
-  data.tar.gz: 2c88a3f24efc404eba97ad4997e24b08ef64c2e76d6ed30d757a93c1b4d2942476392cc57d32843c54395c5547629f6cc3548fbfbb3517e754148ef78bda9008
+  metadata.gz: 73e61e1e27001bff6d1bbfa70954042b126f5e127807d8e323c0f50fe0a1c07c9fd62c41b4f2938e2fab58308780e4d7e25c631c34337727d4ed23ee1a59c2db
+  data.tar.gz: 550e410fbcd54cf48a64841199ea050622f6df31d4045b993fbc8e604c45127fc72076590be229552f8caf6384ceb790dacf7fbfbc847fb951fc0625b4dae945

data/.bundler-version

@@ -1 +1 @@
-2.4.5
+2.4.20

data/.github/workflows/auto-approve.yml

@@ -1,14 +1,13 @@
-# automatically approve PRs submitted by Dependabot or Renofidev
-# this will allow Dependabot to automatically merge dependency update PRs where CI passes
-# from: https://github.com/hmarr/auto-approve-action
-name: Auto approve dependency upgrades PRs
-on: pull_request_target
+name: Auto approve dependency upgrades and hot-fix PRs
+on:
+  pull_request_target:
+    types: [labeled, unlabeled, edited, ready_for_review, review_requested, auto_merge_enabled]
 
 jobs:
   auto-approve:
     runs-on: ubuntu-latest
     steps:
-    - uses: hmarr/auto-approve-action@v2
-      if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || github.actor == 'renofidev'
-      with:
-        github-token: "${{ secrets.GITHUB_TOKEN }}"
+      - uses: hmarr/auto-approve-action@v3
+        if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || github.actor == 'renofidev' || contains(toJson(github), 'HOTFIX-AUTO-APPROVE')
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"

data/.github/workflows/auto-merge-dependencies.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: automerge-dependencies
-        uses: pascalgn/automerge-action@v0.15.5
+        uses: pascalgn/automerge-action@v0.15.6
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           MERGE_METHOD: squash

data/.github/workflows/auto-merge.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: automerge
-        uses: pascalgn/automerge-action@v0.15.5
+        uses: pascalgn/automerge-action@v0.15.6
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           MERGE_METHOD: squash

data/.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['3.0', 3.1]
+        ruby-version: [3.1, 3.2]
 
     steps:
     - uses: actions/checkout@v3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fishplate (7.0.6)
+    fishplate (7.1.0.1)
       a9n (~> 1.0)
       activemodel (~> 7.0)
       activerecord (~> 7.0)
@@ -13,76 +13,98 @@ GEM
   remote: https://rubygems.org/
   specs:
     a9n (1.5.0)
-    activemodel (7.0.4.2)
-      activesupport (= 7.0.4.2)
-    activerecord (7.0.4.2)
-      activemodel (= 7.0.4.2)
-      activesupport (= 7.0.4.2)
-    activesupport (7.0.4.2)
+    activemodel (7.1.0)
+      activesupport (= 7.1.0)
+    activerecord (7.1.0)
+      activemodel (= 7.1.0)
+      activesupport (= 7.1.0)
+      timeout (>= 0.4.0)
+    activesupport (7.1.0)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
     ast (2.4.2)
+    base64 (0.1.1)
+    bigdecimal (3.1.4)
     coderay (1.1.3)
-    concurrent-ruby (1.2.0)
+    concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
     diff-lcs (1.5.0)
-    i18n (1.12.0)
+    drb (2.1.1)
+      ruby2_keywords
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     json (2.6.3)
+    language_server-protocol (3.17.0.3)
     method_source (1.0.0)
-    mini_portile2 (2.8.1)
-    minitest (5.17.0)
-    parallel (1.22.1)
-    parser (3.2.1.0)
+    mini_portile2 (2.8.4)
+    minitest (5.20.0)
+    mutex_m (0.1.2)
+    parallel (1.23.0)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
+      racc
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
+    racc (1.7.1)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.7.0)
-    rexml (3.2.5)
+    regexp_parser (2.8.1)
+    rexml (3.2.6)
     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-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.3)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    rubocop (1.45.1)
+    rspec-support (3.12.1)
+    rubocop (1.56.4)
+      base64 (~> 0.1.1)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.24.1, < 2.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.26.0)
+    rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
-    rubocop-capybara (2.17.0)
+    rubocop-capybara (2.19.0)
       rubocop (~> 1.41)
+    rubocop-factory_bot (2.24.0)
+      rubocop (~> 1.33)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.18.1)
+    rubocop-rspec (2.24.1)
       rubocop (~> 1.33)
       rubocop-capybara (~> 2.17)
-    ruby-progressbar (1.11.0)
-    sqlite3 (1.6.0)
+      rubocop-factory_bot (~> 2.22)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    sqlite3 (1.6.6)
       mini_portile2 (~> 2.8.0)
+    timeout (0.4.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2022.7)
+    tzinfo-data (1.2023.3)
       tzinfo (>= 1.0.0)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
 
 PLATFORMS
   ruby
@@ -99,4 +121,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   2.3.26
+   2.4.20

data/fishplate.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 3.0'
+  spec.required_ruby_version = '>= 3.2'
 
   spec.add_dependency 'a9n', '~> 1.0'
   spec.add_dependency 'activemodel', '~> 7.0'

data/lib/fishplate/rack.rb

@@ -7,7 +7,7 @@ module Fishplate
     def call(env)
       @app.call(env)
     ensure
-      ActiveRecord::Base.clear_active_connections!
+      ActiveRecord::Base.connection_handler.clear_active_connections!
     end
   end
 end

data/lib/fishplate/sidekiq_middleware.rb

@@ -3,7 +3,7 @@ module Fishplate
     def call(*)
       yield
     ensure
-      ActiveRecord::Base.clear_active_connections!
+      ActiveRecord::Base.connection_handler.clear_active_connections!
     end
   end
 end

data/lib/fishplate/version.rb

@@ -1,3 +1,3 @@
 module Fishplate
-  VERSION = "7.0.6".freeze
+  VERSION = "7.1.0.1".freeze
 end

data/lib/fishplate.rb

@@ -83,8 +83,8 @@ module Fishplate
     end
 
     def setup_db_connection
-      ActiveRecord::Base.clear_active_connections!
-      ActiveRecord::Base.flush_idle_connections!
+      ActiveRecord::Base.connection_handler.clear_active_connections!
+      ActiveRecord::Base.connection_handler.flush_idle_connections!
       ActiveRecord::Base.establish_connection
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fishplate
 version: !ruby/object:Gem::Version
-  version: 7.0.6
+  version: 7.1.0.1
 platform: ruby
 authors:
 - Krzysztof Knapik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-14 00:00:00.000000000 Z
+date: 2023-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: a9n
@@ -139,14 +139,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Fishplate is a library allowing running ActiveRecord without Railties.