Upgrade Ruby to 3.4.1 (#416)

jcraigk · Dec 26, 2024 · ce6283f · ce6283f
1 parent e7ea51f
commit ce6283f
Show file tree

Hide file tree

Showing 36 changed files with 79 additions and 137 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,4 +1,13 @@
-/public/attachments
+/public/packs
 /public/packs-test
-/node_modules
 /tmp
+/log/*
+/node_modules
+.git
+.gitignore
+.env
+/spec
+docker-compose.*
+Dockerfile.*
+/yarn-error.log
+/npm-debug.log
diff --git a/.github/workflows/woke.yml b/.github/workflows/woke.yml
diff --git a/.gitignore b/.gitignore
@@ -1,17 +1,14 @@
 .bundle
 .DS_Store
 .env
-/content
 /coverage
 /log
-/public/assets
-/public/audio
 /public/sitemap
-/public/attachments
 /tmp
 /public/packs
 /public/packs-test
 /node_modules
 /yarn-error.log
 yarn-debug.log*
 .yarn-integrity
+.yarn/*
diff --git a/.rspec b/.rspec
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -16,7 +16,7 @@ AllCops:
     - vendor/**/*
     - lib/tasks/*
   NewCops: enable
-  TargetRubyVersion: 3.3.3
+  TargetRubyVersion: 3.4.1
 
 FactoryBot/ExcessiveCreateList:
   Enabled: false

diff --git a/.ruby-version b/.ruby-version
diff --git a/.tool-versions b/.tool-versions
@@ -1 +1 @@
-ruby 3.3.3
+ruby 3.4.1
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 dist: focal
 language: ruby
 rvm:
-  - 3.3.3
+  - 3.4.1
 cache: bundler
 notifications:
   email: false

diff --git a/.wokeignore b/.wokeignore
diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz
diff --git a/DOKKU_SCALE b/DOKKU_SCALE
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.3.3-slim-bullseye
+FROM ruby:3.4.1-slim-bullseye
 
 ARG APP_NAME=phishin
 

diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby "3.3.3"
+ruby "3.4.1"
 
 gem "actionpack-action_caching"
 gem "chronic"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -80,7 +80,7 @@ GEM
     base64 (0.2.0)
     bcrypt (3.1.20)
     benchmark (0.4.0)
-    bigdecimal (3.1.8)
+    bigdecimal (3.1.9)
     builder (3.3.0)
     bullet (8.0.0)
       activesupport (>= 3.0.0)
@@ -107,7 +107,7 @@ GEM
     concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     crass (1.0.6)
-    csv (3.3.1)
+    csv (3.3.2)
     date (3.4.1)
     declarative (0.0.20)
     diff-lcs (1.5.1)
@@ -153,8 +153,7 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-arm64-darwin)
+    ffi (1.17.0)
     friendly_id (5.5.1)
       activerecord (>= 4.0.0)
     fugit (1.11.1)
@@ -224,7 +223,7 @@ GEM
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     json (2.9.1)
-    jwt (2.9.3)
+    jwt (2.10.0)
       base64
     language_server-protocol (3.17.0.3)
     launchy (3.0.1)
@@ -254,18 +253,16 @@ GEM
     mutex_m (0.3.0)
     net-http (0.6.0)
       uri
-    net-imap (0.5.3)
+    net-imap (0.5.4)
       date
       net-protocol
     net-pop (0.1.2)
+      net-protocol
     net-protocol (0.2.2)
       timeout
     net-smtp (0.5.0)
-      net-protocol
     nio4r (2.7.4)
-    nokogiri (1.17.2-aarch64-linux)
-      racc (~> 1.4)
-    nokogiri (1.17.2-arm64-darwin)
+    nokogiri (1.18.0-arm64-darwin)
       racc (~> 1.4)
     oauth (1.1.0)
       oauth-tty (~> 1.0, >= 1.0.1)
@@ -305,7 +302,7 @@ GEM
       rack
     rack-session (2.0.0)
       rack (>= 3.0.0)
-    rack-test (2.1.0)
+    rack-test (2.2.0)
       rack (>= 1.3)
     rackup (2.2.1)
       rack (>= 3)
@@ -350,7 +347,7 @@ GEM
       rainbow (~> 3.0)
     redis-client (0.23.0)
       connection_pool
-    regexp_parser (2.9.3)
+    regexp_parser (2.10.0)
     reline (0.6.0)
       io-console (~> 0.5)
     representable (3.2.0)
@@ -398,7 +395,7 @@ GEM
     rubocop-performance (1.23.0)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.27.0)
+    rubocop-rails (2.28.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.52.0, < 2.0)
@@ -510,8 +507,7 @@ GEM
     zeitwerk (2.7.1)
 
 PLATFORMS
-  aarch64-linux
-  arm64-darwin-23
+  arm64-darwin-24
 
 DEPENDENCIES
   actionpack-action_caching
@@ -569,7 +565,7 @@ DEPENDENCIES
   will_paginate
 
 RUBY VERSION
-   ruby 3.3.3p89
+   ruby 3.4.1p0
 
 BUNDLED WITH
-   2.5.21
+   2.6.2
diff --git a/MIT-LICENSE b/MIT-LICENSE
@@ -1,4 +1,4 @@
-Copyright 2013-2024 Phish.in. https://phish.in
+Copyright 2013-2025 Phish.in. https://phish.in
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

diff --git a/Procfile.dev-static b/Procfile.dev-static
diff --git a/app/api/api_v2/entities/playlist.rb b/app/api/api_v2/entities/playlist.rb
@@ -27,7 +27,7 @@ class ApiV2::Entities::Playlist < ApiV2::Entities::Base
       desc: "The description of the playlist"
     }
 
-  expose(:username) { _1.user.username }
+  expose(:username) { it.user.username }
 
   expose \
     :duration,

diff --git a/app/api/api_v2/entities/show.rb b/app/api/api_v2/entities/show.rb
@@ -66,7 +66,7 @@ class ApiV2::Entities::Show < ApiV2::Entities::Base
       type: "String",
       desc: "Name of the tour the show belongs to"
     }
-  ) { _1.tour.name }
+  ) { it.tour.name }
 
   expose \
     :venue_name,

diff --git a/app/api/api_v2/entities/show_tag.rb b/app/api/api_v2/entities/show_tag.rb
@@ -5,31 +5,31 @@ class ApiV2::Entities::ShowTag < ApiV2::Entities::Base
       type: "String",
       desc: "The name of the tag"
     }
-  ) { _1.tag.name }
+  ) { it.tag.name }
 
   expose(
     :description,
     documentation: {
       type: "String",
       desc: "A description of the tag"
     }
-  ) { _1.tag.description }
+  ) { it.tag.description }
 
   expose(
     :color,
     documentation: {
       type: "String",
       desc: "The color of the tag"
     }
-  ) { _1.tag.color }
+  ) { it.tag.color }
 
   expose(
     :priority,
     documentation: {
       type: "Integer",
       desc: "The display priority of the tag"
     }
-  ) { _1.tag.priority }
+  ) { it.tag.priority }
 
   expose \
     :notes,

diff --git a/app/api/api_v2/entities/track.rb b/app/api/api_v2/entities/track.rb
@@ -94,31 +94,31 @@ class ApiV2::Entities::Track < ApiV2::Entities::Base
       format: "date",
       desc: "Date of the show that the track belongs to"
     }
-  ) { _1.show.date }
+  ) { it.show.date }
 
   expose(
     :show_cover_art_urls,
     documentation: {
       type: "Object",
       desc: "Object containing named URLs for variants of raw cover art images"
     }
-  ) { _1.show.cover_art_urls }
+  ) { it.show.cover_art_urls }
 
   expose(
     :show_album_cover_url,
     documentation: {
       type: "Object",
       desc: "URL of album cover image (text overlayed on cover art)"
     }
-  ) { _1.show.album_cover_url }
+  ) { it.show.album_cover_url }
 
   expose(
     :venue_slug,
     documentation: {
       type: "String",
       desc: "Unique slug of the venue where the show took place"
     }
-  ) { _1.show.venue.slug }
+  ) { it.show.venue.slug }
 
   expose(
     :venue_name,
@@ -127,15 +127,15 @@ class ApiV2::Entities::Track < ApiV2::Entities::Base
       desc: "Name the venue where the show took place, " \
             "reflecting the name used on the date of the show"
     }
-  ) { _1.show.venue_name }
+  ) { it.show.venue_name }
 
   expose(
     :venue_location,
     documentation: {
       type: "String",
       desc: "City and state where the venue of the show was located"
     }
-  ) { _1.show.venue.location }
+  ) { it.show.venue.location }
 
   expose \
     :show,

diff --git a/app/api/api_v2/entities/track_tag.rb b/app/api/api_v2/entities/track_tag.rb
@@ -5,31 +5,31 @@ class ApiV2::Entities::TrackTag < ApiV2::Entities::Base
       type: "String",
       desc: "The name of the tag"
     }
-   ) { _1.tag.name }
+   ) { it.tag.name }
 
   expose(
     :description,
     documentation: {
       type: "String",
       desc: "A description of the tag"
     }
-  ) { _1.tag.description }
+  ) { it.tag.description }
 
   expose(
     :color,
     documentation: {
       type: "String",
       desc: "The color of the tag"
     }
-  ) { _1.tag.color }
+  ) { it.tag.color }
 
   expose(
     :priority,
     documentation: {
       type: "Integer",
       desc: "The display priority of the tag"
     }
-  ) { _1.tag.priority }
+  ) { it.tag.priority }
 
   expose \
     :notes,

diff --git a/app/services/bustout_tag_service.rb b/app/services/bustout_tag_service.rb
@@ -17,7 +17,7 @@ def call
 
   def apply_bustout_tag(track, song, gap)
     ttag = track.track_tags.find do
-      _1.tag == bustout_tag && _1.notes&.include?(song.title)
+      it.tag == bustout_tag && it.notes&.include?(song.title)
     end || track.track_tags.build(tag: bustout_tag)
     ttag.notes = "First performance of #{song.title} in #{gap} shows"
     ttag.save!

diff --git a/app/services/cover_art_prompt_service.rb b/app/services/cover_art_prompt_service.rb
@@ -122,7 +122,7 @@ def call
   def new_prompt
     return @new_prompt if defined?(@new_prompt)
     num = rand < 0.3 ? 1 : 2
-    subjects = CATEGORIES.sample(num).map { chatgpt_response[_1.to_sym].sample }.join(" and ")
+    subjects = CATEGORIES.sample(num).map { chatgpt_response[it.to_sym].sample }.join(" and ")
     @new_prompt =
       "Create an image featuring #{subjects} " \
       "in the style of #{style} with a #{hue} hue."
@@ -137,7 +137,7 @@ def print_response_hints
 
   def song_list
     show.tracks.map do
-      "#{_1.title} by #{_1.songs.first.artist || 'Phish'}"
+      "#{it.title} by #{it.songs.first.artist || 'Phish'}"
     end.join(", ")
   end
 

diff --git a/app/services/debut_tag_service.rb b/app/services/debut_tag_service.rb
@@ -13,7 +13,7 @@ def call
   private
 
   def apply_debut_tag(track)
-    ttag = track.track_tags.find { _1.tag == debut_tag } || track.track_tags.build(tag: debut_tag)
+    ttag = track.track_tags.find { it.tag == debut_tag } || track.track_tags.build(tag: debut_tag)
     ttag.save!
   end
 

diff --git a/bin/bundle b/bin/bundle
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-load Gem.bin_path('bundler', 'bundle')
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
+load Gem.bin_path("bundler", "bundle")