rails_bootstrap_form 0.9.1 → 0.9.3

data/lib/rails_bootstrap_form/helpers/choice.rb

@@ -0,0 +1,81 @@
+# -*- encoding: utf-8 -*-
+# -*- frozen_string_literal: true -*-
+# -*- warn_indent: true -*-
+
+module RailsBootstrapForm
+  module Helpers
+    module Choice
+      extend ActiveSupport::Concern
+
+      def self.included(base_class)
+        [:check_box, :radio_button].each do |tag_name|
+          define_method("#{tag_name}_label") do |attribute, value, options, bootstrap|
+            label_options = {
+              class: choice_label_classes(attribute, bootstrap, options)
+            }
+            label_options[:value] = value if tag_name.eql?(:radio_button)
+            label_options[:for] = options[:id] if options[:id].present?
+
+            label_text = label_text(attribute, bootstrap)
+
+            label(attribute, label_text, label_options)
+          end
+        end
+
+        [:check_box, :radio_button].each do |tag_name|
+          define_method("bootstrap_#{tag_name}") do |attribute, value, options, bootstrap|
+            options[:class] = choice_classes(attribute, options)
+
+            if tag_name.eql?(:check_box)
+              choice_field = check_box_without_bootstrap(attribute, options, value, nil)
+              choice_label = check_box_label(attribute, value, options, bootstrap)
+            else
+              choice_field = radio_button_without_bootstrap(attribute, value, options)
+              choice_label = radio_button_label(attribute, value, options, bootstrap)
+            end
+
+            choice_field + choice_label
+          end
+        end
+
+        def choice_classes(attribute, options)
+          classes = Array("form-check-input") << options[:class]
+          classes << "is-invalid" if is_invalid?(attribute)
+          classes.flatten.compact
+        end
+
+        def choice_label_classes(attribute, bootstrap, options)
+          classes = Array("form-check-label") << bootstrap.additional_label_class
+          classes << "required" if is_field_required?(attribute, options)
+          classes << "is-invalid" if is_invalid?(attribute)
+          classes << bootstrap.hide_class if bootstrap.hide_label?
+          classes.flatten.compact
+        end
+
+        def choice_container_classes(bootstrap)
+          classes = Array(bootstrap.field_col_wrapper_class)
+          classes << field_offset_class(bootstrap.label_col_wrapper_class)
+          classes.flatten.compact
+        end
+
+        def choice_wrapper_classes(bootstrap)
+          classes = Array("form-check")
+          classes << "form-check-inline" if bootstrap.inline?
+          classes << "form-switch" if bootstrap.switch?
+          classes.flatten.compact
+        end
+
+        def collection_input_checked?(checked, obj, input_value)
+          checked == input_value || Array(checked).try(:include?, input_value) ||
+            checked == obj || Array(checked).try(:include?, obj)
+        end
+
+        private :choice_classes, :choice_label_classes,
+                :choice_container_classes, :choice_wrapper_classes,
+                :check_box_label, :radio_button_label,
+                :bootstrap_check_box, :bootstrap_radio_button,
+                :collection_input_checked?
+      end
+    end
+  end
+end

data/lib/rails_bootstrap_form/helpers/help_text.rb

@@ -8,10 +8,10 @@ module RailsBootstrapForm
       extend ActiveSupport::Concern
 
       def self.included(base_class)
-        def help_text(attribute, bootstrap_options)
-          return if bootstrap_options.help_text == false
+        def help_text(attribute, bootstrap)
+          return if bootstrap.help_text == false
 
-          help_text = (bootstrap_options.help_text || scoped_help_text(attribute))
+          help_text = (bootstrap.help_text || scoped_help_text(attribute))
 
           tag.div(help_text, class: "form-text text-muted") if help_text.present?
         end

data/lib/rails_bootstrap_form/helpers/labels.rb

@@ -8,42 +8,42 @@ module RailsBootstrapForm
       extend ActiveSupport::Concern
 
       def self.included(base_class)
-        def draw_label(attribute, options, bootstrap_options)
-          unless bootstrap_options.skip_label? && !bootstrap_options.floating?
+        def draw_label(attribute, options, bootstrap)
+          unless bootstrap.skip_label? && !bootstrap.floating?
             label_options = {
-              class: label_classes(attribute, options, bootstrap_options)
+              class: label_classes(attribute, options, bootstrap)
             }
             label_options[:for] = options[:id] if options[:id].present?
