simple_form 4.1.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1461390ccbd2b434d67a43a84ada68f255d08bc48a9e23d7734075c8f105b400
-  data.tar.gz: c81c4b918e6f9e467081e8b534273ef8807ef6e508da40077fe4c91b5b85a66f
+  metadata.gz: 8260fa0dbaf1a82ae7b8a5c120c4f26ba4e2f0c03a9821241bf6d2d193962384
+  data.tar.gz: f1ef61699c7246302e31eb405c734816491b1698419bc810643b71c54d7ffb2d
 SHA512:
-  metadata.gz: 71d69573ae8125232a436ea4c23115584497647de1a3b5fa996c9c95f78599b3a3e9ff07ce0812cd5370a1e2c0351dc8fdc43bbea30b7f35d6c68213c68a5f84
-  data.tar.gz: dacdc01de808196a155ad1219f913bafff072578ad0bb3c0a9602a9f0377d4359f03e54880dd77a3e27307a35754568064d9dd5dcec95abf8a93f5f0164149a8
+  metadata.gz: 31be8f22b6fbe417be6051466e6370c8d54e4667df16c1506a84580df69376daae06af454bb46e21b8b86e61fed6efaf954f45c876005f2b33dde00ad3ca8374
+  data.tar.gz: 756ef0c153e13b61a6d6823f3ea9f615ee507e329effce3c31ca477b85de86c6b0aa7bb645802be3c405281b621777191b1c34efba2cdeceb9035c2dfbb9ce82

data/CHANGELOG.md

