fishplate 7.0.6 → 7.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (13) hide show
  1. checksums.yaml +4 -4
  2. data/.bundler-version +1 -1
  3. data/.github/workflows/auto-approve.yml +8 -9
  4. data/.github/workflows/auto-merge-dependencies.yml +1 -1
  5. data/.github/workflows/auto-merge.yml +1 -1
  6. data/.github/workflows/ci.yml +1 -1
  7. data/Gemfile.lock +55 -33
  8. data/fishplate.gemspec +4 -4
  9. data/lib/fishplate/rack.rb +1 -1
  10. data/lib/fishplate/sidekiq_middleware.rb +1 -1
  11. data/lib/fishplate/version.rb +1 -1
  12. data/lib/fishplate.rb +2 -2
  13. metadata +10 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 83ff9b7684e57defeeed309327a423e8021a5260d34cec6d977546eee75c613b
4
- data.tar.gz: 370ac6d882b60cc4559166b793a0c8b15e7c856f38aa722ecf60335eb651b104
3
+ metadata.gz: 2dc7f126143ce3b6f17543d22403caba365093b249ec245351b905115277b927
4
+ data.tar.gz: 0d77ea962a9bcf62b30413cf5d6ce9fd74217bf2daeca88b2768d4f734d69792
5
5
  SHA512:
6
- metadata.gz: c2b5ea9687bcca4807dc176de33ea8f42a8770c9ba425b77b396476beaab3f3ff84e1490fe93c13bcfc89534b304e958248c7a6687c5698849d61009b76cd5ee
7
- data.tar.gz: 2c88a3f24efc404eba97ad4997e24b08ef64c2e76d6ed30d757a93c1b4d2942476392cc57d32843c54395c5547629f6cc3548fbfbb3517e754148ef78bda9008
6
+ metadata.gz: cd167ee7f1a4e2090748e8a1c06d2a2fa13cc9fabc4f892c10f730b2251fdfa90e598d3ee1f50ae0b85e144493831a12b66b3de2407bd3893d731fac8f831ad0
7
+ data.tar.gz: 0f74769e8353352421fb228acbf589df9d9001ca09dac1e0826c59f7677b8f46addd111621ef8752e56e72c3d5cab8955163495c6c6cf477e48907e9dfba0f0b
data/.bundler-version CHANGED
@@ -1 +1 @@
1
- 2.4.5
1
+ 2.4.20
data/.github/workflows/auto-approve.yml CHANGED
@@ -1,14 +1,13 @@
1
- # automatically approve PRs submitted by Dependabot or Renofidev
2
- # this will allow Dependabot to automatically merge dependency update PRs where CI passes
3
- # from: https://github.com/hmarr/auto-approve-action
4
- name: Auto approve dependency upgrades PRs
5
- on: pull_request_target
1
+ name: Auto approve dependency upgrades and hot-fix PRs
2
+ on:
3
+ pull_request_target:
4
+ types: [labeled, unlabeled, edited, ready_for_review, review_requested, auto_merge_enabled]
6
5
 
7
6
  jobs:
8
7
  auto-approve:
9
8
  runs-on: ubuntu-latest
10
9
  steps:
11
- - uses: hmarr/auto-approve-action@v2
12
- if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || github.actor == 'renofidev'
13
- with:
14
- github-token: "${{ secrets.GITHUB_TOKEN }}"
10
+ - uses: hmarr/auto-approve-action@v3
11
+ if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || github.actor == 'renofidev' || contains(toJson(github), 'HOTFIX-AUTO-APPROVE')
12
+ with:
13
+ github-token: "${{ secrets.GITHUB_TOKEN }}"
data/.github/workflows/auto-merge-dependencies.yml CHANGED
@@ -15,7 +15,7 @@ jobs:
15
15
  runs-on: ubuntu-latest
16
16
  steps:
17
17
  - name: automerge-dependencies
18
- uses: pascalgn/automerge-action@v0.15.5
18
+ uses: pascalgn/automerge-action@v0.15.6
19
19
  env:
20
20
  GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
21
21
  MERGE_METHOD: squash
data/.github/workflows/auto-merge.yml CHANGED
@@ -15,7 +15,7 @@ jobs:
15
15
  runs-on: ubuntu-latest
16
16
  steps:
17
17
  - name: automerge
18
- uses: pascalgn/automerge-action@v0.15.5
18
+ uses: pascalgn/automerge-action@v0.15.6
19
19
  env:
20
20
  GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
21
21
  MERGE_METHOD: squash
data/.github/workflows/ci.yml CHANGED
@@ -11,7 +11,7 @@ jobs:
11
11
  runs-on: ubuntu-latest
12
12
  strategy:
13
13
  matrix:
14
- ruby-version: ['3.0', 3.1]
14
+ ruby-version: [3.1, 3.2]
15
15
 
16
16
  steps:
17
17
  - uses: actions/checkout@v3
data/Gemfile.lock CHANGED
@@ -1,11 +1,11 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- fishplate (7.0.6)
4
+ fishplate (7.1.0)
5
5
  a9n (~> 1.0)
