bootstrap_form 5.2.0 → 5.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d296af534429e0065b8f5aef6254dd12455e6317fd36f684b060b3c425c03e8
-  data.tar.gz: aa02bc3031975302dbe4d556a1fcaa6751e2b4cbb961e737fa23b80516904ea2
+  metadata.gz: 4f254a69bb17aa95e9b912696e17d960c76a8b276946e3e33a0c4ade55cc3a38
+  data.tar.gz: 5d7d83dd48e78fc1dfbb9be6cea0cf12a4bdc9dbe646e3720152e4f78953adb3
 SHA512:
-  metadata.gz: 0a402ef41606092aa37ec284382f754aea85d73dfc16b8b065ea130c6d47910d061afac644a0b0d38f1269f0c53caa2f987c8b5d4ce9dfa6105811919a40bc8f
-  data.tar.gz: 546e5dbb15379578c5f06a4d6d40a362bd08d9dc4049cd4a7140cc7b29f459bfc8f914d8e114125d398be8b323102d4912653d589e008441eb288dda71fb0ebd
+  metadata.gz: 2e9d0227f8d07cd40fd0986cb67f0b86de8c759fd7e7b60d42e3ea8dd0d825555a62b5f60de26e30a8b08985cc9b38e42e765338d1ca628e50c5a8841ca64756
+  data.tar.gz: 74034f6ad801fea16c3002242b80647eed61732c9a15c8d6b4197f59cd232c7d361974ef42697fa4b81f03100d73e7699794a0a5454da03661bde1677045ee42

data/CHANGELOG.md

@@ -6,11 +6,14 @@ https://github.com/bootstrap-ruby/bootstrap_form/releases
 
 ## Diffs
 
