Merge pull request #5157 from consuldemocracy/ruby3.1

Upgrade Ruby to version 3.1.4

.gitlab-ci.yml

@@ -3,7 +3,7 @@ stages:
   - lint
 
 tests:
-  image: "ruby:3.0.6"
+  image: "ruby:3.1.4"
   stage: test
   services:
     - postgres:10.10
@@ -34,7 +34,7 @@ tests:
 # PRONTO_GITLAB_API_PRIVATE_TOKEN to your repository CI/CD settings
 # giving it the value of the Personal Access Token
 linters:
-  image: "ruby:3.0.6"
+  image: "ruby:3.1.4"
   stage: lint
   cache:
     key: consul

.rubocop.yml

@@ -319,6 +319,13 @@ Lint/UselessAssignment:
 Lint/Void:
   Enabled: true
 
+Naming/BlockForwarding:
+  Enabled: true
+  Exclude:
+    - "app/controllers/application_controller.rb"
+    - "app/controllers/management/base_controller.rb"
+    - "app/controllers/subscriptions_controller.rb"
+
 Naming/VariableName:
   Enabled: true
 
@@ -620,6 +627,9 @@ Style/AndOr:
 Style/ArrayCoercion:
   Enabled: true
 
+Style/ArrayIntersect:
+  Enabled: true
+
 Style/BlockDelimiters:
   Enabled: true
 
@@ -646,6 +656,7 @@ Style/HashExcept:
 
 Style/HashSyntax:
   Enabled: true
+  EnforcedShorthandSyntax: either
 
 Style/HashTransformKeys:
   Enabled: true

.ruby-version

@@ -1 +1 @@
-3.0.6
+3.1.4

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.0.6-buster
+FROM ruby:3.1.4-buster
 
 ENV DEBIAN_FRONTEND noninteractive
 

Gemfile.lock

@@ -784,4 +784,4 @@ DEPENDENCIES
   wkhtmltopdf-binary (~> 0.12.6)
 
 BUNDLED WITH
-   2.2.33
+   2.3.26

README.md

