chore(deps): update dependency ruby to v3.1.2 (#299)

* chore(deps): update dependency ruby to v3.1.2

* Fix linting errors

* Update brakeman

* fix lint

* fix another lint

* almost fixed lint

* almost fixe lint (2)

* fixed lint

---------

Co-authored-by: Renovate Bot <[email protected]>
Co-authored-by: Wilco van Beijnum <[email protected]>
Co-authored-by: lodewiges <[email protected]>
Co-authored-by: lodewiges <[email protected]>

.ruby-version

@@ -1 +1 @@
-3.0.4
+3.1.2

Dockerfile

@@ -1,4 +1,5 @@
-FROM ruby:3.0.4-alpine@sha256:d5c7b1207fdfc7a39125c2a33929b974077f6cd1dfdaaca3750d114e5febf32e
+
+FROM ruby:3.1.2-alpine@sha256:0b91e98c4613c2287bb7274a1584ea141b68960fb6b0edd7fe32127dc888d1a0
 
 ARG BUILD_HASH='unknown'
 ENV BUILD_HASH=$BUILD_HASH

Gemfile.lock

@@ -101,7 +101,7 @@ GEM
       debug_inspector (>= 0.0.1)
     bootsnap (1.11.1)
       msgpack (~> 1.2)
-    brakeman (5.2.1)
+    brakeman (5.2.3)
     builder (3.2.4)
     bullet (7.0.1)
       activesupport (>= 3.0.0)

app/controllers/v1/books_controller.rb

@@ -14,8 +14,8 @@ def isbn_lookup # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     author = ActionView::Base.full_sanitizer.sanitize(info['authors'].to_sentence)
     description = ActionView::Base.full_sanitizer.sanitize(info['description'])
     cover_photo = get_cover_photo(volume['id'])
-    data = { title: title, author: author, description: description, isbn: isbn,
-             cover_photo: cover_photo }
+    data = { title:, author:, description:, isbn:,
+             cover_photo: }
     render json: data
   end
 

app/controllers/v1/daily_verses_controller.rb

@@ -24,7 +24,7 @@ def parse_verse(response)
     reference = ActionView::Base.full_sanitizer.sanitize(data['source'])
     content = ActionView::Base.full_sanitizer.sanitize(data['text']['bgt'])
     { data: [{ id: 1, type: 'daily_verse', attributes:
-      { copyright: copyright, reference: reference, content: content } }] }
+      { copyright:, reference:, content: } }] }
   end
 
   def ttl_to_midnight

app/jobs/mail_alias_sync_job.rb

@@ -42,7 +42,7 @@ def moderation_route
     default_options = Rails.application.config.action_mailer.default_url_options
     path = '/api/rails/action_mailbox/improvmx/inbound_emails'
 
-    uri = URI::Generic.build(default_options.merge(path: path))
+    uri = URI::Generic.build(default_options.merge(path:))
     uri.user = 'actionmailbox'
     uri.password = Rails.application.credentials.action_mailbox.fetch(:ingress_password)
 

app/jobs/slack_message_job.rb

@@ -3,6 +3,6 @@ class SlackMessageJob < ApplicationJob
   queue_as :default
 
   def perform(message, channel: nil)
-    ping(message, channel: channel)
+    ping(message, channel:)
   end
 end

app/mailboxes/moderated_mailbox.rb

@@ -9,12 +9,12 @@ def process # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       # Since mail.to contains all recipients, and this function is called once per moderated
       # recipient we need to check if a stored mail has already been created for this inbound_email
       message_id = inbound_email.message_id
-      inbound_email_ids = ActionMailbox::InboundEmail.select('id').where(message_id: message_id)
+      inbound_email_ids = ActionMailbox::InboundEmail.select('id').where(message_id:)
       next if StoredMail.with_deleted
-                        .where(mail_alias: mail_alias)
+                        .where(mail_alias:)
                         .exists?(inbound_email_id: inbound_email_ids)
 
-      stored_mail = StoredMail.create(mail_alias: mail_alias, inbound_email: inbound_email)
+      stored_mail = StoredMail.create(mail_alias:, inbound_email:)
 
       mail_alias.moderators.each do |moderator|
         MailModerationMailer.request_for_moderation_email(moderator, stored_mail).deliver_later