-            label_text = label_text(attribute, bootstrap_options)
+            label_text = label_text(attribute, bootstrap)
 
             label(attribute, label_text, label_options)
           end
         end
 
-        def label_classes(attribute, options, bootstrap_options)
+        def label_classes(attribute, options, bootstrap)
           classes = []
-          classes << label_layout_classes(bootstrap_options)
-          classes << bootstrap_options.additional_label_class
-          classes << bootstrap_options.hide_class if hide_class_required?(bootstrap_options)
+          classes << label_layout_classes(bootstrap)
+          classes << bootstrap.additional_label_class
+          classes << bootstrap.hide_class if hide_class_required?(bootstrap)
           classes << "required" if is_field_required?(attribute, options)
           classes << "is-invalid" if is_invalid?(attribute)
           classes.flatten.compact
         end
 
-        def label_layout_classes(bootstrap_options)
-          if bootstrap_options.layout_horizontal?
-            [bootstrap_options.label_col_class, bootstrap_options.label_col_wrapper_class]
+        def label_layout_classes(bootstrap)
+          if bootstrap.layout_horizontal?
+            [bootstrap.label_col_class, bootstrap.label_col_wrapper_class]
           else
-            bootstrap_options.label_class
+            bootstrap.label_class
           end
         end
 
-        def label_text(attribute, bootstrap_options)
-          bootstrap_options.label_text || object&.class.try(:human_attribute_name, attribute)
+        def label_text(attribute, bootstrap)
+          bootstrap.label_text || object&.class.try(:human_attribute_name, attribute)
         end
 
-        def hide_class_required?(bootstrap_options)
-          bootstrap_options.hide_label? || (bootstrap_options.layout_inline? && !bootstrap_options.floating?)
+        def hide_class_required?(bootstrap)
+          bootstrap.hide_label? || (bootstrap.layout_inline? && !bootstrap.floating?)
         end
 
         private :draw_label, :label_classes, :label_text, :label_layout_classes,

data/lib/rails_bootstrap_form/helpers.rb

@@ -11,30 +11,29 @@ module RailsBootstrapForm
     autoload :Labels
     autoload :RequiredField
     autoload :Errors
-    autoload :CheckBox
-    autoload :RadioButton
     autoload :Buttons
+    autoload :Choice
 
     include HelpText
     include Labels
     include RequiredField
     include Errors
-    include CheckBox
-    include RadioButton
     include Buttons
+    include Choice
 
     def self.included(base_class)
-      def collection_input_checked?(checked, obj, input_value)
-        checked == input_value || Array(checked).try(:include?, input_value) ||
-          checked == obj || Array(checked).try(:include?, obj)
+      def sanitized_tag_name(attribute, value)
+        # label's `for` attribute needs to match checkbox/radio button 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
+        "#{@object_name}_#{attribute}_#{value.to_s.gsub(/\s/, "_").gsub(/[^-[[:word:]]]/, "").mb_chars.downcase}"
       end
 
       def control_specific_class(field_tag_name)
         "rails-bootstrap-forms-#{field_tag_name.to_s.tr("_", "-")}"
       end
 
-      def is_size_valid?(bootstrap_options)
-        bootstrap_options.size && %i(sm lg).include?(bootstrap_options.size)
+      def is_size_valid?(bootstrap)
+        bootstrap.size && %i(sm lg).include?(bootstrap.size)
       end
 
       def field_offset_class(label_col_wrapper_class)
@@ -52,8 +51,8 @@ module RailsBootstrapForm
         options.delete(:class) if options[:class].blank?
       end
 
-      private :collection_input_checked?, :control_specific_class, :is_size_valid?,
-              :add_css_class!, :remove_css_class!
+      private :control_specific_class, :is_size_valid?, :add_css_class!,
+              :remove_css_class!
     end
   end
 end

data/lib/rails_bootstrap_form/input_group_builder.rb

@@ -7,17 +7,17 @@ module RailsBootstrapForm
     extend ActiveSupport::Concern
 
     def self.included(base_class)
-      def input_group_wrapper(attribute, bootstrap_options, &block)
+      def input_group_wrapper(attribute, bootstrap, &block)
         input = capture(&block) || ActiveSupport::SafeBuffer.new
 
-        if input_group_required?(bootstrap_options)
-          prepend = attach_input(bootstrap_options, :prepend)
-          append = attach_input(bootstrap_options, :append)
+        if input_group_required?(bootstrap)
+          prepend = attach_input(bootstrap, :prepend)
+          append = attach_input(bootstrap, :append)
 
           input = prepend + input + append
           input += generate_error(attribute)
 
