Merge pull request #590 from benilovj/rails-8-1

Add support for Rails 8.1

Author: peteryates

.github/workflows/tests.yml

@@ -11,7 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         ruby: ['3.2.6', '3.3.6', '3.4.1']
-        rails: ['7.1.5', '7.2.2', '8.0.1']
+        rails: ['7.1.5', '7.2.2', '8.0.1', '8.1.0']
     runs-on: ubuntu-latest
     name: Testing with Ruby ${{ matrix.ruby }} and Rails ${{ matrix.rails }}
     steps:

lib/govuk_design_system_formbuilder.rb

@@ -1,12 +1,21 @@
-require 'active_support/configurable'
+require 'active_support/ordered_options'
 require 'html_attributes_utils'
 
 [%w(presenters *.rb), %w(refinements *.rb), %w(traits *.rb), %w(*.rb), %w(elements ** *.rb), %w(containers ** *.rb)]
   .flat_map { |matcher| Dir.glob(File.join(__dir__, 'govuk_design_system_formbuilder', *matcher)) }
   .each { |file| require file }
 
 module GOVUKDesignSystemFormBuilder
-  include ActiveSupport::Configurable
+  class << self
+    class_attribute :config,
+                    instance_predicate: false,
+                    default: ActiveSupport::OrderedOptions.new
+
+    def inherited(klass) # :nodoc:
+      klass.config = ActiveSupport::InheritableOptions.new(config)
+      super
+    end
+  end
 
   # @!group Defaults
 
@@ -133,7 +142,20 @@ module GOVUKDesignSystemFormBuilder
     enable_nested_localisation: true,
   }.freeze
 
-  DEFAULTS.each_key { |k| config_accessor(k) { DEFAULTS[k] } }
+  DEFAULTS.each do |key, value|
+    reader = "def #{key}; config.#{key}; end"
+    reader_line = __LINE__
+    writer = "def #{key}=(value); config.#{key} = value; end"
+    writer_line = __LINE__
+
+    singleton_class.class_eval reader, __FILE__, reader_line
+    singleton_class.class_eval writer, __FILE__, writer_line
+
+    class_eval reader, __FILE__, reader_line
+    class_eval writer, __FILE__, writer_line
+
+    send("#{key}=", value)
+  end
   # @!endgroup
 
   class << self
@@ -146,7 +168,7 @@ class << self
     #     conf.default_error_summary_title = 'OMG'
     #   end
     def configure
-      yield(config)
+      yield config
     end
 
     # Resets each of the configurable values to its default