bootstrap_form 5.1.0 → 5.2.1

data/lib/bootstrap_form/components/validation.rb

@@ -8,35 +8,45 @@ module BootstrapForm
       private
 
       def error?(name)
-        object.respond_to?(:errors) && !(name.nil? || object.errors[name].empty?)
+        name && object.respond_to?(:errors) && (object.errors[name].any? || association_error?(name))
+      end
+
+      def association_error?(name)
+        object.class.try(:reflections)&.any? do |association_name, a|
+          next unless a.is_a?(ActiveRecord::Reflection::BelongsToReflection)
+          next unless a.foreign_key == name.to_s
+
+          object.errors[association_name].any?
+        end
       end
 
       def required_attribute?(obj, attribute)
         return false unless obj && attribute
 
         target = obj.instance_of?(Class) ? obj : obj.class
+        return false unless target.respond_to? :validators_on
 
-        target_validators = if target.respond_to? :validators_on
-                              target.validators_on(attribute).map(&:class)
-                            else
-                              []
-                            end
-
-        presence_validator?(target_validators)
+        presence_validator?(target_validators(target, attribute)) ||
+          required_association?(target, attribute)
       end
 
-      def presence_validator?(target_validators)
-        has_presence_validator = target_validators.include?(
-          ActiveModel::Validations::PresenceValidator
-        )
-
-        if defined? ActiveRecord::Validations::PresenceValidator
-          has_presence_validator |= target_validators.include?(
-            ActiveRecord::Validations::PresenceValidator
-          )
+      def required_association?(target, attribute)
+        target.try(:reflections)&.find do |name, a|
+          next unless a.is_a?(ActiveRecord::Reflection::BelongsToReflection)
+          next unless a.foreign_key == attribute.to_s
+
+          presence_validator?(target_validators(target, name))
         end
+      end
+
+      def target_validators(target, attribute)
+        target.validators_on(attribute).map(&:class)
+      end
 
-        has_presence_validator
+      def presence_validator?(target_validators)
+        target_validators.include?(ActiveModel::Validations::PresenceValidator) ||
+          (defined?(ActiveRecord::Validations::PresenceValidator) &&
+            target_validators.include?(ActiveRecord::Validations::PresenceValidator))
       end
 
       def inline_error?(name)
@@ -54,7 +64,14 @@ module BootstrapForm
       end
 
       def get_error_messages(name)
-        object.errors[name].join(", ")
+        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]
+        end
+        messages.join(", ")
       end
     end
   end

data/lib/bootstrap_form/form_builder.rb

@@ -1,10 +1,12 @@
 # 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,
                 :label_errors, :acts_like_form_tag
 
+    include BootstrapForm::Helpers::Field
     include BootstrapForm::Helpers::Bootstrap
 
     include BootstrapForm::FormGroupBuilder
@@ -31,7 +33,7 @@ module BootstrapForm
     include BootstrapForm::Inputs::PhoneField
     include BootstrapForm::Inputs::RadioButton
     include BootstrapForm::Inputs::RangeField
-    include BootstrapForm::Inputs::RichTextArea if Rails::VERSION::MAJOR >= 6
+    include BootstrapForm::Inputs::RichTextArea
     include BootstrapForm::Inputs::SearchField
     include BootstrapForm::Inputs::Select
     include BootstrapForm::Inputs::TelephoneField
@@ -130,3 +132,4 @@ module BootstrapForm
     end
   end
 end
+# rubocop:enable Metrics/ClassLength

data/lib/bootstrap_form/form_group.rb

@@ -32,15 +32,18 @@ module BootstrapForm
       end
     end
 
-    def form_group_content(label, help_text, options, &block)
+    def form_group_content(label, help_text, options, &block) # rubocop:disable Metrics/AbcSize
+      label ||= ActiveSupport::SafeBuffer.new
       if group_layout_horizontal?(options[:layout])
-        concat(label).concat(tag.div(capture(&block) + help_text, class: form_group_control_class(options)))
+        label + tag.div(capture(&block) + help_text, class: form_group_control_class(options))
       else
+        content = ActiveSupport::SafeBuffer.new
         # Floating labels need to be rendered after the field
