bootstrap_form 5.4.0 → 5.6.0

data/lib/bootstrap_form/inputs/check_box.rb

@@ -13,13 +13,15 @@ module BootstrapForm
           content = tag.div(class: check_box_wrapper_class(options), **options[:wrapper].to_h.except(:class)) do
             html = check_box_without_bootstrap(name, check_box_options(name, options), checked_value, unchecked_value)
             html << check_box_label(name, options, checked_value, &block) unless options[:skip_label]
-            html << generate_error(name) if options[:error_message]
+            html << generate_error(name, options[:id]) if options[:error_message]
             html
           end
           wrapper(content, options)
         end
 
         bootstrap_alias :check_box
+        alias_method :checkbox_with_bootstrap, :check_box_with_bootstrap if Rails::VERSION::MAJOR >= 8
+        bootstrap_alias :checkbox if Rails::VERSION::MAJOR >= 8
       end
 
       private
@@ -39,10 +41,11 @@ module BootstrapForm
                                            :inline, :label, :label_class, :label_col, :layout, :skip_label,
                                            :switch, :wrapper, :wrapper_class)
         check_box_options[:class] = check_box_classes(name, options)
+        check_box_options[:aria] = { describedby: aria_feedback_id(id: options[:id], name:) } if error?(name)
         check_box_options.merge!(required_field_options(options, name))
       end
 
-      def check_box_label(name, options, checked_value, &block)
+      def check_box_label(name, options, checked_value, &)
         label_name = if options[:multiple]
                        check_box_value(name, checked_value)
                      else
@@ -50,19 +53,20 @@ module BootstrapForm
                      end
         label_options = { class: check_box_label_class(options) }
         label_options[:for] = options[:id] if options[:id].present?
-        label(label_name, check_box_description(name, options, &block), label_options)
+        label(label_name, check_box_description(name, options, &), label_options)
       end
 
       def check_box_description(name, options, &block)
         content = block ? capture(&block) : options[:label]
-        content || object&.class&.human_attribute_name(name) || name.to_s.humanize
+        # Ugh. Next Rails after 7.1 passes `false` when there's no object.
+        content || (object && object.class.human_attribute_name(name)) || name.to_s.humanize # rubocop:disable Style/SafeNavigation
       end
 
       def check_box_value(name, value)
         # label's `for` attribute needs to match checkbox tag's id,
         # IE sanitized value, IE
         # https://github.com/rails/rails/blob/5-0-stable/actionview/lib/action_view/helpers/tags/base.rb#L123-L125
-        "#{name}_#{value.to_s.gsub(/\s/, '_').gsub(/[^-[[:word:]]]/, '').mb_chars.downcase}"
+        "#{name}_#{value.to_s.gsub(/\s/, '_').gsub(/[^-[[:word:]]]/, '').downcase}"
       end
 
       def check_box_classes(name, options)
@@ -83,7 +87,10 @@ module BootstrapForm
       def check_box_wrapper_class(options)
         classes = ["form-check"]
         classes << "form-check-inline" if layout_inline?(options[:inline])
-        classes << "mb-3" unless options[:multiple] || %i[horizontal inline].include?(layout)
+        classes << "mb-3" unless options[:multiple] ||
+                                 %i[horizontal inline].include?(layout) ||
+                                 options[:wrapper_class] == false ||
+                                 options.dig(:wrapper, :class) == false
         classes << "form-switch" if options[:switch]
         classes << options.dig(:wrapper, :class).presence
         classes << options[:wrapper_class].presence

data/lib/bootstrap_form/inputs/collection_check_boxes.rb

@@ -9,6 +9,7 @@ module BootstrapForm
 
       included do
         def collection_check_boxes_with_bootstrap(*args)
+          args[4]&.delete(:id)
           html = inputs_collection(*args) do |name, value, options|
             options[:multiple] = true
             check_box(name, options, value, nil)
@@ -21,14 +22,8 @@ module BootstrapForm
         end
 
         bootstrap_alias :collection_check_boxes
-
-        if Rails::VERSION::MAJOR < 7
-          def field_name(method, *methods, multiple: false, index: @options[:index])
-            object_name = @options.fetch(:as) { @object_name }
-
-            @template.field_name(object_name, method, *methods, index: index, multiple: multiple)
-          end
-        end
+        alias_method :collection_checkboxes_with_bootstrap, :collection_check_boxes_with_bootstrap if Rails::VERSION::MAJOR >= 8
+        bootstrap_alias :collection_checkboxes if Rails::VERSION::MAJOR >= 8
       end
     end
   end

data/lib/bootstrap_form/inputs/collection_radio_buttons.rb

