Skip to content
This repository was archived by the owner on Nov 2, 2026. It is now read-only.

Commit 305ec31

Browse files
authored
AP-526: upgrade Rails and other dependencies (#19)
* ruby 3.3 and rails 8.0 * update rubocop and apply corrections * upgrade to omniauth-cas 3.0 (#20): omniauth-cas now requires a switch from a GET to POST, which leads us to need to modify how our login links exist and are styled (i.e., they are no longer truly links but rather forms). this thus updates css and modifies application helpers, too.
1 parent 2f680d7 commit 305ec31

31 files changed

Lines changed: 730 additions & 306 deletions

‎.rubocop.yml‎

Lines changed: 255 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ inherit_mode:
33
- Exclude
44
- Include
55

6-
require:
6+
plugins:
77
- rubocop-rails
88

99
AllCops:
@@ -15,6 +15,7 @@ AllCops:
1515
- 'out/**/*'
1616
# Exclude vendor files in GitHub build
1717
- 'vendor/**/*'
18+
SuggestExtensions: false
1819

1920
# Allow one line around block body (Layout/EmptyLines will still disallow two or more)
2021
Layout/EmptyLinesAroundBlockBody:
@@ -190,7 +191,7 @@ Lint/TripleQuotes: # (new in 1.9)
190191
Enabled: true
191192
Style/IfWithBooleanLiteralBranches: # (new in 1.9)
192193
Enabled: true
193-
Gemspec/DateAssignment: # (new in 1.10)
194+
Gemspec/DeprecatedAttributeAssignment: # (new in 1.10)
194195
Enabled: true
195196
Style/HashConversion: # (new in 1.10)
196197
Enabled: true
@@ -242,6 +243,184 @@ Style/MapToHash: # new in 1.24
242243
Enabled: true
243244
Style/NestedFileDirname: # new in 1.26
244245
Enabled: true
246+
Gemspec/AddRuntimeDependency: # new in 1.65
247+
Enabled: true
248+
Gemspec/AttributeAssignment: # new in 1.77
249+
Enabled: true
250+
Gemspec/DevelopmentDependencies: # new in 1.44
251+
Enabled: true
252+
Layout/EmptyLinesAfterModuleInclusion: # new in 1.79
253+
Enabled: true
254+
Layout/LineContinuationLeadingSpace: # new in 1.31
255+
Enabled: true
256+
Layout/LineContinuationSpacing: # new in 1.31
257+
Enabled: true
258+
Lint/ArrayLiteralInRegexp: # new in 1.71
259+
Enabled: true
260+
Lint/ConstantOverwrittenInRescue: # new in 1.31
261+
Enabled: true
262+
Lint/ConstantReassignment: # new in 1.70
263+
Enabled: true
264+
Lint/CopDirectiveSyntax: # new in 1.72
265+
Enabled: true
266+
Lint/DuplicateMagicComment: # new in 1.37
267+
Enabled: true
268+
Lint/DuplicateMatchPattern: # new in 1.50
269+
Enabled: true
270+
Lint/DuplicateSetElement: # new in 1.67
271+
Enabled: true
272+
Lint/HashNewWithKeywordArgumentsAsDefault: # new in 1.69
273+
Enabled: true
274+
Lint/ItWithoutArgumentsInBlock: # new in 1.59
275+
Enabled: true
276+
Lint/LiteralAssignmentInCondition: # new in 1.58
277+
Enabled: true
278+
Lint/MixedCaseRange: # new in 1.53
279+
Enabled: true
280+
Lint/NonAtomicFileOperation: # new in 1.31
281+
Enabled: true
282+
Lint/NumericOperationWithConstantResult: # new in 1.69
283+
Enabled: true
284+
Lint/RedundantRegexpQuantifiers: # new in 1.53
285+
Enabled: true
286+
Lint/RedundantTypeConversion: # new in 1.72
287+
Enabled: true
288+
Lint/RefinementImportMethods: # new in 1.27
289+
Enabled: true
290+
Lint/RequireRangeParentheses: # new in 1.32
291+
Enabled: true
292+
Lint/SharedMutableDefault: # new in 1.70
293+
Enabled: true
294+
Lint/SuppressedExceptionInNumberConversion: # new in 1.72
295+
Enabled: true
296+
Lint/UnescapedBracketInRegexp: # new in 1.68
297+
Enabled: true
298+
Lint/UselessConstantScoping: # new in 1.72
299+
Enabled: true
300+
Lint/UselessDefaultValueArgument: # new in 1.76
301+
Enabled: true
302+
Lint/UselessDefined: # new in 1.69
303+
Enabled: true
304+
Lint/UselessNumericOperation: # new in 1.66
305+
Enabled: true
306+
Lint/UselessOr: # new in 1.76
307+
Enabled: true
308+
Lint/UselessRescue: # new in 1.43
309+
Enabled: true
310+
Metrics/CollectionLiteralLength: # new in 1.47
311+
Enabled: true
312+
Naming/PredicateMethod: # new in 1.76
313+
Enabled: true
314+
Security/CompoundHash: # new in 1.28
315+
Enabled: true
316+
Style/AmbiguousEndlessMethodDefinition: # new in 1.68
317+
Enabled: true
318+
Style/ArrayIntersect: # new in 1.40
319+
Enabled: true
320+
Style/ArrayIntersectWithSingleElement: # new in 1.81
321+
Enabled: true
322+
Style/BitwisePredicate: # new in 1.68
323+
Enabled: true
324+
Style/CollectionQuerying: # new in 1.77
325+
Enabled: true
326+
Style/CombinableDefined: # new in 1.68
327+
Enabled: true
328+
Style/ComparableBetween: # new in 1.74
329+
Enabled: true
330+
Style/ComparableClamp: # new in 1.44
331+
Enabled: true
332+
Style/ConcatArrayLiterals: # new in 1.41
333+
Enabled: true
334+
Style/DataInheritance: # new in 1.49
335+
Enabled: true
336+
Style/DigChain: # new in 1.69
337+
Enabled: true
338+
Style/DirEmpty: # new in 1.48
339+
Enabled: true
340+
Style/EmptyHeredoc: # new in 1.32
341+
Enabled: true
342+
Style/EmptyStringInsideInterpolation: # new in 1.76
343+
Enabled: true
344+
Style/EnvHome: # new in 1.29
345+
Enabled: true
346+
Style/ExactRegexpMatch: # new in 1.51
347+
Enabled: true
348+
Style/FetchEnvVar: # new in 1.28
349+
Enabled: true
350+
Style/FileEmpty: # new in 1.48
351+
Enabled: true
352+
Style/FileNull: # new in 1.69
353+
Enabled: true
354+
Style/FileTouch: # new in 1.69
355+
Enabled: true
356+
Style/HashFetchChain: # new in 1.75
357+
Enabled: true
358+
Style/HashSlice: # new in 1.71
359+
Enabled: true
360+
Style/ItAssignment: # new in 1.70
361+
Enabled: true
362+
Style/ItBlockParameter: # new in 1.75
363+
Enabled: true
364+
Style/KeywordArgumentsMerging: # new in 1.68
365+
Enabled: true
366+
Style/MagicCommentFormat: # new in 1.35
367+
Enabled: true
368+
Style/MapCompactWithConditionalBlock: # new in 1.30
369+
Enabled: true
370+
Style/MapIntoArray: # new in 1.63
371+
Enabled: true
372+
Style/MapToSet: # new in 1.42
373+
Enabled: true
374+
Style/MinMaxComparison: # new in 1.42
375+
Enabled: true
376+
Style/ObjectThen: # new in 1.28
377+
Enabled: true
378+
Style/OperatorMethodCall: # new in 1.37
379+
Enabled: true
380+
Style/RedundantArrayConstructor: # new in 1.52
381+
Enabled: true
382+
Style/RedundantArrayFlatten: # new in 1.76
383+
Enabled: true
384+
Style/RedundantConstantBase: # new in 1.40
385+
Enabled: true
386+
Style/RedundantCurrentDirectoryInPath: # new in 1.53
387+
Enabled: true
388+
Style/RedundantDoubleSplatHashBraces: # new in 1.41
389+
Enabled: true
390+
Style/RedundantEach: # new in 1.38
391+
Enabled: true
392+
Style/RedundantFilterChain: # new in 1.52
393+
Enabled: true
394+
Style/RedundantFormat: # new in 1.72
395+
Enabled: true
396+
Style/RedundantHeredocDelimiterQuotes: # new in 1.45
397+
Enabled: true
398+
Style/RedundantInitialize: # new in 1.27
399+
Enabled: true
400+
Style/RedundantInterpolationUnfreeze: # new in 1.66
401+
Enabled: true
402+
Style/RedundantLineContinuation: # new in 1.49
403+
Enabled: true
404+
Style/RedundantRegexpArgument: # new in 1.53
405+
Enabled: true
406+
Style/RedundantRegexpConstructor: # new in 1.52
407+
Enabled: true
408+
Style/RedundantStringEscape: # new in 1.37
409+
Enabled: true
410+
Style/ReturnNilInPredicateMethodDefinition: # new in 1.53
411+
Enabled: true
412+
Style/SafeNavigationChainLength: # new in 1.68
413+
Enabled: true
414+
Style/SendWithLiteralMethodName: # new in 1.64
415+
Enabled: true
416+
Style/SingleLineDoEndBlock: # new in 1.57
417+
Enabled: true
418+
Style/SuperArguments: # new in 1.64
419+
Enabled: true
420+
Style/SuperWithArgsParentheses: # new in 1.58
421+
Enabled: true
422+
Style/YAMLFileRead: # new in 1.53
423+
Enabled: true
245424

246425
############################################################
247426
# rubocop-rails
@@ -337,3 +516,77 @@ Rails/RedundantPresenceValidationOnBelongsTo: # new in 2.13
337516
Enabled: true
338517
Rails/RootJoinChain: # new in 2.13
339518
Enabled: true
519+
Rails/ActionControllerFlashBeforeRender: # new in 2.16
520+
Enabled: true
521+
Rails/ActionControllerTestCase: # new in 2.14
522+
Enabled: true
523+
Rails/ActionOrder: # new in 2.17
524+
Enabled: true
525+
Rails/ActiveSupportOnLoad: # new in 2.16
526+
Enabled: true
527+
Rails/DangerousColumnNames: # new in 2.21
528+
Enabled: true
529+
Rails/DeprecatedActiveModelErrorsMethods: # new in 2.14
530+
Enabled: true
531+
Rails/DotSeparatedKeys: # new in 2.15
532+
Enabled: true
533+
Rails/DuplicateAssociation: # new in 2.14
534+
Enabled: true
535+
Rails/DuplicateScope: # new in 2.14
536+
Enabled: true
537+
Rails/EnumSyntax: # new in 2.26
538+
Enabled: true
539+
Rails/EnvLocal: # new in 2.22
540+
Enabled: true
541+
Rails/FindByOrAssignmentMemoization: # new in 2.33
542+
Enabled: true
543+
Rails/FreezeTime: # new in 2.16
544+
Enabled: true
545+
Rails/HttpStatusNameConsistency: # new in 2.34
546+
Enabled: true
547+
Rails/I18nLazyLookup: # new in 2.14
548+
Enabled: true
549+
Rails/I18nLocaleTexts: # new in 2.14
550+
Enabled: true
551+
Rails/IgnoredColumnsAssignment: # new in 2.17
552+
Enabled: true
553+
Rails/MigrationClassName: # new in 2.14
554+
Enabled: true
555+
Rails/MultipleRoutePaths: # new in 2.29
556+
Enabled: true
557+
Rails/OrderArguments: # new in 2.33
558+
Enabled: true
559+
Rails/RedirectBackOrTo: # new in 2.34
560+
Enabled: true
561+
Rails/RedundantActiveRecordAllMethod: # new in 2.21
562+
Enabled: true
563+
Rails/ResponseParsedBody: # new in 2.18
564+
Enabled: true
565+
Rails/RootPathnameMethods: # new in 2.16
566+
Enabled: true
567+
Rails/RootPublicPath: # new in 2.15
568+
Enabled: true
569+
Rails/SelectMap: # new in 2.21
570+
Enabled: true
571+
Rails/StripHeredoc: # new in 2.15
572+
Enabled: true
573+
Rails/StrongParametersExpect: # new in 2.29
574+
Enabled: true
575+
Rails/ThreeStateBooleanColumn: # new in 2.19
576+
Enabled: true
577+
Rails/ToFormattedS: # new in 2.15
578+
Enabled: true
579+
Rails/ToSWithArgument: # new in 2.16
580+
Enabled: true
581+
Rails/TopLevelHashWithIndifferentAccess: # new in 2.16
582+
Enabled: true
583+
Rails/TransactionExitStatement: # new in 2.14
584+
Enabled: true
585+
Rails/UnusedRenderContent: # new in 2.21
586+
Enabled: true
587+
Rails/WhereMissing: # new in 2.16
588+
Enabled: true
589+
Rails/WhereNotWithMultipleConditions: # new in 2.17
590+
Enabled: true
591+
Rails/WhereRange: # new in 2.25
592+
Enabled: true

‎.ruby-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.1.3
1+
3.3.10

‎CHANGES.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
# 1.0.9 (unreleased)
1+
# 1.1.0 (unreleased)
22

3+
* AP-526: upgrade Ruby, Rails, and other dependencies
4+
* includes changes to support omniauth-cas 3.x
5+
* AP-521: convert healthchecks to okcomputer
36
* AP-487: declare correct mime type for HLS streams
47

58
# 1.0.8 (2025-11-04)

‎Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# The base stage scaffolds elements which are common to building and running
55
# the application, such as installing ca-certificates, creating the app user,
66
# and installing runtime system dependencies.
7-
FROM ruby:3.1.3-slim AS base
7+
FROM ruby:3.3-slim AS base
88

99
# ------------------------------------------------------------
1010
# Declarative metadata
@@ -36,7 +36,8 @@ RUN apt-get update -qq
3636
RUN apt-get install -y --no-install-recommends \
3737
curl \
3838
git \
39-
gpg
39+
gpg \
40+
libyaml-dev
4041

4142
# Install Node.js and Yarn from their own repositories
4243

‎Gemfile‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,18 @@ ruby_version_file = File.expand_path('.ruby-version', __dir__)
55
ruby_version_exact = File.read(ruby_version_file).strip
66
ruby ruby_version_exact
77

8-
gem 'berkeley_library-av-core', '~> 0.4.3'
8+
gem 'berkeley_library-av-core', '~> 0.5.0'
99
gem 'berkeley_library-docker', '~> 0.2.0'
1010
gem 'berkeley_library-logging', '~> 0.2'
1111
gem 'browser', '~> 4.2'
12-
gem 'jbuilder', '~> 2.7'
12+
gem 'jbuilder', '~> 2.13'
13+
gem 'mutex_m'
1314
gem 'non-stupid-digest-assets', '~> 1.0' # Allow static pages (e.g. 404.html) to link to compiled assets
1415
gem 'okcomputer', '~> 1.19'
15-
gem 'omniauth-cas', '~> 2.0'
16+
gem 'omniauth-cas', '~> 3.0'
17+
gem 'omniauth-rails_csrf_protection', '~> 1.0'
1618
gem 'puma', '~> 5.3', '>= 5.3.1'
17-
gem 'rails', '~> 7.0.4'
19+
gem 'rails', '~> 8.0.4'
1820
gem 'rest-client', '~> 2.1'
1921
gem 'sassc-rails', '~> 2.1'
2022
gem 'sprockets', '~> 4.0'
@@ -27,14 +29,15 @@ group :development, :test do
2729
gem 'byebug', platforms: %i[mri mingw x64_mingw]
2830
gem 'colorize'
2931
gem 'dotenv-rails'
30-
gem 'rspec-rails', '~> 5.0'
32+
gem 'rspec-rails', '~> 8.0'
3133
end
3234

3335
group :development do
3436
gem 'listen', '>= 3.0'
35-
gem 'rubocop', '~> 1.26.0'
36-
gem 'rubocop-rails', '~> 2.13.2', require: false
37-
gem 'rubocop-rspec', '~> 2.4.0', require: false
37+
gem 'rubocop', '~> 1.81.7'
38+
gem 'rubocop-rails', '~> 2.34.2', require: false
39+
gem 'rubocop-rspec', '~> 3.8.0', require: false
40+
gem 'rubocop-rspec_rails', require: false
3841
gem 'ruby-prof', '~> 1.4', require: false
3942
gem 'web-console', '>= 4.1.0'
4043
end

0 commit comments

Comments
 (0)