rails_bootstrap_form 0.5.3 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1031de2aa81bb74657e9a45f334c4dc4d67ee673e89874358881d8021388d8b9
-  data.tar.gz: 4a5d3c85afb71bd06005eb95c0b8abb76a429a46ea49f22b470943bba2a6f7ae
+  metadata.gz: 34303679b08cf0617516305e5b4e1f21d8c201ffcd9f4cc8eb90f26a587a7f7a
+  data.tar.gz: 4e01e2321eb0318e222e802ce84e8c63648296c50e78de5de9f3c8e14be9570e
 SHA512:
-  metadata.gz: 188081d3651b5f6977df21c3bfb4436e44b3d96685ef8b6fc36b7805056b205ab77ced5f3ad4d3094217116e47f04e8a07a914db1f073c60be664bd4acf33694
-  data.tar.gz: 180295d5dbc0159f5181183be148203565d877d874d978074af43dd31ba0cfb7e7d8d2be3bcf3d3c72e1abe6d4ff58636da8c4386be3b09d64380edc4ef06b2d
+  metadata.gz: c7f4349d0933eeea1f1965df83eb80ec0fd83392a3a47e2299214a797ec36e5c198e647d727969443779d60910741f91b49f88973a6ebcf6d93a29302f308b46
+  data.tar.gz: adab966d0ca4b8064094e7e941296d95e75e594452384e9cb6e7370ca19fd288a4e9d9cea1e56dbf7981804ef58f9cafc1398d1e0203bb1eefb80004f27ab18d

data/CHANGELOG.md

@@ -1,5 +1,114 @@
-## [Unreleased]
+# Change Log
+
+You can find recent releases with docs in GitHub:
+
+https://github.com/shivam091/rails_bootstrap_form/releases
+
+## [0.6.1](https://github.com/shivam091/rails_bootstrap_form/compare/v0.6.0...v0.6.1) - 2023-05-24
+
+### What's changed
+- Changes in directory structure
+- Added test cases
+- Added README and CHANGELOG
+
+## [0.6.0](https://github.com/shivam091/rails_bootstrap_form/compare/v0.5.3...v0.6.0) - 2023-05-22
+
+### What's new
+- Added support for **`horizontal`** form layout
+
+## [0.5.3](https://github.com/shivam091/rails_bootstrap_form/compare/v0.5.2...v0.5.3) - 2023-05-21
+
+### What's changed
+- Added new option inline to render checkboxes and radio buttons inline
+
+## [0.5.2](https://github.com/shivam091/rails_bootstrap_form/compare/v0.5.1...v0.5.2) - 2023-05-21
+
+### What's new
+- Added option to add custom options to the field's wrapper
+- Added option to apply user defined CSS class to the field
+- Added option to control size of input group and field
+- Added provision to change id of the field and corresponding label
+
+### What's changed
+- Added `mb-3` css class to field wrapper if radio buttons or check boxes are not inline
+
+## [0.5.1](https://github.com/shivam091/rails_bootstrap_form/compare/v0.5.0...v0.5.1) - 2023-05-20
+
+### What's new
+- Wrapped `collection_check_boxes` and `collection_radio_buttons` inside field wrapper.
+
+## [0.5.0](https://github.com/shivam091/rails_bootstrap_form/compare/v0.4.2...v0.5.0) - 2023-05-20
+
+### What's new
+- Added wrapper methods for `check_box`, `collection_check_boxes`, `radio_button`, and `collection_radio_buttons` to support Bootstrap 5 form styles
+
+### What's changed
+- Replaced HTML tag of help_text component from `<span>` to `<div>`
+
+## [0.4.2](https://github.com/shivam091/rails_bootstrap_form/compare/v0.4.1...v0.4.2) - 2023-05-16
+
+### What's new
+- Added wrapper method for `grouped_collection_select`
+
+## [0.4.1](https://github.com/shivam091/rails_bootstrap_form/compare/v0.4.0...v0.4.1) - 2023-05-16
 