-        concat(label) unless options[:floating]
-        concat(capture(&block))
-        concat(label) if options[:floating]
-        concat(help_text) if help_text
+        content << label unless options[:floating]
+        content << capture(&block)
+        content << label if options[:floating]
+        content << help_text if help_text
+        content
       end
     end
 

data/lib/bootstrap_form/form_group_builder.rb

@@ -28,8 +28,7 @@ module BootstrapForm
     def form_group_builder_options(options, method)
       options.symbolize_keys!
       options = convert_form_tag_options(method, options) if acts_like_form_tag
-      options[:required] = form_group_required(options) if !options[:skip_label] && options.key?(:skip_required)
-      options
+      options.merge!(required_field_options(options, method))
     end
 
     def convert_form_tag_options(method, options={})
@@ -77,11 +76,15 @@ module BootstrapForm
       classes
     end
 
-    def form_group_required(options)
-      return unless options.key?(:skip_required)
-
-      warn "`:skip_required` is deprecated, use `:required: false` instead"
-      options[:skip_required] ? false : :default
+    def form_group_required(options, method)
+      if options[:skip_required]
+        warn "`:skip_required` is deprecated, use `:required: false` instead"
+        false
+      elsif options.key?(:required)
+        options[:required]
+      else
+        required_attribute?(object, method)
+      end
     end
 
     def form_group_css_options(method, html_options, options)

data/lib/bootstrap_form/helpers/bootstrap.rb

@@ -30,8 +30,7 @@ module BootstrapForm
           if options[:error_summary] == false
             title
           else
-            concat tag.p title
-            concat error_summary
+            tag.p(title) + error_summary
           end
         end
       end
@@ -39,9 +38,9 @@ module BootstrapForm
       def error_summary
         return unless object.errors.any?
 
-        tag.ul class: "rails-bootstrap-forms-error-summary" do
-          object.errors.full_messages.each do |error|
-            concat tag.li(error)
+        tag.ul(class: "rails-bootstrap-forms-error-summary") do
+          object.errors.full_messages.reduce(ActiveSupport::SafeBuffer.new) do |acc, error|
+            acc << tag.li(error)
           end
         end
       end
@@ -83,12 +82,12 @@ module BootstrapForm
       end
 
       def prepend_and_append_input(name, options, &block)
-        options = options.extract!(:prepend, :append, :input_group_class)
+        options = options.extract!(:prepend, :append, :input_group_class).compact
 
         input = capture(&block) || ActiveSupport::SafeBuffer.new
 
         input = attach_input(options, :prepend) + input + attach_input(options, :append)
-        input += generate_error(name)
+        input << generate_error(name)
         options.present? &&
           input = tag.div(input, class: ["input-group", options[:input_group_class]].compact)
         input
@@ -100,7 +99,7 @@ module BootstrapForm
       end
 
       def input_group_content(content)
-        return content if /btn/.match?(content)
+        return content if content.include?("btn")
 
         tag.span(content, class: "input-group-text")
       end

data/lib/bootstrap_form/helpers/field.rb

@@ -0,0 +1,26 @@
+module BootstrapForm
+  module Helpers
+    module Field
+      def required_field_options(options, method)
+        required = required_field?(options, method)
+        {}.tap do |option|
+          option[:required] = required
+          option[:aria] = { required: true } if required
+        end
+      end
+
+      private
+
+      def required_field?(options, method)
+        if options[:skip_required]
+          warn "`:skip_required` is deprecated, use `:required: false` instead"
+          false
+        elsif options.key?(:required)
+          options[:required]
+        else
+          required_attribute?(object, method)
+        end
+      end
+    end
+  end
+end

data/lib/bootstrap_form/helpers.rb

@@ -5,5 +5,6 @@ module BootstrapForm
     extend ActiveSupport::Autoload
 
     autoload :Bootstrap
+    autoload :Field
   end
 end

data/lib/bootstrap_form/inputs/base.rb

@@ -6,8 +6,8 @@ module BootstrapForm
       extend ActiveSupport::Concern
 
       class_methods do
-        def bootstrap_field(field_name)
-          define_method "#{field_name}_with_bootstrap" do |name, options={}|
+        def bootstrap_field(field_name, control_class: nil)
+          define_method "#{field_name}_with_bootstrap" do |name, options={ control_class: control_class }.compact|
             form_group_builder(name, options) do
               prepend_and_append_input(name, options) do
                 options[:placeholder] ||= name if options[:floating]

