Merge pull request #5074 from consul/ruby3.0

Upgrade Ruby to version 3.0.6
consuldemocracy · Apr 13, 2023 · 03a12ea · 03a12ea
2 parents 8e0acb8 + f298715
commit 03a12ea
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 16 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ stages:
   - lint
 
 tests:
-  image: "ruby:2.7.7"
+  image: "ruby:3.0.6"
   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:2.7.7"
+  image: "ruby:3.0.6"
   stage: lint
   cache:
     key: consul

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -505,6 +505,9 @@ Style/FileWrite:
 Style/HashConversion:
   Enabled: true
 
+Style/HashExcept:
+  Enabled: true
+
 Style/HashSyntax:
   Enabled: true
 

diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.7.7
+3.0.6
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.7.7-buster
+FROM ruby:3.0.6-buster
 
 ENV DEBIAN_FRONTEND noninteractive
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,6 +1,11 @@
 GEM
-  remote: https://rubygems.org/
   remote: https://rails-assets.org/
+  specs:
+    rails-assets-leaflet (1.5.1)
+    rails-assets-markdown-it (9.0.1)
+
+GEM
+  remote: https://rubygems.org/
   specs:
     actioncable (6.0.6.1)
       actionpack (= 6.0.6.1)
@@ -457,8 +462,6 @@ GEM
       bundler (>= 1.3.0)
       railties (= 6.0.6.1)
       sprockets-rails (>= 2.0.0)
-    rails-assets-leaflet (1.5.1)
-    rails-assets-markdown-it (9.0.1)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
@@ -768,4 +771,4 @@ DEPENDENCIES
   wkhtmltopdf-binary (~> 0.12.6)
 
 BUNDLED WITH
-   2.1.4
+   2.2.33
diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ You can access the main website of the project at [http://consulproject.org](htt
 
 **NOTE**: For more detailed instructions check the [docs](https://docs.consulproject.org)
 
-Prerequisites: install git, Ruby 2.7.7, CMake, pkg-config, shared-mime-info, Node.js and PostgreSQL (>=9.5).
+Prerequisites: install git, Ruby 3.0.6, CMake, pkg-config, shared-mime-info, Node.js and PostgreSQL (>=9.5).
 
 ```bash
 git clone https://github.com/consul/consul.git

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

diff --git a/app/helpers/embed_videos_helper.rb b/app/helpers/embed_videos_helper.rb
@@ -1,6 +1,6 @@
 module EmbedVideosHelper
-  VIMEO_REGEX = /vimeo.*(staffpicks\/|channels\/|videos\/|video\/|\/)([^#\&\?]*).*/.freeze
-  YOUTUBE_REGEX = /youtu.*(be\/|v\/|u\/\w\/|embed\/|watch\?v=|\&v=)([^#\&\?]*).*/.freeze
+  VIMEO_REGEX = /vimeo.*(staffpicks\/|channels\/|videos\/|video\/|\/)([^#\&\?]*).*/
+  YOUTUBE_REGEX = /youtu.*(be\/|v\/|u\/\w\/|embed\/|watch\?v=|\&v=)([^#\&\?]*).*/
 
   def embedded_video_code(resource)
     link = resource.video_url

diff --git a/app/models/legislation/process.rb b/app/models/legislation/process.rb
@@ -24,7 +24,7 @@ class Legislation::Process < ApplicationRecord
   PHASES_AND_PUBLICATIONS = %i[homepage_phase draft_phase debate_phase allegations_phase
                                proposals_phase draft_publication result_publication].freeze
 
-  CSS_HEX_COLOR = /\A#?(?:[A-F0-9]{3}){1,2}\z/i.freeze
+  CSS_HEX_COLOR = /\A#?(?:[A-F0-9]{3}){1,2}\z/i
 
   has_many :draft_versions, -> { order(:id) },
     foreign_key: "legislation_process_id",

diff --git a/app/models/poll/question/answer/video.rb b/app/models/poll/question/answer/video.rb
@@ -1,8 +1,8 @@
 class Poll::Question::Answer::Video < ApplicationRecord
   belongs_to :answer, class_name: "Poll::Question::Answer"
 
-  VIMEO_REGEX = /vimeo.*(staffpicks\/|channels\/|videos\/|video\/|\/)([^#\&\?]*).*/.freeze
-  YOUTUBE_REGEX = /youtu.*(be\/|v\/|u\/\w\/|embed\/|watch\?v=|\&v=)([^#\&\?]*).*/.freeze
+  VIMEO_REGEX = /vimeo.*(staffpicks\/|channels\/|videos\/|video\/|\/)([^#\&\?]*).*/
+  YOUTUBE_REGEX = /youtu.*(be\/|v\/|u\/\w\/|embed\/|watch\?v=|\&v=)([^#\&\?]*).*/
 
   validates :title, presence: true
   validate :valid_url?

diff --git a/app/models/progress_bar.rb b/app/models/progress_bar.rb
@@ -1,6 +1,6 @@
 class ProgressBar < ApplicationRecord
   self.inheritance_column = nil
-  RANGE = (0..100).freeze
+  RANGE = (0..100)
 
   enum kind: %i[primary secondary]
 

diff --git a/spec/models/skip_validation_spec.rb b/spec/models/skip_validation_spec.rb
@@ -58,6 +58,7 @@ def self.name
         translates :title, touch: true
         translates :description, touch: true
         include Globalizable
+        has_many :translations, class_name: "DummyBanner::Translation", foreign_key: "banner_id"
 
         validates_translation :title, presence: true
         validates_translation :description, presence: true