sdr_view_components 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da67f1cfd2cfb8a85d88d496df552d11e6a5c0648ae0662d4847ee6735aedf04
-  data.tar.gz: cf355351c20972ad34829bd2565e5363f10bd3b443befdc879ad008dea30ed4a
+  metadata.gz: 70bbb057dd95a5fb475b407f387eafc7b8948a59e5ea5a7eb72e56a1facf10e1
+  data.tar.gz: c5be40e999590e03fbfbaa4d3a0eb4e52cdbbd83bd5b61b394f568899c574fe8
 SHA512:
-  metadata.gz: e2d8ad78b5a7de81672e11e55d0d2a5ce524075ed2317f6917d1b02ed9fb97c64129cb428a74e152fc1cb4ce46cf37c19663a29e03fdf87aed78310aa8a8c2c1
-  data.tar.gz: e947cae010e6f7d039952b66ab9875609ba19dcd8ccabf0fa8d1aca0eba2f1f6109d44480ea2949136cc7c6fd6b6ad8f84866b4d03879f7951abf129c6ab4ab8
+  metadata.gz: 95ad863bdb52830c08d73ff044dcd09279f5f56b0ae5f9ba95a4d08b0cece0b8b09d50d1bda4463eae96e56fd7bcde42e288f4612e3086b357aa17cd9be9ce67
+  data.tar.gz: f9beb404a32f5beb693e9014561fe80ec3db9f47d6cec331169e56de2ca8925a15b7f8c22a2464e142d378c460a99e6ebaa872ea4724877daa8449b7371fa668

data/app/components/sdr_view_components/forms/radio_button_component.rb

@@ -15,14 +15,22 @@ module SdrViewComponents
       end
 
       def label_field_name
-        "#{sanitize(field_name)}_#{sanitize(input_args[:value])}"
+        "#{sanitize_method_name(field_name)}_#{sanitize_value(input_args[:value])}"
       end
 
       private
 
-      # From https://github.com/rails/rails/blob/main/actionview/lib/action_view/helpers/form_tag_helper.rb
-      def sanitize(value)
-        value.to_s.delete(']').tr('^-a-zA-Z0-9:.', '_')
+      # The input is rendered by form.radio_button, so the label's for must match the id that
+      # ActionView::Helpers::Tags::Base generates. These mirror its sanitized_method_name and
+      # sanitized_value. Note this is *not* form_tag_helper.rb's sanitize_to_id, which applies
+      # to radio_button_tag and disagrees on uppercase letters, '.', and other non-word chars.
+      # From https://github.com/rails/rails/blob/main/actionview/lib/action_view/helpers/tags/base.rb
+      def sanitize_method_name(name)
+        name.to_s.delete_suffix('?')
+      end
+
+      def sanitize_value(value)
+        value.to_s.gsub(/[\s.]/, '_').gsub(/[^-[[:word:]]]/, '').downcase
       end
     end
   end

data/app/components/sdr_view_components/tab_form/hidden_fields_form_component.html.erb

@@ -1,4 +1,4 @@
-<%= form_with(model:, id:, url:, html: { novalidate: true }) do |form| %>
+<%= form_with(model:, id:, url:, html: { novalidate: true, **html_options }) do |form| %>
   <% hidden_fields.each do |field| %>
     <%= form.hidden_field field %>
   <% end %>

data/app/components/sdr_view_components/tab_form/hidden_fields_form_component.rb

@@ -9,15 +9,16 @@ module SdrViewComponents
     # `url:` is optional and only needed when the model can't derive its own submission url
     # (e.g. it has no resourceful routes).
     class HiddenFieldsFormComponent < BaseComponent
-      def initialize(model:, id:, hidden_fields: [], url: nil)
+      def initialize(model:, id:, hidden_fields: [], url: nil, html_options: {})
         @model = model
         @id = id
         @hidden_fields = hidden_fields
         @url = url
+        @html_options = html_options
         super()
       end
 
-      attr_reader :model, :id, :hidden_fields, :url
+      attr_reader :model, :id, :hidden_fields, :url, :html_options
     end
   end
 end

data/lib/sdr_view_components/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SdrViewComponents
-  VERSION = '0.11.1'
+  VERSION = '0.12.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sdr_view_components
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Aaron Collier
@@ -375,7 +375,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Rails gem for providing SDR-specific ViewComponents.
 test_files: []