➖ Drop Rails 5.2 and 6.0

Author: pboling

.github/workflows/unsupported.yml

@@ -36,22 +36,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # Ruby 2.7, Rails 5.2
-          - ruby: "ruby-2.7"
-            appraisal: "rails-5-2"
-            exec_cmd: "rake test"
-            gemfile: "Appraisal.root"
-            rubygems: '3.4.22'
-            bundler: '2.4.22'
-
-          # Ruby 2.7, Rails 6.0
-          - ruby: "ruby-2.7"
-            appraisal: "rails-6-0"
-            exec_cmd: "rake test"
-            gemfile: "Appraisal.root"
-            rubygems: '3.4.22'
-            bundler: '2.4.22'
-
           # Ruby 2.7, Rails 6.1
           - ruby: "ruby-2.7"
             appraisal: "rails-6-1"

Appraisals

@@ -1,32 +1,5 @@
 # frozen_string_literal: true
 
-# Compat: Ruby >= 2.2.2
-# Test Matrix:
-#   - Ruby 2.7
-appraise "rails-5-2" do
-  # Load order is very important with combustion!
-  gem "combustion", "~> 1.5"
-  gem "sqlite3", "~> 1.4"
-
-  gem "rails", "~> 5.2.8.1"
-  gem "nokogiri"
-  eval_gemfile "modular/mini_testing.gemfile"
-  remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
-end
-
-# Compat: Ruby >= 2.5
-# Test Matrix:
-#   - Ruby 2.7
-appraise "rails-6-0" do
-  # Load order is very important with combustion!
-  gem "combustion", "~> 1.5"
-  gem "sqlite3", "~> 1.4"
-
-  gem "rails", "~> 6.0.6.1"
-  eval_gemfile "modular/mini_testing.gemfile"
-  remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
-end
-
 # Compat: Ruby >= 2.5
 # Test Matrix:
 #   - Ruby 2.7

README.md

@@ -59,8 +59,7 @@ client-server communication (like requesting simple registration data).
 ### Introduction
 
 `masq2` adds ORACLE database support, as well as support for
-Rails 5.2, 6.0, 6.1, 7.0, 7.1, 7.2, 8.0,
-which `masq` never had.
+Rails 6.1, 7.0, 7.1, 7.2, 8.0, which `masq` never had.
 
 The main functionality is in the server controller, which is the endpoint for incoming
 OpenID requests. The server controller is supposed to only interact with relying parties
@@ -78,7 +77,6 @@ Rails 5.2.8.1 is a security patch release to fix CVE-2022-32224.
 See: https://discuss.rubyonrails.org/t/cve-2022-32224-possible-rce-escalation-bug-with-serialized-columns-in-active-record/81017
 
 The patch (Rails v5.2.8.1) causes an error with `masq` v0.3.4
-(... actually it doesn't work at all on Rails v5, but some forks have been fixed):
 
 ```
 Psych::DisallowedClass: Tried to load unspecified class: ActiveSupport::HashWithIndifferentAccess
@@ -91,14 +89,15 @@ serialize :parameters, Hash
 
 so we instead switch to serializing as JSON:
 ```ruby
-serialize :parameters, JSON
+# serialize :parameters, JSON # Would be for Rails 5.2/6.0, but this gem has already dropped support for Rails 5.2/6.0
+serialize :parameters, type: Hash, coder: JSON
 ```
 
 If an implementation needs to continue using the serialized Hash,
 you will need to override the definition by reopening the model, and adding:
 
 ```ruby
-serialize :parameters, Hash
+serialize :parameters, type: Hash, coder: Hash
 ```
 
 In addition, one of the following is also needed.

app/models/masq/open_id_request.rb

@@ -2,9 +2,6 @@ module Masq
   class OpenIdRequest < ActiveRecord::Base
     validates_presence_of :token, :parameters
 
-    def make_token
-      self.token = Digest::SHA1.hexdigest(Time.now.to_s.split("").sort_by { rand }.join)
-    end
     before_validation :make_token, on: :create
 
     serialize :parameters, type: Hash, coder: JSON
@@ -31,5 +28,11 @@ def from_trusted_domain?
 
       Masq::Engine.config.masq["trusted_domains"].find { |domain| host.to_s.ends_with?(domain) }
     end
+
+    protected
+
+    def make_token
+      self.token = Digest::SHA1.hexdigest(Time.now.to_s.split("").sort_by { rand }.join)
+    end
   end
 end

gemfiles/rails_5_2.gemfile

@@ -1,3 +1,12 @@
+---
 test:
-  adapter:  sqlite3
-  database: db/combustion_test.sqlite
+  adapter: sqlite3
+  database: db/test.sqlite3
+  username:
+  password:
+  port:
+  socket:
+  host: localhost
+  encoding: utf8
+  pool: 5
+  timeout: 5000