Skip to content

Commit eb0cc26

Browse files
authored
Merge pull request #1480 from MITLibraries/etd-678-rails-72
Etd 678 rails 72
2 parents 61f05b1 + b2b004a commit eb0cc26

19 files changed

+227
-415
lines changed

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.2.9
1+
3.4.7

Gemfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
source 'https://rubygems.org'
2-
ruby '3.2.9'
2+
ruby '3.4.7'
33

44
git_source(:github) do |repo_name|
55
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?('/')
@@ -13,6 +13,7 @@ gem 'aws-sdk-sqs'
1313
gem 'bootsnap'
1414
gem 'cancancan'
1515
gem 'cocoon'
16+
gem 'csv'
1617
gem 'delayed_job_active_record'
1718
gem 'devise'
1819
gem 'flipflop'
@@ -28,7 +29,7 @@ gem 'omniauth-rails_csrf_protection'
2829
gem 'omniauth-saml'
2930
gem 'paper_trail'
3031
gem 'puma'
31-
gem 'rails', '~> 7.1.0'
32+
gem 'rails', '~> 7.2.0'
3233
gem 'rubyzip'
3334
gem 'sass-rails'
3435
gem 'sentry-rails'

Gemfile.lock

Lines changed: 75 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -10,83 +10,77 @@ GIT
1010
GEM
1111
remote: https://rubygems.org/
1212
specs:
13-
actioncable (7.1.5.2)
14-
actionpack (= 7.1.5.2)
15-
activesupport (= 7.1.5.2)
13+
actioncable (7.2.2.2)
14+
actionpack (= 7.2.2.2)
15+
activesupport (= 7.2.2.2)
1616
nio4r (~> 2.0)
1717
websocket-driver (>= 0.6.1)
1818
zeitwerk (~> 2.6)
19-
actionmailbox (7.1.5.2)
20-
actionpack (= 7.1.5.2)
21-
activejob (= 7.1.5.2)
22-
activerecord (= 7.1.5.2)
23-
activestorage (= 7.1.5.2)
24-
activesupport (= 7.1.5.2)
25-
mail (>= 2.7.1)
26-
net-imap
27-
net-pop
28-
net-smtp
29-
actionmailer (7.1.5.2)
30-
actionpack (= 7.1.5.2)
31-
actionview (= 7.1.5.2)
32-
activejob (= 7.1.5.2)
33-
activesupport (= 7.1.5.2)
34-
mail (~> 2.5, >= 2.5.4)
35-
net-imap
36-
net-pop
37-
net-smtp
19+
actionmailbox (7.2.2.2)
20+
actionpack (= 7.2.2.2)
21+
activejob (= 7.2.2.2)
22+
activerecord (= 7.2.2.2)
23+
activestorage (= 7.2.2.2)
24+
activesupport (= 7.2.2.2)
25+
mail (>= 2.8.0)
26+
actionmailer (7.2.2.2)
27+
actionpack (= 7.2.2.2)
28+
actionview (= 7.2.2.2)
29+
activejob (= 7.2.2.2)
30+
activesupport (= 7.2.2.2)
31+
mail (>= 2.8.0)
3832
rails-dom-testing (~> 2.2)
39-
actionpack (7.1.5.2)
40-
actionview (= 7.1.5.2)
41-
activesupport (= 7.1.5.2)
33+
actionpack (7.2.2.2)
34+
actionview (= 7.2.2.2)
35+
activesupport (= 7.2.2.2)
4236
nokogiri (>= 1.8.5)
4337
racc
44-
rack (>= 2.2.4)
38+
rack (>= 2.2.4, < 3.2)
4539
rack-session (>= 1.0.1)
4640
rack-test (>= 0.6.3)
4741
rails-dom-testing (~> 2.2)
4842
rails-html-sanitizer (~> 1.6)
49-
actiontext (7.1.5.2)
50-
actionpack (= 7.1.5.2)
51-
activerecord (= 7.1.5.2)
52-
activestorage (= 7.1.5.2)
53-
activesupport (= 7.1.5.2)
43+
useragent (~> 0.16)
44+
actiontext (7.2.2.2)
45+
actionpack (= 7.2.2.2)
46+
activerecord (= 7.2.2.2)
47+
activestorage (= 7.2.2.2)
48+
activesupport (= 7.2.2.2)
5449
globalid (>= 0.6.0)
5550
nokogiri (>= 1.8.5)
56-
actionview (7.1.5.2)
57-
activesupport (= 7.1.5.2)
51+
actionview (7.2.2.2)
52+
activesupport (= 7.2.2.2)
5853
builder (~> 3.1)
5954
erubi (~> 1.11)
6055
rails-dom-testing (~> 2.2)
6156
rails-html-sanitizer (~> 1.6)
62-
activejob (7.1.5.2)
63-
activesupport (= 7.1.5.2)
57+
activejob (7.2.2.2)
58+
activesupport (= 7.2.2.2)
6459
globalid (>= 0.3.6)
65-
activemodel (7.1.5.2)
66-
activesupport (= 7.1.5.2)
67-
activerecord (7.1.5.2)
68-
activemodel (= 7.1.5.2)
69-
activesupport (= 7.1.5.2)
60+
activemodel (7.2.2.2)
61+
activesupport (= 7.2.2.2)
62+
activerecord (7.2.2.2)
63+
activemodel (= 7.2.2.2)
64+
activesupport (= 7.2.2.2)
7065
timeout (>= 0.4.0)
71-
activestorage (7.1.5.2)
72-
actionpack (= 7.1.5.2)
73-
activejob (= 7.1.5.2)
74-
activerecord (= 7.1.5.2)
75-
activesupport (= 7.1.5.2)
66+
activestorage (7.2.2.2)
67+
actionpack (= 7.2.2.2)
68+
activejob (= 7.2.2.2)
69+
activerecord (= 7.2.2.2)
70+
activesupport (= 7.2.2.2)
7671
marcel (~> 1.0)
77-
activesupport (7.1.5.2)
72+
activesupport (7.2.2.2)
7873
base64
7974
benchmark (>= 0.3)
8075
bigdecimal
81-
concurrent-ruby (~> 1.0, >= 1.0.2)
76+
concurrent-ruby (~> 1.0, >= 1.3.1)
8277
connection_pool (>= 2.2.5)
8378
drb
8479
i18n (>= 1.6, < 2)
8580
logger (>= 1.4.2)
8681
minitest (>= 5.1)
87-
mutex_m
8882
securerandom (>= 0.3)
89-
tzinfo (~> 2.0)
83+
tzinfo (~> 2.0, >= 2.0.5)
9084
addressable (2.8.7)
9185
public_suffix (>= 2.0.2, < 7.0)
9286
administrate (0.20.1)
@@ -159,6 +153,7 @@ GEM
159153
bigdecimal
160154
rexml
161155
crass (1.0.6)
156+
csv (3.3.5)
162157
date (3.4.1)
163158
delayed_job (4.1.13)
164159
activesupport (>= 3.0, < 9.0)
@@ -177,14 +172,14 @@ GEM
177172
dotenv (= 3.1.8)
178173
railties (>= 6.1)
179174
drb (2.2.3)
180-
erb (5.0.3)
175+
erb (5.1.1)
181176
erubi (1.13.1)
182177
execjs (2.10.0)
183178
ffi (1.17.1)
184179
flipflop (2.8.0)
185180
activesupport (>= 4.0)
186181
terminal-table (>= 1.8)
187-
globalid (1.2.1)
182+
globalid (1.3.0)
188183
activesupport (>= 6.1)
189184
hashdiff (1.2.0)
190185
hashie (5.0.0)
@@ -233,15 +228,16 @@ GEM
233228
loofah (2.24.1)
234229
crass (~> 1.0.2)
235230
nokogiri (>= 1.12.0)
236-
mail (2.8.1)
231+
mail (2.9.0)
232+
logger
237233
mini_mime (>= 0.1.1)
238234
net-imap
239235
net-pop
240236
net-smtp
241237
marc (1.3.0)
242238
nokogiri (~> 1.0)
243239
rexml
244-
marcel (1.0.4)
240+
marcel (1.1.0)
245241
matrix (0.4.2)
246242
mini_mime (1.1.5)
247243
mini_portile2 (2.8.9)
@@ -252,7 +248,6 @@ GEM
252248
minitest (>= 5.0)
253249
ruby-progressbar
254250
msgpack (1.8.0)
255-
mutex_m (0.3.0)
256251
net-imap (0.5.12)
257252
date
258253
net-protocol
@@ -296,7 +291,7 @@ GEM
296291
puma (7.1.0)
297292
nio4r (~> 2.0)
298293
racc (1.8.1)
299-
rack (3.2.3)
294+
rack (3.1.18)
300295
rack-protection (4.1.1)
301296
base64 (>= 0.1.0)
302297
logger (>= 1.6.0)
@@ -308,20 +303,20 @@ GEM
308303
rack (>= 1.3)
309304
rackup (2.2.1)
310305
rack (>= 3)
311-
rails (7.1.5.2)
312-
actioncable (= 7.1.5.2)
313-
actionmailbox (= 7.1.5.2)
314-
actionmailer (= 7.1.5.2)
315-
actionpack (= 7.1.5.2)
316-
actiontext (= 7.1.5.2)
317-
actionview (= 7.1.5.2)
318-
activejob (= 7.1.5.2)
319-
activemodel (= 7.1.5.2)
320-
activerecord (= 7.1.5.2)
321-
activestorage (= 7.1.5.2)
322-
activesupport (= 7.1.5.2)
306+
rails (7.2.2.2)
307+
actioncable (= 7.2.2.2)
308+
actionmailbox (= 7.2.2.2)
309+
actionmailer (= 7.2.2.2)
310+
actionpack (= 7.2.2.2)
311+
actiontext (= 7.2.2.2)
312+
actionview (= 7.2.2.2)
313+
activejob (= 7.2.2.2)
314+
activemodel (= 7.2.2.2)
315+
activerecord (= 7.2.2.2)
316+
activestorage (= 7.2.2.2)
317+
activesupport (= 7.2.2.2)
323318
bundler (>= 1.15.0)
324-
railties (= 7.1.5.2)
319+
railties (= 7.2.2.2)
325320
rails-dom-testing (2.3.0)
326321
activesupport (>= 5.0.0)
327322
minitest
@@ -331,10 +326,10 @@ GEM
331326
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
332327
rails-mermaid_erd (0.6.0)
333328
rails (>= 5.2)
334-
railties (7.1.5.2)
335-
actionpack (= 7.1.5.2)
336-
activesupport (= 7.1.5.2)
337-
irb
329+
railties (7.2.2.2)
330+
actionpack (= 7.2.2.2)
331+
activesupport (= 7.2.2.2)
332+
irb (~> 1.13)
338333
rackup (>= 1.0.0)
339334
rake (>= 12.2)
340335
thor (~> 1.0, >= 1.2.2)
@@ -344,9 +339,10 @@ GEM
344339
rb-fsevent (0.11.2)
345340
rb-inotify (0.11.1)
346341
ffi (~> 1.0)
347-
rdoc (6.14.2)
342+
rdoc (6.15.0)
348343
erb
349344
psych (>= 4.0.0)
345+
tsort
350346
regexp_parser (2.11.3)
351347
reline (0.6.2)
352348
io-console (~> 0.5)
@@ -437,12 +433,14 @@ GEM
437433
tilt (2.6.0)
438434
timecop (0.9.10)
439435
timeout (0.4.3)
436+
tsort (0.2.0)
440437
tzinfo (2.0.6)
441438
concurrent-ruby (~> 1.0)
442439
unicode-display_width (3.2.0)
443440
unicode-emoji (~> 4.1)
444441
unicode-emoji (4.1.0)
445442
uniform_notifier (1.18.0)
443+
useragent (0.16.11)
446444
warden (1.2.9)
447445
rack (>= 2.0.9)
448446
web-console (4.2.1)
@@ -455,7 +453,7 @@ GEM
455453
crack (>= 0.3.2)
456454
hashdiff (>= 0.4.0, < 2.0.0)
457455
websocket (1.2.11)
458-
websocket-driver (0.7.7)
456+
websocket-driver (0.8.0)
459457
base64
460458
websocket-extensions (>= 0.1.0)
461459
websocket-extensions (0.1.5)
@@ -480,6 +478,7 @@ DEPENDENCIES
480478
capybara
481479
climate_control
482480
cocoon
481+
csv
483482
delayed_job_active_record
484483
devise
485484
dotenv-rails
@@ -500,7 +499,7 @@ DEPENDENCIES
500499
paper_trail
501500
pg
502501
puma
503-
rails (~> 7.1.0)
502+
rails (~> 7.2.0)
504503
rails-mermaid_erd
505504
rubocop
506505
rubocop-rails
@@ -522,7 +521,7 @@ DEPENDENCIES
522521
zip_tricks
523522