-          input = tag.div(input, class: input_group_classes(attribute, bootstrap_options))
+          input = tag.div(input, class: input_group_classes(attribute, bootstrap))
         else
           input += generate_error(attribute)
         end
@@ -25,18 +25,18 @@ module RailsBootstrapForm
         input
       end
 
-      def input_group_classes(attribute, bootstrap_options)
-        classes = Array("input-group") << bootstrap_options.additional_input_group_class
-        if is_size_valid?(bootstrap_options)
-          classes << "input-group-#{bootstrap_options.size}"
+      def input_group_classes(attribute, bootstrap)
+        classes = Array("input-group") << bootstrap.additional_input_group_class
+        if is_size_valid?(bootstrap)
+          classes << "input-group-#{bootstrap.size}"
         end
         # Require `has-validation` class if field has errors.
         classes << "has-validation" if is_invalid?(attribute)
         classes.flatten.compact
       end
 
-      def attach_input(bootstrap_options, key)
-        tags = [*bootstrap_options.send(key)].map do |item|
+      def attach_input(bootstrap, key)
+        tags = [*bootstrap.send(key)].map do |item|
           input_group_content(item)
         end
 
@@ -49,10 +49,10 @@ module RailsBootstrapForm
         tag.span(content.html_safe, class: "input-group-text")
       end
 
-      def input_group_required?(bootstrap_options)
+      def input_group_required?(bootstrap)
         [
-          bootstrap_options.prepend,
-          bootstrap_options.append
+          bootstrap.prepend,
+          bootstrap.append
         ].any?(&:present?)
       end
 

data/lib/rails_bootstrap_form/inputs/base.rb

@@ -8,23 +8,26 @@ module RailsBootstrapForm
       extend ActiveSupport::Concern
 
       included do
-        def inputs_collection(attribute, collection, value_method, text_method, bootstrap_options, options = {})
+        def inputs_collection(attribute, collection, value_method, text_method, bootstrap, options = {})
           inputs = ActiveSupport::SafeBuffer.new
 
           collection.each do |object|
+            value = object.send(value_method)
+
             input_options = {
               bootstrap: {
                 label_text: text_method.respond_to?(:call) ? text_method.call(object) : object.send(text_method),
-                help_text: false,
-                inline: bootstrap_options.inline?
-              }
+                inline: bootstrap.inline?
+              },
+              required: false,
+              id: sanitized_tag_name(attribute, value)
             }.deep_merge!(options)
 
             if (checked = input_options[:checked])
-              input_options[:checked] = collection_input_checked?(checked, object, object.send(value_method))
+              input_options[:checked] = collection_input_checked?(checked, object, value)
             end
 
-            input_value = value_method.respond_to?(:call) ? value_method.call(object) : object.send(value_method)
+            input_value = value_method.respond_to?(:call) ? value_method.call(object) : value
 
             inputs << yield(attribute, input_value, input_options)
           end
@@ -34,26 +37,26 @@ module RailsBootstrapForm
       end
 
       class_methods do
-        def bootstrap_field(field_name)
-          define_method(field_name) do |attribute, options = {}|
-            bootstrap_options = bootstrap_form_options.scoped(options.delete(:bootstrap))
-            return super(attribute, options) if bootstrap_options.disabled?
+        def bootstrap_field(tag_name)
+          define_method(tag_name) do |attribute, options = {}|
+            bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
+            return super(attribute, options) if bootstrap.disabled?
 
-            field_wrapper_builder(attribute, bootstrap_options, options) do
+            field_wrapper_builder(attribute, bootstrap, options) do
               super(attribute, options)
             end
           end
         end
 
-        def bootstrap_select_group(field_name)
-          define_method(field_name) do |attribute, options = {}, html_options = {}|
-            options = {bootstrap: {field_class: "form-select"}}.deep_merge!(options)
+        def bootstrap_select_group(tag_name)
+          define_method(tag_name) do |attribute, options = {}, html_options = {}|
+            options = {bootstrap: {field_class: "form-select", floating: false}}.deep_merge!(options)
 
-            bootstrap_options = bootstrap_form_options.scoped(options.delete(:bootstrap))
-            return super(attribute, options, html_options) if bootstrap_options.disabled?
+            bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
+            return super(attribute, options, html_options) if bootstrap.disabled?
 
