From 3fbd28f2a7b6aa693391be13d7b67aab5824da99 Mon Sep 17 00:00:00 2001
From: Dave Steinberg <dave@steinbergcomputing.com>
Date: Thu, 4 Dec 2025 22:06:42 +0000
Subject: [PATCH 1/3] add ruby 3.3 + 3.4; rails 7.1 + 7.2 ; drop EOL rubies and
 rails 5.x

---
 .github/workflows/ruby.yml                    | 27 ++-----------------
 gemfiles/rails52.gemfile                      |  8 ------
 gemfiles/{rails50.gemfile => rails71.gemfile} |  2 +-
 gemfiles/{rails51.gemfile => rails72.gemfile} |  2 +-
 4 files changed, 4 insertions(+), 35 deletions(-)
 delete mode 100644 gemfiles/rails52.gemfile
 rename gemfiles/{rails50.gemfile => rails71.gemfile} (81%)
 rename gemfiles/{rails51.gemfile => rails72.gemfile} (81%)

diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index 0fc4636..93d4344 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -13,31 +13,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        gemfile: [rails50, rails51, rails52, rails60, rails61, rails70]
-        ruby: ["2.5", "2.6", "2.7", "3.0", "3.1", "3.2"]
-        exclude:
-          - gemfile: rails50g
-            ruby: "3.0"
-          - gemfile: rails51
-            ruby: "3.0"
-          - gemfile: rails52
-            ruby: "3.0"
-          - gemfile: rails50
-            ruby: "3.1"
-          - gemfile: rails51
-            ruby: "3.1"
-          - gemfile: rails52
-            ruby: "3.1"
-          - gemfile: rails50
-            ruby: "3.2"
-          - gemfile: rails51
-            ruby: "3.2"
-          - gemfile: rails52
-            ruby: "3.2"
-          - gemfile: rails70
-            ruby: "2.5"
-          - gemfile: rails70
-            ruby: "2.6"
+        gemfile: [rails60, rails61, rails70, rails71, rails72]
+        ruby: ["3.2", "3.3", "3.4"]
 
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
diff --git a/gemfiles/rails52.gemfile b/gemfiles/rails52.gemfile
deleted file mode 100644
index f956cf6..0000000
--- a/gemfiles/rails52.gemfile
+++ /dev/null
@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-gemspec path: '../'
-
-group :development, :test do
-  gem 'rails', '~> 5.2.0'
-end
diff --git a/gemfiles/rails50.gemfile b/gemfiles/rails71.gemfile
similarity index 81%
rename from gemfiles/rails50.gemfile
rename to gemfiles/rails71.gemfile
index 39e73c8..a6d30a0 100644
--- a/gemfiles/rails50.gemfile
+++ b/gemfiles/rails71.gemfile
@@ -4,5 +4,5 @@ source 'https://rubygems.org'
 gemspec path: '../'
 
 group :development, :test do
-  gem 'rails', '~> 5.0.0'
+  gem 'rails', '~> 7.1.0'
 end
diff --git a/gemfiles/rails51.gemfile b/gemfiles/rails72.gemfile
similarity index 81%
rename from gemfiles/rails51.gemfile
rename to gemfiles/rails72.gemfile
index 25b10f5..db84780 100644
--- a/gemfiles/rails51.gemfile
+++ b/gemfiles/rails72.gemfile
@@ -4,5 +4,5 @@ source 'https://rubygems.org'
 gemspec path: '../'
 
 group :development, :test do
-  gem 'rails', '~> 5.1.0'
+  gem 'rails', '~> 7.2.0'
 end

From 7d0139c2a302c5283db7742a6a7d96e79a1b0b1c Mon Sep 17 00:00:00 2001
From: Dave Steinberg <dave@steinbergcomputing.com>
Date: Thu, 4 Dec 2025 22:10:01 +0000
Subject: [PATCH 2/3] drop rails 6 as well since its long EOL

---
 .github/workflows/ruby.yml | 2 +-
 gemfiles/rails60.gemfile   | 8 --------
 gemfiles/rails61.gemfile   | 8 --------
 3 files changed, 1 insertion(+), 17 deletions(-)
 delete mode 100644 gemfiles/rails60.gemfile
 delete mode 100644 gemfiles/rails61.gemfile

diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index 93d4344..40fef77 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        gemfile: [rails60, rails61, rails70, rails71, rails72]
+        gemfile: [rails70, rails71, rails72]
         ruby: ["3.2", "3.3", "3.4"]
 
     env:
diff --git a/gemfiles/rails60.gemfile b/gemfiles/rails60.gemfile
deleted file mode 100644
index 4f3b0f7..0000000
--- a/gemfiles/rails60.gemfile
+++ /dev/null
@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-gemspec path: '../'
-
-group :development, :test do
-  gem 'rails', '~> 6.0.0'
-end
diff --git a/gemfiles/rails61.gemfile b/gemfiles/rails61.gemfile
deleted file mode 100644
index 1a3c8a9..0000000
--- a/gemfiles/rails61.gemfile
+++ /dev/null
@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-gemspec path: '../'
-
-group :development, :test do
-  gem 'rails', '~> 6.1.0'
-end

From 952e667529f5804ff65719e08b368f92ad084745 Mon Sep 17 00:00:00 2001
From: Dave Steinberg <dave@steinbergcomputing.com>
Date: Thu, 4 Dec 2025 22:13:13 +0000
Subject: [PATCH 3/3] add require's for OpenStruct, since it is moving out of
 the standard library

---
 rails_warden.gemspec | 1 +
 spec/spec_helper.rb  | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/rails_warden.gemspec b/rails_warden.gemspec
index 71be97f..f0ed334 100644
--- a/rails_warden.gemspec
+++ b/rails_warden.gemspec
@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "ostruct"
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 711851f..f77c2fd 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -3,6 +3,7 @@
 require "rails_warden"
 
 require "action_controller"
+require "ostruct"
 
 $TESTING=true
 
@@ -20,4 +21,4 @@
   end
 
   config.order = :random
-end
\ No newline at end of file
+end