app/mailers/mail_moderation_mailer.rb

@@ -58,6 +58,6 @@ def reminder_for_moderation_email(moderator, stored_mail)
   def to_moderation_url(stored_mail)
     default_options = Rails.application.config.action_mailer.default_url_options
     path = "/mail-moderations/#{stored_mail.id}"
-    URI::Generic.build(default_options.merge(path: path)).to_s
+    URI::Generic.build(default_options.merge(path:)).to_s
   end
 end

app/mailers/user_cleanup_mailer.rb

@@ -6,6 +6,6 @@ def cleanup_email(will_archive_users, archived_users)
               ' staan op het punt gearchiveerd te worden'
     subject = 'Er zijn gebruikers gearchiveerd!' if @will_archive_users.empty?
 
-    mail to: '[email protected];[email protected]', subject: subject
+    mail to: '[email protected];[email protected]', subject:
   end
 end

app/models/activity.rb

@@ -80,7 +80,7 @@ def to_ical # rubocop:disable Metrics/AbcSize
   def copy_author_and_group_to_form!
     return unless form
 
-    form.update(author: author, group: group)
+    form.update(author:, group:)
   end
 
   def small_changes_allowed_on_present_responses

app/models/article.rb

@@ -30,7 +30,7 @@ def owners
   def only_one_pinned_article
     return unless pinned?
 
-    matches = Article.pinned.where.not(id: id)
+    matches = Article.pinned.where.not(id:)
     errors.add(:pinned, 'cannot have more than one pinned article') if matches.exists?
   end
 end

app/models/debit/collection.rb

@@ -41,7 +41,7 @@ def add_transaction(sdd, amount, mandate) # rubocop:disable Metrics/MethodLength
       sdd.add_transaction(
         name: mandate.iban_holder,
         iban: IBANTools::IBAN.new(mandate.iban).code,
-        amount: amount,
+        amount:,
         mandate_id: mandate.id,
         mandate_date_of_signature: mandate.start_date,
         reference: date,
@@ -51,7 +51,7 @@ def add_transaction(sdd, amount, mandate) # rubocop:disable Metrics/MethodLength
     end
 
     def user_amount(user)
-      user_amount = transactions.where(user: user).sum(&:amount)
+      user_amount = transactions.where(user:).sum(&:amount)
       return user_amount if user_amount.positive?
       return if user_amount.zero?
 

app/models/debit/mandate.rb

@@ -15,19 +15,19 @@ class Mandate < ApplicationRecord
             now: Time.zone.now)
     })
 
-    scope :mandates_for, (->(user) { where(user: user) })
+    scope :mandates_for, (->(user) { where(user:) })
 
     private
 
     def unique_on_time_interval?
-      return true unless Debit::Mandate.where.not(id: id).where(user_id: user_id)
+      return true unless Debit::Mandate.where.not(id:).where(user_id:)
                                        .exists?([':start_date BETWEEN start_date AND end_date OR
                                         :end_date BETWEEN start_date AND end_date OR
                                         start_date BETWEEN :start_date AND :end_date OR
                                         end_date BETWEEN :start_date AND :end_date OR
                                         (start_date < :start_date AND end_date IS NULL) OR
                                         (start_date > :start_date AND :end_date IS NULL)',
-                                                 { start_date: start_date, end_date: end_date }])
+                                                 { start_date:, end_date: }])
 
       errors.add(:mandate, 'is not unique on time interval')
       false

app/models/debit/transaction.rb

@@ -6,6 +6,6 @@ class Transaction < ApplicationRecord
     validates :description, presence: true
     validates :amount, presence: true
 
-    scope :transactions_for, (->(user) { where(user: user) })
+    scope :transactions_for, (->(user) { where(user:) })
   end
 end

app/models/forum/thread.rb

@@ -14,7 +14,7 @@ def closed?
     end
 
     def read?(user)
-      thread = Forum::ReadThread.find_or_create_by(thread: self, user: user)
+      thread = Forum::ReadThread.find_or_create_by(thread: self, user:)
       thread.post == posts.last
     end
   end

app/models/import/transaction.rb

@@ -52,8 +52,8 @@ def hash_to_list(hash, user)
         amount = normalize_amount(amount, description, user)
         next if amount.nil? || amount.zero?
 