-            field_wrapper_builder(attribute, bootstrap_options, options, html_options) do
-              tag.fieldset(class: control_specific_class(field_name)) do
+            field_wrapper_builder(attribute, bootstrap, options, html_options) do
+              tag.fieldset(class: control_specific_class(tag_name)) do
                 super(attribute, options, html_options)
               end
             end

data/lib/rails_bootstrap_form/inputs/check_box.rb

@@ -8,32 +8,24 @@ module RailsBootstrapForm
       extend ActiveSupport::Concern
 
       included do
-        def check_box(attribute, options = {}, checked_value = "1", unchecked_value = "0", &block)
-          bootstrap_options = bootstrap_form_options.scoped(options.delete(:bootstrap))
-          return super if bootstrap_options.disabled?
+        def check_box(attribute, options = {}, checked_value = "1", unchecked_value = "0")
+          bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
+          return super if bootstrap.disabled?
 
-          options[:class] = check_box_classes(attribute, options)
-
-          check_box_field = super(attribute, options, checked_value, unchecked_value)
-          check_box_help_text = help_text(attribute, bootstrap_options)
-
-          check_box_label = check_box_label(attribute, checked_value, options, bootstrap_options, &block)
-
-          check_box_html = tag.div(**check_box_wrapper_options(bootstrap_options)) do
-            concat(check_box_field)
-            concat(check_box_label)
-            concat(check_box_help_text)
-            concat(generate_error(attribute)) if (is_invalid?(attribute) && !bootstrap_options.inline?)
+          check_box_html = tag.div(class: choice_wrapper_classes(bootstrap)) do
+            concat(bootstrap_check_box(attribute, checked_value, options, bootstrap))
+            concat(help_text(attribute, bootstrap))
+            concat(generate_error(attribute)) if is_invalid?(attribute)
           end
 
-          if (bootstrap_options.layout_horizontal? && !bootstrap_options.inline?)
-            tag.div(class: field_wrapper_classes(bootstrap_options)) do
-              tag.div(class: check_box_container_classes(bootstrap_options)) do
+          if bootstrap.wrapper
+            tag.div(**field_wrapper_options(bootstrap)) do
+              if bootstrap.layout_horizontal?
+                tag.div(class: choice_container_classes(bootstrap)) { check_box_html }
+              else
                 check_box_html
               end
             end
-          elsif bootstrap_options.layout_inline?
-            tag.div(class: "col-12") { check_box_html }
           else
             check_box_html
           end

data/lib/rails_bootstrap_form/inputs/collection_check_boxes.rb

@@ -9,18 +9,23 @@ module RailsBootstrapForm
 
       included do
         def collection_check_boxes(attribute, collection, value_method, text_method, options = {}, html_options = {})
-          bootstrap_options = bootstrap_form_options.scoped(options.delete(:bootstrap))
-          return super if bootstrap_options.disabled?
+          bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
+          bootstrap.floating = false
+          return super if bootstrap.disabled?
 
-          inputs = inputs_collection(attribute, collection, value_method, text_method, bootstrap_options, options) do |attribute, value, options|
-            check_box(attribute, options, value, nil)
+          inputs = inputs_collection(attribute, collection, value_method, text_method, bootstrap, options) do |attribute, value, options|
+            bootstrap_opts = bootstrap_form_options.scoped(options.delete(:bootstrap))
+
+            tag.div(class: choice_wrapper_classes(bootstrap_opts)) do
+              bootstrap_check_box(attribute, value, options, bootstrap_opts)
+            end
           end
 
           if options.delete(:include_hidden) { true }
             inputs.prepend(hidden_field(attribute, value: "", multiple: options[:multiple]))
           end
 
-          field_wrapper_builder(attribute, bootstrap_options, options, html_options) do
+          field_wrapper_builder(attribute, bootstrap, options, html_options) do
             concat(tag.div(class: control_specific_class(:collection_check_boxes)) do
               concat(inputs)
             end)

data/lib/rails_bootstrap_form/inputs/collection_radio_buttons.rb

@@ -9,14 +9,19 @@ module RailsBootstrapForm
 
       included do
         def collection_radio_buttons(attribute, collection, value_method, text_method, options = {}, html_options = {})
-          bootstrap_options = bootstrap_form_options.scoped(options.delete(:bootstrap))
-          return super if bootstrap_options.disabled?
+          bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
+          bootstrap.floating = false
+          return super if bootstrap.disabled?
 