data/lib/bootstrap_form/inputs/check_box.rb

@@ -9,14 +9,11 @@ module BootstrapForm
       included do
         def check_box_with_bootstrap(name, options={}, checked_value="1", unchecked_value="0", &block)
           options = options.symbolize_keys!
-          check_box_options = options.except(:class, :label, :label_class, :error_message, :help,
-                                             :inline, :hide_label, :skip_label, :wrapper, :wrapper_class, :switch)
-          check_box_options[:class] = check_box_classes(name, options)
 
           tag.div(class: check_box_wrapper_class(options), **options[:wrapper].to_h.except(:class)) do
-            html = check_box_without_bootstrap(name, check_box_options, checked_value, unchecked_value)
-            html.concat(check_box_label(name, options, checked_value, &block)) unless options[:skip_label]
-            html.concat(generate_error(name)) if options[:error_message]
+            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
         end
@@ -26,6 +23,13 @@ module BootstrapForm
 
       private
 
+      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[:class] = check_box_classes(name, options)
+        check_box_options.merge!(required_field_options(options, name))
+      end
+
       def check_box_label(name, options, checked_value, &block)
         label_name = if options[:multiple]
                        check_box_value(name, checked_value)
@@ -59,6 +63,7 @@ module BootstrapForm
       def check_box_label_class(options)
         classes = ["form-check-label"]
         classes << options[:label_class]
+        classes << "required" if options[:required]
         classes << hide_class if options[:hide_label]
         classes.flatten.compact
       end
@@ -72,6 +77,17 @@ module BootstrapForm
         classes << options[:wrapper_class].presence
         classes.flatten.compact
       end
+
+      def checkbox_required(options, method)
+        if options[:skip_required]
+          warn "`:skip_required` is deprecated, use `:required: false` instead"
+          false
+        elsif options.key?(:required)
+          options[:required]
+        else
+          required_attribute?(object, method)
+        end
+      end
     end
   end
 end

data/lib/bootstrap_form/inputs/radio_button.rb

@@ -13,8 +13,8 @@ module BootstrapForm
           wrapper_attributes[:class] = radio_button_wrapper_class(options)
           tag.div(**wrapper_attributes) do
             html = radio_button_without_bootstrap(name, value, radio_button_options(name, options))
-            html.concat(radio_button_label(name, value, options)) unless options[:skip_label]
-            html.concat(generate_error(name)) if options[:error_message]
+            html << radio_button_label(name, value, options) unless options[:skip_label]
+            html << generate_error(name) if options[:error_message]
             html
           end
         end
@@ -28,7 +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
+        radio_button_options.merge!(required_field_options(options, name))
       end
 
       def radio_button_label(name, value, options)

data/lib/bootstrap_form/inputs/range_field.rb

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

data/lib/bootstrap_form/inputs.rb

@@ -25,7 +25,7 @@ module BootstrapForm
     autoload :PhoneField
     autoload :RadioButton
     autoload :RangeField
-    autoload :RichTextArea if Rails::VERSION::MAJOR >= 6
+    autoload :RichTextArea
     autoload :SearchField
     autoload :Select
     autoload :TelephoneField

data/lib/bootstrap_form/version.rb

@@ -1,3 +1,4 @@
 module BootstrapForm
-  VERSION = "5.1.0".freeze
+  VERSION = "5.2.1".freeze
+  REQUIRED_RAILS_VERSION = ">= 6.0".freeze
 end

data/lib/bootstrap_form.rb

@@ -1,7 +1,7 @@
 # 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.
-if ::Rails::VERSION::STRING > "6"
+if Rails::VERSION::STRING > "6"
   require "#{Gem::Specification.find_by_name('actiontext').gem_dir}/app/helpers/action_text/tag_helper"
 end
 require "action_view"

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_form
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.1
 platform: ruby
 authors:
 - Stephen Potenza
 - Carlos Lopes
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-25 00:00:00.000000000 Z
+date: 2023-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
 description: bootstrap_form is a rails form builder that makes it super easy to create
   beautiful-looking forms using Bootstrap 5
 email:
@@ -52,6 +52,7 @@ files:
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- ".yarnrc"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
@@ -67,145 +68,11 @@ files:
 - UPGRADE-5.0.md
 - app/assets/stylesheets/rails_bootstrap_forms.css
 - bootstrap_form.gemspec
