rails_bootstrap_form 0.9.7 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ffc0cdcd818f57b7e0b683ec59b2ac3a59b80edab6e40f9eebe1da8d32cd376
-  data.tar.gz: 676be2383b1d1421b70a50ad5dc044eed15dfe4707b26ca345077644de9abebc
+  metadata.gz: 4d162d5f0c75c1cb4197b2a39c2a97507701b9551a36ed8dec2d0c854d1f1765
+  data.tar.gz: ed59ebe1781a986acaa02e21d58a0de124bd28db51416ab95651394bd77c3c60
 SHA512:
-  metadata.gz: cdf31544bc3fd0032dff7b12bb95b1af33466d8e5a199ea0ecd263e1a8cdfdc2d00b02cc95425a1e712c6f2edd8ca626cf5e9ca6523fdf7eecf66a5a4776b17e
-  data.tar.gz: 60e72524a66706827e25fd018ffbe4dc75e823d346a86627c525e0e9f095af6a490846dc04526127708f4c30811f59c30c94b32936543055dcc6bf2fd6a3af4f
+  metadata.gz: ce0eb94537c026a961c5323567e150c4c3c962252d6e670317a08176d6dc70c65aca0c70ea66dbf1ab90b874f25363218fc6fe084d819282b9310618e9853a2f
+  data.tar.gz: 5b7c554cc34e2e9d603f623a263bef1ad019fe2e9ff0c27a276e2c2196a92502d28d1a123e0c9ec93d38115e4c78c0174b8ef6500d3278e86908c25e094dfba6

data/.codeclimate.yml

@@ -0,0 +1,47 @@
+version: "2"
+checks:
+  argument-count:
+    enabled: true
+    config:
+      threshold: 4
+  complex-logic:
+    enabled: true
+    config:
+      threshold: 4
+  file-lines:
+    enabled: true
+    config:
+      threshold: 250
+  method-complexity:
+    enabled: true
+    config:
+      threshold: 5
+  method-count:
+    enabled: true
+    config:
+      threshold: 20
+  method-lines:
+    enabled: true
+    config:
+      threshold: 25
+  nested-control-flow:
+    enabled: true
+    config:
+      threshold: 4
+  return-statements:
+    enabled: true
+    config:
+      threshold: 4
+exclude_patterns:
+- "config/"
+- "db/"
+- "dist/"
+- "features/"
+- "demo/"
+- "**/node_modules/"
+- "script/"
+- "**/spec/"
+- "**/test/"
+- "**/tests/"
+- "**/vendor/"
+- "**/*.d.ts"

data/CHANGELOG.md

@@ -4,6 +4,16 @@ You can find recent releases with docs in GitHub:
 
 https://github.com/shivam091/rails_bootstrap_form/releases
 