-          inputs = inputs_collection(attribute, collection, value_method, text_method, bootstrap_options, options) do |attribute, value, options|
-            radio_button(attribute, value, options)
+          inputs = inputs_collection(attribute, collection, value_method, text_method, bootstrap, options) do |attribute, value, options|
+            bootstrap_opts = bootstrap_form_options.scoped(options.delete(:bootstrap))
+
+            tag.div(class: choice_wrapper_classes(bootstrap_opts)) do
+              bootstrap_radio_button(attribute, value, options, bootstrap_opts)
+            end
           end
 
-          field_wrapper_builder(attribute, bootstrap_options, options, html_options) do
+          field_wrapper_builder(attribute, bootstrap, options, html_options) do
             concat(tag.div(class: control_specific_class(:collection_radio_buttons)) do
               concat(inputs)
             end)

data/lib/rails_bootstrap_form/inputs/collection_select.rb

@@ -11,10 +11,10 @@ module RailsBootstrapForm
         def collection_select(attribute, collection, value_method, text_method, options = {}, html_options = {})
           options = {bootstrap: {field_class: "form-select"}}.deep_merge!(options)
 
-          bootstrap_options = bootstrap_form_options.scoped(options.delete(:bootstrap))
-          return super if bootstrap_options.disabled?
+          bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
+          return super if bootstrap.disabled?
 
-          field_wrapper_builder(attribute, bootstrap_options, options, html_options) do
+          field_wrapper_builder(attribute, bootstrap, options, html_options) do
             super(attribute, collection, value_method, text_method, options, html_options)
           end
         end

data/lib/rails_bootstrap_form/inputs/color_field.rb

@@ -9,12 +9,17 @@ module RailsBootstrapForm
 
       included do
         def color_field(attribute, options = {})
-          options = {bootstrap: {field_class: "form-control form-control-color"}}.deep_merge!(options)
+          options = {
+            bootstrap: {
+              field_class: "form-control form-control-color",
+              floating: false
+            }
+          }.deep_merge!(options)
 
-          bootstrap_options = bootstrap_form_options.scoped(options.delete(:bootstrap))
-          return super if bootstrap_options.disabled?
+          bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
+          return super if bootstrap.disabled?
 
-          field_wrapper_builder(attribute, bootstrap_options, options) do
+          field_wrapper_builder(attribute, bootstrap, options) do
             super(attribute, options)
           end
         end

data/lib/rails_bootstrap_form/inputs/grouped_collection_select.rb

@@ -11,10 +11,10 @@ module RailsBootstrapForm
         def grouped_collection_select(attribute, collection, group_method, group_label_method, option_key_method, option_value_method, options = {}, html_options = {})
           options = {bootstrap: {field_class: "form-select"}}.deep_merge!(options)
 
-          bootstrap_options = bootstrap_form_options.scoped(options.delete(:bootstrap))
-          return super if bootstrap_options.disabled?
+          bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
+          return super if bootstrap.disabled?
 
-          field_wrapper_builder(attribute, bootstrap_options, options, html_options) do
+          field_wrapper_builder(attribute, bootstrap, options, html_options) do
             super(attribute, collection, group_method, group_label_method, option_key_method, option_value_method, options, html_options)
           end
         end

data/lib/rails_bootstrap_form/inputs/radio_button.rb

@@ -9,31 +9,23 @@ module RailsBootstrapForm
 
       included do
         def radio_button(attribute, value, options = {})
-          bootstrap_options = bootstrap_form_options.scoped(options.delete(:bootstrap))
-          return super if bootstrap_options.disabled?
+          bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
+          return super if bootstrap.disabled?
 
-          options[:class] = radio_button_classes(attribute, options)
-
-          radio_button_field = super(attribute, value, options)
-          radio_button_help_text = help_text(attribute, bootstrap_options)
-
-          radio_button_label = radio_button_label(attribute, value, options, bootstrap_options)
-
-          radio_button_html = tag.div(**radio_button_wrapper_options(bootstrap_options)) do
-            concat(radio_button_field)
-            concat(radio_button_label)
-            concat(radio_button_help_text)
-            concat(generate_error(attribute)) if (is_invalid?(attribute) && !bootstrap_options.inline?)
+          radio_button_html = tag.div(class: choice_wrapper_classes(bootstrap)) do
+            concat(bootstrap_radio_button(attribute, value, options, bootstrap))
+            concat(help_text(attribute, bootstrap))
+            concat(generate_error(attribute)) if is_invalid?(attribute)
           end
 
