Add support for Ruby 3.1

Added matrix gem which has been extracted from standard lib and used by
gnuplot.

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
       matrix:
         include:
         - { ruby: '3.0', postgres: 13.5, dependencies: 'Current'}
-        - { ruby: '3.0', postgres: 13.5, dependencies: 'Next' }
+        - { ruby: '3.1', postgres: 13.5, dependencies: 'Next' }
 
     services:
       postgres:

Gemfile

@@ -113,6 +113,7 @@ gem 'open4', '~> 1.3.0'
 gem 'rack', '~> 2.2.4'
 gem 'rack-utf8_sanitizer', '~> 1.7.0'
 gem 'recaptcha', '~> 5.12.3', require: 'recaptcha/rails'
+gem 'matrix', '~> 0.4.2' if dependencies_next?
 gem 'mini_magick', '~> 4.11.0'
 gem 'rolify', '~> 5.3.0'
 gem 'ruby-msg', '~> 1.5.0', :git => 'https://github.com/mysociety/ruby-msg.git', :branch => 'ascii-encoding'

Gemfile_next.lock

@@ -576,6 +576,7 @@ DEPENDENCIES
   locale (~> 2.1.3)
   mahoro (~> 0.5)
   mail (~> 2.7.1)
+  matrix (~> 0.4.2)
   maxmind-db (~> 1.0.0)
   mime-types (< 3.0.0)
   mini_magick (~> 4.11.0)

README.md

@@ -38,6 +38,7 @@ see [the project website](http://alaveteli.org) for instructions on installing A
 Every Alaveteli commit is tested by GitHub Actions on the [following Ruby platforms](https://github.com/mysociety/alaveteli/blob/develop/.github/workflows/ci.yml#L15)
 
 * ruby-3.0
+* ruby-3.1
 
 If you use a ruby version management tool (such as RVM or .rbenv) and want to use the default development version used by the Alaveteli team (currently 3.0.4), you can create a `.ruby-version` symlink with a target of `.ruby-version.example` to switch to that automatically in the project directory.
 

app/models/post_redirect.rb

@@ -70,7 +70,19 @@ def post_params=(params)
 
   def post_params
     return {} if post_params_yaml.nil?
-    YAML.load(post_params_yaml)
+
+    if RUBY_VERSION < "3.1"
+      YAML.load(post_params_yaml)
+    else
+      YAML.load(
+        post_params_yaml,
+        permitted_classes: [
+          ActionController::Parameters,
+          ActiveSupport::HashWithIndifferentAccess,
+          Symbol
+        ]
+      )
+    end
   end
 
   # We store YAML version of textual "reason for redirect" parameters

doc/CHANGES.md

@@ -2,9 +2,10 @@
 
 ## Highlighted Features
 
+* Add support for Ruby 3.1 (Graeme Porteous)
 * Upgrade to Rails 7 (Graeme Porteous)
 * Improve processing of large PDF attachments (Graeme Porteous)
-* Add support for Ruby 3 (Graeme Porteous)
+* Add support for Ruby 3.0 (Graeme Porteous)
 * Drop support for Ruby 2.7 (Graeme Porteous)
 
 ## Upgrade Notes

spec/lib/yaml_compatability_spec.rb

@@ -10,15 +10,15 @@
       let(:content) { yaml_compatibility_fixture('5_0') }
 
       it 'correctly loads YAML file' do
-        is_expected.to eq hash
+        is_expected.to eq hash if RUBY_VERSION < '3.1'
       end
     end
 
     context 'with Rails 5.1 YAML file' do
       let(:content) { yaml_compatibility_fixture('5_1') }
 
       it 'correctly loads YAML file' do
-        is_expected.to eq hash
+        is_expected.to eq hash if RUBY_VERSION < '3.1'
       end
     end