bootstrap_form 5.1.0 → 5.2.1

data/README.md

@@ -25,8 +25,8 @@ Some other nice things that `bootstrap_form` does for you are:
 
 `bootstrap_form` supports at a minimum the currently supported versions of Ruby and Rails:
 
-* Ruby 2.5+
-* Rails 5.2+
+* Ruby 3.0+ (https://www.ruby-lang.org/en/downloads/branches/)
+* Rails 6.0+ (https://guides.rubyonrails.org/maintenance_policy.html)
 * Bootstrap 5.0+
 
 ## Installation
@@ -42,7 +42,7 @@ And follow the remaining instructions in the [official bootstrap installation gu
 Add the `bootstrap_form` gem to your `Gemfile`:
 
 ```ruby
-gem "bootstrap_form", "~> 5.1"
+gem "bootstrap_form", "~> 5.2"
 ```
 
 Then:
@@ -84,7 +84,7 @@ This generates the following HTML:
 <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
   <div class="mb-3">
     <label class="form-label required" for="user_email">Email</label>
-    <input class="form-control" id="user_email" name="user[email]" type="email" value="steve@example.com">
+    <input aria-required="true" class="form-control" id="user_email" name="user[email]" required="required" type="email" value="steve@example.com">
   </div>
   <div class="mb-3">
     <label class="form-label" for="user_password">Password</label>
@@ -125,8 +125,6 @@ This generates:
 
 ### bootstrap_form_with
 
-Note that `form_with` in Rails 5.1 does not add IDs to form elements and labels by default, which are both important to Bootstrap markup. This behaviour is corrected in Rails 5.2.
-
 To get started, just use the `bootstrap_form_with` helper in place of `form_with`. Here's an example:
 
 ![Example 2](demo/doc/screenshots/bootstrap/readme/02_example.png "Example 2")
@@ -145,7 +143,7 @@ This generates:
 <form accept-charset="UTF-8" action="/users" method="post">
   <div class="mb-3">
     <label class="form-label required" for="user_email">Email</label>
-    <input class="form-control" id="user_email" name="user[email]" type="email" value="steve@example.com">
+    <input aria-required="true" class="form-control" id="user_email" name="user[email]" required="required" type="email" value="steve@example.com">
   </div>
   <div class="mb-3">
     <label class="form-label" for="user_password">Password</label>
@@ -200,7 +198,7 @@ date_field               password_field                            time_field
 date_select              phone_field                               time_select
 datetime_field           radio_button                              time_zone_select
 datetime_local_field     range_field                               url_field
-datetime_select          rich_text_area (Rails 6+)                 week_field
+datetime_select          rich_text_area                            week_field
 ```
 
 By default, the helpers generate a `label` tag, and an `input`, `select`, or `textarea` tag, by calling the Rails `label` helper, and then the Rails helper with the same name as the `bootstrap_form` helper.
@@ -278,7 +276,7 @@ This generates:
 ```html
 <div class="mb-3">
   <label class="form-label custom-class required" for="user_email">Email</label>
-  <input class="form-control" id="user_email" name="user[email]" type="text" value="steve@example.com">
+  <input aria-required="true" class="form-control" id="user_email" name="user[email]" required="required" type="text" value="steve@example.com">
 </div>
 ```
 
@@ -294,7 +292,7 @@ This generates:
 ```html
 <div class="mb-3">
   <label class="form-label visually-hidden required" for="user_email">Email</label>
-  <input class="form-control" id="user_email" name="user[email]" placeholder="Email" type="text" value="steve@example.com">
+  <input aria-required="true" class="form-control" id="user_email" name="user[email]" placeholder="Email" required="required" type="text" value="steve@example.com">
 </div>
 ```
 
@@ -312,7 +310,7 @@ This generates:
 ```html
 <div class="mb-3">
   <label class="form-label required" for="user_email">Email</label>
-  <input class="custom-class" id="user_email" name="user[email]" type="text" value="steve@example.com">
+  <input aria-required="true" class="custom-class" id="user_email" name="user[email]" required="required" type="text" value="steve@example.com">
 </div>
 ```
 
@@ -438,7 +436,7 @@ This generates:
 <div class="mb-3">
   <label class="form-label required" for="user_email">Email</label>
   <div class="input-group input-group-lg">
-    <input class="form-control" id="user_email" name="user[email]" type="email" value="steve@example.com">
+    <input aria-required="true" class="form-control" id="user_email" name="user[email]" required="required" type="email" value="steve@example.com">
     <input class="btn btn-primary" data-disable-with="Subscribe" name="commit" type="submit" value="Subscribe">
   </div>
 </div>
@@ -503,7 +501,7 @@ Generated HTML:
 
 ```html
 <div class="mb-3">
-  <input class="form-control" id="user_email" name="user[email]" type="email" value="steve@example.com">
+  <input aria-required="true" class="form-control" id="user_email" name="user[email]" required="required" type="email" value="steve@example.com">
 </div>
 ```
 
@@ -753,7 +751,7 @@ This generates:
 ```html
 <div class="mb-3">
   <label class="form-label" for="user_excellence">Excellence</label>
-  <input class="form-control" id="user_excellence" name="user[excellence]" type="range">
+  <input class="form-range" id="user_excellence" name="user[excellence]" type="range">
 </div>
 ```
 
@@ -771,7 +769,7 @@ This generates:
 ```html
 <div class="mb-3">
   <label class="form-label required" for="user_email">Email</label>
-  <input class="form-control-plaintext" id="user_email" name="user[email]" readonly type="text" value="steve@example.com">
+  <input aria-required="true" class="form-control-plaintext" id="user_email" name="user[email]" readonly required="required" type="text" value="steve@example.com">
 </div>
 ```
 
@@ -791,7 +789,7 @@ This generates:
   <div class="mb-3 row">
     <label class="form-label col-form-label col-sm-2 required" for="user_email">Email</label>
     <div class="col-sm-10">
-      <input class="form-control-plaintext" id="user_email" name="user[email]" readonly type="text" value="steve@example.com">
+      <input aria-required="true" class="form-control-plaintext" id="user_email" name="user[email]" readonly required="required" type="text" value="steve@example.com">
     </div>
   </div>
 </form>
@@ -946,8 +944,6 @@ will be rendered as
 
 ## Rich Text Areas AKA Trix Editor
 
-If you're using Rails 6, `bootstrap_form` supports the `rich_text_area` helper.
-
 ![Example 34](demo/doc/screenshots/bootstrap/readme/34_example.png "Example 34")
 ```erb
 <%= f.rich_text_area(:life_story) %>
@@ -1054,7 +1050,7 @@ This generates:
 <form accept-charset="UTF-8" action="/users" class="new_user row row-cols-auto g-3 align-items-center" id="new_user" method="post">
   <div class="col">
     <label class="form-label visually-hidden mr-sm-2 required" for="user_email">Email</label>
-    <input class="form-control" id="user_email" name="user[email]" type="email" value="steve@example.com">
+    <input aria-required="true" class="form-control" id="user_email" name="user[email]" required="required" type="email" value="steve@example.com">
   </div>
   <div class="col">
     <label class="form-label visually-hidden mr-sm-2" for="user_password">Password</label>
@@ -1116,7 +1112,7 @@ This generates:
   <div class="mb-3 row">
     <label class="form-label col-form-label col-sm-2 required" for="user_email">Email</label>
     <div class="col-sm-10">
-      <input class="form-control" id="user_email" name="user[email]" type="email" value="steve@example.com">
+      <input aria-required="true" class="form-control" id="user_email" name="user[email]" required="required" type="email" value="steve@example.com">
     </div>
   </div>
   <div class="mb-3 row">
@@ -1134,7 +1130,7 @@ This generates:
       </div>
     </div>
   </div>
-
+  
   <div class="mb-3 row">
     <div class="col-sm-10 offset-sm-2">
       <input class="btn btn-secondary" data-disable-with="Create User" name="commit" type="submit" value="Create User">
@@ -1163,7 +1159,7 @@ This generates:
   <div class="mb-3 row">
     <label class="form-label col-form-label col-sm-2 required" for="user_email">Email</label>
     <div class="col-sm-10">
-      <input class="form-control" id="user_email" name="user[email]" type="email" value="steve@example.com">
+      <input aria-required="true" class="form-control" id="user_email" name="user[email]" required="required" type="email" value="steve@example.com">
     </div>
   </div>
   <div class="mb-3 row">
@@ -1220,7 +1216,7 @@ This generates:
   <div class="mb-3 row">
     <label class="form-label col-form-label col-sm-2 required" for="user_email">Email</label>
     <div class="col-sm-10">
-      <input class="form-control" id="user_email" name="user[email]" type="email" value="steve@example.com">
+      <input aria-required="true" class="form-control" id="user_email" name="user[email]" required="required" type="email" value="steve@example.com">
     </div>
   </div>
   <div class="mb-3 row">
@@ -1260,7 +1256,7 @@ This generates:
   <div class="mb-3 row">
     <label class="form-label col-form-label col-sm-2 required" for="user_email">Email</label>
     <div class="col-sm-10">
-      <input class="form-control" id="user_email" name="user[email]" type="email" value="steve@example.com">
+      <input aria-required="true" class="form-control" id="user_email" name="user[email]" required="required" type="email" value="steve@example.com">
     </div>
   </div>
   <div class="mb-3">
@@ -1301,7 +1297,7 @@ This generates:
 <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
   <div class="mb-3">
     <label class="form-label required" for="user_email">Email</label>
-    <input class="form-control" id="user_email" name="user[email]" type="email" value="steve@example.com">
+    <input aria-required="true" class="form-control" id="user_email" name="user[email]" required="required" type="email" value="steve@example.com">
   </div>
   <div class="mb-3">
     <label class="form-label" for="user_password">Password</label>
@@ -1337,7 +1333,7 @@ This generates:
 ```html
 <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
   <div class="mb-3 form-floating">
-    <input class="form-control" id="user_email" name="user[email]" placeholder="Email" type="email" value="steve@example.com">
+    <input aria-required="true" class="form-control" id="user_email" name="user[email]" placeholder="Email" required="required" type="email" value="steve@example.com">
     <label class="form-label required" for="user_email">Email</label>
   </div>
   <div class="mb-3 form-floating">
@@ -1369,18 +1365,29 @@ Rails normally wraps fields with validation errors in a `div.field_with_errors`,
 By default, fields that have validation errors will be outlined in red and the
 error will be displayed below the field. Here's an example:
 
+![Example 44](demo/doc/screenshots/bootstrap/readme/44_example.png "Example 44")
+```erb
+<%= bootstrap_form_for(@user_with_error) do |f| %>
+  <%= f.email_field :email %>
+<% end %>
+```
+
+Generated HTML:
+
 ```html
-<div class="mb-3">
-  <label class="form-label form-control-label" for="user_email">Email</label>
-  <input class="form-control is-invalid" id="user_email" name="user[email]" type="email" value="">
-  <small class="invalid-feedback">can't be blank</small>
-</div>
+<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
+  <div class="mb-3">
+    <label class="form-label required" for="user_email">Email</label>
+    <input aria-required="true" class="form-control is-invalid" id="user_email" name="user[email]" required="required" type="email" value="steve.example.com">
+    <div class="invalid-feedback">is invalid</div>
+  </div>
+</form>
 ```
 
 You can turn off inline errors for the entire form like this:
 
 ```erb
-<%= bootstrap_form_for(@user, inline_errors: false) do |f| %>
+<%= bootstrap_form_for(@user_with_error, inline_errors: false) do |f| %>
   ...
 <% end %>
 ```
@@ -1390,12 +1397,24 @@ You can turn off inline errors for the entire form like this:
 You can also display validation errors in the field's label; just turn
 on the `:label_errors` option. Here's an example:
 
+![Example 45](demo/doc/screenshots/bootstrap/readme/45_example.png "Example 45")
 ```erb
-<%= bootstrap_form_for(@user, label_errors: true) do |f| %>
-  ...
+<%= bootstrap_form_for(@user_with_error, label_errors: true) do |f| %>
+  <%= f.email_field :email %>
 <% end %>
 ```
 
+Generated HTML:
+
+```html
+<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
+  <div class="mb-3">
+    <label class="form-label required text-danger" for="user_email">Email is invalid</label>
+    <input aria-required="true" class="form-control is-invalid" id="user_email" name="user[email]" required="required" type="email" value="steve.example.com">
+  </div>
+</form>
+```
+
 By default, turning on `:label_errors` will also turn off
 `:inline_errors`. If you want both turned on, you can do that too:
 
@@ -1411,7 +1430,7 @@ To display an error message with an error summary, you can use the
 `alert_message` helper. This won't output anything unless a model validation
 has failed.
 
-![Example 44](demo/doc/screenshots/bootstrap/readme/44_example.png "Example 44")
+![Example 46](demo/doc/screenshots/bootstrap/readme/46_example.png "Example 46")
 ```erb
 <%= bootstrap_form_for @user_with_error do |f| %>
   <%= f.alert_message "Please fix the errors below." %>
@@ -1434,7 +1453,7 @@ Which outputs:
 
 You can turn off the error summary like this:
 
-![Example 45](demo/doc/screenshots/bootstrap/readme/45_example.png "Example 45")
+![Example 47](demo/doc/screenshots/bootstrap/readme/47_example.png "Example 47")
 ```erb
 <%= bootstrap_form_for @user_with_error do |f| %>
   <%= f.alert_message "Please fix the errors below.", error_summary: false %>
@@ -1451,7 +1470,7 @@ This generates:
 
 To output a simple unordered list of errors, use the `error_summary` helper.
 
-![Example 46](demo/doc/screenshots/bootstrap/readme/46_example.png "Example 46")
+![Example 48](demo/doc/screenshots/bootstrap/readme/48_example.png "Example 48")
 ```erb
 <%= bootstrap_form_for @user_with_error do |f| %>
   <%= f.error_summary %>
@@ -1473,7 +1492,7 @@ Which outputs:
 
 If you want to display a custom inline error for a specific attribute not represented by a form field, use the `errors_on` helper.
 
-![Example 47](demo/doc/screenshots/bootstrap/readme/47_example.png "Example 47")
+![Example 49](demo/doc/screenshots/bootstrap/readme/49_example.png "Example 49")
 ```erb
 <%= bootstrap_form_for @user_with_error do |f| %>
   <%= f.errors_on :email %>
@@ -1490,7 +1509,7 @@ Which outputs:
 
 You can hide the attribute name like this:
 
-![Example 48](demo/doc/screenshots/bootstrap/readme/48_example.png "Example 48")
+![Example 50](demo/doc/screenshots/bootstrap/readme/50_example.png "Example 50")
 ```erb
 <%= bootstrap_form_for @user_with_error do |f| %>
   <%= f.errors_on :email, hide_attribute_name: true %>
@@ -1507,7 +1526,7 @@ Which outputs:
 
 You can also use a custom class for the wrapping div, like this:
 
-![Example 49](demo/doc/screenshots/bootstrap/readme/49_example.png "Example 49")
+![Example 51](demo/doc/screenshots/bootstrap/readme/51_example.png "Example 51")
 ```erb
 <%= bootstrap_form_for @user_with_error do |f| %>
   <%= f.errors_on :email, custom_class: 'custom-error' %>
@@ -1542,7 +1561,7 @@ ActiveModel::Validations::PresenceValidator.
 
 In cases where this behaviour is undesirable, use the `required` option to force the class to be present or absent:
 
-![Example 50](demo/doc/screenshots/bootstrap/readme/50_example.png "Example 50")
+![Example 52](demo/doc/screenshots/bootstrap/readme/52_example.png "Example 52")
 ```erb
 <%= f.password_field :login, label: "New Username", required: true %>
 <%= f.password_field :password, label: "New Password", required: false %>
@@ -1553,7 +1572,7 @@ This generates:
 ```html
 <div class="mb-3">
   <label class="form-label required" for="user_login">New Username</label>
-  <input class="form-control" id="user_login" name="user[login]" required="required" type="password">
+  <input aria-required="true" class="form-control" id="user_login" name="user[login]" required="required" type="password">
 </div>
 <div class="mb-3">
   <label class="form-label" for="user_password">New Password</label>
@@ -1561,6 +1580,53 @@ This generates:
 </div>
 ```
 
+### Required belongs_to associations
+
+Adding a form control for a `belongs_to` field will automatically pick up the associated presence validator.
+
+![Example 53](demo/doc/screenshots/bootstrap/readme/53_example.png "Example 53")
+```erb
+<%= bootstrap_form_for(@address, url: '/address') do |f| %>
+  <%= f.collection_select :user_id, @users, :id, :email, include_blank: "Select a value" %>
+  <%= f.text_field :street %>
+  <%= f.text_field :city %>
+  <%= f.text_field :state %>
+  <%= f.text_field :zip_code %>
+  <%= f.submit "Save" %>
+<% end %>
+```
+
+Generated HTML:
+
+```html
+<form accept-charset="UTF-8" action="/address" class="new_address" id="new_address_1" method="post">
+  <div class="mb-3">
+    <label class="form-label required" for="address_user_id">User</label>
+    <select class="form-select" id="address_user_id" name="address[user_id]">
+      <option value="">Select a value</option>
+      <option value="">steve@example.com</option>
+    </select>
+  </div>
+  <div class="mb-3">
+    <label class="form-label" for="address_street">Street</label>
+    <input class="form-control" id="address_street" name="address[street]" type="text" value="Foo">
+  </div>
+  <div class="mb-3">
+    <label class="form-label" for="address_city">City</label>
+    <input class="form-control" id="address_city" name="address[city]" type="text">
+  </div>
+  <div class="mb-3">
+    <label class="form-label" for="address_state">State</label>
+    <input class="form-control" id="address_state" name="address[state]" type="text">
+  </div>
+  <div class="mb-3">
+    <label class="form-label" for="address_zip_code">Zip code</label>
+    <input class="form-control" id="address_zip_code" name="address[zip_code]" type="text">
+  </div>
+  <input class="btn btn-secondary" data-disable-with="Save" name="commit" type="submit" value="Save">
+</form>
+```
+
 ## Internationalization
 
 bootstrap_form follows standard rails conventions so it's i18n-ready. See more

data/RELEASING.md

@@ -11,7 +11,18 @@ Follow these steps to release a new version of bootstrap_form to rubygems.org.
 ## How to release
 
 1. Run `BUNDLE_GEMFILE=gemfiles/7.0.gemfile bundle update` to make sure that you have all the gems necessary for testing and releasing.
-2. **Ensure the tests are passing by running `BUNDLE_GEMFILE=gemfiles/7.0.gemfile bundle update`.** (Currently this step shows a lot of warnings about method redefinitions, but otherwise everything must be green before release.)
+2. **Ensure the tests are passing by running the tests**
+
+   (There should be no errors or warnings.)
+
+       BUNDLE_GEMFILE=gemfiles/7.0.gemfile bundle exec rake test
+
+2. **Ensure the demo tests are passing by running**
+
+       cd demo
+       bundle update
+       bundle exec rake test:all
+
 3. Determine which would be the correct next version number according to [semver](http://semver.org/).
 4. Update the version in `./lib/bootstrap_form/version.rb`.
 5. Update the GitHub diff links at the beginning of `CHANGELOG.md` (The pattern should be obvious when you look at them).

data/Rakefile

@@ -17,12 +17,13 @@ end
 
 require 'bundler/gem_tasks'
 
-require 'rake/testtask'
+require "minitest/test_task"
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
+Minitest::TestTask.create(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.warning = false
+  t.test_globs = ["test/**/*_test.rb"]
 end
 
 # This automatically updates GitHub Releases whenever we `rake release` the gem
@@ -34,4 +35,4 @@ end
 desc 'Run RuboCop checks'
 RuboCop::RakeTask.new(:rubocop)
 
-task default: %i[test rubocop]
+task default: %i[test rubocop:autocorrect]

data/bootstrap_form.gemspec

@@ -3,30 +3,28 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require "bootstrap_form/version"
 
-REQUIRED_RAILS_VERSION = ">= 5.2".freeze
-
 Gem::Specification.new do |s|
   s.name        = "bootstrap_form"
   s.version     = BootstrapForm::VERSION
   s.authors     = ["Stephen Potenza", "Carlos Lopes"]
   s.email       = ["potenza@gmail.com", "carlos.el.lopes@gmail.com"]
   s.homepage    = "https://github.com/bootstrap-ruby/bootstrap_form"
-  s.summary     = "Rails form builder that makes it easy to style forms using "\
+  s.summary     = "Rails form builder that makes it easy to style forms using " \
                   "Bootstrap 5"
-  s.description = "bootstrap_form is a rails form builder that makes it super "\
+  s.description = "bootstrap_form is a rails form builder that makes it super " \
                   "easy to create beautiful-looking forms using Bootstrap 5"
   s.license     = "MIT"
   s.metadata    = { "rubygems_mfa_required" => "true" }
 
   s.files = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test)/})
+    f.match(%r{^(test)/|^(demo)/})
   end
 
   s.bindir        = "exe"
   s.require_paths = ["lib"]
 
-  s.required_ruby_version = ">= 2.7"
+  s.required_ruby_version = ">= 3.0"
 
-  s.add_dependency("actionpack", REQUIRED_RAILS_VERSION)
-  s.add_dependency("activemodel", REQUIRED_RAILS_VERSION)
+  s.add_dependency("actionpack", BootstrapForm::REQUIRED_RAILS_VERSION)
+  s.add_dependency("activemodel", BootstrapForm::REQUIRED_RAILS_VERSION)
 end

data/docker-compose.yml

@@ -5,9 +5,10 @@ services:
     build:
       context: .
       args:
-        NODE_MAJOR: '12'
-        YARN_VERSION: '1.22.4'
-    image: bootstrap-form:0.0.1
+        NODE_MAJOR: "12"
+        YARN_VERSION: "1.22.4"
+        RUBY_VERSION: ${RUBY_VERSION}
+    image: bootstrap-form:latest-$RUBY_VERSION
     tmpfs:
       - /tmp
 
@@ -17,15 +18,6 @@ services:
     tty: true
     volumes:
       - .:/app:cached
-      # - rails_cache:/app/tmp/cache
-      # - bundle:/app/vendor/bundle
-      # - node_modules:/app/node_modules
-      # - packs:/app/public/packs
-      - /etc/passwd:/etc/passwd:ro
-      # One or the other of the following lines might be redundant, or one might be
-      # better than the other.
-      - ~/.ssh:${HOME}/.ssh
-      - ${SSH_AUTH_SOCK}:/ssh-agent
     environment:
       - SSH_AUTH_SOCK=/ssh-agent
       - NODE_ENV=development
@@ -34,16 +26,6 @@ services:
       - WEBPACKER_DEV_SERVER_HOST=webpacker
       - WEB_CONCURRENCY=1
       - HISTFILE=/app/.bash_history
+    ports:
+      - "3000:3000"
     command: /bin/bash
-
-  # server:
-  #   <<: *shell
-  #   command: sh -c "cd demo/app && bundle exec rails server -b 0.0.0.0"
-  #   ports:
-  #     - '3000:3000'
-
-# volumes:
-#   bundle:
-#   node_modules:
-#   rails_cache:
-#   packs:

data/gemfiles/6.0.gemfile

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

data/gemfiles/6.1.gemfile

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

data/gemfiles/7.0.gemfile

@@ -1,6 +1,5 @@
-gems = "#{File.dirname __dir__}/Gemfile"
+gems = "#{__dir__}/common.gemfile"
 eval File.read(gems), binding, gems # rubocop: disable Security/Eval
 
-# 7.0.0 has an issue with Ruby 3.1.
-# And a test case has an issue with 7.0.1
 gem "rails", "~> 7.0.2"
+gem "sprockets-rails", require: "sprockets/railtie"

data/gemfiles/common.gemfile

@@ -0,0 +1,28 @@
+source "http://rubygems.org"
+
+gemspec path: File.dirname(__dir__)
+
+# To test with different Rails versions, use the files in `./gemfiles`
+
+group :development do
+  gem "htmlbeautifier"
+  gem "puma"
+  gem "rubocop-performance", require: false
+  gem "rubocop-rails", require: false
+end
+
+group :test do
+  gem "diffy"
+  gem "equivalent-xml"
+  gem "mocha"
+  gem "sqlite3"
+end
+
+group :development, :test do
+  gem "debug"
+  gem "pry-byebug"
+end
+
+group :ci do
+  gem "danger"
+end

data/gemfiles/edge.gemfile

@@ -1,4 +1,5 @@
-gems = "#{File.dirname __dir__}/Gemfile"
+gems = "#{__dir__}/common.gemfile"
 eval File.read(gems), binding, gems # rubocop: disable Security/Eval
 
-gem "rails", git: "https://github.com/rails/rails.git"
+gem "rails", git: "https://github.com/rails/rails.git", branch: "main"
+gem "sprockets-rails", require: "sprockets/railtie"

data/lib/bootstrap_form/components/labels.rb

@@ -24,14 +24,8 @@ module BootstrapForm
 
       def label_classes(name, options, custom_label_col, group_layout)
         classes = ["form-label", options[:class], label_layout_classes(custom_label_col, group_layout)]
-
-        case options.delete(:required)
-        when true
-          classes << "required"
-        when nil, :default
-          classes << "required" if required_attribute?(object, name)
-        end
-
+        classes << "required" if required_field_options(options, name)[:required]
+        options.delete(:required)
         classes << "text-danger" if label_errors && error?(name)
         classes.flatten.compact
       end
@@ -46,7 +40,7 @@ module BootstrapForm
 
       def label_text(name, options)
         if label_errors && error?(name)
-          (options[:text] || object.class.human_attribute_name(name)).to_s.concat(" #{get_error_messages(name)}")
+          (options[:text] || object.class.human_attribute_name(name)).to_s + " #{get_error_messages(name)}"
         else
           options[:text] || object&.class.try(:human_attribute_name, name)
         end