Skip to content

Commit 8dad38c

Browse files
authored
feat(ruby): make repo compatible with ruby 3.2 (#595)
1 parent 064e847 commit 8dad38c

File tree

10 files changed

+287
-271
lines changed

10 files changed

+287
-271
lines changed

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ gemspec
1313
# To use a debugger
1414
group :development, :test do
1515
gem 'byebug'
16-
gem 'rspec-rails', '3.8.2'
16+
gem 'rspec-rails'
1717
end
1818

1919
group :test do
@@ -22,7 +22,7 @@ group :test do
2222
gem 'simplecov', '~> 0.17.0', require: false
2323
end
2424

25-
gem 'rails', '6.0.3.6'
25+
gem 'rails', '6.1.7'
2626
gem 'forestadmin-jsonapi-serializers'
2727
gem 'rack-cors'
2828
gem 'arel-helpers', '2.14.0'

Gemfile.lock

Lines changed: 132 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -19,78 +19,83 @@ PATH
1919
GEM
2020
remote: https://rubygems.org/
2121
specs:
22-
actioncable (6.0.3.6)
23-
actionpack (= 6.0.3.6)
22+
actioncable (6.1.7)
23+
actionpack (= 6.1.7)
24+
activesupport (= 6.1.7)
2425
nio4r (~> 2.0)
2526
websocket-driver (>= 0.6.1)
26-
actionmailbox (6.0.3.6)
27-
actionpack (= 6.0.3.6)
28-
activejob (= 6.0.3.6)
29-
activerecord (= 6.0.3.6)
30-
activestorage (= 6.0.3.6)
31-
activesupport (= 6.0.3.6)
27+
actionmailbox (6.1.7)
28+
actionpack (= 6.1.7)
29+
activejob (= 6.1.7)
30+
activerecord (= 6.1.7)
31+
activestorage (= 6.1.7)
32+
activesupport (= 6.1.7)
3233
mail (>= 2.7.1)
33-
actionmailer (6.0.3.6)
34-
actionpack (= 6.0.3.6)
35-
actionview (= 6.0.3.6)
36-
activejob (= 6.0.3.6)
34+
actionmailer (6.1.7)
35+
actionpack (= 6.1.7)
36+
actionview (= 6.1.7)
37+
activejob (= 6.1.7)
38+
activesupport (= 6.1.7)
3739
mail (~> 2.5, >= 2.5.4)
3840
rails-dom-testing (~> 2.0)
39-
actionpack (6.0.3.6)
40-
actionview (= 6.0.3.6)
41-
activesupport (= 6.0.3.6)
42-
rack (~> 2.0, >= 2.0.8)
41+
actionpack (6.1.7)
42+
actionview (= 6.1.7)
43+
activesupport (= 6.1.7)
44+
rack (~> 2.0, >= 2.0.9)
4345
rack-test (>= 0.6.3)
4446
rails-dom-testing (~> 2.0)
4547
rails-html-sanitizer (~> 1.0, >= 1.2.0)
46-
actiontext (6.0.3.6)
47-
actionpack (= 6.0.3.6)
48-
activerecord (= 6.0.3.6)
49-
activestorage (= 6.0.3.6)
50-
activesupport (= 6.0.3.6)
48+
actiontext (6.1.7)
49+
actionpack (= 6.1.7)
50+
activerecord (= 6.1.7)
51+
activestorage (= 6.1.7)
52+
activesupport (= 6.1.7)
5153
nokogiri (>= 1.8.5)
52-
actionview (6.0.3.6)
53-
activesupport (= 6.0.3.6)
54+
actionview (6.1.7)
55+
activesupport (= 6.1.7)
5456
builder (~> 3.1)
5557
erubi (~> 1.4)
5658
rails-dom-testing (~> 2.0)
5759
rails-html-sanitizer (~> 1.1, >= 1.2.0)
58-
activejob (6.0.3.6)
59-
activesupport (= 6.0.3.6)
60+
activejob (6.1.7)
61+
activesupport (= 6.1.7)
6062
globalid (>= 0.3.6)
61-
activemodel (6.0.3.6)
62-
activesupport (= 6.0.3.6)
63-
activerecord (6.0.3.6)
64-
activemodel (= 6.0.3.6)
65-
activesupport (= 6.0.3.6)
66-
activestorage (6.0.3.6)
67-
actionpack (= 6.0.3.6)
68-
activejob (= 6.0.3.6)
69-
activerecord (= 6.0.3.6)
70-
marcel (~> 1.0.0)
71-
activesupport (6.0.3.6)
63+
activemodel (6.1.7)
64+
activesupport (= 6.1.7)
65+
activerecord (6.1.7)
66+
activemodel (= 6.1.7)
67+
activesupport (= 6.1.7)
68+
activestorage (6.1.7)
69+
actionpack (= 6.1.7)
70+
activejob (= 6.1.7)
71+
activerecord (= 6.1.7)
72+
activesupport (= 6.1.7)
73+
marcel (~> 1.0)
74+
mini_mime (>= 1.1.0)
75+
activesupport (6.1.7)
7276
concurrent-ruby (~> 1.0, >= 1.0.2)
73-
i18n (>= 0.7, < 2)
74-
minitest (~> 5.1)
75-
tzinfo (~> 1.1)
76-
zeitwerk (~> 2.2, >= 2.2.2)
77+
i18n (>= 1.6, < 2)
78+
minitest (>= 5.1)
79+
tzinfo (~> 2.0)
80+
zeitwerk (~> 2.3)
7781
aes_key_wrap (1.1.0)
7882
arel-helpers (2.14.0)
7983
activerecord (>= 3.1.0, < 8)
8084
attr_required (1.0.1)
81-
bcrypt (3.1.16)
82-
bindata (2.4.13)
85+
bcrypt (3.1.18)
86+
bindata (2.4.14)
8387
builder (3.2.4)
8488
byebug (11.1.3)
8589
concurrent-ruby (1.1.10)
8690
crass (1.0.6)
87-
diff-lcs (1.4.4)
88-
docile (1.3.5)
89-
erubi (1.10.0)
91+
date (3.3.3)
92+
diff-lcs (1.5.0)
93+
docile (1.4.0)
94+
erubi (1.12.0)
9095
forestadmin-jsonapi-serializers (2.0.0.pre.beta.2)
9196
activesupport
92-
globalid (0.4.2)
93-
activesupport (>= 4.2.0)
97+
globalid (1.0.0)
98+
activesupport (>= 5.0)
9499
groupdate (5.2.2)
95100
activesupport (>= 5)
96101
httparty (0.18.1)
@@ -100,34 +105,42 @@ GEM
100105
i18n (1.12.0)
101106
concurrent-ruby (~> 1.0)
102107
ipaddress (0.8.3)
103-
json (2.5.1)
108+
json (2.6.3)
104109
json-jwt (1.15.0)
105110
activesupport (>= 4.2)
106111
aes_key_wrap
107112
bindata
108113
httpclient
109-
jwt (2.2.3)
110-
loofah (2.9.1)
114+
jwt (2.6.0)
115+
loofah (2.19.1)
111116
crass (~> 1.0.2)
112117
nokogiri (>= 1.5.9)
113-
mail (2.7.1)
118+
mail (2.8.0.1)
114119
mini_mime (>= 0.1.1)
115-
marcel (1.0.1)
120+
net-imap
121+
net-pop
122+
net-smtp
123+
marcel (1.0.2)
116124
method_source (1.0.0)
117-
mime-types (3.3.1)
125+
mime-types (3.4.1)
118126
mime-types-data (~> 3.2015)
119-
mime-types-data (3.2021.0225)
127+
mime-types-data (3.2022.0105)
120128
mini_mime (1.1.2)
121-
mini_portile2 (2.5.0)
122-
minitest (5.16.3)
129+
mini_portile2 (2.8.1)
130+
minitest (5.17.0)
123131
multi_xml (0.6.0)
124-
net-protocol (0.1.3)
132+
net-imap (0.3.4)
133+
date
134+
net-protocol
135+
net-pop (0.1.2)
136+
net-protocol
137+
net-protocol (0.2.1)
125138
timeout
126-
net-smtp (0.3.2)
139+
net-smtp (0.3.3)
127140
net-protocol
128-
nio4r (2.5.7)
129-
nokogiri (1.11.3)
130-
mini_portile2 (~> 2.5.0)
141+
nio4r (2.5.8)
142+
nokogiri (1.14.0)
143+
mini_portile2 (~> 2.8.0)
131144
racc (~> 1.4)
132145
openid_connect (1.4.2)
133146
activemodel
@@ -140,9 +153,9 @@ GEM
140153
validate_email
141154
validate_url
142155
webfinger (~> 1.2)
143-
public_suffix (5.0.0)
144-
racc (1.5.2)
145-
rack (2.2.4)
156+
public_suffix (5.0.1)
157+
racc (1.6.2)
158+
rack (2.2.5)
146159
rack-cors (1.1.1)
147160
rack (>= 2.0.0)
148161
rack-oauth2 (1.21.3)
@@ -151,74 +164,74 @@ GEM
151164
httpclient
152165
json-jwt (>= 1.11.0)
153166
rack (>= 2.1.0)
154-
rack-test (1.1.0)
155-
rack (>= 1.0, < 3)
156-
rails (6.0.3.6)
157-
actioncable (= 6.0.3.6)
158-
actionmailbox (= 6.0.3.6)
159-
actionmailer (= 6.0.3.6)
160-
actionpack (= 6.0.3.6)
161-
actiontext (= 6.0.3.6)
162-
actionview (= 6.0.3.6)
163-
activejob (= 6.0.3.6)
164-
activemodel (= 6.0.3.6)
165-
activerecord (= 6.0.3.6)
166-
activestorage (= 6.0.3.6)
167-
activesupport (= 6.0.3.6)
168-
bundler (>= 1.3.0)
169-
railties (= 6.0.3.6)
167+
rack-test (2.0.2)
168+
rack (>= 1.3)
169+
rails (6.1.7)
170+
actioncable (= 6.1.7)
171+
actionmailbox (= 6.1.7)
172+
actionmailer (= 6.1.7)
173+
actionpack (= 6.1.7)
174+
actiontext (= 6.1.7)
175+
actionview (= 6.1.7)
176+
activejob (= 6.1.7)
177+
activemodel (= 6.1.7)
178+
activerecord (= 6.1.7)
179+
activestorage (= 6.1.7)
180+
activesupport (= 6.1.7)
181+
bundler (>= 1.15.0)
182+
railties (= 6.1.7)
170183
sprockets-rails (>= 2.0.0)
171184
rails-dom-testing (2.0.3)
172185
activesupport (>= 4.2.0)
173186
nokogiri (>= 1.6)
174-
rails-html-sanitizer (1.3.0)
175-
loofah (~> 2.3)
176-
railties (6.0.3.6)
177-
actionpack (= 6.0.3.6)
178-
activesupport (= 6.0.3.6)
187+
rails-html-sanitizer (1.4.4)
188+
loofah (~> 2.19, >= 2.19.1)
189+
railties (6.1.7)
190+
actionpack (= 6.1.7)
191+
activesupport (= 6.1.7)
179192
method_source
180-
rake (>= 0.8.7)
181-
thor (>= 0.20.3, < 2.0)
182-
rake (13.0.3)
183-
rspec-core (3.8.2)
184-
rspec-support (~> 3.8.0)
185-
rspec-expectations (3.8.6)
193+
rake (>= 12.2)
194+
thor (~> 1.0)
195+
rake (13.0.6)
196+
rspec-core (3.12.0)
197+
rspec-support (~> 3.12.0)
198+
rspec-expectations (3.12.2)
186199
diff-lcs (>= 1.2.0, < 2.0)
187-
rspec-support (~> 3.8.0)
188-
rspec-mocks (3.8.2)
200+
rspec-support (~> 3.12.0)
201+
rspec-mocks (3.12.2)
189202
diff-lcs (>= 1.2.0, < 2.0)
190-
rspec-support (~> 3.8.0)
191-
rspec-rails (3.8.2)
192-
actionpack (>= 3.0)
193-
activesupport (>= 3.0)
194-
railties (>= 3.0)
195-
rspec-core (~> 3.8.0)
196-
rspec-expectations (~> 3.8.0)
197-
rspec-mocks (~> 3.8.0)
198-
rspec-support (~> 3.8.0)
199-
rspec-support (3.8.3)
203+
rspec-support (~> 3.12.0)
204+
rspec-rails (6.0.1)
205+
actionpack (>= 6.1)
206+
activesupport (>= 6.1)
207+
railties (>= 6.1)
208+
rspec-core (~> 3.11)
209+
rspec-expectations (~> 3.11)
210+
rspec-mocks (~> 3.11)
211+
rspec-support (~> 3.11)
212+
rspec-support (3.12.0)
200213
simplecov (0.17.1)
201214
docile (~> 1.1)
202215
json (>= 1.8, < 3)
203216
simplecov-html (~> 0.10.0)
204217
simplecov-html (0.10.2)
205-
sprockets (4.0.2)
218+
sprockets (4.2.0)
206219
concurrent-ruby (~> 1.0)
207-
rack (> 1, < 3)
208-
sprockets-rails (3.2.2)
209-
actionpack (>= 4.0)
210-
activesupport (>= 4.0)
220+
rack (>= 2.2.4, < 4)
221+
sprockets-rails (3.4.2)
222+
actionpack (>= 5.2)
223+
activesupport (>= 5.2)
211224
sprockets (>= 3.0.0)
212-
sqlite3 (1.4.2)
225+
sqlite3 (1.6.0)
226+
mini_portile2 (~> 2.8.0)
213227
swd (1.3.0)
214228
activesupport (>= 3)
215229
attr_required (>= 0.0.5)
216230
httpclient (>= 2.4)
217-
thor (1.1.0)
218-
thread_safe (0.3.6)
219-
timeout (0.3.0)
220-
tzinfo (1.2.10)
221-
thread_safe (~> 0.1)
231+
thor (1.2.1)
232+
timeout (0.3.1)
233+
tzinfo (2.0.5)
234+
concurrent-ruby (~> 1.0)
222235
useragent (0.16.10)
223236
validate_email (0.1.6)
224237
activemodel (>= 3.0)
@@ -229,10 +242,10 @@ GEM
229242
webfinger (1.2.0)
230243
activesupport
231244
httpclient (>= 2.4)
232-
websocket-driver (0.7.3)
245+
websocket-driver (0.7.5)
233246
websocket-extensions (>= 0.1.0)
234247
websocket-extensions (0.1.5)
235-
zeitwerk (2.6.1)
248+
zeitwerk (2.6.6)
236249

237250
PLATFORMS
238251
ruby
@@ -251,12 +264,12 @@ DEPENDENCIES
251264
jwt
252265
openid_connect (= 1.4.2)
253266
rack-cors
254-
rails (= 6.0.3.6)
267+
rails (= 6.1.7)
255268
rake
256-
rspec-rails (= 3.8.2)
269+
rspec-rails
257270
simplecov (~> 0.17.0)
258271
sqlite3 (~> 1.4)
259272
useragent
260273

261274
BUNDLED WITH
262-
2.2.22
275+
2.4.3

lib/forest_liana/bootstrapper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def generate_apimap
8686
generate_action_hooks
8787
SchemaFileUpdater.new(SCHEMA_FILENAME, @collections_sent, @meta_sent).perform()
8888
else
89-
if File.exists?(SCHEMA_FILENAME)
89+
if File.exist?(SCHEMA_FILENAME)
9090
begin
9191
content = JSON.parse(File.read(SCHEMA_FILENAME))
9292
@collections_sent = content['collections']

spec/dummy/config/storage.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
local:
3+
service: Disk
4+
root: <%= Rails.root.join("storage") %>

spec/dummy/db/schema.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# of editing this file, please use the migrations feature of Active Record to
33
# incrementally modify your database, and then regenerate this schema definition.
44
#
5-
# This file is the source Rails uses to define your schema when running `rails
6-
# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
5+
# This file is the source Rails uses to define your schema when running `bin/rails
6+
# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
77
# be faster and is potentially less error prone than running all of your
88
# migrations from scratch. Old migrations may fail to apply correctly if those
99
# migrations use external dependencies or application code.

0 commit comments

Comments
 (0)