Merge pull request #545 from jsugarman/jsugarman/handle-frozen-string…

…-deprecations Handle frozen string deprecations from ruby 3.4.1
x-govuk · Jan 10, 2025 · deb8089 · deb8089
2 parents fde9552 + a6ca88b
commit deb8089
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -10,8 +10,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['3.2.5', '3.3.6']
-        rails: ['7.1.5', '7.2.2', '8.0.0']
+        ruby: ['3.2.6', '3.3.6', '3.4.1']
+        rails: ['7.1.5', '7.2.2', '8.0.1']
     runs-on: ubuntu-latest
     name: Testing with Ruby ${{ matrix.ruby }} and Rails ${{ matrix.rails }}
     steps:

diff --git a/README.md b/README.md
@@ -7,8 +7,8 @@
 [![Test Coverage](https://api.codeclimate.com/v1/badges/110136fb22341d3ba646/test_coverage)](https://codeclimate.com/github/x-govuk/govuk-form-builder/test_coverage)
 [![GitHub license](https://img.shields.io/github/license/x-govuk/govuk-form-builder)](https://github.com/x-govuk/govuk-form-builder/blob/main/LICENSE)
 [![GOV.UK Design System version](https://img.shields.io/badge/GOV.UK%20Design%20System-5.7.1-brightgreen)](https://design-system.service.gov.uk)
-[![Rails](https://img.shields.io/badge/Rails-7.1.5%20%E2%95%B1%207.2.2%20%E2%95%B1%208.0.0-E16D6D)](https://weblog.rubyonrails.org/releases/)
-[![Ruby](https://img.shields.io/badge/Ruby-3.2.6%20%20%E2%95%B1%203.3.6-E16D6D)](https://www.ruby-lang.org/en/downloads/)
+[![Rails](https://img.shields.io/badge/Rails-7.1.5%20%E2%95%B1%207.2.2%20%E2%95%B1%208.0.1-E16D6D)](https://weblog.rubyonrails.org/releases/)
+[![Ruby](https://img.shields.io/badge/Ruby-3.2.6%20%20%E2%95%B1%203.3.6%20%20%E2%95%B1%203.4.1-E16D6D)](https://www.ruby-lang.org/en/downloads/)
 
 This library provides an easy-to-use form builder for the [GOV.UK Design System](https://design-system.service.gov.uk/).
 

diff --git a/govuk_design_system_formbuilder.gemspec b/govuk_design_system_formbuilder.gemspec
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
     s.add_dependency(*VersionFormatter.new(lib, rails_version, exact_rails_version).to_a)
   end
 
+  s.add_development_dependency('ostruct')
   s.add_development_dependency("pry", "~> 0.14.1")
   s.add_development_dependency("pry-byebug", "~> 3.9", ">= 3.9.0")
   s.add_development_dependency("rspec-html-matchers", "~> 0")

diff --git a/guide/content/introduction/supported-versions.slim b/guide/content/introduction/supported-versions.slim
@@ -36,7 +36,7 @@ table.govuk-table.app-table--constrained
       th.govuk-table__header scope="row"
         | Ruby on Rails
       td.govuk-table__cell.govuk-table__cell--numeric
-        | 8.0.0
+        | 8.0.1
         br
         | 7.2.2
         br
@@ -49,9 +49,11 @@ table.govuk-table.app-table--constrained
       th.govuk-table__header scope="row"
         | Ruby
       td.govuk-table__cell.govuk-table__cell--numeric
+        | 3.4.1
+        br
         | 3.3.6
         br
-        | 3.2.5
+        | 3.2.6
       td.govuk-table__cell.govuk-table__cell--numeric
         | 3.0.3
         br

diff --git a/lib/govuk_design_system_formbuilder/elements/error_summary.rb b/lib/govuk_design_system_formbuilder/elements/error_summary.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GOVUKDesignSystemFormBuilder
   module Elements
     class ErrorSummary < Base
@@ -89,7 +91,7 @@ def list_item(attribute, message, url = nil)
       end
 
       def same_page_link(target)
-        '#'.concat(target)
+        target.prepend('#')
       end
 
       def classes

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -4,6 +4,7 @@
 require 'active_model'
 require 'active_support'
 require 'active_support/core_ext/string'
+require 'ostruct'
 require 'pry'
 require 'pry-byebug'
 require 'simplecov'