bootstrap_form 5.2.3 → 5.3.0

data/lib/bootstrap_form/action_view_extensions/form_helper.rb

@@ -39,6 +39,16 @@ module BootstrapForm
         bootstrap_form_for("", options, &block)
       end
 
+      def bootstrap_fields_for(record_name, record_object=nil, options={}, &block)
+        options[:builder] = BootstrapForm::FormBuilder
+        fields_for(record_name, record_object, options, &block)
+      end
+
+      def bootstrap_fields(scope=nil, model: nil, **options, &block)
+        options[:builder] = BootstrapForm::FormBuilder
+        fields(scope, model: model, **options, &block)
+      end
+
       private
 
       def with_bootstrap_form_field_error_proc

data/lib/bootstrap_form/components/labels.rb

@@ -23,7 +23,9 @@ module BootstrapForm
       end
 
       def label_classes(name, options, custom_label_col, group_layout)
-        classes = ["form-label", options[:class], label_layout_classes(custom_label_col, group_layout)]
+        classes = [options[:class] || label_layout_classes(custom_label_col, group_layout)]
+        add_class = options.delete(:add_class)
+        classes.prepend(add_class) if add_class
         classes << "required" if required_field_options(options, name)[:required]
         options.delete(:required)
         classes << "text-danger" if label_errors && error?(name)
@@ -34,7 +36,9 @@ module BootstrapForm
         if layout_horizontal?(group_layout)
           ["col-form-label", (custom_label_col || label_col)]
         elsif layout_inline?(group_layout)
-          ["me-sm-2"]
+          %w[form-label me-sm-2]
+        else
+          "form-label"
         end
       end
 

data/lib/bootstrap_form/components/layout.rb

@@ -7,10 +7,6 @@ module BootstrapForm
 
       private
 
-      def layout_default?(field_layout=nil)
-        layout_in_effect(field_layout) == :default
-      end
-
       def layout_horizontal?(field_layout=nil)
         layout_in_effect(field_layout) == :horizontal
       end
@@ -27,7 +23,7 @@ module BootstrapForm
       # and those don't have a :horizontal layout
       def layout_in_effect(field_layout)
         field_layout = :inline if field_layout == true
-        field_layout = :default if field_layout == false
+        field_layout = :vertical if field_layout == false
         field_layout || layout
       end
 

data/lib/bootstrap_form/components/validation.rb

@@ -26,29 +26,34 @@ module BootstrapForm
         target = obj.instance_of?(Class) ? obj : obj.class
         return false unless target.respond_to? :validators_on
 
-        presence_validator?(target_unconditional_validators(target, attribute)) ||
-          required_association?(target, attribute)
+        presence_validators?(target, obj, attribute) || required_association?(target, obj, attribute)
       end
 
-      def required_association?(target, attribute)
-        target.try(:reflections)&.find do |name, a|
+      def required_association?(target, object, attribute)
+        target.try(:reflections)&.any? do |name, a|
           next unless a.is_a?(ActiveRecord::Reflection::BelongsToReflection)
           next unless a.foreign_key == attribute.to_s
 
-          presence_validator?(target_unconditional_validators(target, name))
+          presence_validators?(target, object, name)
         end
       end
 
-      def target_unconditional_validators(target, attribute)
-        target.validators_on(attribute)
-              .reject { |validator| validator.options[:if].present? || validator.options[:unless].present? }
-              .map(&:class)
+      def presence_validators?(target, object, attribute)
+        target.validators_on(attribute).select { |v| presence_validator?(v.class) }.any? do |validator|
+          if_option = validator.options[:if]
+          unless_opt = validator.options[:unless]
+          (!if_option || call_with_self(object, if_option)) && (!unless_opt || !call_with_self(object, unless_opt))
+        end
+      end
+
+      def call_with_self(object, proc)
+        object.instance_exec(*[(object if proc.arity >= 1)].compact, &proc)
       end
 