@@ -9,6 +9,7 @@ module BootstrapForm
 
       included do
         def collection_radio_buttons_with_bootstrap(*args)
+          args[4]&.delete(:id)
           inputs_collection(*args) do |name, value, options|
             radio_button(name, value, options)
           end

data/lib/bootstrap_form/inputs/file_field.rb

@@ -10,7 +10,7 @@ module BootstrapForm
         def file_field_with_bootstrap(name, options={})
           options = options.reverse_merge(control_class: "form-control")
           form_group_builder(name, options) do
-            input_with_error(name) do
+            prepend_and_append_input(name, options) do
               file_field_without_bootstrap(name, options)
             end
           end

data/lib/bootstrap_form/inputs/inputs_collection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BootstrapForm
   module Inputs
     module InputsCollection
@@ -5,23 +7,21 @@ module BootstrapForm
 
       private
 
-      def inputs_collection(name, collection, value, text, options={})
-        options[:label] ||= { class: group_label_class(options[:layout]) }
+      def inputs_collection(name, collection, value, text, options={}, &)
+        options[:label] ||= { class: group_label_class(field_layout(options)) }
         options[:inline] ||= layout_inline?(options[:layout])
 
-        form_group_builder(name, options) do
-          inputs = ActiveSupport::SafeBuffer.new
-
-          collection.each_with_index do |obj, i|
-            input_value = value.respond_to?(:call) ? value.call(obj) : obj.send(value)
-            input_options = form_group_collection_input_options(options, text, obj, i, input_value, collection)
-            inputs << yield(name, input_value, input_options)
-          end
+        return group_inputs_collection(name, collection, value, text, options, &) if BootstrapForm.config.group_around_collections
 
-          inputs
+        form_group_builder(name, options) do
+          render_collection(name, collection, value, text, options, &)
         end
       end
 
+      def field_layout(options)
+        (:inline if options[:inline] == true) || options[:layout]
+      end
+
       def group_label_class(field_layout)
         if layout_horizontal?(field_layout)
           group_label_class = "col-form-label #{label_col} pt-0"
@@ -52,6 +52,62 @@ module BootstrapForm
         checked == input_value || Array(checked).try(:include?, input_value) ||
           checked == obj || Array(checked).try(:include?, obj)
       end
+
+      def group_inputs_collection(name, collection, value, text, options={}, &)
+        group_builder(name, options) do
+          render_collection(name, collection, value, text, options, &)
+        end
+      end
+
+      def render_collection(name, collection, value, text, options={}, &)
+        inputs = ActiveSupport::SafeBuffer.new
+
+        collection.each_with_index do |obj, i|
+          input_value = value.respond_to?(:call) ? value.call(obj) : obj.send(value)
+          input_options = form_group_collection_input_options(options, text, obj, i, input_value, collection)
+          inputs << yield(name, input_value, input_options)
+        end
+
+        inputs
+      end
+
+      def group_builder(method, options, html_options=nil, &)
+        form_group_builder_wrapper(method, options, html_options) do |form_group_options, no_wrapper|
+          if no_wrapper
+            yield
+          else
+            field_group(method, form_group_options, &)
+          end
+        end
+      end
+
+      def field_group(name, options, &)
+        options[:class] = form_group_classes(options)
+
+        tag.div(
+          **options.except(
+            :add_control_col_class, :append, :control_col, :floating, :help, :icon, :id,
+            :input_group_class, :label, :label_col, :layout, :prepend
+          ),
+          aria: { labelledby: group_label_div_id(id: options[:id], name:) },
+          role: :group
+        ) do
+          group_label_div = generate_group_label_div(name, options)
+          prepare_label_options(options[:id], name, options[:label], options[:label_col], options[:layout])
+          form_group_content(group_label_div, generate_help(name, options[:help]), options, &)
+        end
+      end
+
+      def generate_group_label_div(name, options)
+        group_label_div_class = options.dig(:label, :class) || "form-label"
+
+        tag.div(
+          **{ class: group_label_div_class }.compact,
+          id: group_label_div_id(id: options[:id], name:)
+        ) { label_text(name, options.dig(:label, :text)) }
+      end
+
+      def group_label_div_id(id:, name:) = id || field_id(name)
     end
   end
 end

data/lib/bootstrap_form/inputs/radio_button.rb

@@ -14,7 +14,7 @@ module BootstrapForm
           tag.div(**wrapper_attributes) do
             html = radio_button_without_bootstrap(name, value, radio_button_options(name, options))
             html << radio_button_label(name, value, options) unless options[:skip_label]
-            html << generate_error(name) if options[:error_message]
+            html << generate_error(name, options[:id]) if options[:error_message]
             html
           end
         end