-- demo/.postcssrc.yml
-- demo/.ruby-version
-- demo/Gemfile
-- demo/Gemfile.lock
-- demo/Procfile.dev
-- demo/README.md
-- demo/Rakefile
-- demo/app/assets/builds/.keep
-- demo/app/assets/builds/application.js.LICENSE.txt
-- demo/app/assets/config/manifest.js
-- demo/app/assets/stylesheets/actiontext.css
-- demo/app/assets/stylesheets/actiontext.scss
-- demo/app/assets/stylesheets/application.scss
-- demo/app/controllers/application_controller.rb
-- demo/app/controllers/bootstrap_controller.rb
-- demo/app/controllers/users_controller.rb
-- demo/app/helpers/bootstrap_helper.rb
-- demo/app/javascript/application.js
-- demo/app/javascript/channels/consumer.js
-- demo/app/javascript/channels/index.js
-- demo/app/javascript/packs/application.js
-- demo/app/models/address.rb
-- demo/app/models/application_record.rb
-- demo/app/models/faux_user.rb
-- demo/app/models/skill.rb
-- demo/app/models/super_user.rb
-- demo/app/models/user.rb
-- demo/app/views/active_storage/blobs/_blob.html.erb
-- demo/app/views/bootstrap/form.html.erb
-- demo/app/views/layouts/action_text/contents/_content.html.erb
-- demo/app/views/layouts/application.html.erb
-- demo/bin/bundle
-- demo/bin/dev
-- demo/bin/rails
-- demo/bin/rake
-- demo/bin/setup
-- demo/bin/update
-- demo/bin/webpack
-- demo/bin/webpack-dev-server
-- demo/bin/yarn
-- demo/config.ru
-- demo/config/application.rb
-- demo/config/boot.rb
-- demo/config/database.yml
-- demo/config/environment.rb
-- demo/config/environments/development.rb
-- demo/config/environments/production.rb
-- demo/config/environments/test.rb
-- demo/config/initializers/application_controller_renderer.rb
-- demo/config/initializers/backtrace_silencers.rb
-- demo/config/initializers/cookies_serializer.rb
-- demo/config/initializers/filter_parameter_logging.rb
-- demo/config/initializers/inflections.rb
-- demo/config/initializers/mime_types.rb
-- demo/config/initializers/wrap_parameters.rb
-- demo/config/locales/en.yml
-- demo/config/puma.rb
-- demo/config/routes.rb
-- demo/config/spring.rb
-- demo/config/storage.yml
-- demo/config/webpack/development.js
-- demo/config/webpack/environment.js
-- demo/config/webpack/production.js
-- demo/config/webpack/test.js
-- demo/config/webpacker.yml
-- demo/db/schema.rb
-- demo/doc/screenshots/bootstrap/index/00_horizontal_form.png
-- demo/doc/screenshots/bootstrap/index/01_with_validation_error.png
-- demo/doc/screenshots/bootstrap/index/02_inline_form.png
-- demo/doc/screenshots/bootstrap/index/03_simple_action_text_example.png
-- demo/doc/screenshots/bootstrap/index/04_floating_labels.png
-- demo/doc/screenshots/bootstrap/readme/00_example.png
-- demo/doc/screenshots/bootstrap/readme/01_example.png
-- demo/doc/screenshots/bootstrap/readme/02_example.png
-- demo/doc/screenshots/bootstrap/readme/03_example.png
-- demo/doc/screenshots/bootstrap/readme/04_example.png
-- demo/doc/screenshots/bootstrap/readme/05_example.png
-- demo/doc/screenshots/bootstrap/readme/06_example.png
-- demo/doc/screenshots/bootstrap/readme/07_example.png
-- demo/doc/screenshots/bootstrap/readme/08_example.png
-- demo/doc/screenshots/bootstrap/readme/09_example.png
-- demo/doc/screenshots/bootstrap/readme/10_example.png
-- demo/doc/screenshots/bootstrap/readme/11_example.png
-- demo/doc/screenshots/bootstrap/readme/12_example.png
-- demo/doc/screenshots/bootstrap/readme/13_example.png
-- demo/doc/screenshots/bootstrap/readme/14_example.png
-- demo/doc/screenshots/bootstrap/readme/15_example.png
-- demo/doc/screenshots/bootstrap/readme/16_example.png
-- demo/doc/screenshots/bootstrap/readme/17_example.png
-- demo/doc/screenshots/bootstrap/readme/18_example.png
-- demo/doc/screenshots/bootstrap/readme/19_example.png
-- demo/doc/screenshots/bootstrap/readme/20_example.png
-- demo/doc/screenshots/bootstrap/readme/21_example.png
-- demo/doc/screenshots/bootstrap/readme/22_example.png
-- demo/doc/screenshots/bootstrap/readme/23_example.png
-- demo/doc/screenshots/bootstrap/readme/24_example.png
-- demo/doc/screenshots/bootstrap/readme/25_example.png
-- demo/doc/screenshots/bootstrap/readme/26_example.png
-- demo/doc/screenshots/bootstrap/readme/27_example.png
-- demo/doc/screenshots/bootstrap/readme/28_example.png
-- demo/doc/screenshots/bootstrap/readme/29_example.png
-- demo/doc/screenshots/bootstrap/readme/30_example.png
-- demo/doc/screenshots/bootstrap/readme/31_example.png
-- demo/doc/screenshots/bootstrap/readme/32_example.png
-- demo/doc/screenshots/bootstrap/readme/33_example.png
-- demo/doc/screenshots/bootstrap/readme/34_example.png
-- demo/doc/screenshots/bootstrap/readme/35_example.png
-- demo/doc/screenshots/bootstrap/readme/36_example.png
-- demo/doc/screenshots/bootstrap/readme/37_example.png
-- demo/doc/screenshots/bootstrap/readme/38_example.png
-- demo/doc/screenshots/bootstrap/readme/39_example.png
-- demo/doc/screenshots/bootstrap/readme/40_example.png
-- demo/doc/screenshots/bootstrap/readme/41_example.png
-- demo/doc/screenshots/bootstrap/readme/42_example.png
-- demo/doc/screenshots/bootstrap/readme/43_example.png
-- demo/doc/screenshots/bootstrap/readme/44_example.png
-- demo/doc/screenshots/bootstrap/readme/45_example.png
-- demo/doc/screenshots/bootstrap/readme/46_example.png
-- demo/doc/screenshots/bootstrap/readme/47_example.png
-- demo/doc/screenshots/bootstrap/readme/48_example.png
-- demo/doc/screenshots/bootstrap/readme/49_example.png
-- demo/doc/screenshots/bootstrap/readme/50_example.png
-- demo/log/.keep
-- demo/package.json
-- demo/public/favicon.ico
-- demo/test/application_system_test_case.rb
-- demo/test/controllers/bootstrap_controller_test.rb
-- demo/test/controllers/users_controller_test.rb
-- demo/test/fixtures/action_text/rich_texts.yml
-- demo/test/fixtures/users.yml
-- demo/test/system/bootstrap_test.rb
-- demo/test/test_helper.rb
-- demo/webpack.config.js
-- demo/yarn.lock
 - docker-compose.yml
-- gemfiles/5.2.gemfile
 - gemfiles/6.0.gemfile
 - gemfiles/6.1.gemfile
 - gemfiles/7.0.gemfile
+- gemfiles/common.gemfile
 - gemfiles/edge.gemfile
 - lib/bootstrap_form.rb
 - lib/bootstrap_form/action_view_extensions/form_helper.rb
@@ -221,6 +88,7 @@ files:
 - lib/bootstrap_form/form_group_builder.rb
 - lib/bootstrap_form/helpers.rb
 - lib/bootstrap_form/helpers/bootstrap.rb
+- lib/bootstrap_form/helpers/field.rb
 - lib/bootstrap_form/inputs.rb
 - lib/bootstrap_form/inputs/base.rb
 - lib/bootstrap_form/inputs/check_box.rb
@@ -260,7 +128,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -268,15 +136,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Rails form builder that makes it easy to style forms using Bootstrap 5
 test_files: []

data/demo/.postcssrc.yml

@@ -1,3 +0,0 @@
-plugins:
-  postcss-import: {}
-  postcss-cssnext: {}

data/demo/.ruby-version

@@ -1 +0,0 @@
-ruby-2.7.6