@@ -38,7 +38,7 @@ You can access the main website of the project at [http://consuldemocracy.org](h
 
 **NOTE**: For more detailed instructions check the [docs](https://docs.consuldemocracy.org)
 
-Prerequisites: install git, Ruby 3.0.6, CMake, pkg-config, shared-mime-info, Node.js and PostgreSQL (>=9.5).
+Prerequisites: install git, Ruby 3.1.4, CMake, pkg-config, shared-mime-info, Node.js and PostgreSQL (>=9.5).
 
 ```bash
 git clone https://github.com/consuldemocracy/consuldemocracy.git

README_ES.md

@@ -36,7 +36,7 @@ Puedes acceder a la página principal del proyecto en [http://consuldemocracy.or
 
 **NOTA**: para unas instrucciones más detalladas consulta la [documentación](https://docs.consuldemocracy.org)
 
-Prerequisitos: tener instalado git, Ruby 3.0.6, CMake, pkg-config, shared-mime-info, Node.js y PostgreSQL (9.5 o superior).
+Prerequisitos: tener instalado git, Ruby 3.1.4, CMake, pkg-config, shared-mime-info, Node.js y PostgreSQL (9.5 o superior).
 
 ```bash
 git clone https://github.com/consuldemocracy/consuldemocracy.git

app/controllers/stats_controller.rb

@@ -23,7 +23,7 @@ class StatsController < ApplicationController
 
   private
 
-    def daily_cache(key, &block)
-      Rails.cache.fetch("public_stats/#{Time.current.strftime("%Y-%m-%d")}/#{key}", &block)
+    def daily_cache(key, &)
+      Rails.cache.fetch("public_stats/#{Time.current.strftime("%Y-%m-%d")}/#{key}", &)
     end
 end

app/graphql/types/base_object.rb

@@ -1,7 +1,7 @@
 module Types
   class BaseObject < GraphQL::Schema::Object
-    def self.field(*args, **kwargs, &block)
-      super(*args, **kwargs, &block)
+    def self.field(*args, **kwargs, &)
+      super(*args, **kwargs, &)
 
       # The old api contained non-camelized fields
       # We want to support these for now, but throw a deprecation warning
@@ -14,7 +14,7 @@ module Types
       if field_name.to_s.include?("_")
         reason = "Snake case fields are deprecated. Please use #{field_name.to_s.camelize(:lower)}."
         kwargs = kwargs.merge({ camelize: false, deprecation_reason: reason })
-        super(*args, **kwargs, &block)
+        super(*args, **kwargs, &)
       end
 
       # Make sure associations only return public records

app/helpers/globalize_helper.rb

@@ -130,7 +130,7 @@ module GlobalizeHelper
     hidden_field_tag("enabled_translations[#{locale}]", (enabled ? 1 : 0))
   end
 
-  def globalize(locale, &block)
-    Globalize.with_locale(locale, &block)
+  def globalize(locale, &)
+    Globalize.with_locale(locale, &)
   end
 end

app/helpers/translatable_form_helper.rb

@@ -1,6 +1,6 @@
 module TranslatableFormHelper
-  def translatable_form_for(record, options = {}, &block)
-    form_for(record, options.merge(builder: TranslatableFormBuilder), &block)
+  def translatable_form_for(record, options = {}, &)
+    form_for(record, options.merge(builder: TranslatableFormBuilder), &)
   end
 
   def translations_interface_enabled?
@@ -8,7 +8,7 @@ module TranslatableFormHelper
   end
 
   def backend_translations_enabled?
-    (controller.class.module_parents & [Admin, Management, Valuation, SDGManagement]).any?
+    controller.class.module_parents.intersect?([Admin, Management, Valuation, SDGManagement])
   end
 
   def highlight_translation_html_class
@@ -18,13 +18,13 @@ module TranslatableFormHelper
   class TranslatableFormBuilder < ConsulFormBuilder
     attr_accessor :translations
 
-    def translatable_fields(&block)
+    def translatable_fields(&)
       @translations = {}
       visible_locales.map do |locale|
         @translations[locale] = translation_for(locale)
       end
       safe_join(visible_locales.map do |locale|
-        Globalize.with_locale(locale) { fields_for_locale(locale, &block) }
+        Globalize.with_locale(locale) { fields_for_locale(locale, &) }
       end)
     end
 
@@ -46,8 +46,8 @@ module TranslatableFormHelper
         end
       end
 
-      def fields_for_translation(translation, &block)
-        fields_for(:translations, translation, builder: TranslationsFieldsBuilder, &block)
+      def fields_for_translation(translation, &)
+        fields_for(:translations, translation, builder: TranslationsFieldsBuilder, &)
       end
 
       def translation_for(locale)

app/mailers/mailer.rb

@@ -158,8 +158,8 @@ class Mailer < ApplicationMailer
 
   private
 
-    def with_user(user, &block)
-      I18n.with_locale(user.locale, &block)
+    def with_user(user, &)
+      I18n.with_locale(user.locale, &)
     end
 
     def prevent_delivery_to_users_without_email

app/models/budget/stats.rb

@@ -180,7 +180,7 @@ class Budget::Stats
 
     stats_cache(*stats_methods)
 
-    def stats_cache(key, &block)
-      Rails.cache.fetch("budgets_stats/#{budget.id}/#{phases.join}/#{key}/#{version}", &block)
+    def stats_cache(key, &)
+      Rails.cache.fetch("budgets_stats/#{budget.id}/#{phases.join}/#{key}/#{version}", &)
     end
 end

app/models/poll/stats.rb

@@ -117,7 +117,7 @@ class Poll::Stats
 
     stats_cache(*stats_methods)
 
-    def stats_cache(key, &block)
-      Rails.cache.fetch("polls_stats/#{poll.id}/#{key}/#{version}", &block)
+    def stats_cache(key, &)
+      Rails.cache.fetch("polls_stats/#{poll.id}/#{key}/#{version}", &)
     end
 end

app/models/sdg/process_enabled.rb

@@ -43,6 +43,6 @@ class SDG::ProcessEnabled
     def relatable?
       return true if controller_path_name?
 
-      (SDG::Related::RELATABLE_TYPES & [record_or_name.class.name, record_or_name]).any?
+      SDG::Related::RELATABLE_TYPES.intersect?([record_or_name.class.name, record_or_name])
     end
 end

app/models/tenant.rb

@@ -139,9 +139,9 @@ class Tenant < ApplicationRecord
     Apartment::Tenant.switch(...)
   end
 
-  def self.run_on_each(&block)
+  def self.run_on_each(&)
     ["public"].union(Apartment.tenant_names).each do |schema|
-      switch(schema, &block)
+      switch(schema, &)
     end
   end
 

config/deploy.rb

@@ -2,7 +2,7 @@
 lock "~> 3.17.1"
 
 def deploysecret(key, default: "")
-  @deploy_secrets_yml ||= YAML.load_file("config/deploy-secrets.yml")[fetch(:stage).to_s]
+  @deploy_secrets_yml ||= YAML.load_file("config/deploy-secrets.yml", aliases: true)[fetch(:stage).to_s]
   @deploy_secrets_yml.fetch(key.to_s, default)
 end
 

config/puma/defaults.rb

@@ -18,7 +18,6 @@ threads 0, 16
 workers 2
 preload_app!
 
-restart_command "bundle exec --keep-file-descriptors puma"
 plugin :tmp_restart
 
 on_restart do

lib/remote_translations/microsoft/available_locales.rb

@@ -50,7 +50,7 @@ class RemoteTranslations::Microsoft::AvailableLocales
       JSON.parse(result)["translation"].map(&:first)
     end
 
-    def self.daily_cache(key, &block)
-      Rails.cache.fetch("remote_available_locales/#{Time.current.strftime("%Y-%m-%d")}/#{key}", &block)
+    def self.daily_cache(key, &)
+      Rails.cache.fetch("remote_available_locales/#{Time.current.strftime("%Y-%m-%d")}/#{key}", &)
     end
 end

spec/sessions_helper.rb

@@ -1,3 +1,3 @@
-def in_browser(name, &block)
-  Capybara.using_session(name, &block)
+def in_browser(name, &)
+  Capybara.using_session(name, &)
 end