@@ -28,6 +28,7 @@ module BootstrapForm
         radio_button_options = options.except(:class, :label, :label_class, :error_message, :help,
                                               :inline, :hide_label, :skip_label, :wrapper, :wrapper_class)
         radio_button_options[:class] = radio_button_classes(name, options)
+        radio_button_options[:aria] = { describedby: aria_feedback_id(id: options[:id], name:) } if error?(name)
         radio_button_options.merge!(required_field_options(options, name))
       end
 

data/lib/bootstrap_form/inputs/range_field.rb

@@ -7,7 +7,7 @@ module BootstrapForm
       include Base
 
       included do
-        bootstrap_field :range_field, control_class: "form-range"
+        bootstrap_field :range_field
       end
     end
   end

data/lib/bootstrap_form/inputs/rich_text_area.rb

@@ -17,6 +17,8 @@ module BootstrapForm
         end
 
         bootstrap_alias :rich_text_area
+        alias_method :rich_textarea, :rich_text_area if Rails::VERSION::MAJOR >= 8
+        bootstrap_alias :rich_textarea if Rails::VERSION::MAJOR >= 8
       end
     end
   end

data/lib/bootstrap_form/inputs/submit.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module BootstrapForm
   module Inputs
     module Submit
-      def button(value=nil, options={}, &block)
+      def button(value=nil, options={}, &)
         value = setup_css_class "btn btn-secondary", value, options
         super
       end

data/lib/bootstrap_form/inputs/text_area.rb

@@ -8,6 +8,8 @@ module BootstrapForm
 
       included do
         bootstrap_field :text_area
+        alias_method :textarea_with_bootstrap, :text_area_with_bootstrap if Rails::VERSION::MAJOR >= 8
+        bootstrap_field :textarea if Rails::VERSION::MAJOR >= 8
       end
     end
   end

data/lib/bootstrap_form/inputs/time_zone_select.rb

@@ -10,7 +10,7 @@ module BootstrapForm
         def time_zone_select_with_bootstrap(method, priority_zones=nil, options={}, html_options={})
           html_options = html_options.reverse_merge(control_class: "form-select")
           form_group_builder(method, options, html_options) do
-            input_with_error(method) do
+            input_with_error(method, options[:id]) do
               time_zone_select_without_bootstrap(method, priority_zones, options, html_options)
             end
           end

data/lib/bootstrap_form/version.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 module BootstrapForm
-  VERSION = "5.4.0".freeze
-  REQUIRED_RAILS_VERSION = ">= 6.1".freeze
+  VERSION = "5.6.0"
+  REQUIRED_RAILS_VERSION = ">= 7.2"
 end

data/lib/bootstrap_form.rb

@@ -1,16 +1,9 @@
-# NOTE: The rich_text_area and rich_text_area_tag helpers are defined in a file
-# with a different name and not in the usual autoload-reachable way.
-# The following line is definitely need to make `bootstrap_form` work.
-# rubocop:disable Lint/SuppressedException
-begin
-  require "#{Gem::Specification.find_by_name('actiontext').gem_dir}/app/helpers/action_text/tag_helper"
-rescue Gem::MissingSpecError
-end
-# rubocop:enable Lint/SuppressedException
+# frozen_string_literal: true
 
 require "action_view"
 require "action_pack"
 require "bootstrap_form/action_view_extensions/form_helper"
+require "bootstrap_form/configuration"
 
 module BootstrapForm
   extend ActiveSupport::Autoload
@@ -33,12 +26,8 @@ module BootstrapForm
       BootstrapForm::Inputs.eager_load!
     end
 
-    def config
-      @config ||= BootstrapForm::Configuration.new
-    end
-
-    def configure
-      yield config
+    def deprecator
+      @deprecator ||= ActiveSupport::Deprecation.new("a future release", "BootstrapForm")
     end
   end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_form
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.6.0
 platform: ruby
 authors:
 - Stephen Potenza
 - Carlos Lopes
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-30 00:00:00.000000000 Z
+date: 2026-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.2'
 description: bootstrap_form is a rails form builder that makes it super easy to create
   beautiful-looking forms using Bootstrap 5
 email:
@@ -48,16 +48,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".devcontainer.json"
 - ".editorconfig"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".yarnrc"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
+- DOCKER.md
 - Dangerfile
-- Dockerfile
 - Gemfile
 - LICENSE.txt
 - OLD-README.md
@@ -68,11 +68,10 @@ files:
 - UPGRADE-5.0.md
 - app/assets/stylesheets/rails_bootstrap_forms.css
 - bootstrap_form.gemspec