@@ -1,10 +1,58 @@
-## Unreleased
+## 5.1.0
+
+* Remove `I18nCache` module entirely. It was added complexity for very little gain in some translations, and caused extra trouble upgrading to Ruby 3. If you need that level of caching consider looking into I18n caching as a whole.
+* Add support for Ruby 3.0, drop support for Ruby < 2.5.
+* Add support for Rails 6.1, drop support for Rails < 5.2.
+* Move CI to GitHub Actions.
+
+## 5.0.3
+
+### Bug fix
+* Fix for ActiveStorage::Attached::Many. [@enriquez](https://github.com/enriquez)
+
+## 5.0.2
+
+### Enhancements
+* Remove instruction to use form-inline class. [@goalaleo](https://github.com/goalaleo)
+* Added RichTextAreaInput for ActionText. [itsterry](https://github.com/itsterry)
+* Skip valid_class check if no class defined. [TALlama](https://github.com/TALlama)
+
+### Bug fix
+* Fix 'aria-required' field generated by prompt. [@CarlosAlbertoSantos](https://github.com/CarlosAlbertoSantos)
+
+## 5.0.1
+
+### Bug fix
+* Replace `_url` with `remote_url` when trying to guess file inputs [@tegon](https://github.com/tegon). This has the side-effect of changing carrierwave's support from `0.2.1` to `0.2.2`.
+
+## 5.0.0
+
+### Enhancements
+* Set multiple attribute for grouped selects also. [@ollym](https://github.com/ollym)
+* Removes or renames label classes. [Abduvakilov](https://github.com/Abduvakilov)
+* Support to label custom classes for inline collections. [@feliperenan](https://github.com/feliperenan)
+* Update bootstrap generator template to match v4.3.x. [@m5o](https://github.com/m5o)
+* Allow "required" attribute in generated select elements of PriorityInput. [@mcountis](https://github.com/mcountis)
+
+### Bug fix
+* Do not call `#send` in form object to check whether the attribute is a file input. [@tegon](https://github.com/tegon)
+
+## Deprecations
+* The config `SimpleForm.file_methods` is deprecated and it has no effect. Simple Form now supports automatically discover of file inputs for the following Gems: activestorage, carrierwave, paperclip, refile and shrine. If you are using a custom method that is not from one of the supported Gems, please change your forms to pass the input type explicitly:
+
+```erb
+ <%= form.input :avatar, as: :file %>
+ ```
+
+See http://blog.plataformatec.com.br/2019/09/incorrect-access-control-in-simple-form-cve-2019-16676 for more information.
+
+## 4.1.0
 
 ### Enhancements
 * Guess input type more carefully. [@sringling](https://github.com/sringling)
 * Allow custom error on forms without model. [@victorperez](https://github.com/victorperez)
 * Do not support Ruby < 2.3 anymore. [@gssbzn](https://github.com/gssbzn)
-* Add color inout type. [@gssbzn](https://github.com/gssbzn)
+* Add color input type. [@gssbzn](https://github.com/gssbzn)
 
 ### Bug fix
 * Improve disabled option to input_field. [@betelgeuse](https://github.com/betelgeuse)
@@ -84,7 +132,7 @@
 
 ### bug fix
   * Fix `merge_wrapper_options` to correctly merge options with duplicated keys. [@herminiotorres](https://github.com/herminiotorres)
-  Closes [#1278](https://github.com/plataformatec/simple_form/issues/1278).
+  Closes [#1278](https://github.com/heartcombo/simple_form/issues/1278).
 
 ## 3.2.1
 
@@ -146,11 +194,11 @@
   * Add `boolean_label_class` config.
   * Add `:html` option to include additional attributes on custom wrappers [@remofritzsche](https://github.com/remofritzsche) and [@ulissesalmeida](https://github.com/ulissesalmeida)
   * Make possible to use the Wrappers API to define attributes for the components.
-  See https://github.com/plataformatec/simple_form/pull/997 for more information.
+  See https://github.com/heartcombo/simple_form/pull/997 for more information.
   * Put a whitespace before the `inline_label` options of boolean input if it is present.
   * Add support to configure the `label_text` proc at the wrapper level. [@NOX73](https://github.com/NOX73)
   * `label_text` proc now receive three arguments (label, request, and if the label was explicit). [@timscott](https://github.com/timscott)
-  * Add I18n support to `:include_blank` and `:prompt` when `:translate` is used as value. [@haines](https://github.com/plataformatec/simple_form/pull/616)
+  * Add I18n support to `:include_blank` and `:prompt` when `:translate` is used as value. [@haines](https://github.com/heartcombo/simple_form/pull/616)
   * Add support to define custom error messages for the attributes.
   * Add support to change the I18n scope to be used in Simple Form. [@nielsbuus](https://github.com/nielsbuus)
   * The default form class can now be overridden with `html: { :class }`. [@rmm5t](https://github.com/rmm5t)
@@ -159,16 +207,16 @@
   * Fix `full_error` when the attribute is an association. [@mvdamme](https://github.com/jorge-d)
   * Fix suppport to `:namespace` and `:index` options for nested check boxes and radio buttons when the attribute is an association.
   * Collection input that uses automatic collection translation properly sets checked values.
-  Closes [#971](https://github.com/plataformatec/simple_form/issues/971) [@nashby](https://github.com/nashby)
+  Closes [#971](https://github.com/heartcombo/simple_form/issues/971) [@nashby](https://github.com/nashby)
   * Collection input generates `required` attribute if it has `prompt` option. [@nashby](https://github.com/nashby)
   * Grouped collection uses the first non-empty object to detect label and value methods.
 
 ## deprecation
   * Methods on custom inputs now accept a required argument with the wrapper options.
-  See https://github.com/plataformatec/simple_form/pull/997 for more information.
+  See https://github.com/heartcombo/simple_form/pull/997 for more information.
   * SimpleForm.form_class is deprecated in favor of SimpleForm.default_form_class.
   Future versions of Simple Form will not generate `simple_form` class for the form
   element.
-  See https://github.com/plataformatec/simple_form/pull/1109 for more information.
+  See https://github.com/heartcombo/simple_form/pull/1109 for more information.
 
-Please check [v3.0](https://github.com/plataformatec/simple_form/blob/v3.0/CHANGELOG.md) for previous changes.
+Please check [v3.0](https://github.com/heartcombo/simple_form/blob/v3.0/CHANGELOG.md) for previous changes.

data/MIT-LICENSE

@@ -1,4 +1,5 @@
-Copyright (c) 2009-2016 Plataformatec http://plataformatec.com.br/
+Copyright (c) 2020 Rafael França, Carlos Antônio da Silva
+Copyright (c) 2009-2019 Plataformatec
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,6 +1,4 @@
-![Simple Form Logo](https://raw.github.com/plataformatec/simple_form/master/simple_form.png)
-
-By [Plataformatec](http://plataformatec.com.br/).
+![Simple Form Logo](https://raw.github.com/heartcombo/simple_form/master/simple_form.png)
 
 Rails forms made easy.
 
@@ -9,8 +7,7 @@ your forms. The basic goal of **Simple Form** is to not touch your way of defini
 you find the better design for your eyes. Most of the DSL was inherited from Formtastic,
 which we are thankful for and should make you feel right at home.
 
-INFO: This README is [also available in a friendly navigable format](http://simple-form.plataformatec.com.br/)
-and refers to **Simple Form** 3.1. For older releases, check the related branch for your version.
+INFO: This README refers to **Simple Form** 5.0. For older releases, check the related branch for your version.
 
 ## Installation
 
@@ -118,7 +115,7 @@ of any of them:
 
 ```erb
 <%= simple_form_for @user do |f| %>
-  <%= f.input :username, label_html: { class: 'my_class' } %>
+  <%= f.input :username, label_html: { class: 'my_class' }, hint_html: { class: 'hint_class' } %>
   <%= f.input :password, hint: false, error_html: { id: 'password_error'} %>
   <%= f.input :password_confirmation, label: false %>
   <%= f.button :submit %>
@@ -184,7 +181,7 @@ By default, **Simple Form** will look at the column type in the database and use
 appropriate input for the column. For example, a column created with type
 `:text` in the database will use a `textarea` input by default. See the section
 [Available input types and defaults for each column
-type](https://github.com/plataformatec/simple_form#available-input-types-and-defaults-for-each-column-type)
+type](https://github.com/heartcombo/simple_form#available-input-types-and-defaults-for-each-column-type)
 for a complete list of defaults.
 
 **Simple Form** also lets you overwrite the default input type it creates:
@@ -288,14 +285,7 @@ end
 </form>
 ```
 
-Produces:
-
-```html
-<input class="string required" id="user_name" maxlength="100"
-   name="user[name]" size="100" type="text" value="Carlos" />
-```
-
-To view the actual RDocs for this, check them out here - http://rubydoc.info/github/plataformatec/simple_form/master/SimpleForm/FormBuilder:input_field
+To view the actual RDocs for this, check them out here - http://rubydoc.info/github/heartcombo/simple_form/master/SimpleForm/FormBuilder:input_field
 
 ### Collections
 
@@ -325,7 +315,7 @@ Collection inputs accept two other options beside collections:
 Those methods are useful to manipulate the given collection. Both of these options also accept
 lambda/procs in case you want to calculate the value or label in a special way eg. custom
 translation. You can also define a `to_label` method on your model as **Simple Form** will search for
-and use `:to_label` as a `:label_method` first if it is found. 
+and use `:to_label` as a `:label_method` first if it is found.
 
 By default, **Simple Form** will use the first item from an array as the label and the second one as the value.
 If you want to change this behavior you must make it explicit, like this:
@@ -507,7 +497,7 @@ Creates a collection of radio inputs with labels associated (same API as `collec
 
 ```ruby
 form_for @user do |f|
-  f.collection_radio_buttons :options, [[true, 'Yes'] ,[false, 'No']], :first, :last
+  f.collection_radio_buttons :options, [[true, 'Yes'], [false, 'No']], :first, :last
 end
 ```
 
@@ -524,7 +514,7 @@ Creates a collection of checkboxes with labels associated (same API as `collecti
 
 ```ruby
 form_for @user do |f|
-  f.collection_check_boxes :options, [[true, 'Yes'] ,[false, 'No']], :first, :last
+  f.collection_check_boxes :options, [[true, 'Yes'], [false, 'No']], :first, :last
 end
 ```
 
@@ -545,6 +535,12 @@ form_for @user do |f|
 end
 ```
 
+To add a CSS class to the label item, you can use the `item_label_class` option:
+
+```ruby
+f.collection_check_boxes :role_ids, Role.all, :id, :name, item_label_class: 'my-custom-class'
+```
+
 ## Available input types and defaults for each column type
 
 The following table shows the html element you will get for each attribute
@@ -562,6 +558,7 @@ Mapping         | Generated HTML Element               | Database Column Type
 `password`      | `input[type=password]`               | `string` with `name =~ /password/`
 `search`        | `input[type=search]`                 | -
 `uuid`          | `input[type=text]`                   | `uuid`
+`color`         | `input[type=color]`                  | `string`
 `text`          | `textarea`                           | `text`
 `hstore`        | `textarea`                           | `hstore`
 `json`          | `textarea`                           | `json`
@@ -910,8 +907,8 @@ config.wrappers do |b|
 end
 ```
 
-This you set the input and label class to `'label-input-class'` and will set the class `'is-invalid'`
-when the input has errors and `'is-valid'` if the input is valid.
+This sets the input and label classes to `'label-input-class'` and will set the class `'is-invalid'`
+if the input has errors and `'is-valid'` if the input is valid.
 
 If you want to customize the custom _Form components_ on demand you can give it a name like this:
 
@@ -992,7 +989,7 @@ when the content is present.
 
 ## Custom Components
 
-When you use custom wrappers, you might also be looking for a way to add custom components to your 
+When you use custom wrappers, you might also be looking for a way to add custom components to your
 wrapper. The default components are:
 
 ```ruby
@@ -1143,8 +1140,8 @@ by passing the html5 option:
 
 ### Using non Active Record objects
 
-There are few ways to build forms with objects that don't inherit from Active Record, as 
-follow:
+There are few ways to build forms with objects that don't inherit from Active Record, as
+follows:
 
 You can include the module `ActiveModel::Model`.
 
@@ -1156,14 +1153,14 @@ class User
 end
 ```
 
-If you are using Presenters or Decorators that inherit from `SimpleDelegator` you can delegate 
+If you are using Presenters or Decorators that inherit from `SimpleDelegator` you can delegate
 it to the model.
 
 ```ruby
 class UserPresenter < SimpleDelegator
   # Without that, Simple Form will consider the user model as the object.
-  def to_model 
-    self 
+  def to_model
+    self
   end
 end
 ```
@@ -1171,7 +1168,7 @@ end
 You can define all methods required by the helpers.
 
 ```ruby
-class User 
+class User
   extend ActiveModel::Naming
 
   attr_accessor :id, :name
@@ -1180,25 +1177,25 @@ class User
     self
   end
 
-  def to_key 
-    id 
+  def to_key
+    id
   end
 
-  def persisted? 
-    false 
+  def persisted?
+    false
   end
 end
 ```
 
-If your object doesn't implement those methods, you must make explicit it when you are 
+If your object doesn't implement those methods, you must make explicit it when you are
 building the form
 
 ```ruby
-class User 
+class User
   attr_accessor :id, :name
 
   # The only method required to use the f.submit helper.
-  def persisted? 
+  def persisted?
     false
   end
 end
@@ -1206,25 +1203,25 @@ end
 
 ```erb
 <%= simple_form_for(@user, as: :user, method: :post, url: users_path) do |f| %>
-  <%= f.input :name %> 
+  <%= f.input :name %>
   <%= f.submit 'New user' %>
 <% end %>
 ```
 
 ## Information
 
-### Google Group
+### RDocs
 
-If you have any questions, comments, or concerns please use the Google Group instead of the GitHub
-Issues tracker:
+You can view the **Simple Form** documentation in RDoc format here:
 
-http://groups.google.com/group/plataformatec-simpleform
+http://rubydoc.info/github/heartcombo/simple_form/master/frames
 
-### RDocs
+### Supported Ruby / Rails versions
 
-You can view the **Simple Form** documentation in RDoc format here:
+We intend to maintain support for all Ruby / Rails versions that haven't reached end-of-life.
 
-http://rubydoc.info/github/plataformatec/simple_form/master/frames
+For more information about specific versions please check [Ruby](https://www.ruby-lang.org/en/downloads/branches/)
+and [Rails](https://guides.rubyonrails.org/maintenance_policy.html) maintenance policies, and our test matrix.
 
 ### Bug reports
 
@@ -1232,23 +1229,22 @@ If you discover any bugs, feel free to create an issue on GitHub. Please add as
 possible to help us in fixing the potential bug. We also encourage you to help even more by forking and
 sending us a pull request.
 
-https://github.com/plataformatec/simple_form/issues
+https://github.com/heartcombo/simple_form/issues
+
+If you have discovered a security related bug, please do NOT use the GitHub issue tracker. Send an e-mail to heartcombo@googlegroups.com.
 
 ## Maintainers
 
-* José Valim (https://github.com/josevalim)
 * Carlos Antonio da Silva (https://github.com/carlosantoniodasilva)
 * Rafael Mendonça França (https://github.com/rafaelfranca)
-* Vasiliy Ermolovich (https://github.com/nashby)
+* Felipe Renan (https://github.com/feliperenan)
 
 [![Gem Version](https://fury-badge.herokuapp.com/rb/simple_form.png)](http://badge.fury.io/rb/simple_form)
-[![Build Status](https://api.travis-ci.org/plataformatec/simple_form.svg?branch=master)](http://travis-ci.org/plataformatec/simple_form)
-[![Code Climate](https://codeclimate.com/github/plataformatec/simple_form.png)](https://codeclimate.com/github/plataformatec/simple_form)
-[![Inline docs](http://inch-ci.org/github/plataformatec/simple_form.png)](http://inch-ci.org/github/plataformatec/simple_form)
+[![Code Climate](https://codeclimate.com/github/heartcombo/simple_form.png)](https://codeclimate.com/github/heartcombo/simple_form)
+[![Inline docs](http://inch-ci.org/github/heartcombo/simple_form.png)](http://inch-ci.org/github/heartcombo/simple_form)
 
 ## License
 
-MIT License. Copyright 2009-2018 Plataformatec. http://plataformatec.com.br
+MIT License. Copyright 2020 Rafael França, Carlos Antônio da Silva. Copyright 2009-2019 Plataformatec.
 
-You are not granted rights or licenses to the trademarks of the Plataformatec, including without
-limitation the Simple Form name or logo.
+The Simple Form logo is licensed under [Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License](https://creativecommons.org/licenses/by-nc-nd/4.0/).

data/lib/generators/simple_form/templates/README

@@ -3,9 +3,8 @@
   Be sure to have a copy of the Bootstrap stylesheet available on your
   application, you can get it on http://getbootstrap.com/.
 
-  Inside your views, use the 'simple_form_for' with the Bootstrap form
-  class, '.form-inline', as the following:
+  For usage examples and documentation, see:
 
-    = simple_form_for(@user, html: { class: 'form-inline' }) do |form|
+    http://simple-form-bootstrap.plataformatec.com.br/
 
 ===============================================================================

data/lib/generators/simple_form/templates/config/initializers/simple_form.rb

@@ -2,7 +2,7 @@
 #
 # Uncomment this and change the path if necessary to include your own
 # components.
-# See https://github.com/plataformatec/simple_form#custom-components to know
+# See https://github.com/heartcombo/simple_form#custom-components to know
 # more about custom components.
 # Dir[Rails.root.join('lib/components/**/*.rb')].each { |f| require f }
 #
@@ -129,9 +129,6 @@ SimpleForm.setup do |config|
   # change this configuration to true.
   config.browser_validations = false
 
-  # Collection of methods to detect if a file type was given.
-  # config.file_methods = [ :mounted_as, :file?, :public_filename, :attached? ]
-
   # Custom mappings for input types. This should be a hash containing a regexp
   # to match as key, and the input type that will be used when the field name
   # matches the regexp as value.

data/lib/generators/simple_form/templates/config/initializers/simple_form_bootstrap.rb

@@ -4,11 +4,11 @@
 # This generator is maintained by the community around simple_form-bootstrap:
 # https://github.com/rafaelfranca/simple_form-bootstrap
 # All future development, tests, and organization should happen there.
-# Background history: https://github.com/plataformatec/simple_form/issues/1561
+# Background history: https://github.com/heartcombo/simple_form/issues/1561
 
 # Uncomment this and change the path if necessary to include your own
 # components.
-# See https://github.com/plataformatec/simple_form#custom-components
+# See https://github.com/heartcombo/simple_form#custom-components
 # to know more about custom components.
 # Dir[Rails.root.join('lib/components/**/*.rb')].each { |f| require f }
 
@@ -57,7 +57,7 @@ SimpleForm.setup do |config|
     b.optional :pattern
     b.optional :min_max
     b.optional :readonly
-    b.use :label, class: 'form-control-label'
+    b.use :label
     b.use :input, class: 'form-control', error_class: 'is-invalid', valid_class: 'is-valid'
     b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' }
     b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
@@ -76,7 +76,7 @@ SimpleForm.setup do |config|
   end
 
   # vertical input for radio buttons and check boxes
-  config.wrappers :vertical_collection, item_wrapper_class: 'form-check', tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
+  config.wrappers :vertical_collection, item_wrapper_class: 'form-check', item_label_class: 'form-check-label', tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
     b.use :html5
     b.optional :readonly
     b.wrapper :legend_tag, tag: 'legend', class: 'col-form-label pt-0' do |ba|
@@ -88,7 +88,7 @@ SimpleForm.setup do |config|
   end
 
   # vertical input for inline radio buttons and check boxes
-  config.wrappers :vertical_collection_inline, item_wrapper_class: 'form-check form-check-inline', tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
+  config.wrappers :vertical_collection_inline, item_wrapper_class: 'form-check form-check-inline', item_label_class: 'form-check-label', tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
     b.use :html5
     b.optional :readonly
     b.wrapper :legend_tag, tag: 'legend', class: 'col-form-label pt-0' do |ba|
@@ -108,7 +108,7 @@ SimpleForm.setup do |config|
     b.optional :readonly
     b.use :label
     b.use :input, class: 'form-control-file', error_class: 'is-invalid', valid_class: 'is-valid'
-    b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' }
+    b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' }
     b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
   end
 
@@ -116,7 +116,7 @@ SimpleForm.setup do |config|
   config.wrappers :vertical_multi_select, tag: 'div', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
     b.use :html5
     b.optional :readonly
-    b.use :label, class: 'form-control-label'
+    b.use :label
     b.wrapper tag: 'div', class: 'd-flex flex-row justify-content-between align-items-center' do |ba|
       ba.use :input, class: 'form-control mx-1', error_class: 'is-invalid', valid_class: 'is-valid'
     end
@@ -174,10 +174,10 @@ SimpleForm.setup do |config|
   end
 
   # horizontal input for radio buttons and check boxes
-  config.wrappers :horizontal_collection, item_wrapper_class: 'form-check', tag: 'div', class: 'form-group row', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
+  config.wrappers :horizontal_collection, item_wrapper_class: 'form-check', item_label_class: 'form-check-label', tag: 'div', class: 'form-group row', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
     b.use :html5
     b.optional :readonly
-    b.use :label, class: 'col-sm-3 form-control-label'
+    b.use :label, class: 'col-sm-3 col-form-label pt-0'
     b.wrapper :grid_wrapper, tag: 'div', class: 'col-sm-9' do |ba|
       ba.use :input, class: 'form-check-input', error_class: 'is-invalid', valid_class: 'is-valid'
       ba.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' }
@@ -186,10 +186,10 @@ SimpleForm.setup do |config|
   end
 
   # horizontal input for inline radio buttons and check boxes
-  config.wrappers :horizontal_collection_inline, item_wrapper_class: 'form-check form-check-inline', tag: 'div', class: 'form-group row', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
+  config.wrappers :horizontal_collection_inline, item_wrapper_class: 'form-check form-check-inline', item_label_class: 'form-check-label', tag: 'div', class: 'form-group row', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
     b.use :html5
     b.optional :readonly
-    b.use :label, class: 'col-sm-3 form-control-label'
+    b.use :label, class: 'col-sm-3 col-form-label pt-0'
     b.wrapper :grid_wrapper, tag: 'div', class: 'col-sm-9' do |ba|
       ba.use :input, class: 'form-check-input', error_class: 'is-invalid', valid_class: 'is-valid'
       ba.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' }
@@ -204,7 +204,7 @@ SimpleForm.setup do |config|
     b.optional :maxlength
     b.optional :minlength
     b.optional :readonly
-    b.use :label, class: 'col-sm-3 form-control-label'
+    b.use :label, class: 'col-sm-3 col-form-label'
     b.wrapper :grid_wrapper, tag: 'div', class: 'col-sm-9' do |ba|
       ba.use :input, error_class: 'is-invalid', valid_class: 'is-valid'
       ba.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' }
@@ -216,7 +216,7 @@ SimpleForm.setup do |config|
   config.wrappers :horizontal_multi_select, tag: 'div', class: 'form-group row', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
     b.use :html5
     b.optional :readonly
-    b.use :label, class: 'col-sm-3 control-label'
+    b.use :label, class: 'col-sm-3 col-form-label'
     b.wrapper :grid_wrapper, tag: 'div', class: 'col-sm-9' do |ba|
       ba.wrapper tag: 'div', class: 'd-flex flex-row justify-content-between align-items-center' do |bb|
         bb.use :input, class: 'form-control mx-1', error_class: 'is-invalid', valid_class: 'is-valid'
@@ -232,7 +232,7 @@ SimpleForm.setup do |config|
     b.use :placeholder
     b.optional :readonly
     b.optional :step
-    b.use :label, class: 'col-sm-3 form-control-label'
+    b.use :label, class: 'col-sm-3 col-form-label'
     b.wrapper :grid_wrapper, tag: 'div', class: 'col-sm-9' do |ba|
       ba.use :input, class: 'form-control-range', error_class: 'is-invalid', valid_class: 'is-valid'
       ba.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' }
@@ -260,7 +260,7 @@ SimpleForm.setup do |config|
   end
 
   # inline input for boolean
-  config.wrappers :inline_boolean, tag: 'span', class: 'form-check flex-wrap justify-content-start mr-sm-2', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
+  config.wrappers :inline_boolean, tag: 'span', class: 'form-check mb-2 mr-sm-2', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
     b.use :html5
     b.optional :readonly
     b.use :input, class: 'form-check-input', error_class: 'is-invalid', valid_class: 'is-valid'
@@ -284,10 +284,11 @@ SimpleForm.setup do |config|
     end
   end
 
+  # custom input switch for boolean
   config.wrappers :custom_boolean_switch, tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
     b.use :html5
     b.optional :readonly
-    b.wrapper :form_check_wrapper, tag: 'div', class: 'custom-control custom-checkbox-switch' do |bb|
+    b.wrapper :form_check_wrapper, tag: 'div', class: 'custom-control custom-switch' do |bb|
       bb.use :input, class: 'custom-control-input', error_class: 'is-invalid', valid_class: 'is-valid'
       bb.use :label, class: 'custom-control-label'
       bb.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' }
@@ -296,7 +297,7 @@ SimpleForm.setup do |config|
   end
 
   # custom input for radio buttons and check boxes
-  config.wrappers :custom_collection, item_wrapper_class: 'custom-control', tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
+  config.wrappers :custom_collection, item_wrapper_class: 'custom-control', item_label_class: 'custom-control-label', tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
     b.use :html5
     b.optional :readonly
     b.wrapper :legend_tag, tag: 'legend', class: 'col-form-label pt-0' do |ba|
@@ -308,7 +309,7 @@ SimpleForm.setup do |config|
   end
 
   # custom input for inline radio buttons and check boxes
-  config.wrappers :custom_collection_inline, item_wrapper_class: 'custom-control custom-control-inline', tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
+  config.wrappers :custom_collection_inline, item_wrapper_class: 'custom-control custom-control-inline', item_label_class: 'custom-control-label', tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
     b.use :html5
     b.optional :readonly
     b.wrapper :legend_tag, tag: 'legend', class: 'col-form-label pt-0' do |ba|
@@ -326,7 +327,7 @@ SimpleForm.setup do |config|
     b.optional :maxlength
     b.optional :minlength
     b.optional :readonly
-    b.use :label, class: 'form-control-label'
+    b.use :label
     b.wrapper :custom_file_wrapper, tag: 'div', class: 'custom-file' do |ba|
       ba.use :input, class: 'custom-file-input', error_class: 'is-invalid', valid_class: 'is-valid'
       ba.use :label, class: 'custom-file-label'
@@ -339,7 +340,7 @@ SimpleForm.setup do |config|
   config.wrappers :custom_multi_select, tag: 'div', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
     b.use :html5
     b.optional :readonly
-    b.use :label, class: 'form-control-label'
+    b.use :label
     b.wrapper tag: 'div', class: 'd-flex flex-row justify-content-between align-items-center' do |ba|
       ba.use :input, class: 'custom-select mx-1', error_class: 'is-invalid', valid_class: 'is-valid'
     end
@@ -353,7 +354,7 @@ SimpleForm.setup do |config|
     b.use :placeholder
     b.optional :readonly
     b.optional :step
-    b.use :label, class: 'form-control-label'
+    b.use :label
     b.use :input, class: 'custom-range', error_class: 'is-invalid', valid_class: 'is-valid'
     b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' }
     b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
@@ -370,7 +371,7 @@ SimpleForm.setup do |config|
   #   b.optional :pattern
   #   b.optional :min_max
   #   b.optional :readonly
-  #   b.use :label, class: 'form-control-label'
+  #   b.use :label
   #   b.wrapper :input_group_tag, tag: 'div', class: 'input-group' do |ba|
   #     ba.optional :prepend
   #     ba.use :input, class: 'form-control', error_class: 'is-invalid', valid_class: 'is-valid'
@@ -393,7 +394,7 @@ SimpleForm.setup do |config|
     b.optional :min_max
     b.optional :readonly
     b.use :input, class: 'form-control', error_class: 'is-invalid', valid_class: 'is-valid'
-    b.use :label, class: 'form-control-label'
+    b.use :label
     b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' }
     b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
   end
@@ -402,8 +403,8 @@ SimpleForm.setup do |config|
   config.wrappers :floating_labels_select, tag: 'div', class: 'form-label-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
     b.use :html5
     b.optional :readonly
-    b.use :input, class: 'custom-select custom-select-lg', error_class: 'is-invalid', valid_class: 'is-valid'
-    b.use :label, class: 'form-control-label'
+    b.use :input, class: 'custom-select', error_class: 'is-invalid', valid_class: 'is-valid'
+    b.use :label
     b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' }
     b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
   end