-## [0.1.0] - 2023-05-15
+### What's fixed
+- Replaced `reverse_merge` by `deep_merge!` in adding new option values to fix bug causing not to merge options.
+
+## [0.4.0](https://github.com/shivam091/rails_bootstrap_form/compare/v0.3.1...v0.4.0) - 2023-05-15
+
+### What's new
+- Added wrapper methods for `range_field` and `color_field`
+- Added wrapper methods for `time_zone_select` and `hidden_field`
+- Added wrapper methods for `date_select`, `time_select`, and `datetime_select`
+- Added wrapper method to render static control
+- Added wrapper method for `collection_select`
+
+## [0.3.1](https://github.com/shivam091/rails_bootstrap_form/compare/v0.3.0...v0.3.1) - 2023-05-15
+
+### What's fixed
+- Bug causing fields to wrap in input group even when content to append and prepend is not available.
+
+## [0.3.0](https://github.com/shivam091/rails_bootstrap_form/compare/v0.2.3...v0.3.0) - 2023-05-15
+
+### What's new
+- Added support to wrap field in input group
+- Added support to display error messages below the field
+- Added support for floating labels for inputs.
+
+## [0.2.3](https://github.com/shivam091/rails_bootstrap_form/compare/v0.2.2...v0.2.3) - 2023-05-15
+
+### What's new
+- Added component to mark labels as required
+
+## [0.2.2](https://github.com/shivam091/rails_bootstrap_form/compare/v0.2.1...v0.2.2) - 2023-05-15
+
+### What's new
+- Added support to display labels along with the field.
+
+## [0.2.1](https://github.com/shivam091/rails_bootstrap_form/compare/v0.2.0...v0.2.1) - 2023-05-15
+
+### What's new
+- Added FieldWrapperBuilder to create wrapper for placing fields and other related components
+- Added support to display help text along with the field
+- Added wrapper methods for simple form fields
+
+## [0.2.0](https://github.com/shivam091/rails_bootstrap_form/compare/v0.1.1...v0.2.0) - 2023-05-15
+
+### What's new
+- Added PORO class `BootstrapFormOptions` to maintain gem specific configuration.
+- Added BoostrapFormBuilder and extension methods for Rails form builder.
+- Added required models, controllers, and views in demo application.
+
+## [0.1.1](https://github.com/shivam091/rails_bootstrap_form/compare/v0.1.0...v0.1.1) - 2023-05-15
+
+### What's new
+- Initialized demo application for demonstrating the working.
+- Added generater to copy initializer file required for maintaining global configuration.
+- Added Configuration class to maintain configurable options.
+
+## 0.1.0 - 2023-05-15
 
 - Initial release
+
+## [Unreleased]

data/Gemfile.lock

@@ -1,7 +1,9 @@
 PATH
   remote: .
   specs:
-    rails_bootstrap_form (0.5.3)
+    rails_bootstrap_form (0.6.1)
+      actionpack (~> 7.0)
+      activemodel (~> 7.0)
 
 GEM
   remote: http://rubygems.org/
@@ -79,6 +81,8 @@ GEM
       sassc-rails (>= 2.0.0)
     builder (3.2.4)
     byebug (11.1.3)
+    compare-xml (0.66)
+      nokogiri (~> 1.8)
     concurrent-ruby (1.2.2)
     crass (1.0.6)
     date (3.3.3)
@@ -118,6 +122,7 @@ GEM
     nio4r (2.5.9)
     nokogiri (1.14.4-x86_64-linux)
       racc (~> 1.4)
+    pg (1.5.3)
     popper_js (2.11.7)
     puma (6.2.2)
       nio4r (~> 2.0)
@@ -190,7 +195,6 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.6.2-x86_64-linux)
     thor (1.2.2)
     tilt (2.1.0)
     timeout (0.3.2)
@@ -207,7 +211,10 @@ PLATFORMS
 DEPENDENCIES
   bootstrap (~> 5.3.0.alpha3)
   byebug
+  compare-xml
   generator_spec
+  nokogiri
+  pg (~> 1.1)
   puma
   rails (~> 7.0)
   rails_bootstrap_form!
@@ -216,7 +223,6 @@ DEPENDENCIES
   sassc-rails
   simplecov
   sprockets-rails
-  sqlite3 (~> 1.4)
 
 BUNDLED WITH
    2.4.10

data/README.md