6
- activemodel (~> 7.0)
7
- activerecord (~> 7.0)
8
- activesupport (~> 7.0)
6
+ activemodel (~> 7.1)
7
+ activerecord (~> 7.1)
8
+ activesupport (~> 7.1)
9
9
  rake (~> 13)
10
10
  tzinfo-data
11
11
 
@@ -13,76 +13,98 @@ GEM
13
13
  remote: https://rubygems.org/
14
14
  specs:
15
15
  a9n (1.5.0)
16
- activemodel (7.0.4.2)
17
- activesupport (= 7.0.4.2)
18
- activerecord (7.0.4.2)
19
- activemodel (= 7.0.4.2)
20
- activesupport (= 7.0.4.2)
21
- activesupport (7.0.4.2)
16
+ activemodel (7.1.0)
17
+ activesupport (= 7.1.0)
18
+ activerecord (7.1.0)
19
+ activemodel (= 7.1.0)
20
+ activesupport (= 7.1.0)
21
+ timeout (>= 0.4.0)
22
+ activesupport (7.1.0)
23
+ base64
24
+ bigdecimal
22
25
  concurrent-ruby (~> 1.0, >= 1.0.2)
26
+ connection_pool (>= 2.2.5)
27
+ drb
23
28
  i18n (>= 1.6, < 2)
24
29
  minitest (>= 5.1)
30
+ mutex_m
25
31
  tzinfo (~> 2.0)
26
32
  ast (2.4.2)
33
+ base64 (0.1.1)
34
+ bigdecimal (3.1.4)
27
35
  coderay (1.1.3)
28
- concurrent-ruby (1.2.0)
36
+ concurrent-ruby (1.2.2)
37
+ connection_pool (2.4.1)
29
38
  diff-lcs (1.5.0)
30
- i18n (1.12.0)
39
+ drb (2.1.1)
40
+ ruby2_keywords
41
+ i18n (1.14.1)
31
42
  concurrent-ruby (~> 1.0)
32
43
  json (2.6.3)
44
+ language_server-protocol (3.17.0.3)
33
45
  method_source (1.0.0)
34
- mini_portile2 (2.8.1)
35
- minitest (5.17.0)
36
- parallel (1.22.1)
37
- parser (3.2.1.0)
46
+ mini_portile2 (2.8.4)
47
+ minitest (5.20.0)
48
+ mutex_m (0.1.2)
49
+ parallel (1.23.0)
50
+ parser (3.2.2.4)
38
51
  ast (~> 2.4.1)
52
+ racc
39
53
  pry (0.14.2)
40
54
  coderay (~> 1.1)
41
55
  method_source (~> 1.0)
56
+ racc (1.7.1)
42
57
  rainbow (3.1.1)
43
58
  rake (13.0.6)
44
- regexp_parser (2.7.0)
45
- rexml (3.2.5)
59
+ regexp_parser (2.8.1)
60
+ rexml (3.2.6)
46
61
  rspec (3.12.0)
47
62
  rspec-core (~> 3.12.0)
48
63
  rspec-expectations (~> 3.12.0)
49
64
  rspec-mocks (~> 3.12.0)
50
- rspec-core (3.12.1)
65
+ rspec-core (3.12.2)
51
66
  rspec-support (~> 3.12.0)
52
- rspec-expectations (3.12.2)
67
+ rspec-expectations (3.12.3)
53
68
  diff-lcs (>= 1.2.0, < 2.0)
54
69
  rspec-support (~> 3.12.0)
55
- rspec-mocks (3.12.3)
70
+ rspec-mocks (3.12.6)
56
71
  diff-lcs (>= 1.2.0, < 2.0)
57
72
  rspec-support (~> 3.12.0)
58
- rspec-support (3.12.0)
59
- rubocop (1.45.1)
73
+ rspec-support (3.12.1)
74
+ rubocop (1.56.4)
75
+ base64 (~> 0.1.1)
60
76
  json (~> 2.3)
77
+ language_server-protocol (>= 3.17.0)
61
78
  parallel (~> 1.10)
62
- parser (>= 3.2.0.0)
79
+ parser (>= 3.2.2.3)
63
80
  rainbow (>= 2.2.2, < 4.0)
64
81
  regexp_parser (>= 1.8, < 3.0)
65
82
  rexml (>= 3.2.5, < 4.0)
66
- rubocop-ast (>= 1.24.1, < 2.0)
83
+ rubocop-ast (>= 1.28.1, < 2.0)
67
84
  ruby-progressbar (~> 1.7)
68
85
  unicode-display_width (>= 2.4.0, < 3.0)
69
- rubocop-ast (1.26.0)
86
+ rubocop-ast (1.29.0)
70
87
  parser (>= 3.2.1.0)
71
- rubocop-capybara (2.17.0)
88
+ rubocop-capybara (2.19.0)
72
89
  rubocop (~> 1.41)
90
+ rubocop-factory_bot (2.24.0)
91
+ rubocop (~> 1.33)
73
92
  rubocop-rake (0.6.0)
