rails_bootstrap_form 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15ea5c9f97b548a1fbadb720b875c2a0a784ea6184e77b62af1191865bcef46c
-  data.tar.gz: 70f4b371a945958580eb8883868a799deb9b189454a1c8bf97ef263905dd0a39
+  metadata.gz: 4cc018cfa787b152387078681629abadc1794699ef4151423db7fad244560be7
+  data.tar.gz: 4e932a41a3c992a79f766b868d04b655b4fb3aafabb08559caa8714189ac25d0
 SHA512:
-  metadata.gz: 82b6509a781a1acd0ac837b1bd51900a2fa023bc1a55870905c25509fc48d674d1ee164ca309c8cf8446dae4364f815bf639ecab14b4c205c60cca0edd2e0a4b
-  data.tar.gz: f2e4dd5bcd9a4f0f4aa5763d22bc9003118b8f8ad3e56f56c16dc30defd86ea95d877d6b0fdeaca54ffc11eeb32358bf3dd5a388c7165e966c4d9f366d709fef
+  metadata.gz: 6738ad4f1381fe2ef85aa87e87b825ac0b0d96a3131f5727a5550361945cf99a9223fbed1b4018f139e89d39c9ab679df3a57b43e8e66dccfd1adb11af4610b6
+  data.tar.gz: c6e9250a1ea90b92398a2e3834450fbf6bdcc27f3ab8a5189c394795d53548caca48371f55e91b786bd9c2d05acb2702021d31b8a1fe5f6debaf9b1574611ced

data/CHANGELOG.md

@@ -4,6 +4,17 @@ You can find recent releases with docs in GitHub:
 
 https://github.com/shivam091/rails_bootstrap_form/releases
 