-        transaction = Debit::Transaction.new(description: description, amount: amount,
-                                             collection: @collection, user: user)
+        transaction = Debit::Transaction.new(description:, amount:,
+                                             collection: @collection, user:)
         (transactions << transaction) && next if transaction.valid?
 
         @errors.add(:import_file, "Transaction #{description} for user #{user.username} is invalid")

app/models/import/user.rb

@@ -32,7 +32,7 @@ def save!(live_run) # rubocop:disable Metrics/MethodLength
     def save_user_to_group(user, group)
       return unless user && group
 
-      Membership.create(user: user, group: group, start_date: Time.zone.now)
+      Membership.create(user:, group:, start_date: Time.zone.now)
     end
 
     def valid? # rubocop:disable Metrics/MethodLength, Metrics/AbcSize

app/models/membership.rb

@@ -19,14 +19,14 @@ class Membership < ApplicationRecord
   private
 
   def unique_on_time_interval?
-    return true unless Membership.where.not(id: id).where(group_id: group_id, user_id: user_id)
+    return true unless Membership.where.not(id:).where(group_id:, user_id:)
                                  .exists?([':start_date BETWEEN start_date AND end_date OR
                                         :end_date BETWEEN start_date AND end_date OR
                                         start_date BETWEEN :start_date AND :end_date OR
                                         end_date BETWEEN :start_date AND :end_date OR
                                         (start_date < :start_date AND end_date IS NULL) OR
                                         (start_date > :start_date AND :end_date IS NULL)',
-                                           { start_date: start_date, end_date: end_date }])
+                                           { start_date:, end_date: }])
 
     errors.add(:membership, 'is not unique on time interval')
     false

app/models/photo_tag.rb

@@ -12,8 +12,7 @@ class PhotoTag < ApplicationRecord
   private
 
   def user_not_already_tagged
-    existing_tag = PhotoTag.where(photo_id: photo_id,
-                                  tagged_user_id: tagged_user_id).where.not(id: id).exists?
+    existing_tag = PhotoTag.where(photo_id:, tagged_user_id:).where.not(id:).exists?
     errors.add(:tagged_user, 'has already been tagged in this photo') if existing_tag
   end
 end

app/models/poll.rb

@@ -13,7 +13,7 @@ class Poll < ApplicationRecord
   def copy_author_to_form!
     return unless form
 
-    form.update(author: author)
+    form.update(author:)
   end
 
   def form_has_at_most_one_question

app/models/quickpost_message.rb

@@ -8,7 +8,7 @@ class QuickpostMessage < ApplicationRecord
   private
 
   def publish_to_message_bus
-    attributes = { id: id, author_id: author.id, message: message, created_at: created_at }
+    attributes = { id:, author_id: author.id, message:, created_at: }
     MessageBus.publish('/quickpost_messages', attributes.to_json, group_ids: [0])
   end
 end

app/models/user.rb

@@ -98,7 +98,7 @@ class User < ApplicationRecord # rubocop:disable Metrics/ClassLength
     scope
   })
   scope :active_users_for_group, (lambda { |group|
-    joins(:memberships).merge(Membership.active.where(group: group))
+    joins(:memberships).merge(Membership.active.where(group:))
   })
 
   def full_name
@@ -153,7 +153,7 @@ def current_group_member?(group)
   end
 
   def activation_url
-    params = { activation_token: activation_token }
+    params = { activation_token: }
     default_options = Rails.application.config.action_mailer.default_url_options
     URI::Generic.build(default_options.merge(path: "/users/#{id}/activate-account",
                                              query: params.to_query)).to_s

app/processors/v1/form/closed_question_answer_processor.rb

@@ -38,7 +38,7 @@ def recreate_resource
     resource_id = params[:resource_id]
     data = params[:data]
 
-    resource = resource_klass.find_by_key(resource_id, context: context)
+    resource = resource_klass.find_by_key(resource_id, context:)
 
     result = resource.replace_fields(data)
 

app/processors/v1/form/open_question_answer_processor.rb

@@ -29,7 +29,7 @@ def recreate_resource
     resource_id = params[:resource_id]
     data = params[:data]
 
-    resource = resource_klass.find_by_key(resource_id, context: context)
+    resource = resource_klass.find_by_key(resource_id, context:)
 
     result = resource.replace_fields(data)
 