74
93
  rubocop (~> 1.0)
75
- rubocop-rspec (2.18.1)
94
+ rubocop-rspec (2.24.1)
76
95
  rubocop (~> 1.33)
77
96
  rubocop-capybara (~> 2.17)
78
- ruby-progressbar (1.11.0)
79
- sqlite3 (1.6.0)
97
+ rubocop-factory_bot (~> 2.22)
98
+ ruby-progressbar (1.13.0)
99
+ ruby2_keywords (0.0.5)
100
+ sqlite3 (1.6.6)
80
101
  mini_portile2 (~> 2.8.0)
102
+ timeout (0.4.0)
81
103
  tzinfo (2.0.6)
82
104
  concurrent-ruby (~> 1.0)
83
- tzinfo-data (1.2022.7)
105
+ tzinfo-data (1.2023.3)
84
106
  tzinfo (>= 1.0.0)
85
- unicode-display_width (2.4.2)
107
+ unicode-display_width (2.5.0)
86
108
 
87
109
  PLATFORMS
88
110
  ruby
@@ -99,4 +121,4 @@ DEPENDENCIES
99
121
  sqlite3
100
122
 
101
123
  BUNDLED WITH
102
- 2.3.26
124
+ 2.4.20
data/fishplate.gemspec CHANGED
@@ -23,12 +23,12 @@ Gem::Specification.new do |spec|
23
23
  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
24
24
  spec.require_paths = ['lib']
25
25
 
26
- spec.required_ruby_version = '>= 3.0'
26
+ spec.required_ruby_version = '>= 3.2'
27
27
 
28
28
  spec.add_dependency 'a9n', '~> 1.0'
29
- spec.add_dependency 'activemodel', '~> 7.0'
30
- spec.add_dependency 'activerecord', '~> 7.0'
31
- spec.add_dependency 'activesupport', '~> 7.0'
29
+ spec.add_dependency 'activemodel', '~> 7.1'
30
+ spec.add_dependency 'activerecord', '~> 7.1'
31
+ spec.add_dependency 'activesupport', '~> 7.1'
32
32
  spec.add_dependency 'rake', '~> 13'
33
33
  spec.add_dependency 'tzinfo-data'
34
34
  end
data/lib/fishplate/rack.rb CHANGED
@@ -7,7 +7,7 @@ module Fishplate
7
7
  def call(env)
8
8
  @app.call(env)
9
9
  ensure
10
- ActiveRecord::Base.clear_active_connections!
10
+ ActiveRecord::Base.connection_handler.clear_active_connections!
11
11
  end
12
12
  end
13
13
  end
data/lib/fishplate/sidekiq_middleware.rb CHANGED
@@ -3,7 +3,7 @@ module Fishplate
3
3
  def call(*)
4
4
  yield
5
5
  ensure
6
- ActiveRecord::Base.clear_active_connections!
6
+ ActiveRecord::Base.connection_handler.clear_active_connections!
7
7
  end
8
8
  end
9
9
  end
data/lib/fishplate/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Fishplate
2
- VERSION = "7.0.6".freeze
2
+ VERSION = "7.1.0".freeze
3
3
  end
data/lib/fishplate.rb CHANGED
@@ -83,8 +83,8 @@ module Fishplate
83
83
  end
84
84
 
85
85
  def setup_db_connection
86
- ActiveRecord::Base.clear_active_connections!
87
- ActiveRecord::Base.flush_idle_connections!
86
+ ActiveRecord::Base.connection_handler.clear_active_connections!
87
+ ActiveRecord::Base.connection_handler.flush_idle_connections!
88
88
  ActiveRecord::Base.establish_connection
89
89
  end
90
90
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fishplate
3
3
  version: !ruby/object:Gem::Version
4
- version: 7.0.6
4
+ version: 7.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Krzysztof Knapik
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2023-02-14 00:00:00.000000000 Z
11
+ date: 2023-10-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: a9n
@@ -30,42 +30,42 @@ dependencies:
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: '7.0'
33
+ version: '7.1'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: '7.0'
40
+ version: '7.1'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: activerecord
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: '7.0'
47
+ version: '7.1'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: '7.0'
54
+ version: '7.1'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: activesupport
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: '7.0'
61
+ version: '7.1'
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: '7.0'
68
+ version: '7.1'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rake
71
71
  requirement: !ruby/object:Gem::Requirement
@@ -139,14 +139,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
139
139
  requirements:
140
140
  - - ">="
141
141
  - !ruby/object:Gem::Version
142
- version: '3.0'
142
+ version: '3.2'
143
143
  required_rubygems_version: !ruby/object:Gem::Requirement
144
144
  requirements:
145
145
  - - ">="
146
146
  - !ruby/object:Gem::Version
147
147
  version: '0'
148
148
  requirements: []
149
- rubygems_version: 3.4.6
149
+ rubygems_version: 3.4.20
150
150
  signing_key:
151
151
  specification_version: 4
152
152
  summary: Fishplate is a library allowing running ActiveRecord without Railties.