-      def presence_validator?(target_validators)
-        target_validators.include?(ActiveModel::Validations::PresenceValidator) ||
+      def presence_validator?(validator_class)
+        validator_class == ActiveModel::Validations::PresenceValidator ||
           (defined?(ActiveRecord::Validations::PresenceValidator) &&
-            target_validators.include?(ActiveRecord::Validations::PresenceValidator))
+            validator_class == ActiveRecord::Validations::PresenceValidator)
       end
 
       def inline_error?(name)
@@ -65,16 +70,20 @@ module BootstrapForm
         content_tag(help_tag, help_text, class: help_klass)
       end
 
+      # rubocop:disable Metrics/AbcSize
       def get_error_messages(name)
-        messages = object.errors[name]
         object.class.try(:reflections)&.each do |association_name, a|
           next unless a.is_a?(ActiveRecord::Reflection::BelongsToReflection)
           next unless a.foreign_key == name.to_s
 
-          messages << object.errors[association_name]
+          object.errors[association_name].each do |error|
+            object.errors.add(name, error)
+          end
         end
-        messages.join(", ")
+
+        object.errors[name].join(", ")
       end
+      # rubocop:enable Metrics/AbcSize
     end
   end
 end

data/lib/bootstrap_form/form_builder.rb

@@ -1,6 +1,5 @@
 # require 'bootstrap_form/aliasing'
 
-# rubocop:disable Metrics/ClassLength
 module BootstrapForm
   class FormBuilder < ActionView::Helpers::FormBuilder
     attr_reader :layout, :label_col, :control_col, :has_error, :inline_errors,
@@ -36,6 +35,7 @@ module BootstrapForm
     include BootstrapForm::Inputs::RichTextArea
     include BootstrapForm::Inputs::SearchField
     include BootstrapForm::Inputs::Select
+    include BootstrapForm::Inputs::Submit
     include BootstrapForm::Inputs::TelephoneField
     include BootstrapForm::Inputs::TextArea
     include BootstrapForm::Inputs::TextField
@@ -48,16 +48,12 @@ module BootstrapForm
     delegate :content_tag, :capture, :concat, :tag, to: :@template
 
     def initialize(object_name, object, template, options)
+      warn_deprecated_layout_value(options)
       @layout = options[:layout] || default_layout
       @label_col = options[:label_col] || default_label_col
       @control_col = options[:control_col] || default_control_col
       @label_errors = options[:label_errors] || false
-
-      @inline_errors = if options[:inline_errors].nil?
-                         @label_errors != true
-                       else
-                         options[:inline_errors] != false
-                       end
+      @inline_errors = options[:inline_errors].nil? ? @label_errors != true : options[:inline_errors] != false
       @acts_like_form_tag = options[:acts_like_form_tag]
       add_default_form_attributes_and_form_inline options
       super
@@ -99,8 +95,8 @@ module BootstrapForm
     end
 
     def default_layout
-      # :default, :horizontal or :inline
-      :default
+      # :vertical, :horizontal or :inline
+      :vertical
     end
 
     def default_label_col
@@ -132,4 +128,3 @@ module BootstrapForm
     end
   end
 end
-# rubocop:enable Metrics/ClassLength

data/lib/bootstrap_form/form_group.rb

@@ -13,10 +13,8 @@ module BootstrapForm
       tag.div(**options.except(:append, :id, :label, :help, :icon,
                                :input_group_class, :label_col, :control_col,
                                :add_control_col_class, :layout, :prepend, :floating)) do
-        form_group_content(
-          generate_label(options[:id], name, options[:label], options[:label_col], options[:layout]),
-          generate_help(name, options[:help]), options, &block
-        )
+        label = generate_label(options[:id], name, options[:label], options[:label_col], options[:layout])
+        form_group_content(label, generate_help(name, options[:help]), options, &block)
       end
     end
 

data/lib/bootstrap_form/helpers/bootstrap.rb

@@ -1,27 +1,6 @@
 module BootstrapForm
   module Helpers
     module Bootstrap