-- [Pending Release](https://github.com/bootstrap-ruby/bootstrap_form/compare/v5.2.0...HEAD)
+- [5.2.2](https://github.com/bootstrap-ruby/bootstrap_form/compare/v5.2.1...v5.2.2)
+  [Closed issues](https://github.com/bootstrap-ruby/bootstrap_form/issues?q=closed%3A2023-05-23T10%3A00..2023-05-28T16%3A00)
+- [5.2.1](https://github.com/bootstrap-ruby/bootstrap_form/compare/v5.2.0...v5.2.1)
+  [Closed issues](https://github.com/bootstrap-ruby/bootstrap_form/issues?q=closed%3A2023-05-20T23%3A59..2023-05-23T10%3A00)
 - [5.2.0](https://github.com/bootstrap-ruby/bootstrap_form/compare/v5.1.0...v5.2.0)
-  [Issues](https://github.com/bootstrap-ruby/bootstrap_form/issues?q=closed%3A2022-06-25T17%3A22..2023-05-20T23%3A59)
+  [Closed issues](https://github.com/bootstrap-ruby/bootstrap_form/issues?q=closed%3A2022-06-25T17%3A22..2023-05-20T23%3A59)
 - [5.1.0](https://github.com/bootstrap-ruby/bootstrap_form/compare/v5.0.0...v5.1.0)
-  [Issues](https://github.com/bootstrap-ruby/bootstrap_form/issues?q=closed%3A2021-11-12T05%3A58..2022-06-25T17%3A22)
+  [Closed issues](https://github.com/bootstrap-ruby/bootstrap_form/issues?q=closed%3A2021-11-12T05%3A58..2022-06-25T17%3A22)
 - [5.0.0](https://github.com/bootstrap-ruby/bootstrap_form/compare/v4.5.0...v5.0.0)
 - [4.5.0](https://github.com/bootstrap-ruby/bootstrap_form/compare/v4.4.0...v4.5.0)
 - [4.4.0](https://github.com/bootstrap-ruby/bootstrap_form/compare/v4.3.0...v4.4.0)

data/README.md

@@ -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")
@@ -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.
@@ -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>
 ```
 
@@ -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) %>
@@ -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 %>
@@ -1565,7 +1584,7 @@ This generates:
 
 Adding a form control for a `belongs_to` field will automatically pick up the associated presence validator.
 
-![Example 51](demo/doc/screenshots/bootstrap/readme/51_example.png "Example 51")
+![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" %>

data/RELEASING.md

@@ -10,22 +10,37 @@ 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.
+1. Make sure that you have all the gems necessary for testing and releasing.
+
+       BUNDLE_GEMFILE=gemfiles/7.0.gemfile bundle update
+
 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**
+3. **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).
-6. Update the installation instructions in `README.md` to use the new version.
-7. Commit the CHANGELOG and version changes in a single commit; the message should be "Preparing vX.Y.Z" where `X.Y.Z` is the version being released.
-8. Run `bundle exec rake release`; this will tag, push to GitHub, and publish to rubygems.org.
+       cd -
+
+4. Determine which would be the correct next version number according to [semver](http://semver.org/).
+5. Update the version in `./lib/bootstrap_form/version.rb`.
+6. Update the GitHub diff links at the beginning of `CHANGELOG.md` (The pattern should be obvious when you look at them).
+7. Update the installation instructions in `README.md` to use the new version.
+8. Commit the CHANGELOG and version changes in a single commit; the message should be "Preparing vX.Y.Z" where `X.Y.Z` is the version being released.
+9. Tag, push to GitHub, and publish to rubygems.org:
+
+       bundle exec rake release
+
+10. Go to https://github.com/bootstrap-ruby/bootstrap_form/releases and create the new release and add release notes by clicking the "Generate release notes" button.
+    Add the link of closed issues from CHANGELOG.
+    Group the commits in sections:
+    * ### New features
+    * ### Bugfixes
+    * ### Performance
+    * ### Documentation
+    * ### Development

data/Rakefile

@@ -1,12 +1,14 @@
 begin
   require 'bundler/setup'
+
+  require 'bundler/gem_tasks'
+  require "minitest/test_task"
+  require 'rdoc/task'
   require 'rubocop/rake_task'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-require 'rdoc/task'
-
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'BootstrapForm'
@@ -15,10 +17,6 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-require 'bundler/gem_tasks'
-
-require "minitest/test_task"
-
 Minitest::TestTask.create(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
@@ -26,12 +24,6 @@ Minitest::TestTask.create(:test) do |t|
   t.test_globs = ["test/**/*_test.rb"]
 end
 
-# This automatically updates GitHub Releases whenever we `rake release` the gem
-task "release:rubygem_push" do
-  require "chandler/tasks"
-  Rake.application.invoke_task("chandler:push")
-end
-
 desc 'Run RuboCop checks'
 RuboCop::RakeTask.new(:rubocop)
 

data/lib/bootstrap_form/components/validation.rb

@@ -12,7 +12,7 @@ module BootstrapForm
       end
 
       def association_error?(name)
-        object.class.reflections.any? do |association_name, a|
+        object.class.try(:reflections)&.any? do |association_name, a|
           next unless a.is_a?(ActiveRecord::Reflection::BelongsToReflection)
           next unless a.foreign_key == name.to_s
 
@@ -26,21 +26,23 @@ module BootstrapForm
         target = obj.instance_of?(Class) ? obj : obj.class
         return false unless target.respond_to? :validators_on
 
-        presence_validator?(target_validators(target, attribute)) ||
+        presence_validator?(target_unconditional_validators(target, attribute)) ||
           required_association?(target, attribute)
       end
 
       def required_association?(target, attribute)
-        target.reflections.find do |name, a|
+        target.try(:reflections)&.find do |name, a|
           next unless a.is_a?(ActiveRecord::Reflection::BelongsToReflection)
           next unless a.foreign_key == attribute.to_s
 
-          presence_validator?(target_validators(target, name))
+          presence_validator?(target_unconditional_validators(target, name))
         end
       end
 
-      def target_validators(target, attribute)
-        target.validators_on(attribute).map(&:class)
+      def target_unconditional_validators(target, attribute)
+        target.validators_on(attribute)
+              .reject { |validator| validator.options[:if].present? || validator.options[:unless].present? }
+              .map(&:class)
       end
 
       def presence_validator?(target_validators)
@@ -65,7 +67,7 @@ module BootstrapForm
 
       def get_error_messages(name)
         messages = object.errors[name]
-        object.class.reflections.each do |association_name, a|
+        object.class.try(:reflections)&.each do |association_name, a|
           next unless a.is_a?(ActiveRecord::Reflection::BelongsToReflection)
           next unless a.foreign_key == name.to_s
 

data/lib/bootstrap_form/form_builder.rb

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

data/lib/bootstrap_form/inputs/base.rb

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

data/lib/bootstrap_form/inputs/range_field.rb

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

data/lib/bootstrap_form/inputs.rb

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

data/lib/bootstrap_form/version.rb

@@ -1,4 +1,4 @@
 module BootstrapForm
-  VERSION = "5.2.0".freeze
+  VERSION = "5.2.2".freeze
   REQUIRED_RAILS_VERSION = ">= 6.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_form
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.2.2
 platform: ruby
 authors:
 - Stephen Potenza
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-20 00:00:00.000000000 Z
+date: 2023-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack