diff --git a/.ruby-version b/.ruby-version index 7921bd0..7636e75 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.4.8 +4.0.5 diff --git a/Gemfile b/Gemfile index d3eb8ab..9652426 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ # frozen_string_literal: true source 'https://rubygems.org' -ruby '3.4.8' +ruby '4.0.5' gem 'active_storage_validations' gem 'acts-as-taggable-on' diff --git a/Gemfile.lock b/Gemfile.lock index fcfe3aa..cd29482 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -93,11 +93,11 @@ GEM ffi-compiler (~> 1.0) ast (2.4.3) aws-eventstream (1.4.0) - aws-partitions (1.1241.0) + aws-partitions (1.1262.0) aws-sdk-cloudfront (1.143.0) aws-sdk-core (~> 3, >= 3.244.0) aws-sigv4 (~> 1.5) - aws-sdk-core (3.246.0) + aws-sdk-core (3.252.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) @@ -105,11 +105,11 @@ GEM bigdecimal jmespath (~> 1, >= 1.6.1) logger - aws-sdk-kms (1.123.0) - aws-sdk-core (~> 3, >= 3.244.0) + aws-sdk-kms (1.129.0) + aws-sdk-core (~> 3, >= 3.248.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.220.0) - aws-sdk-core (~> 3, >= 3.244.0) + aws-sdk-s3 (1.226.0) + aws-sdk-core (~> 3, >= 3.248.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) aws-sigv4 (1.12.1) @@ -174,7 +174,7 @@ GEM railties (>= 5.0) climate_control (1.2.0) coderay (1.1.3) - concurrent-ruby (1.3.6) + concurrent-ruby (1.3.7) connection_pool (3.0.2) crass (1.0.6) dalli (5.0.2) @@ -219,7 +219,7 @@ GEM ruby-progressbar (~> 1.4) globalid (1.3.0) activesupport (>= 6.1) - i18n (1.14.8) + i18n (1.15.2) concurrent-ruby (~> 1.0) image_processing (1.14.0) mini_magick (>= 4.9.5, < 6) @@ -238,7 +238,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.19.4) + json (2.20.0) language_server-protocol (3.17.0.5) launchy (3.1.1) addressable (~> 2.8) @@ -266,11 +266,11 @@ GEM logger mini_mime (1.1.5) mini_portile2 (2.8.9) - minitest (6.0.5) + minitest (6.0.6) drb (~> 2.0) prism (~> 1.5) mutex_m (0.3.0) - net-imap (0.6.4) + net-imap (0.6.4.1) date net-protocol net-pop (0.1.2) @@ -285,24 +285,24 @@ GEM net-protocol net-ssh (7.3.2) nio4r (2.7.5) - nokogiri (1.19.2) + nokogiri (1.19.4) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.19.2-aarch64-linux-gnu) + nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) - nokogiri (1.19.2-aarch64-linux-musl) + nokogiri (1.19.4-aarch64-linux-musl) racc (~> 1.4) - nokogiri (1.19.2-arm-linux-gnu) + nokogiri (1.19.4-arm-linux-gnu) racc (~> 1.4) - nokogiri (1.19.2-arm-linux-musl) + nokogiri (1.19.4-arm-linux-musl) racc (~> 1.4) - nokogiri (1.19.2-arm64-darwin) + nokogiri (1.19.4-arm64-darwin) racc (~> 1.4) - nokogiri (1.19.2-x86_64-darwin) + nokogiri (1.19.4-x86_64-darwin) racc (~> 1.4) - nokogiri (1.19.2-x86_64-linux-gnu) + nokogiri (1.19.4-x86_64-linux-gnu) racc (~> 1.4) - nokogiri (1.19.2-x86_64-linux-musl) + nokogiri (1.19.4-x86_64-linux-musl) racc (~> 1.4) ostruct (0.6.3) parallel (2.1.0) @@ -329,7 +329,7 @@ GEM date stringio public_suffix (7.0.5) - puma (8.0.0) + puma (8.0.2) nio4r (~> 2.0) racc (1.8.1) rack (3.2.6) @@ -410,7 +410,7 @@ GEM rspec-mocks (>= 3.13.0, < 5.0.0) rspec-support (>= 3.13.0, < 5.0.0) rspec-support (3.13.7) - rubocop (1.86.1) + rubocop (1.88.0) json (~> 2.3) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.1.0) @@ -428,7 +428,7 @@ GEM lint_roller (~> 1.1) rubocop (>= 1.75.0, < 2.0) rubocop-ast (>= 1.47.1, < 2.0) - rubocop-rails (2.34.3) + rubocop-rails (2.35.5) activesupport (>= 4.2.0) lint_roller (~> 1.1) rack (>= 1.1) @@ -582,7 +582,7 @@ DEPENDENCIES will_paginate RUBY VERSION - ruby 3.4.8p72 + ruby 4.0.5p0 BUNDLED WITH 2.7.2 diff --git a/app/controllers/admin/tracks_controller.rb b/app/controllers/admin/tracks_controller.rb index f97efa4..d9081d2 100644 --- a/app/controllers/admin/tracks_controller.rb +++ b/app/controllers/admin/tracks_controller.rb @@ -12,7 +12,7 @@ def index end def show - @track = Track.friendly.find(params[:id]) + @track = Track.friendly.find(params.expect(:id)) respond_to do |format| format.html # show.html.erb @@ -30,13 +30,13 @@ def new end def clone - @track = Track.friendly.find(params[:id]).dup + @track = Track.friendly.find(params.expect(:id)).dup @track.published = false render 'new' end def edit - @track = Track.friendly.find(params[:id]) + @track = Track.friendly.find(params.expect(:id)) end def create @@ -53,7 +53,7 @@ def create end def update - @track = Track.friendly.find(params[:id]) + @track = Track.friendly.find(params.expect(:id)) respond_to do |format| if @track.update(track_params) format.html { redirect_to admin_track_path(@track), notice: 'Track was successfully updated.' } @@ -66,7 +66,7 @@ def update end def destroy - @track = Track.friendly.find(params[:id]) + @track = Track.friendly.find(params.expect(:id)) @track.destroy respond_to do |format| diff --git a/app/controllers/tracks_controller.rb b/app/controllers/tracks_controller.rb index 6f0f0d3..914a928 100644 --- a/app/controllers/tracks_controller.rb +++ b/app/controllers/tracks_controller.rb @@ -2,7 +2,7 @@ class TracksController < ApplicationController def show - @track = Track.friendly.find(params[:id]) + @track = Track.friendly.find(params.expect(:id)) respond_to do |format| format.html format.json { render json: TrackSerializer.new(@track).serialized_json } diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index cd0183c..a6fafdc 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -19,6 +19,6 @@ def index def tags_params return unless params.key?(:tags) - [params[:tags].split(',')].flatten.map { |t| t.strip.downcase }.uniq.sort + [params.expect(:tags).split(',')].flatten.map { |t| t.strip.downcase }.uniq.sort end end