-      def button(value=nil, options={}, &block)
-        setup_css_class "btn btn-secondary", options
-        super
-      end
-
-      def submit(name=nil, options={})
-        setup_css_class "btn btn-secondary", options
-        layout == :inline ? form_group { super } : super
-      end
-
-      def primary(name=nil, options={}, &block)
-        setup_css_class "btn btn-primary", options
-
-        if options[:render_as_button] || block
-          options.except! :render_as_button
-          button(name, options, &block)
-        else
-          submit(name, options)
-        end
-      end
-
       def alert_message(title, options={})
         css = options[:class] || "alert alert-danger"
         return unless object.respond_to?(:errors) && object.errors.full_messages.any?
@@ -116,15 +95,6 @@ module BootstrapForm
         end
         ActiveSupport::SafeBuffer.new(tags.join)
       end
-
-      def setup_css_class(the_class, options={})
-        return if options.key? :class
-
-        if (extra_class = options.delete(:extra_class))
-          the_class = "#{the_class} #{extra_class}"
-        end
-        options[:class] = the_class
-      end
     end
   end
 end

data/lib/bootstrap_form/helpers/field.rb

@@ -4,8 +4,7 @@ module BootstrapForm
       def required_field_options(options, method)
         required = required_field?(options, method)
         {}.tap do |option|
-          option[:required] = required
-          option[:aria] = { required: true } if required
+          option[:required] = true if required
         end
       end
 

data/lib/bootstrap_form/inputs/base.rb

@@ -8,6 +8,7 @@ module BootstrapForm
       class_methods do
         def bootstrap_field(field_name, control_class: nil)
           define_method "#{field_name}_with_bootstrap" do |name, options={ control_class: control_class }.compact|
+            warn_deprecated_layout_value(options)
             form_group_builder(name, options) do
               prepend_and_append_input(name, options) do
                 options[:placeholder] ||= name if options[:floating]
@@ -35,6 +36,15 @@ module BootstrapForm
           alias_method field_name, "#{field_name}_with_bootstrap".to_sym
         end
       end
+
+      private
+
+      def warn_deprecated_layout_value(options)
+        return unless options[:layout] == :default
+
+        warn "Layout `:default` is deprecated, use `:vertical` instead."
+        options[:layout] = :vertical
+      end
     end
   end
 end

data/lib/bootstrap_form/inputs/check_box.rb

@@ -10,12 +10,13 @@ module BootstrapForm
         def check_box_with_bootstrap(name, options={}, checked_value="1", unchecked_value="0", &block)
           options = options.symbolize_keys!
 
-          tag.div(class: check_box_wrapper_class(options), **options[:wrapper].to_h.except(:class)) do
+          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
           end
+          wrapper(content, options)
         end
 
         bootstrap_alias :check_box
@@ -23,9 +24,20 @@ module BootstrapForm
 
       private
 
+      def wrapper(content, options)
+        if layout == :inline && !options[:multiple]
+          tag.div(class: "col") { content }
+        elsif layout == :horizontal && !options[:multiple]
+          form_group(layout: layout_in_effect(options[:layout]), label_col: options[:label_col]) { content }
+        else
+          content
+        end
+      end
+
       def check_box_options(name, options)
-        check_box_options = options.except(:class, :label, :label_class, :error_message, :help,
-                                           :inline, :hide_label, :skip_label, :wrapper, :wrapper_class, :switch)
+        check_box_options = options.except(:class, :control_col, :error_message, :help, :hide_label,
+                                           :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.merge!(required_field_options(options, name))
       end
@@ -71,7 +83,7 @@ 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] || layout == :horizontal
+        classes << "mb-3" unless options[:multiple] || %i[horizontal inline].include?(layout)
         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

@@ -15,12 +15,20 @@ module BootstrapForm
           end
 
           if args.extract_options!.symbolize_keys!.delete(:include_hidden) { true }
-            html.prepend hidden_field(args.first, value: "", multiple: true)
+            html.prepend hidden_field(args.first, value: "", name: field_name(args[0], multiple: true))
           end
           html
         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
       end
     end
   end

data/lib/bootstrap_form/inputs/inputs_collection.rb

@@ -6,6 +6,7 @@ module BootstrapForm
       private
 
       def inputs_collection(name, collection, value, text, options={})