524523
RUBY VERSION
525-
ruby 3.2.9p265
524+
ruby 3.4.7p58
526525

527526
BUNDLED WITH
528527
2.3.7

bin/rubocop

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/usr/bin/env ruby
2+
require "rubygems"
3+
require "bundler/setup"
4+
5+
# explicit rubocop config increases performance slightly while avoiding config confusion.
6+
ARGV.unshift("--config", File.expand_path("../.rubocop.yml", __dir__))
7+
8+
load Gem.bin_path("rubocop", "rubocop")

bin/setup

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/usr/bin/env ruby
22
require "fileutils"
33

4-
# path to your application root.
54
APP_ROOT = File.expand_path("..", __dir__)
5+
APP_NAME = "thing"
66

77
def system!(*args)
88
system(*args, exception: true)
@@ -30,4 +30,8 @@ FileUtils.chdir APP_ROOT do
3030

3131
puts "\n== Restarting application server =="
3232
system! "bin/rails restart"
33+
34+
# puts "\n== Configuring puma-dev =="
35+
# system "ln -nfs #{APP_ROOT} ~/.puma-dev/#{APP_NAME}"
36+
# system "curl -Is https://#{APP_NAME}.test/up | head -n 1"
3337
end

config/application.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ class Application < Rails::Application
1717
config.flipflop.raise_strategy_errors = nil
1818

1919
# Initialize configuration defaults for originally generated Rails version.
20-
config.load_defaults 7.1
20+
config.load_defaults 7.2
2121

2222
# Please, add to the `ignore` list any other `lib` subdirectories that do
2323
# not contain `.rb` files, or that should not be reloaded or eager loaded.
2424
# Common ones are `templates`, `generators`, or `middleware`, for example.
25-
config.autoload_lib(ignore: %w(assets tasks))
25+
config.autoload_lib(ignore: %w[assets tasks])
2626

2727
# Configuration for the application, engines, and railties goes here.
2828
#

0 commit comments

Comments
 (0)