@@ -0,0 +1,68 @@
+# RailsBootstrapForm
+
+**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.
+
+## Minimum Requirements
+
+* Ruby 3.2.2+ (https://www.ruby-lang.org/en/downloads/branches/)
+* Rails 7.0+ (https://guides.rubyonrails.org/maintenance_policy.html)
+* Bootstrap 5.0+ (https://getbootstrap.com/docs/versions/)
+
+## Installation
+
+Install Bootstrap 5. There are many ways to do this, depending on the asset pipeline you're using in your Rails application. One way is to use the gem that works with Sprockets. To do so, in a brand new Rails 7.0 application created _without_ the `--webpacker` option, add the `bootstrap` gem to your `Gemfile`:
+
+```ruby
+gem "bootstrap", "~> 5.0"
+```
+
+And follow the remaining instructions in the [official bootstrap installation guide](https://github.com/twbs/bootstrap-rubygem#a-ruby-on-rails) for setting up `application.scss` and `application.js`.
+
+Add the `rails_bootstrap_form` gem to your `Gemfile`:
+
+```ruby
+gem "rails_bootstrap_form", "~> 0.6.1"
+```
+
+Then:
+
+`bundle install`
+
+Depending on which CSS pre-processor you are using, adding the bootstrap form styles differs slightly.
+If you use Rails in the default mode without any pre-processor, you'll have to add the following line to your `application.css` file:
+
+```css
+*= require rails_bootstrap_form
+```
+
+If you followed the [official bootstrap installation guide](https://github.com/twbs/bootstrap-rubygem#a-ruby-on-rails), you'll probably have switched to SCSS. In this case add the following line to your `application.scss`:
+
+```scss
+@import "rails_bootstrap_form";
+```
+
+## Configuration
+
+`rails_bootstrap_form` can be used without any configuration. However, `rails_bootstrap_form` does have an optional configuration file at `config/initializers/rails_bootstrap_form.rb` for setting options that affect all generated forms in an application. This configuration file is created using the generator
+by running the command on the terminal.
+
+```
+$ rails generate rails_bootstrap_form:install
+```
+
+Example:
+
+```ruby
+# config/initializers/rails_bootstrap_form.rb
+RailsBootstrapForm.configure do |config|
+  # to make forms non-compliant with W3C.
+  config.default_form_attributes = {role: "form", novalidate: true}
+end
+```
+
+The current configuration options are:
+
+| Option | Default value | Description |
+|---------------------------|------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `default_form_attributes` | | Set this option to `{role: "form"}` to make forms non-compliant with W3C, but generate the `role="form"` attribute. |

data/Rakefile

@@ -4,7 +4,9 @@
 
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require_relative "demo/config/application"
 
+Rails.application.load_tasks
 RSpec::Core::RakeTask.new(:spec)
 
 task default: :spec

data/app/assets/stylesheets/rails_bootstrap_form.css

@@ -20,3 +20,6 @@ label.required::after {
   display: inline-block;
   width: auto;
 }
+.invalid-feedback {
+  display: block;
+}

data/demo/app/views/users/_form.html.erb

@@ -3,3 +3,5 @@
 <% end %>
 
 <%= render partial: "users/vertical_form" %>
+
+<%= render partial: "users/horizontal_form" %>

data/demo/app/views/users/_horizontal_form.html.erb

@@ -0,0 +1,32 @@
+<div class="card card-primary my-3">
+  <div class="card-header fw-bold">
+    Profile Form (Horizontal layout)
+  </div>
+  <div class="card-body">
+    <%= bootstrap_form_for @user, bootstrap_form: {layout: :horizontal} do |form| %>
+      <%= form.text_field :name, autocomplete: "new-name" %>
+      <%= form.email_field :email, autocomplete: "new-email" %>
+      <%= form.password_field :password, autocomplete: "new-password" %>
+      <%= form.phone_field :mobile_number %>
+      <%= form.date_field :birth_date %>
+      <%= form.range_field :excellence %>
+      <%= form.url_field :blog_url %>
+      <%= form.collection_radio_buttons :fruit_id, ::Fruit.all, :id, :name, {checked: form.object.fruit_id} %>
+      <%= form.color_field :favorite_color %>
+      <%= form.collection_check_boxes :skill_ids, ::Skill.all, :id, :name %>
+      <%= form.fields_for :address, include_id: false, bootstrap_form: {layout: :horizontal} do |address_form| %>
+        <%= address_form.text_area :street %>
+        <%= address_form.text_field :state %>
+        <%= address_form.grouped_collection_select :city, ::Country.includes(:cities), :cities, :name, :id, :name, {include_blank: "Select city"} %>
+        <%= address_form.text_field :postal_code %>
+        <%= address_form.select :country_id, options_for_select(::Country.pluck(:name, :id), address_form.object.country_id),
+            {include_blank: "Select Country"} %>
+      <% end %>
+      <%= form.check_box :terms, required: true %>
+      <div class="mt-3">
+        <%= form.submit "Register", class: "btn btn-primary" %>
+        <%= link_to "Cancel", users_path, class: "btn btn-secondary" %>
+      </div>
+    <% end %>
+  </div>
+</div>

data/demo/app/views/users/_vertical_form.html.erb

@@ -3,26 +3,26 @@
     Profile Form (Vertical layout)
   </div>
   <div class="card-body">
-    <%= bootstrap_form_for @user, bootstrap_form: {} do |form| %>
-      <%= form.text_field :name, autocomplete: "new-name", class: "dsds", bootstrap_form: {} %>
-      <%= form.text_field :email, autocomplete: "new-email", bootstrap_form: {} %>
-      <%= form.text_field :password, autocomplete: "new-password" %>
+    <%= bootstrap_form_for @user do |form| %>
+      <%= form.text_field :name, autocomplete: "new-name" %>
+      <%= form.email_field :email, autocomplete: "new-email" %>
+      <%= form.password_field :password, autocomplete: "new-password" %>
       <%= form.phone_field :mobile_number %>
       <%= form.date_field :birth_date %>
-      <%= form.check_box :terms, bootstrap_form: {switch: false}, required: true %>
       <%= form.range_field :excellence %>
       <%= form.url_field :blog_url %>
-      <%= form.collection_radio_buttons :fruit_id, ::Fruit.all, :id, :name, {bootstrap_form: {inline: true}, checked: form.object.fruit_id} %>
+      <%= form.collection_radio_buttons :fruit_id, ::Fruit.all, :id, :name, {checked: form.object.fruit_id} %>
       <%= form.color_field :favorite_color %>
-      <%= form.collection_check_boxes :skill_ids, ::Skill.all, :id, :name, {bootstrap_form: {inline: true}} %>
+      <%= form.collection_check_boxes :skill_ids, ::Skill.all, :id, :name %>
       <%= form.fields_for :address, include_id: false do |address_form| %>
         <%= address_form.text_area :street %>
         <%= address_form.text_field :state %>
         <%= address_form.grouped_collection_select :city, ::Country.includes(:cities), :cities, :name, :id, :name, {include_blank: "Select city"} %>
         <%= address_form.text_field :postal_code %>
         <%= address_form.select :country_id, options_for_select(::Country.pluck(:name, :id), address_form.object.country_id),
-            {include_blank: "Select Country", bootstrap_form: {}} %>
+            {include_blank: "Select Country"} %>
       <% end %>
+      <%= form.check_box :terms, required: true %>
       <div class="mt-3">
         <%= form.submit "Register", class: "btn btn-primary" %>
         <%= link_to "Cancel", users_path, class: "btn btn-secondary" %>

data/demo/config/database.yml

@@ -1,25 +1,17 @@
-# SQLite. Versions 3.8.0 and up are supported.
-#   gem install sqlite3
-#
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem "sqlite3"
-#
 default: &default
-  adapter: sqlite3
-  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
-  timeout: 5000
+  adapter: postgresql
+  encoding: unicode
+  reconnect: false
+  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 20 } %>
 
 development:
   <<: *default
-  database: db/development.sqlite3
+  url: <%= ENV["DATABASE_URL"] %>
 
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
 test:
   <<: *default
-  database: db/test.sqlite3
+  url: <%= ENV["DATABASE_URL"] %>
 
 production:
   <<: *default
-  database: db/production.sqlite3
+  url: <%= ENV["DATABASE_URL"] %>

data/demo/db/schema.rb

@@ -11,8 +11,11 @@
 # It's strongly recommended that you check this file into your version control system.
 
 ActiveRecord::Schema[7.0].define(version: 2023_05_16_044126) do
+  # These are extensions that must be enabled in order to support this database
+  enable_extension "plpgsql"
+
   create_table "addresses", primary_key: "user_id", force: :cascade do |t|
-    t.integer "country_id"
+    t.bigint "country_id"
     t.string "street"
     t.string "city"
     t.string "state"
@@ -25,7 +28,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_05_16_044126) do
 
   create_table "cities", force: :cascade do |t|
     t.string "name"
-    t.integer "country_id"
+    t.bigint "country_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["country_id"], name: "index_cities_on_country_id"
@@ -50,8 +53,8 @@ ActiveRecord::Schema[7.0].define(version: 2023_05_16_044126) do
   end
 
   create_table "user_skills", force: :cascade do |t|
-    t.integer "user_id"
-    t.integer "skill_id"
+    t.bigint "user_id"
+    t.bigint "skill_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["skill_id"], name: "index_user_skills_on_skill_id"
@@ -65,7 +68,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_05_16_044126) do
     t.string "mobile_number"
     t.string "blog_url"
     t.date "birth_date"
-    t.integer "fruit_id"
+    t.bigint "fruit_id"
     t.boolean "terms"
     t.string "excellence"
     t.string "favorite_color"

data/gemfiles/common.gemfile

@@ -15,8 +15,8 @@ gem "sassc-rails"
 # Add bootstrap support
 gem "bootstrap", "~> 5.3.0.alpha3"
 
-# Use sqlite3 as the database for Active Record
-gem "sqlite3", "~> 1.4"
+# Use postgresql as the database for Active Record
+gem "pg", "~> 1.1"
 
 # Library to show coverage of the code.
 gem "simplecov"
@@ -25,6 +25,14 @@ group :development do
   gem "puma"
 end
 
+group :test do
+  # make it easy and painless to work with XML and HTML from Ruby.
+  gem "nokogiri"
+
+  # Solve your XML/HTML comparison or diffing needs.
+  gem "compare-xml"
+end
+
 group :development, :test do
   gem "byebug"
 end

data/lib/rails_bootstrap_form/bootstrap_form_builder.rb

@@ -6,7 +6,7 @@ module RailsBootstrapForm
   class BootstrapFormBuilder < ActionView::Helpers::FormBuilder
 
     include RailsBootstrapForm::FieldWrapperBuilder
-    include RailsBootstrapForm::Components
+    include RailsBootstrapForm::Helpers
     include RailsBootstrapForm::InputGroupBuilder
     include RailsBootstrapForm::Inputs
 

data/lib/rails_bootstrap_form/bootstrap_form_options.rb

@@ -50,8 +50,9 @@ module RailsBootstrapForm
     # readers. Default is `visually-hidden`
     attr_accessor :hide_class
 
-    # Default CSS class that will be applied to all label tags.
-    # Default is `form-label`.
+    # Default CSS class that will be applied to all label tags when layout is
+    # vertical.
+    # The default value is `form-label`.
     attr_accessor :label_class
 
     # An additional CSS class that will be added along with the existing
@@ -105,6 +106,19 @@ module RailsBootstrapForm
     #   form.collection_radio_buttons :choices, ["yes", "no"], :to_s, :to_s, bootstrap_form: {inline: true}
     attr_accessor :inline
 
+    # Default CSS class that will be applied to all label tags when layout is
+    # horizontal.
+    # The default value is `col-form-label`.
+    attr_accessor :label_col_class
+
+    # Default CSS class for label column when using horizontal form.
+    # The default value is `col-sm-2`.
+    attr_accessor :label_col_wrapper_class
+
+    # Default CSS class for control column when using horizontal form.
+    # The default value is `col-sm-10`.
+    attr_accessor :field_col_wrapper_class
+
     def initialize(options = {})
       set_defaults
       set_bootstrap_form_options(options)
@@ -131,7 +145,7 @@ module RailsBootstrapForm
     # to a given form field. For example, we can change grid just for one field:
     #
     #   bootstrap_form_with model: @user do |f|
-    #     f.text_field :email, bootstrap_form: {label_col_class: "col-md-6", control_col_class: "col-md-6"}
+    #     f.text_field :email, bootstrap_form: {label_col_wrapper_class: "col-md-6", field_col_wrapper_class: "col-md-6"}
     #     f.password_field :password
     #   end
     #
@@ -173,6 +187,10 @@ module RailsBootstrapForm
       @size = nil
 
       @inline = false
+
+      @label_col_class = "col-form-label"
+      @label_col_wrapper_class = "col-sm-2"
+      @field_col_wrapper_class = "col-sm-10"
     end
 
     private :set_defaults

data/lib/rails_bootstrap_form/field_wrapper_builder.rb

@@ -16,35 +16,49 @@ module RailsBootstrapForm
       label = draw_label(attribute, options, bootstrap_options)
       help_text = help_text(attribute, bootstrap_options)
 
-      if bootstrap_options.floating
+      if bootstrap_options.layout_horizontal?
         tag.div(**field_wrapper_options(bootstrap_options)) do
-          concat(input_group_wrapper(attribute, bootstrap_options) do
-            tag.div(class: floating_label_classes(attribute)) do
-              concat(capture(&block))
-              concat(label)
-            end
+          concat(label)
+          concat(tag.div(class: bootstrap_options.field_col_wrapper_class) do
+            concat(input_group_wrapper(attribute, bootstrap_options) do
+              capture(&block)
+            end)
+            concat(help_text)
           end)
-          concat(help_text)
         end
       else
-        tag.div(**field_wrapper_options(bootstrap_options)) do
-          concat(label)
-          concat(input_group_wrapper(attribute, bootstrap_options) do
-            capture(&block)
-          end)
-          concat(help_text)
+        if bootstrap_options.floating
+          tag.div(**field_wrapper_options(bootstrap_options)) do
+            concat(input_group_wrapper(attribute, bootstrap_options) do
+              tag.div(class: floating_label_classes(attribute)) do
+                concat(capture(&block))
+                concat(label)
+              end
+            end)
+            concat(help_text)
+          end
+        else
+          tag.div(**field_wrapper_options(bootstrap_options)) do
+            concat(label)
+            concat(input_group_wrapper(attribute, bootstrap_options) do
+              capture(&block)
+            end)
+            concat(help_text)
+          end
         end
       end
     end
 
     def field_wrapper_options(bootstrap_options)
       {}.tap do |option|
-        option[:class] = field_wrapper_classes
+        option[:class] = field_wrapper_classes(bootstrap_options)
       end.merge(bootstrap_options.wrapper_options)
     end
 
-    def field_wrapper_classes
-      classes = [form_wrapper_default_class]
+    def field_wrapper_classes(bootstrap_options)
+      classes = []
+      classes << "row" if bootstrap_options.layout_horizontal?
+      classes << form_wrapper_default_class
       classes.flatten.compact
     end
 
@@ -68,7 +82,7 @@ module RailsBootstrapForm
       css_options[:class] = field_classes.flatten.compact
       css_options.merge!(required_field_options(attribute, options))
 
-      if bootstrap_options.floating
+      if (bootstrap_options.floating && !bootstrap_options.layout_horizontal?)
         css_options[:placeholder] ||= label_text(attribute, bootstrap_options)
       end
 

data/lib/rails_bootstrap_form/{components → helpers}/check_box.rb

@@ -3,7 +3,7 @@
 # -*- warn_indent: true -*-
 
 module RailsBootstrapForm
-  module Components
+  module Helpers
     module CheckBox
       extend ActiveSupport::Concern
 
@@ -62,11 +62,18 @@ module RailsBootstrapForm
           classes = Array("form-check")
           classes << "form-switch" if bootstrap_options.switch
           classes << "form-check-inline" if bootstrap_options.inline?
-          classes << "mb-3"
+          classes << "mb-3" unless (bootstrap_options.layout_horizontal? || bootstrap_options.inline?)
           classes.flatten.compact
         end
 
-        private :check_box_label, :check_box_classes, :check_box_label_class, :check_box_wrapper_class
+        def check_box_container_classes(bootstrap_options)
+          classes = Array(bootstrap_options.field_col_wrapper_class)
+          classes << field_offset_class(bootstrap_options.label_col_wrapper_class)
+          classes.flatten.compact
+        end
+
+        private :check_box_label, :check_box_classes, :check_box_label_class,
+                :check_box_wrapper_class, :check_box_container_classes
       end
     end
   end

data/lib/rails_bootstrap_form/{components → helpers}/errors.rb

@@ -3,7 +3,7 @@
 # -*- warn_indent: true -*-
 
 module RailsBootstrapForm
-  module Components
+  module Helpers
     module Errors
       extend ActiveSupport::Concern
 

data/lib/rails_bootstrap_form/{components → helpers}/help_text.rb

@@ -3,7 +3,7 @@
 # -*- warn_indent: true -*-
 
 module RailsBootstrapForm
-  module Components
+  module Helpers
     module HelpText
       extend ActiveSupport::Concern
 

data/lib/rails_bootstrap_form/{components → helpers}/labels.rb

@@ -3,7 +3,7 @@
 # -*- warn_indent: true -*-
 
 module RailsBootstrapForm
-  module Components
+  module Helpers
     module Labels
       extend ActiveSupport::Concern
 
@@ -21,7 +21,13 @@ module RailsBootstrapForm
         end
 
         def label_classes(attribute, bootstrap_options)
-          classes = [bootstrap_options.label_class, bootstrap_options.additional_label_class]
+          classes = []
+          classes << if bootstrap_options.layout_horizontal?
+            [bootstrap_options.label_col_class, bootstrap_options.label_col_wrapper_class]
+          else
+            bootstrap_options.label_class
+          end
+          classes << bootstrap_options.additional_label_class
           classes << bootstrap_options.hide_class if bootstrap_options.hide_label
           classes << "required" if is_attribute_required?(attribute)
           classes << "is-invalid" if is_invalid?(attribute)