-- docker-compose-system-test.yml
-- docker-compose.yml
-- gemfiles/6.1.gemfile
-- gemfiles/7.0.gemfile
-- gemfiles/7.1.gemfile
+- compose.yml
+- gemfiles/7.2.gemfile
+- gemfiles/8.0.gemfile
+- gemfiles/8.1.gemfile
 - gemfiles/common.gemfile
 - gemfiles/edge.gemfile
 - lib/bootstrap_form.rb
@@ -130,7 +129,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -138,15 +137,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Rails form builder that makes it easy to style forms using Bootstrap 5
 test_files: []

data/.yarnrc

@@ -1,5 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-lastUpdateCheck 1698606246341

data/Dockerfile

@@ -1,22 +0,0 @@
-ARG RUBY_VERSION=3.0
-ARG DISTRO=bullseye
-
-FROM ruby:$RUBY_VERSION-$DISTRO
-
-ARG NODE_MAJOR=18
-
-RUN mkdir -p /app
-ENV HOME /app
-WORKDIR /app
-
-ENV GEM_HOME $HOME/vendor/bundle
-ENV BUNDLE_APP_CONFIG="$GEM_HOME"
-ENV PATH ./bin:$GEM_HOME/bin:$PATH
-RUN (echo 'docker'; echo 'docker') | passwd root
-
-# Rails wants a newer version of node than we get with the Debian distro.
-RUN curl -fsSL https://deb.nodesource.com/setup_$NODE_MAJOR.x | bash - && apt-get install -y nodejs
-RUN corepack enable && corepack prepare yarn@stable --activate
-RUN apt install -y -q sqlite3
-
-EXPOSE 3000

data/docker-compose-system-test.yml

@@ -1,45 +0,0 @@
-version: '3.3'
-
-services:
-  app: &app
-    build:
-      context: .
-      args:
-        NODE_MAJOR: "12"
-        YARN_VERSION: "1.22.4"
-        RUBY_VERSION: ${RUBY_VERSION}
-    image: bootstrap-form:latest-$RUBY_VERSION
-    tmpfs:
-      - /tmp
-
-  shell:
-    <<: *app
-    stdin_open: true
-    tty: true
-    volumes:
-      - .:/app:cached
-    environment:
-      - SSH_AUTH_SOCK=/ssh-agent
-      - NODE_ENV=development
-      - BOOTSNAP_CACHE_DIR=/usr/local/bundle/_bootsnap
-      - WEB_CONCURRENCY=1
-      - HISTFILE=/app/.bash_history
-      - SELENIUM_HOST=selenium
-      - SELENIUM_PORT=4444
-      - TEST_APP_HOST=shell
-      - TEST_APP_PORT=3001
-    ports:
-      - "3001:3001"
-    command: /bin/bash
-
-  selenium:
-    image: selenium/standalone-chrome:118.0
-    logging:
-      driver: none
-    stdin_open: true
-    tty: true
-    environment:
-      - LANG=en_CA.UTF-8
-    ports:
-      - '4444:4444'
-      - '5900:5900'

data/docker-compose.yml

@@ -1,29 +0,0 @@
-version: '3.3'
-
-services:
-  app: &app
-    build:
-      context: .
-      args:
-        NODE_MAJOR: "18"
-        RUBY_VERSION: ${RUBY_VERSION}
-    image: bootstrap-form:latest-$RUBY_VERSION
-    tmpfs:
-      - /tmp
-
-  shell: &shell
-    <<: *app
-    stdin_open: true
-    tty: true
-    volumes:
-      - .:/app:cached
-    environment:
-      - SSH_AUTH_SOCK=/ssh-agent
-      - NODE_ENV=development
-      - RAILS_ENV=${RAILS_ENV:-development}
-      - BOOTSNAP_CACHE_DIR=/usr/local/bundle/_bootsnap
-      - WEB_CONCURRENCY=1
-      - HISTFILE=/app/.bash_history
-    ports:
-      - "3000:3000"
-    command: /bin/bash

data/gemfiles/6.1.gemfile

@@ -1,4 +0,0 @@
-gems = "#{__dir__}/common.gemfile"
-eval File.read(gems), binding, gems # rubocop: disable Security/Eval
-
-gem "rails", "~> 6.1.0"

data/gemfiles/7.0.gemfile

@@ -1,5 +0,0 @@
-gems = "#{__dir__}/common.gemfile"
-eval File.read(gems), binding, gems # rubocop: disable Security/Eval
-
-gem "rails", "~> 7.0.2"
-gem "sprockets-rails", require: "sprockets/railtie"

data/gemfiles/7.1.gemfile

@@ -1,5 +0,0 @@
-gems = "#{__dir__}/common.gemfile"
-eval File.read(gems), binding, gems # rubocop: disable Security/Eval
-
-gem "rails", "~> 7.1.0"
-gem "sprockets-rails", require: "sprockets/railtie"