+## [0.9.9](https://github.com/shivam091/rails_bootstrap_form/compare/v0.9.8...v0.9.9) - 2023-07-02
+
+- Code smell fixes and removed `role="form"` from demo application and readme.
+
+## [0.9.8](https://github.com/shivam091/rails_bootstrap_form/compare/v0.9.7...v0.9.8) - 2023-07-01
+
+### What's fixed
+
+- Fixed bug causing button helpers not to work with block and options ([#50](https://github.com/shivam091/rails_bootstrap_form/issues/50))
+
 ## [0.9.7](https://github.com/shivam091/rails_bootstrap_form/compare/v0.9.6...v0.9.7) - 2023-06-26
 
 ### What's new

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails_bootstrap_form (0.9.7)
+    rails_bootstrap_form (0.9.9)
       actionpack (~> 7.0)
       activemodel (~> 7.0)
 

data/README.md

@@ -2,6 +2,9 @@
 
 [![Ruby](https://github.com/shivam091/rails_bootstrap_form/actions/workflows/main.yml/badge.svg?branch=main)](https://github.com/shivam091/rails_bootstrap_form/actions/workflows/main.yml)
 [![Gem Version](https://badge.fury.io/rb/rails_bootstrap_form.svg)](https://badge.fury.io/rb/rails_bootstrap_form)
+[![Gem Downloads](https://img.shields.io/gem/dt/rails_bootstrap_form.svg)](http://rubygems.org/gems/rails_bootstrap_form)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/8038de955c10394ae35d/test_coverage)](https://codeclimate.com/github/shivam091/rails_bootstrap_form/test_coverage)
+[![Maintainability](https://api.codeclimate.com/v1/badges/8038de955c10394ae35d/maintainability)](https://codeclimate.com/github/shivam091/rails_bootstrap_form/maintainability)
 
 **rails_bootstrap_form** is a Rails form builder that makes it super easy to integrate [Bootstrap 5](https://getbootstrap.com/) forms into your Rails application.
 `rails_bootstrap_form`'s form helpers generate the form field and its label along with all the Bootstrap mark-up required for proper Bootstrap display.
@@ -28,7 +31,7 @@ for setting up `application.scss` and `application.js`.
 Add the `rails_bootstrap_form` gem to your `Gemfile`:
 
 ```ruby
-gem "rails_bootstrap_form", "~> 0.9.6"
+gem "rails_bootstrap_form", "~> 0.9.8"
 ```
 
 Then:
@@ -94,7 +97,7 @@ To get started, use the `bootstrap_form_for` helper in place of the Rails [`form
 This generates the following HTML:
 
 ```html
-<form role="form" novalidate="novalidate" class="new_user" id="new_user" action="/users" accept-charset="UTF-8" method="post">
+<form novalidate="novalidate" class="new_user" id="new_user" action="/users" accept-charset="UTF-8" method="post">
   <div class="mb-3">
     <label class="form-label required" for="user_email">Email address</label>
     <input class="form-control" aria-required="true" required="required" type="email" name="user[email]" id="user_email">
@@ -132,7 +135,7 @@ To get started, use the `bootstrap_form_with` helper in place of the Rails [`for
 This generates the following HTML:
 
 ```html
-<form role="form" novalidate="novalidate" class="new_user" id="new_user" action="/users" accept-charset="UTF-8" method="post">
+<form novalidate="novalidate" class="new_user" id="new_user" action="/users" accept-charset="UTF-8" method="post">
   <div class="mb-3">
     <label class="form-label required" for="user_email">Email address</label>
     <input class="form-control" aria-required="true" required="required" type="email" name="user[email]" id="user_email">
@@ -200,7 +203,7 @@ Here's an example of a form where one field uses different layout:
 This generates the following HTML:
 
 ```html
-<form role="form" novalidate="novalidate" class="new_user" id="new_user" action="/users" accept-charset="UTF-8" method="post">
+<form novalidate="novalidate" class="new_user" id="new_user" action="/users" accept-charset="UTF-8" method="post">
   <div class="mb-3">
     <label class="form-label required" for="user_name">Name</label>
     <input class="form-control" aria-required="true" required="required" type="text" name="user[name]" id="user_name">
@@ -343,7 +346,7 @@ Here's an example of how it looks like:
 This generates the following HTML:
 
 ```html
-<form role="form" novalidate="novalidate" class="new_user" id="new_user" action="/users" accept-charset="UTF-8" method="post">
+<form novalidate="novalidate" class="new_user" id="new_user" action="/users" accept-charset="UTF-8" method="post">
   <div class="mb-3">
     <label class="form-label required" for="user_email">Email address</label>
     <input class="form-control" aria-required="true" required="required" type="email" name="user[email]" id="user_email">
@@ -376,7 +379,7 @@ Here's an example of how it looks like by default:
 This generates the following HTML:
 
 ```html
-<form role="form" novalidate="novalidate" class="new_user" id="new_user" action="/users" accept-charset="UTF-8" method="post">
+<form novalidate="novalidate" class="new_user" id="new_user" action="/users" accept-charset="UTF-8" method="post">
   <div class="row mb-3">
     <label class="col-form-label col-sm-2 required" for="user_email">Email address</label>
     <div class="col-sm-10">
@@ -413,7 +416,7 @@ The `label_col_wrapper_class` and `field_col_wrapper_class` css classes can also
 This generates the following HTML:
 
 ```html
-<form role="form" novalidate="novalidate" class="new_user" id="new_user" action="/users" accept-charset="UTF-8" method="post">
+<form novalidate="novalidate" class="new_user" id="new_user" action="/users" accept-charset="UTF-8" method="post">
   <div class="row mb-3">
     <label class="col-form-label col-sm-2 required" for="user_name">Name</label>
     <div class="col-sm-10">
@@ -467,7 +470,7 @@ Here's an example of how it looks like:
 This generates the following HTML:
 
 ```html
-<form role="form" novalidate="novalidate" class="new_user row row-cols-lg-auto g-3 align-items-center" id="new_user" action="/users" accept-charset="UTF-8" method="post">
+<form novalidate="novalidate" class="new_user row row-cols-lg-auto g-3 align-items-center" id="new_user" action="/users" accept-charset="UTF-8" method="post">
   <div class="col-12">
     <label class="form-label visually-hidden required" for="user_email">Email address</label>
     <input class="form-control" aria-required="true" required="required" placeholder="Email address" type="email" name="user[email]" id="user_email">
@@ -918,7 +921,7 @@ Our `fields_for` helper accepts the same arguments as the [default Rails helper]
 This generates the following HTML:
 
 ```html
-<form role="form" novalidate="novalidate" class="new_user" id="new_user" action="/users" accept-charset="UTF-8" method="post">
+<form novalidate="novalidate" class="new_user" id="new_user" action="/users" accept-charset="UTF-8" method="post">
   <div class="mb-3">
     <label class="form-label required" for="user_email">Email address</label>
     <input autocomplete="new-email" class="form-control" aria-required="true" required="required" type="email" name="user[email]" id="user_email">
@@ -981,7 +984,7 @@ By setting `bootstrap` option on `bootstrap_form_for` or `bootstrap_form_with`,
 This generates the following HTML:
 
 ```html
-<form role="form" novalidate="novalidate" class="new_user" id="new_user" action="/users" accept-charset="UTF-8" method="post">
+<form novalidate="novalidate" class="new_user" id="new_user" action="/users" accept-charset="UTF-8" method="post">
   <div class="row mb-3">
     <label class="col-form-label col-sm-2 required" for="user_email">Email address</label>
     <div class="col-sm-10">
@@ -1927,7 +1930,7 @@ The `floating` option can be used to enable Bootstrap floating labels. This opti
 This generates the following HTML:
 
 ```html
-<form role="form" novalidate="novalidate" class="new_user" id="new_user" action="/users" accept-charset="UTF-8" method="post">
+<form novalidate="novalidate" class="new_user" id="new_user" action="/users" accept-charset="UTF-8" method="post">
   <div class="mb-3">
     <div class="form-floating">
       <input class="form-control" aria-required="true" required="required" placeholder="Name" type="text" name="user[name]" id="user_name">
@@ -1991,7 +1994,7 @@ By default, fields that have validation errors will be outlined in red and the e
 This generates the following HTML:
 
 ```html
-<form role="form" novalidate="novalidate" class="new_user" id="new_user" action="/users" accept-charset="UTF-8" method="post">
+<form novalidate="novalidate" class="new_user" id="new_user" action="/users" accept-charset="UTF-8" method="post">
   <div class="mb-3">
     <label class="form-label required is-invalid" for="user_email">Email address</label>
     <input class="form-control is-invalid" aria-required="true" required="required" type="email" name="user[email]" id="user_email">

data/demo/config/initializers/rails_bootstrap_form.rb

@@ -6,5 +6,5 @@
 
 RailsBootstrapForm.configure do |config|
   # to make forms non-compliant with W3C.
-  config.default_form_attributes = {role: "form", novalidate: true}
+  config.default_form_attributes = {novalidate: true}
 end

data/lib/rails_bootstrap_form/action_view_extensions/bootstrap_form_helper.rb

@@ -36,6 +36,8 @@ module RailsBootstrapForm
         end
       end
 
+      private
+
       def supress_form_field_errors
         original_proc = ActionView::Base.field_error_proc
         ActionView::Base.field_error_proc = RailsBootstrapForm.field_error_proc
@@ -43,8 +45,6 @@ module RailsBootstrapForm
       ensure
         ActionView::Base.field_error_proc = original_proc
       end
-
-      private :supress_form_field_errors
     end
   end
 end

data/lib/rails_bootstrap_form/bootstrap_form_builder.rb

@@ -13,7 +13,7 @@ module RailsBootstrapForm
     include RailsBootstrapForm::InputGroupBuilder
     include RailsBootstrapForm::Inputs
 
-    delegate :capture, :concat, :tag, to: :@template
+    delegate :capture, :concat, :tag, :button_tag, to: :@template
 
     attr_accessor :bootstrap_form_options
 
@@ -30,6 +30,8 @@ module RailsBootstrapForm
       super(record_name, record_object, fields_options, &block)
     end
 
+    private
+
     def apply_default_form_options(options)
       options[:html] ||= {}
       options[:html].reverse_merge!(RailsBootstrapForm.config.default_form_attributes)
@@ -49,7 +51,5 @@ module RailsBootstrapForm
       fields_options = bootstrap.deep_merge!(fields_options)
       fields_options
     end
-
-    private :apply_default_form_options, :fields_for_options, :apply_default_form_classes
   end
 end

data/lib/rails_bootstrap_form/bootstrap_form_options.rb

@@ -177,6 +177,8 @@ module RailsBootstrapForm
       self.field_class ||= css_class
     end
 
+    private
+
     def set_defaults
       @disabled = false
 
@@ -216,7 +218,5 @@ module RailsBootstrapForm
 
       @render_as_button = false
     end
-
-    private :set_defaults
   end
 end

data/lib/rails_bootstrap_form/field_wrapper_builder.rb

@@ -4,6 +4,9 @@
 
 module RailsBootstrapForm
   module FieldWrapperBuilder
+
+    private
+
     def field_wrapper_builder(attribute, bootstrap, options, html_options = nil, &block)
       field_options = field_css_options(attribute, bootstrap, options, html_options.try(:symbolize_keys!))
 
@@ -15,37 +18,17 @@ module RailsBootstrapForm
       help_text = help_text(attribute, bootstrap)
       wrapper_content = ActiveSupport::SafeBuffer.new
 
-      if bootstrap.layout_horizontal?
-        wrapper_content << label
-        wrapper_content << tag.div(class: bootstrap.field_col_wrapper_class) do
-          input_group_wrapper(attribute, bootstrap) do
-            capture(&block)
-          end + help_text
-        end
+      wrapper_content = if bootstrap.layout_horizontal?
+        build_horizontal_layout_content(attribute, bootstrap, label, help_text, &block)
       else
         if bootstrap.floating?
-          wrapper_content << input_group_wrapper(attribute, bootstrap) do
-            tag.div(class: floating_label_classes(attribute)) do
-              capture(&block) + label
-            end
-          end
-          wrapper_content << help_text
+          build_floating_layout_content(attribute, bootstrap, label, help_text, &block)
         else
-          wrapper_content << label
-          wrapper_content << input_group_wrapper(attribute, bootstrap) do
-            capture(&block)
-          end
-          wrapper_content << help_text
+          build_default_layout_content(attribute, bootstrap, label, help_text, &block)
         end
       end
 
-      if bootstrap.wrapper
-        tag.div(**field_wrapper_options(bootstrap)) do
-          wrapper_content
-        end
-      else
-        wrapper_content
-      end
+      build_wrapper_element(bootstrap, wrapper_content)
     end
 
     def field_wrapper_options(bootstrap)
@@ -72,18 +55,11 @@ module RailsBootstrapForm
     def field_css_options(attribute, bootstrap, options, html_options)
       css_options = (html_options || options)
 
-      field_classes = Array(bootstrap.field_class) << [bootstrap.additional_field_class || css_options[:class]]
-      field_classes << "is-invalid" if is_invalid?(attribute)
-      if is_size_valid?(bootstrap)
-        field_classes << "#{bootstrap.field_class}-#{bootstrap.size}"
-      end
+      field_classes = build_field_classes(attribute, bootstrap, css_options)
 
       css_options[:class] = field_classes.flatten.compact
       css_options.merge!(required_field_options(attribute, options))
-
-      if placeholder_required?(bootstrap)
-        css_options[:placeholder] ||= label_text(attribute, bootstrap)
-      end
+      add_placeholder_if_required!(css_options, attribute, bootstrap)
 
       css_options
     end
@@ -96,11 +72,63 @@ module RailsBootstrapForm
       classes
     end
 
+    def build_field_classes(attribute, bootstrap, css_options)
+      field_classes = Array(bootstrap.field_class) <<
+      field_classes << [bootstrap.additional_field_class || css_options[:class]]
+      field_classes << "is-invalid" if is_invalid?(attribute)
+      field_classes << "#{bootstrap.field_class}-#{bootstrap.size}" if is_size_valid?(bootstrap)
+      field_classes
+    end
+
     def placeholder_required?(bootstrap)
       (bootstrap.floating? && !bootstrap.layout_horizontal?) || bootstrap.layout_inline?
     end
 
-    private :field_wrapper, :field_wrapper_classes, :field_wrapper_default_class,
-            :field_css_options, :floating_label_classes
+    def add_placeholder_if_required!(css_options, attribute, bootstrap)
+      css_options[:placeholder] ||= label_text(attribute, bootstrap) if placeholder_required?(bootstrap)
+      css_options
+    end
+
+    def build_horizontal_layout_content(attribute, bootstrap, label, help_text, &block)
+      wrapper_content = ActiveSupport::SafeBuffer.new
+      wrapper_content << label
+      wrapper_content << tag.div(class: bootstrap.field_col_wrapper_class) do
+        input_group_wrapper(attribute, bootstrap) do
+          capture(&block)
+        end + help_text
+      end
+      wrapper_content
+    end
+
+    def build_floating_layout_content(attribute, bootstrap, label, help_text, &block)
+      wrapper_content = ActiveSupport::SafeBuffer.new
+      wrapper_content << input_group_wrapper(attribute, bootstrap) do
+        tag.div(class: floating_label_classes(attribute)) do
+          capture(&block) + label
+        end
+      end
+      wrapper_content << help_text
+      wrapper_content
+    end
+
+    def build_default_layout_content(attribute, bootstrap, label, help_text, &block)
+      wrapper_content = ActiveSupport::SafeBuffer.new
+      wrapper_content << label
+      wrapper_content << input_group_wrapper(attribute, bootstrap) do
+        capture(&block)
+      end
+      wrapper_content << help_text
+      wrapper_content
+    end
+
+    def build_wrapper_element(bootstrap, wrapper_content)
+      if bootstrap.wrapper
+        tag.div(**field_wrapper_options(bootstrap)) do
+          wrapper_content
+        end
+      else
+        wrapper_content
+      end
+    end
   end
 end

data/lib/rails_bootstrap_form/helpers/buttons.rb

@@ -7,37 +7,67 @@ module RailsBootstrapForm
     module Buttons
       extend ActiveSupport::Concern
 
-      def self.included(base_class)
-        def render_button(value = nil, options = {}, &block)
-          value, options = nil, value if value.is_a?(Hash)
+      included do
+        def button(value, options, &block)
           bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
+          value, options = extract_button_value_and_options(value, options)
 
-          button_html = if (bootstrap.render_as_button? || block)
-            button(value, options, &block)
-          else
-            submit(value, options)
-          end
-
-          if bootstrap.layout_inline?
-            tag.div(class: "col-12") { button_html }
-          else
-            button_html
-          end
+          add_button_css_classes!(options, bootstrap)
+
+          button_html = render_button_html(value, options, bootstrap, &block)
+          button_html = wrap_button_html(button_html, bootstrap)
+
+          button_html
         end
 
         def secondary(value = nil, options = {}, &block)
-          add_css_class!(options, "btn btn-secondary")
-          render_button(value, options, &block)
+          button(value, options.merge!(variant: "secondary"), &block)
         end
 
         def primary(value = nil, options = {}, &block)
-          add_css_class!(options, "btn btn-primary")
-          render_button(value, options, &block)
+          button(value, options.merge!(variant: "primary"), &block)
         end
 
         def danger(value = nil, options = {}, &block)
-          add_css_class!(options, "btn btn-danger")
-          render_button(value, options, &block)
+          button(value, options.merge!(variant: "danger"), &block)
+        end
+      end
+
+      private
+
+      def button_variant_class(options)
+        case options.delete(:variant)
+        when "secondary" then "btn-secondary"
+        when "primary" then "btn-primary"
+        when "danger" then "btn-danger"
+        else ""
+        end
+      end
+
+      def extract_button_value_and_options(value, options)
+        return [nil, value.merge(options)] if value.is_a?(Hash)
+
+        [value, options]
+      end
+
+      def add_button_css_classes!(options, bootstrap)
+        add_css_class!(options, "btn")
+        add_css_class!(options, button_variant_class(options))
+      end
+
+      def render_button_html(value, options, bootstrap, &block)
+        if bootstrap.render_as_button? || block
+          button_tag(value, options, &block)
+        else
+          submit(value, options)
+        end
+      end
+
+      def wrap_button_html(button_html, bootstrap)
+        if bootstrap.layout_inline?
+          tag.div(class: "col-12") { button_html }
+        else
+          button_html
         end
       end
     end

data/lib/rails_bootstrap_form/helpers/choice.rb

@@ -7,76 +7,92 @@ module RailsBootstrapForm
     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|
-            unless bootstrap.skip_label?
-              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?
+      private
 
-              label_text = label_text(attribute, bootstrap)
+      [:check_box, :radio_button].each do |tag_name|
+        define_method("#{tag_name}_label") do |attribute, value, options, bootstrap|
+          unless bootstrap.skip_label?
+            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(attribute, label_text, label_options)
-            end
+            label_text = label_text(attribute, bootstrap)
+
+            label(attribute, label_text, label_options)
           end
         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, bootstrap, 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
+      [:check_box, :radio_button].each do |tag_name|
+        define_method("bootstrap_#{tag_name}") do |attribute, value, options, bootstrap|
+          options[:class] = choice_classes(attribute, bootstrap, options)
 
-            choice_field + choice_label
+          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
-        end
 
-        def choice_classes(attribute, bootstrap, options)
-          classes = Array("form-check-input") << [bootstrap.additional_field_class || options[:class]]
-          classes << "is-invalid" if is_invalid?(attribute)
-          classes.flatten.compact
+          choice_field + choice_label
         end
+      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
+      [:check_box, :radio_button].each do |tag_name|
+        define_method("build_#{tag_name}_html") do |attribute, value, bootstrap, options|
+          tag.div(class: choice_wrapper_classes(bootstrap)) do
+            concat(send("bootstrap_#{tag_name}", attribute, value, options, bootstrap))
+            concat(help_text(attribute, bootstrap))
+            concat(generate_error(attribute)) if is_invalid?(attribute)
+          end
         end
+      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
+      [:check_box, :radio_button].each do |tag_name|
+        define_method("build_wrapped_#{tag_name}_html") do |bootstrap, tag_html|
+          tag.div(**field_wrapper_options(bootstrap)) do
+            if bootstrap.layout_horizontal?
+              tag.div(class: choice_container_classes(bootstrap)) { tag_html }
+            else
+              tag_html
+            end
+          end
         end
+      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 choice_classes(attribute, bootstrap, options)
+        classes = Array("form-check-input") << [bootstrap.additional_field_class || options[:class]]
+        classes << "is-invalid" if is_invalid?(attribute)
+        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
+      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
 
-        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?
+      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
     end
   end