-          if (bootstrap_options.layout_horizontal? && !bootstrap_options.inline?)
-            tag.div(class: field_wrapper_classes(bootstrap_options)) do
-              tag.div(class: radio_button_container_classes(bootstrap_options)) do
+          if bootstrap.wrapper
+            tag.div(**field_wrapper_options(bootstrap)) do
+              if bootstrap.layout_horizontal?
+                tag.div(class: choice_container_classes(bootstrap)) { radio_button_html }
+              else
                 radio_button_html
               end
             end
-          elsif bootstrap_options.layout_inline?
-            tag.div(class: "col-12") { radio_button_html }
           else
             radio_button_html
           end

data/lib/rails_bootstrap_form/inputs/range_field.rb

@@ -9,12 +9,12 @@ module RailsBootstrapForm
 
       included do
         def range_field(attribute, options = {})
-          options = {bootstrap: {field_class: "form-range"}}.deep_merge!(options)
+          options = {bootstrap: {field_class: "form-range", floating: false}}.deep_merge!(options)
 
-          bootstrap_options = bootstrap_form_options.scoped(options.delete(:bootstrap))
-          return super if bootstrap_options.disabled?
+          bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
+          return super if bootstrap.disabled?
 
-          field_wrapper_builder(attribute, bootstrap_options, options) do
+          field_wrapper_builder(attribute, bootstrap, options) do
             super(attribute, options)
           end
         end

data/lib/rails_bootstrap_form/inputs/rich_text_area.rb

@@ -11,10 +11,10 @@ module RailsBootstrapForm
         def rich_text_area(attribute, options = {})
           options[:class] = ["trix-content", options[:class]].compact.join(" ")
 
-          bootstrap_options = bootstrap_form_options.scoped(options.delete(:bootstrap))
-          return super if bootstrap_options.disabled?
+          bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
+          return super if bootstrap.disabled?
 
-          field_wrapper_builder(attribute, bootstrap_options, options) do
+          field_wrapper_builder(attribute, bootstrap, options) do
             super(attribute, options)
           end
         end

data/lib/rails_bootstrap_form/inputs/select.rb

@@ -11,10 +11,10 @@ module RailsBootstrapForm
         def select(attribute, choices = nil, options = {}, html_options = {}, &block)
           options = {bootstrap: {field_class: "form-select"}}.deep_merge!(options)
 
-          bootstrap_options = bootstrap_form_options.scoped(options.delete(:bootstrap))
-          return super if bootstrap_options.disabled?
+          bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
+          return super if bootstrap.disabled?
 
-          field_wrapper_builder(attribute, bootstrap_options, options, html_options) do
+          field_wrapper_builder(attribute, bootstrap, options, html_options) do
             super(attribute, choices, options, html_options, &block)
           end
         end

data/lib/rails_bootstrap_form/inputs/time_zone_select.rb

@@ -11,10 +11,10 @@ module RailsBootstrapForm
         def time_zone_select(attribute, priority_zones = nil, options = {}, html_options = {})
           options = {bootstrap: {field_class: "form-select"}}.deep_merge!(options)
 
-          bootstrap_options = bootstrap_form_options.scoped(options.delete(:bootstrap))
-          return super if bootstrap_options.disabled?
+          bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
+          return super if bootstrap.disabled?
 
-          field_wrapper_builder(attribute, bootstrap_options, options, html_options) do
+          field_wrapper_builder(attribute, bootstrap, options, html_options) do
             super(attribute, priority_zones, options, html_options)
           end
         end

data/lib/rails_bootstrap_form/inputs/weekday_select.rb

@@ -11,10 +11,10 @@ module RailsBootstrapForm
         def weekday_select(attribute, options = {}, html_options = {}, &block)
           options = {bootstrap: {field_class: "form-select"}}.deep_merge!(options)
 
-          bootstrap_options = bootstrap_form_options.scoped(options.delete(:bootstrap))
-          return super if bootstrap_options.disabled?
+          bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
+          return super if bootstrap.disabled?
 
-          field_wrapper_builder(attribute, bootstrap_options, options, html_options) do
+          field_wrapper_builder(attribute, bootstrap, options, html_options) do
             super(attribute, options, html_options, &block)
           end
         end

data/lib/rails_bootstrap_form/version.rb

@@ -3,6 +3,6 @@
 # -*- warn_indent: true -*-
 
 module RailsBootstrapForm
-  VERSION = "0.9.1".freeze
+  VERSION = "0.9.3".freeze
   REQUIRED_RAILS_VERSION = "~> 7.0".freeze
 end