app/processors/v1/form/response_processor.rb

@@ -26,7 +26,7 @@ def recreate_resource
     resource_id = params[:resource_id]
     data = params[:data]
 
-    resource = resource_klass.find_by_key(resource_id, context: context)
+    resource = resource_klass.find_by_key(resource_id, context:)
 
     result = resource.replace_fields(data)
 

db/migrate/20170408130108_decouple_activities_and_forms.rb

@@ -14,7 +14,7 @@ def change
 
   def migrate_data_from_form_to_activities
     Form::Form.all.each do |form|
-      activity = Activity.find_by(form: form)
+      activity = Activity.find_by(form:)
       next unless activity
 
       activity.assign_attributes(title: form.title, description: form.description,

db/migrate/20180224135619_add_mandate_model.rb

@@ -13,7 +13,7 @@ def up # rubocop:disable Metrics/AbcSize
     end
 
     User.all.each do |user|
-      Debit::Mandate.create(user: user, uid: user.id,
+      Debit::Mandate.create(user:, uid: user.id,
                             iban: user.iban,
                             iban_holder: user.iban_holder,
                             start_date: Time.zone.now)

db/seeds/content.rb

@@ -37,7 +37,7 @@
 
 articles.each do |article|
   members.sample(6).each do |user|
-    FactoryBot.create(:article_comment, article: article, author: user)
+    FactoryBot.create(:article_comment, article:, author: user)
   end
 end
 
@@ -67,19 +67,19 @@
   closed_questions = FactoryBot.create_list(:closed_question, 4, form: activity.form)
 
   closed_questions.each do |question|
-    FactoryBot.create_list(:closed_question_option, 3, question: question)
+    FactoryBot.create_list(:closed_question_option, 3, question:)
   end
 
   members.sample(3).each do |user|
-    response = FactoryBot.create(:response, form: activity.form, user: user)
+    response = FactoryBot.create(:response, form: activity.form, user:)
 
     closed_questions.each do |question|
       FactoryBot.create(:closed_question_answer, option: question.options.sample,
-                                                 response: response)
+                                                 response:)
     end
 
     open_questions.each do |open_question|
-      FactoryBot.create(:open_question_answer, question: open_question, response: response)
+      FactoryBot.create(:open_question_answer, question: open_question, response:)
     end
   end
 end
@@ -93,15 +93,15 @@
   closed_questions = FactoryBot.create_list(:closed_question, 1, form: poll.form)
 
   closed_questions.each do |question|
-    FactoryBot.create_list(:closed_question_option, 3, question: question)
+    FactoryBot.create_list(:closed_question_option, 3, question:)
   end
 
   members.sample(3).each do |user|
-    response = FactoryBot.create(:response, form: poll.form, user: user)
+    response = FactoryBot.create(:response, form: poll.form, user:)
 
     closed_questions.each do |question|
       FactoryBot.create(:closed_question_answer, option: question.options.sample,
-                                                 response: response)
+                                                 response:)
     end
   end
 end
@@ -113,21 +113,21 @@
 
 forum_categories.each do |category|
   members.sample(4).each do |member|
-    forum_threads << FactoryBot.create(:thread, author: member, category: category)
+    forum_threads << FactoryBot.create(:thread, author: member, category:)
   end
 end
 
 forum_threads.each do |thread|
-  forum_posts << FactoryBot.create(:post, thread: thread, author: thread.author)
+  forum_posts << FactoryBot.create(:post, thread:, author: thread.author)
   members.sample(24).each do |member|
-    forum_posts << FactoryBot.create(:post, thread: thread, author: member)
+    forum_posts << FactoryBot.create(:post, thread:, author: member)
   end
 end
 
 bestuur = Group.find_by(name: 'Bestuur').users
 
 bestuur.each do |user|
-  FactoryBot.create(:board_room_presence, user: user)
+  FactoryBot.create(:board_room_presence, user:)
 end
 
 FactoryBot.create_list(:static_page, 3)
@@ -137,7 +137,7 @@
 
 collections.each do |collection|
   members.sample(8).each do |member|
-    FactoryBot.create(:transaction, collection: collection, user: member)
+    FactoryBot.create(:transaction, collection:, user: member)
   end
 end