From: Tom Hughes <tom@compton.nu>
Date: Tue, 8 Jun 2021 19:33:25 +0000 (+0100)
Subject: Drop last vestiges of ruby 2.5 support
X-Git-Tag: live~1546
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/baa32464cda54d41c3f5b24a1ddb37fea0fd4917

Drop last vestiges of ruby 2.5 support
---

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index e818884ae..d6a06b549 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         ubuntu: [18.04, 20.04]
-        ruby: [2.5, 2.7, 3.0]
+        ruby: [2.7, 3.0]
     runs-on: ubuntu-${{ matrix.ubuntu }}
     env:
       RAILS_ENV: test
diff --git a/.rubocop.yml b/.rubocop.yml
index 1931eb55f..49fba1d0c 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -7,7 +7,7 @@ require:
   - rubocop-rake
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
   NewCops: enable
   Exclude:
     - 'vendor/**/*'
diff --git a/app/helpers/user_roles_helper.rb b/app/helpers/user_roles_helper.rb
index 79e7cc012..15231f4d0 100644
--- a/app/helpers/user_roles_helper.rb
+++ b/app/helpers/user_roles_helper.rb
@@ -1,6 +1,6 @@
 module UserRolesHelper
   def role_icons(user)
-    safe_join(UserRole::ALL_ROLES.collect { |role| role_icon(user, role) }.compact, " ")
+    safe_join(UserRole::ALL_ROLES.filter_map { |role| role_icon(user, role) }, " ")
   end
 
   def role_icon(user, role)
diff --git a/config/initializers/oauth.rb b/config/initializers/oauth.rb
index 9179e431f..57b89564f 100644
--- a/config/initializers/oauth.rb
+++ b/config/initializers/oauth.rb
@@ -16,7 +16,7 @@ module OAuth
 
     def unescape(value)
       value.to_s.gsub(/%\h{2}/) do |c|
-        c[1..-1].to_i(16).chr
+        c[1..].to_i(16).chr
       end.force_encoding(Encoding::UTF_8)
     end
   end
@@ -52,12 +52,12 @@ module OpenStreetMap
     module ClassMethods
       def included(controller)
         controller.class_eval do
-          def self.before_filter(*names, &blk)
-            before_action(*names, &blk)
+          def self.before_filter(...)
+            before_action(...)
           end
 
-          def self.skip_before_filter(*names, &blk)
-            skip_before_action(*names, &blk)
+          def self.skip_before_filter(...)
+            skip_before_action(...)
           end
         end
 
diff --git a/lib/id.rb b/lib/id.rb
index 4e6cf3b7c..87c4a194e 100644
--- a/lib/id.rb
+++ b/lib/id.rb
@@ -1,3 +1,3 @@
 module ID
-  LOCALES = Locale.list(Rails.root.join("vendor/assets/iD/iD/locales").entries.map { |p| p.basename.to_s[/(.*).json/] && Regexp.last_match(1) }.compact)
+  LOCALES = Locale.list(Rails.root.join("vendor/assets/iD/iD/locales").entries.filter_map { |p| p.basename.to_s[/(.*).json/] && Regexp.last_match(1) })
 end