+## [0.9.1](https://github.com/shivam091/rails_bootstrap_form/compare/v0.9.0...v0.9.1) - 2023-06-
+
+### What's new
+
+- Allow user to configure `options[:multiple]` for `collection_check_boxes`.
+- Added option `inline` to control inline rendering of `collection_check_boxes` and `collection_radio_buttons`.
+
+### What's changed
+
+- `wrapper[:class]` will now be appended to existing field wrapper CSS classes ([#29](https://github.com/shivam091/rails_bootstrap_form/issues/29))
+
 ## [0.9.0](https://github.com/shivam091/rails_bootstrap_form/compare/v0.8.3...v0.9.0) - 2023-05-31
 
 ### What's new

data/Gemfile.lock

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

data/README.md

@@ -836,7 +836,6 @@ Our `fields_for` helper accepts the same arguments as the [default Rails helper]
   <%= form.check_box :terms, required: true %>
   <%= form.primary "Register" %>
 <% end %>
-
 ```
 
 This generates the following HTML:
@@ -1412,7 +1411,7 @@ an argument and takes care of rendering labels, check boxes, and wrapper for you
 ![collection_check_boxes](https://github.com/shivam091/rails_bootstrap_form/assets/7858927/c92f5921-e572-4384-812e-31308e018f66)
 
 ```erb
-<%= form.collection_check_boxes :skill_ids, ::Skill.all, :id, :name, {bootstrap: {layout: :horizontal}, onchange: "this.form.submit();"}, {} %>
+<%= form.collection_check_boxes :skill_ids, ::Skill.all, :id, :name, {bootstrap: {layout: :horizontal, inline: true}, onchange: "this.form.submit();"}, {} %>
 ```
 
 This generates the following HTML:
@@ -1477,7 +1476,7 @@ an argument and takes care of rendering labels, radio button, and wrapper for yo
 ![collection_radio_buttons](https://github.com/shivam091/rails_bootstrap_form/assets/7858927/798a8b0c-915a-40b1-9874-dd74f50d3695)
 
 ```erb
-<%= form.collection_radio_buttons :fruit_id, ::Fruit.all, :id, :name, {checked: form.object.fruit_id, bootstrap: {layout: :horizontal}}, {} %>
+<%= form.collection_radio_buttons :fruit_id, ::Fruit.all, :id, :name, {checked: form.object.fruit_id, bootstrap: {layout: :horizontal, inline: true}}, {} %>
 ```
 
 This generates the following HTML:
@@ -1858,6 +1857,30 @@ This generates the following HTML:
 </form>
 ```
 
+Inline errors are also supported if the field is wrapped inside of input group and has floating label:
+
+![floating_inline_errors](https://github.com/shivam091/rails_bootstrap_form/assets/7858927/89deb618-3f06-463b-91fb-60c50794387c)
+
+```erb
+<%= form.text_field :expected_ctc, bootstrap: {floating: true, prepend: "$", append: "0.0"} %>
+```
+
+This generates the following HTML:
+
+```html
+<div class="mb-3">
+  <div class="input-group has-validation">
+    <span class="input-group-text">$</span>
+    <div class="form-floating is-invalid">
+      <input class="form-control is-invalid" aria-required="true" required="required" placeholder="Expected CTC" type="text" value="" name="user[expected_ctc]" id="user_expected_ctc">
+      <label class="form-label required is-invalid" for="user_expected_ctc">Expected CTC</label>
+    </div>
+    <span class="input-group-text">0.0</span>
+    <div class="invalid-feedback">can't be blank</div>
+  </div>
+</div>
+```
+
 ## Required Fields
 
 A label that is associated with a mandatory field is automatically annotated with a `required` CSS class. `rails_bootstrap_form` provides styling for required fields.

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

@@ -12,9 +12,14 @@
       <%= 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.collection_radio_buttons :fruit_id, ::Fruit.all, :id, :name, {checked: form.object.fruit_id, bootstrap: {inline: true}} %>
       <%= form.color_field :favorite_color %>
-      <%= form.collection_check_boxes :skill_ids, ::Skill.all, :id, :name %>
+      <%= form.collection_check_boxes :skill_ids, ::Skill.all, :id, :name, multiple: true, bootstrap: {inline: true} %>
+      <%= form.number_field :expected_ctc, bootstrap: {prepend: "$", append: "0.0"} %>
+      <%= form.date_select :interview_date %>
+      <%= form.time_select :interview_time %>
+      <%= form.datetime_select :interview_datetime %>
+      <%= form.weekday_select :weekly_off %>
       <%= form.fields_for :address, include_id: false do |address_form| %>
         <%= address_form.text_area :street %>
         <%= address_form.text_field :state %>

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

@@ -12,9 +12,14 @@
       <%= 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.collection_radio_buttons :fruit_id, ::Fruit.all, :id, :name, {checked: form.object.fruit_id, bootstrap: {inline: true}} %>
       <%= form.color_field :favorite_color %>
-      <%= form.collection_check_boxes :skill_ids, ::Skill.all, :id, :name %>
+      <%= form.collection_check_boxes :skill_ids, ::Skill.all, :id, :name, multiple: true, bootstrap: {inline: true} %>
+      <%= form.number_field :expected_ctc, bootstrap: {prepend: "$", append: "0.0"} %>
+      <%= form.date_select :interview_date %>
+      <%= form.time_select :interview_time %>
+      <%= form.datetime_select :interview_datetime %>
+      <%= form.weekday_select :weekly_off %>
       <%= form.fields_for :address, include_id: false do |address_form| %>
         <%= address_form.text_area :street %>
         <%= address_form.text_field :state %>

data/lib/rails_bootstrap_form/field_wrapper_builder.rb

@@ -48,19 +48,23 @@ module RailsBootstrapForm
     end
 
     def field_wrapper_options(bootstrap_options)
+      wrapper_options = bootstrap_options.wrapper
+
       {}.tap do |option|
         option[:class] = field_wrapper_classes(bootstrap_options)
-      end.merge(bootstrap_options.wrapper)
+        option.merge!(wrapper_options.except(:class)) if wrapper_options.is_a?(Hash)
+      end
     end
 
     def field_wrapper_classes(bootstrap_options)
       classes = []
       classes << "row" if bootstrap_options.layout_horizontal?
-      classes << form_wrapper_default_class(bootstrap_options)
+      classes << field_wrapper_default_class(bootstrap_options)
+      classes << bootstrap_options.wrapper[:class]
       classes.flatten.compact
     end
 
-    def form_wrapper_default_class(bootstrap_options)
+    def field_wrapper_default_class(bootstrap_options)
       bootstrap_options.layout_inline? ? "col-12" : "mb-3"
     end
 
@@ -99,7 +103,7 @@ module RailsBootstrapForm
       (bootstrap_options.floating? && !bootstrap_options.layout_horizontal?) || bootstrap_options.layout_inline?
     end
 
-    private :field_wrapper, :field_wrapper_classes, :form_wrapper_default_class,
+    private :field_wrapper, :field_wrapper_classes, :field_wrapper_default_class,
             :field_css_options, :floating_label_classes
   end
 end

data/lib/rails_bootstrap_form/helpers/check_box.rb

@@ -28,9 +28,12 @@ module RailsBootstrapForm
         end
 
         def check_box_wrapper_options(bootstrap_options)
+          wrapper_options = bootstrap_options.wrapper
+
           {}.tap do |option|
-            option[:class] = check_box_wrapper_class(bootstrap_options)
-          end.merge(bootstrap_options.wrapper)
+            option[:class] = check_box_wrapper_classes(bootstrap_options)
+            option.merge!(wrapper_options.except(:class)) if wrapper_options.is_a?(Hash)
+          end
         end
 
         def check_box_label_text(attribute, options, bootstrap_options, &block)
@@ -58,13 +61,14 @@ module RailsBootstrapForm
           classes.flatten.compact
         end
 
-        def check_box_wrapper_class(bootstrap_options)
+        def check_box_wrapper_classes(bootstrap_options)
           classes = Array("form-check")
           classes << "form-switch" if bootstrap_options.switch?
           classes << "form-check-inline" if bootstrap_options.inline?
           if (bootstrap_options.layout_vertical? && !bootstrap_options.inline?)
             classes << "mb-3"
           end
+          classes << bootstrap_options.wrapper[:class]
           classes.flatten.compact
         end
 
@@ -75,7 +79,7 @@ module RailsBootstrapForm
         end
 
         private :check_box_label, :check_box_classes, :check_box_label_class,
-                :check_box_wrapper_class, :check_box_container_classes
+                :check_box_wrapper_classes, :check_box_container_classes
       end
     end
   end

data/lib/rails_bootstrap_form/helpers/radio_button.rb

@@ -29,9 +29,12 @@ module RailsBootstrapForm
         end
 
         def radio_button_wrapper_options(bootstrap_options)
+          wrapper_options = bootstrap_options.wrapper
+
           {}.tap do |option|
-            option[:class] = radio_button_wrapper_class(bootstrap_options)
-          end.merge(bootstrap_options.wrapper)
+            option[:class] = radio_button_wrapper_classes(bootstrap_options)
+            option.merge!(wrapper_options.except(:class)) if wrapper_options.is_a?(Hash)
+          end
         end
 
         def radio_button_value(attribute, value)
@@ -55,12 +58,13 @@ module RailsBootstrapForm
           classes.flatten.compact
         end
 
-        def radio_button_wrapper_class(bootstrap_options)
+        def radio_button_wrapper_classes(bootstrap_options)
           classes = Array("form-check")
           classes << "form-check-inline" if bootstrap_options.inline?
           if (bootstrap_options.layout_vertical? && !bootstrap_options.inline?)
             classes << "mb-3"
           end
+          classes << bootstrap_options.wrapper[:class]
           classes.flatten.compact
         end
 
@@ -71,7 +75,7 @@ module RailsBootstrapForm
         end
 
         private :radio_button_label, :radio_button_classes, :radio_button_label_class,
-                :radio_button_wrapper_class, :radio_button_container_classes
+                :radio_button_wrapper_classes, :radio_button_container_classes
       end
     end
   end

data/lib/rails_bootstrap_form/inputs/base.rb

@@ -7,6 +7,32 @@ module RailsBootstrapForm
     module Base
       extend ActiveSupport::Concern
 
+      included do
+        def inputs_collection(attribute, collection, value_method, text_method, bootstrap_options, options = {})
+          inputs = ActiveSupport::SafeBuffer.new
+
+          collection.each do |object|
+            input_options = {
+              bootstrap: {
+                label_text: text_method.respond_to?(:call) ? text_method.call(object) : object.send(text_method),
+                help_text: false,
+                inline: bootstrap_options.inline?
+              }
+            }.deep_merge!(options)
+
+            if (checked = input_options[:checked])
+              input_options[:checked] = collection_input_checked?(checked, object, object.send(value_method))
+            end
+
+            input_value = value_method.respond_to?(:call) ? value_method.call(object) : object.send(value_method)
+
+            inputs << yield(attribute, input_value, input_options)
+          end
+
+          inputs
+        end
+      end
+
       class_methods do
         def bootstrap_field(field_name)
           define_method(field_name) do |attribute, options = {}|

data/lib/rails_bootstrap_form/inputs/check_box.rb

@@ -22,7 +22,7 @@ module RailsBootstrapForm
           check_box_html = tag.div(**check_box_wrapper_options(bootstrap_options)) do
             concat(check_box_field)
             concat(check_box_label)
-            concat(check_box_help_text) unless bootstrap_options.inline?
+            concat(check_box_help_text)
             concat(generate_error(attribute)) if (is_invalid?(attribute) && !bootstrap_options.inline?)
           end
 

data/lib/rails_bootstrap_form/inputs/collection_check_boxes.rb

@@ -12,20 +12,8 @@ module RailsBootstrapForm
           bootstrap_options = bootstrap_form_options.scoped(options.delete(:bootstrap))
           return super if bootstrap_options.disabled?
 
-          options[:multiple] = true
-
-          inputs = ActiveSupport::SafeBuffer.new
-
-          collection.each do |object|
-            input_value = value_method.respond_to?(:call) ? value_method.call(object) : object.send(value_method)
-            input_options = {
-              bootstrap: {
-                label_text: text_method.respond_to?(:call) ? text_method.call(object) : object.send(text_method),
-                inline: true
-              }
-            }.deep_merge!(options)
-
-            inputs << check_box(attribute, input_options, input_value, nil)
+          inputs = inputs_collection(attribute, collection, value_method, text_method, bootstrap_options, options) do |attribute, value, options|
+            check_box(attribute, options, value, nil)
           end
 
           if options.delete(:include_hidden) { true }

data/lib/rails_bootstrap_form/inputs/collection_radio_buttons.rb

@@ -12,22 +12,8 @@ module RailsBootstrapForm
           bootstrap_options = bootstrap_form_options.scoped(options.delete(:bootstrap))
           return super if bootstrap_options.disabled?
 
-          inputs = ActiveSupport::SafeBuffer.new
-
-          collection.each do |object|
-            input_value = value_method.respond_to?(:call) ? value_method.call(object) : object.send(value_method)
-            input_options = {
-              bootstrap: {
-                label_text: text_method.respond_to?(:call) ? text_method.call(object) : object.send(text_method),
-                inline: true
-              }
-            }.deep_merge!(options)
-
-            if (checked = input_options[:checked])
-              input_options[:checked] = collection_input_checked?(checked, object, object.send(value_method))
-            end
-
-            inputs << radio_button(attribute, input_value, input_options)
+          inputs = inputs_collection(attribute, collection, value_method, text_method, bootstrap_options, options) do |attribute, value, options|
+            radio_button(attribute, value, options)
           end
 
           field_wrapper_builder(attribute, bootstrap_options, options, html_options) do

data/lib/rails_bootstrap_form/inputs/radio_button.rb

@@ -22,7 +22,7 @@ module RailsBootstrapForm
           radio_button_html = tag.div(**radio_button_wrapper_options(bootstrap_options)) do
             concat(radio_button_field)
             concat(radio_button_label)
-            concat(radio_button_help_text) unless bootstrap_options.inline?
+            concat(radio_button_help_text)
             concat(generate_error(attribute)) if (is_invalid?(attribute) && !bootstrap_options.inline?)
           end
 

data/lib/rails_bootstrap_form/version.rb

@@ -3,6 +3,6 @@
 # -*- warn_indent: true -*-
 
 module RailsBootstrapForm
-  VERSION = "0.9.0".freeze
+  VERSION = "0.9.1".freeze
   REQUIRED_RAILS_VERSION = "~> 7.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_bootstrap_form
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Harshal LADHE (shivam091)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-31 00:00:00.000000000 Z
+date: 2023-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: generator_spec