+        options[:label] ||= { class: group_label_class(options[:layout]) }
         options[:inline] ||= layout_inline?(options[:layout])
 
         form_group_builder(name, options) do
@@ -21,6 +22,15 @@ module BootstrapForm
         end
       end
 
+      def group_label_class(field_layout)
+        if layout_horizontal?(field_layout)
+          group_label_class = "col-form-label #{label_col} pt-0"
+        elsif layout_inline?(field_layout)
+          group_label_class = "form-check form-check-inline ps-0"
+        end
+        group_label_class
+      end
+
       # FIXME: Find a way to reduce the parameter list size
       # rubocop:disable Metrics/ParameterLists
       def form_group_collection_input_options(options, text, obj, index, input_value, collection)
@@ -29,6 +39,9 @@ module BootstrapForm
           input_options[:checked] = form_group_collection_input_checked?(checked, obj, input_value)
         end
 
+        # add things like 'data-' attributes to the HTML
+        obj.each { |inner_obj| input_options.merge!(inner_obj) if inner_obj.is_a?(Hash) } if obj.respond_to?(:each)
+
         input_options[:error_message] = index == collection.size - 1
         input_options.except!(:class)
         input_options

data/lib/bootstrap_form/inputs/submit.rb

@@ -0,0 +1,42 @@
+module BootstrapForm
+  module Inputs
+    module Submit
+      def button(value=nil, options={}, &block)
+        value = setup_css_class "btn btn-secondary", value, options
+        super
+      end
+
+      def submit(value=nil, options={})
+        value = setup_css_class "btn btn-secondary", value, options
+        layout == :inline ? form_group { super } : super
+      end
+
+      def primary(value=nil, options={}, &block)
+        value = setup_css_class "btn btn-primary", value, options
+
+        if options[:render_as_button] || block
+          options.except! :render_as_button
+          button(value, options, &block)
+        else
+          submit(value, options)
+        end
+      end
+
+      private
+
+      def setup_css_class(the_class, value, options)
+        if value.is_a?(Hash)
+          options.merge!(value)
+          value = nil
+        end
+        unless options.key? :class
+          if (extra_class = options.delete(:extra_class))
+            the_class = "#{the_class} #{extra_class}"
+          end
+          options[:class] = the_class
+        end
+        value
+      end
+    end
+  end
+end

data/lib/bootstrap_form/inputs.rb

@@ -28,6 +28,7 @@ module BootstrapForm
     autoload :RichTextArea
     autoload :SearchField
     autoload :Select
+    autoload :Submit
     autoload :TelephoneField
     autoload :TextArea
     autoload :TextField

data/lib/bootstrap_form/version.rb

@@ -1,4 +1,4 @@
 module BootstrapForm
-  VERSION = "5.2.3".freeze
-  REQUIRED_RAILS_VERSION = ">= 6.0".freeze
+  VERSION = "5.3.0".freeze
+  REQUIRED_RAILS_VERSION = ">= 6.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_form
 version: !ruby/object:Gem::Version
-  version: 5.2.3
+  version: 5.3.0
 platform: ruby
 authors:
 - Stephen Potenza
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-18 00:00:00.000000000 Z
+date: 2023-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 description: bootstrap_form is a rails form builder that makes it super easy to create
   beautiful-looking forms using Bootstrap 5
 email:
@@ -69,7 +69,6 @@ files:
 - app/assets/stylesheets/rails_bootstrap_forms.css
 - bootstrap_form.gemspec
 - docker-compose.yml
-- gemfiles/6.0.gemfile
 - gemfiles/6.1.gemfile
 - gemfiles/7.0.gemfile
 - gemfiles/common.gemfile
@@ -114,6 +113,7 @@ files:
 - lib/bootstrap_form/inputs/rich_text_area.rb
 - lib/bootstrap_form/inputs/search_field.rb
 - lib/bootstrap_form/inputs/select.rb
+- lib/bootstrap_form/inputs/submit.rb
 - lib/bootstrap_form/inputs/telephone_field.rb
 - lib/bootstrap_form/inputs/text_area.rb
 - lib/bootstrap_form/inputs/text_field.rb

data/gemfiles/6.0.gemfile

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