From 127d8a55fad9ac2b5cd8d050d702288301d577c7 Mon Sep 17 00:00:00 2001
From: Brian Shand <Brian.Shand@nhs.net>
Date: Tue, 21 Oct 2025 23:38:44 +0100
Subject: [PATCH] Support Ruby 3.4, Rails 8.0

---
 .github/workflows/test.yml | 10 ++++++++++
 CHANGELOG.md               |  3 ++-
 Rakefile                   |  6 +++---
 gemfiles/Gemfile.rails80   |  5 +++++
 ndr_ui.gemspec             |  2 +-
 5 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 gemfiles/Gemfile.rails80

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2acc703..11a1025 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,18 +5,28 @@ on: [push]
 jobs:
   test:
     strategy:
+      fail-fast: false
       matrix:
         ruby-version:
           - '3.0'
           - '3.1'
           - '3.2'
           - '3.3'
+          - '3.4'
         gemfile:
           - gemfiles/Gemfile.rails61
           - gemfiles/Gemfile.rails70
           - gemfiles/Gemfile.rails71
           - gemfiles/Gemfile.rails72
+          - gemfiles/Gemfile.rails80
         exclude:
+          # rails 6.1 requires ruby < 3.4
+          - ruby-version: '3.4'
+            gemfile: 'gemfiles/Gemfile.rails61'
+          # rails 7.0 requires ruby >= 2.7, < 3.4
+          # https://www.fastruby.io/blog/ruby/rails/versions/compatibility-table.html
+          - ruby-version: '3.4'
+            gemfile: 'gemfiles/Gemfile.rails70'
           # rails 7.2 requires ruby >= 3.1
           # https://www.fastruby.io/blog/ruby/rails/versions/compatibility-table.html
           - ruby-version: '3.0'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2111ef3..e17a38f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## [Unreleased]
-* no unreleased changes *
+### Fixed
+* Support Ruby 3.4, Rails 8.0
 
 ## 5.0.3 / 2025-03-07
 ### Fixed
diff --git a/Rakefile b/Rakefile
index a8c0bf6..627bdb2 100755
--- a/Rakefile
+++ b/Rakefile
@@ -14,11 +14,11 @@ end
 #   rdoc.rdoc_files.include('lib/**/*.rb')
 # end
 
-load 'rails/tasks/statistics.rake'
-
-APP_RAKEFILE = File.expand_path('../test/dummy/Rakefile', __FILE__)
+APP_RAKEFILE = File.expand_path('test/dummy/Rakefile', __dir__)
 load 'rails/tasks/engine.rake'
 
+load 'rails/tasks/statistics.rake'
+
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
diff --git a/gemfiles/Gemfile.rails80 b/gemfiles/Gemfile.rails80
new file mode 100644
index 0000000..e5a159b
--- /dev/null
+++ b/gemfiles/Gemfile.rails80
@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'rails',  '~> 8.0.0'
diff --git a/ndr_ui.gemspec b/ndr_ui.gemspec
index 639d1a1..c54f1c0 100644
--- a/ndr_ui.gemspec
+++ b/ndr_ui.gemspec
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'bootstrap', '~> 5.3.3'
   spec.add_dependency 'dartsass-sprockets'
   spec.add_dependency 'jquery-rails', '~> 4.6'
-  spec.add_dependency 'rails', '>= 6.1', '< 7.3'
+  spec.add_dependency 'rails', '>= 6.1', '< 8.1'
   spec.add_dependency 'sprockets', '>= 4.0'
   spec.add_dependency 'sprockets-rails', '>= 3.0.0'