rails_bootstrap_form 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c769ec63a2b3c1a8abaeaa8f8a8d11f7b473e71c69d7eb4fda3a4d200b9106e7
-  data.tar.gz: a477abf8d26482d15d9eb6a1a4dae62be453823def408d9958961945d81cfe97
+  metadata.gz: f852149d96066acbbb48afc05ba8dd6d11f535401e9cdff2e6535829f9669303
+  data.tar.gz: d322c72387d0933048e789d849dfe79f9ee7c23f46b8eb2872d349e7698a1008
 SHA512:
-  metadata.gz: 6394304b9d69627c1032d8392a6cb586964f9dce3e0d948aeaf0854303ae222f26f9a357e4df40f41c4f42e4d381140d27cf3cb65b2d1582c2a0f8400895be72
-  data.tar.gz: fb8f1d8a37574de977551917b2e0b1577c2240d6443f48e7ac9d65fff3ca97939eaea6c97f54e88eb5d1322aed18c4336b4d6f440594b8089372d5185013ef6d
+  metadata.gz: 33a938a56a607b29bccd8c5ef712a68d7cd3caee5486b6002a8783023779222f211396d47ffa9e7aaf392820acd22e26d5d20a72c9e765a5aceec07355a34525
+  data.tar.gz: 1418938ffaadcf8a58439324e844f3acff4f437f07ff58e14df45eafb539c35211a28f567b1e3d6409b1e14c7667d62bbd650c7d8f90ea6fa5ba99fc3a37ea66

data/CHANGELOG.md

@@ -4,6 +4,18 @@ You can find recent releases with docs in GitHub:
 
 https://github.com/shivam091/rails_bootstrap_form/releases
 
+## [0.9.4](https://github.com/shivam091/rails_bootstrap_form/compare/v0.9.4...v0.9.5) - 2023-06-21
+
+### What's changed
+
+- Changed default value of `field_class` option to `nil`.
+
+### What's fixed
+
+- Fixed static field options to accept bootstrap options ([#45](https://github.com/shivam091/rails_bootstrap_form/issues/45))
+- Changes to allow overriding of field_class at form and field level ([#44](https://github.com/shivam091/rails_bootstrap_form/issues/44))
+- Fixed bug causing class attribute in select list to not get added to field ([#46](https://github.com/shivam091/rails_bootstrap_form/issues/46))
+
 ## [0.9.4](https://github.com/shivam091/rails_bootstrap_form/compare/v0.9.3...v0.9.4) - 2023-06-17
 
 ### What's new

data/Gemfile.lock

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

data/README.md

@@ -28,7 +28,7 @@ for setting up `application.scss` and `application.js`.
 Add the `rails_bootstrap_form` gem to your `Gemfile`:
 
 ```ruby
-gem "rails_bootstrap_form", "~> 0.9.4"
+gem "rails_bootstrap_form", "~> 0.9.5"
 ```
 
 Then:
@@ -154,13 +154,13 @@ This generates the following HTML:
 
 ## Bootstrap Configuration Options
 
-Here's a list of all possible options you can pass via `bootstrap` option that can be attached to the `bootstrap_form_for` or `bootstrap_form_with` or any field helpers inside of it:
+Here's a list of all possible options you can pass via `bootstrap` option that can be attached to the `bootstrap_form_for`, `bootstrap_form_with`, `fields_for`, or any field helpers inside of it:
 
 | Option | Description | Default value |
 | ------ | ------------- | ----------- |
 | `disabled` | An option to disable **rails_bootstrap_form** helpers. Default rails form builder element is rendered when set to `true` | `false` |
 | `layout` | Controls layout of form and field helpers. It can be `vertical` `horizontal`, or `inline`. | `vertical` |
-| `field_class` | A CSS class that will be applied to all form fields. | `form-control` |
+| `field_class` | A CSS class that will be applied to all form fields. | `nil` |
 | `help_text` | Describes help text for the HTML field. Help text is automatically read from translation file. If you want to customize it, you can pass a string. You can also set it `false` if you do not want help text displayed. | `nil` |
 | `label_text` | An option to customize automatically generated label text. | `nil` |
 | `skip_label` | An option to control whether the label is to be displayed or not. | `false` |
@@ -322,7 +322,7 @@ time_field                   time_select                  time_zone_select
 url_field                    week_field                   weekday_select
 ```
 
-## Supported form layouts
+## Supported Form Layouts
 
 ### Vertical Layout
 
@@ -1030,6 +1030,8 @@ This generates the following HTML:
 </form>
 ```
 
+Options specified at the field level take precedence over those specified at the fields_for level, which take precedence over those specified at the form level.
+
 ### file_field
 
 Our `file_field` helper accepts the same arguments as the [default Rails helper](https://api.rubyonrails.org/classes/ActionView/Helpers/FormHelper.html#method-i-file_field).

data/lib/rails_bootstrap_form/bootstrap_form_options.rb

@@ -25,7 +25,7 @@ module RailsBootstrapForm
     attr_accessor :layout
 
     # A CSS class that will be applied to all form fields.
-    # The default value is `form-control`.
+    # The default value is `nil`.
     attr_accessor :field_class
 
     # An additional CSS class that will be added along with the existing
@@ -169,12 +169,20 @@ module RailsBootstrapForm
       define_method("#{method}?") { self.send(method) }
     end
 
+    def disable_floating_labels!
+      self.floating = false
+    end
+
+    def set_field_class!(css_class)
+      self.field_class ||= css_class
+    end
+
     def set_defaults
       @disabled = false
 
       @layout = "vertical"
 
-      @field_class = "form-control"
+      @field_class = nil
       @additional_field_class = nil
 
       @help_text = nil

data/lib/rails_bootstrap_form/field_wrapper_builder.rb

@@ -72,7 +72,7 @@ module RailsBootstrapForm
     def field_css_options(attribute, bootstrap, options, html_options)
       css_options = (html_options || options)
 
-      field_classes = Array(bootstrap.field_class) << [bootstrap.additional_field_class || options[:class]]
+      field_classes = Array(bootstrap.field_class) << [bootstrap.additional_field_class || css_options[:class]]
       field_classes << "is-invalid" if is_invalid?(attribute)
       if is_size_valid?(bootstrap)
         field_classes << "#{bootstrap.field_class}-#{bootstrap.size}"

data/lib/rails_bootstrap_form/inputs/base.rb

@@ -17,7 +17,7 @@ module RailsBootstrapForm
             input_options = {
               bootstrap: {
                 label_text: text_method.respond_to?(:call) ? text_method.call(object) : object.send(text_method),
-                inline: (bootstrap.inline? || bootstrap.layout_inline?) 
+                inline: (bootstrap.inline? || bootstrap.layout_inline?)
               },
               required: false,
               id: sanitized_tag_name(attribute, value)
@@ -42,6 +42,8 @@ module RailsBootstrapForm
             bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
             return super(attribute, options) if bootstrap.disabled?
 
+            bootstrap.set_field_class!("form-control")
+
             field_wrapper_builder(attribute, bootstrap, options) do
               super(attribute, options)
             end
@@ -50,11 +52,12 @@ module RailsBootstrapForm
 
         def bootstrap_select_group(tag_name)
           define_method(tag_name) do |attribute, options = {}, html_options = {}|
-            options = {bootstrap: {field_class: "form-select", floating: false}}.deep_merge!(options)
-
             bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
             return super(attribute, options, html_options) if bootstrap.disabled?
 
+            bootstrap.set_field_class!("form-select")
+            bootstrap.disable_floating_labels!
+
             field_wrapper_builder(attribute, bootstrap, options, html_options) do
               tag.fieldset(class: control_specific_class(tag_name)) do
                 super(attribute, options, html_options)

data/lib/rails_bootstrap_form/inputs/collection_check_boxes.rb

@@ -10,9 +10,10 @@ module RailsBootstrapForm
       included do
         def collection_check_boxes(attribute, collection, value_method, text_method, options = {}, html_options = {})
           bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
-          bootstrap.floating = false
           return super if bootstrap.disabled?
 
+          bootstrap.disable_floating_labels!
+
           inputs = inputs_collection(attribute, collection, value_method, text_method, bootstrap, options) do |attribute, value, options|
             bootstrap_opts = bootstrap_form_options.scoped(options.delete(:bootstrap))
 

data/lib/rails_bootstrap_form/inputs/collection_radio_buttons.rb

@@ -10,9 +10,10 @@ module RailsBootstrapForm
       included do
         def collection_radio_buttons(attribute, collection, value_method, text_method, options = {}, html_options = {})
           bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
-          bootstrap.floating = false
           return super if bootstrap.disabled?
 
+          bootstrap.disable_floating_labels!
+
           inputs = inputs_collection(attribute, collection, value_method, text_method, bootstrap, options) do |attribute, value, options|
             bootstrap_opts = bootstrap_form_options.scoped(options.delete(:bootstrap))
 

data/lib/rails_bootstrap_form/inputs/collection_select.rb

@@ -9,11 +9,11 @@ module RailsBootstrapForm
 
       included do
         def collection_select(attribute, collection, value_method, text_method, options = {}, html_options = {})
-          options = {bootstrap: {field_class: "form-select"}}.deep_merge!(options)
-
           bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
           return super if bootstrap.disabled?
 
+          bootstrap.set_field_class!("form-select")
+
           field_wrapper_builder(attribute, bootstrap, options, html_options) do
             super(attribute, collection, value_method, text_method, options, html_options)
           end

data/lib/rails_bootstrap_form/inputs/color_field.rb

@@ -9,16 +9,12 @@ module RailsBootstrapForm
 
       included do
         def color_field(attribute, options = {})
-          options = {
-            bootstrap: {
-              field_class: "form-control form-control-color",
-              floating: false
-            }
-          }.deep_merge!(options)
-
           bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
           return super if bootstrap.disabled?
 
+          bootstrap.set_field_class!("form-control form-control-color")
+          bootstrap.disable_floating_labels!
+
           field_wrapper_builder(attribute, bootstrap, options) do
             super(attribute, options)
           end

data/lib/rails_bootstrap_form/inputs/grouped_collection_select.rb

@@ -9,11 +9,11 @@ module RailsBootstrapForm
 
       included do
         def grouped_collection_select(attribute, collection, group_method, group_label_method, option_key_method, option_value_method, options = {}, html_options = {})
-          options = {bootstrap: {field_class: "form-select"}}.deep_merge!(options)
-
           bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
           return super if bootstrap.disabled?
 
+          bootstrap.set_field_class!("form-select")
+
           field_wrapper_builder(attribute, bootstrap, options, html_options) do
             super(attribute, collection, group_method, group_label_method, option_key_method, option_value_method, options, html_options)
           end

data/lib/rails_bootstrap_form/inputs/range_field.rb

@@ -9,11 +9,12 @@ module RailsBootstrapForm
 
       included do
         def range_field(attribute, options = {})
-          options = {bootstrap: {field_class: "form-range", floating: false}}.deep_merge!(options)
-
           bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
           return super if bootstrap.disabled?
 
+          bootstrap.set_field_class!("form-range")
+          bootstrap.disable_floating_labels!
+
           field_wrapper_builder(attribute, bootstrap, options) do
             super(attribute, options)
           end

data/lib/rails_bootstrap_form/inputs/rich_text_area.rb

@@ -9,7 +9,7 @@ module RailsBootstrapForm
 
       included do
         def rich_text_area(attribute, options = {})
-          options[:class] = ["trix-content", options[:class]].compact.join(" ")
+          add_css_class!(options, "trix-content")
 
           bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
           return super if bootstrap.disabled?

data/lib/rails_bootstrap_form/inputs/select.rb

@@ -9,11 +9,11 @@ module RailsBootstrapForm
 
       included do
         def select(attribute, choices = nil, options = {}, html_options = {}, &block)
-          options = {bootstrap: {field_class: "form-select"}}.deep_merge!(options)
-
           bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
           return super if bootstrap.disabled?
 
+          bootstrap.set_field_class!("form-select")
+
           field_wrapper_builder(attribute, bootstrap, options, html_options) do
             super(attribute, choices, options, html_options, &block)
           end

data/lib/rails_bootstrap_form/inputs/static_field.rb

@@ -8,21 +8,19 @@ module RailsBootstrapForm
       extend ActiveSupport::Concern
 
       included do
-        def static_field(*args)
-          options = args.extract_options!
-          attribute = args.first
-
-          static_options = options.merge(
-            readonly: true,
-            disabled: true,
-            bootstrap: {
+        def static_field(attribute, options = {})
+          options.tap do |option|
+            option[:readonly] = true
+            option[:disabled] = true
+            option[:bootstrap] = {
+              floating: false,
               field_class: bootstrap_form_options.static_field_class
-            }.reverse_merge!(options.delete(:bootstrap))
-          )
+            }.reverse_merge!(options.fetch(:bootstrap, {}))
+          end
 
-          static_options[:value] = object.send(attribute) unless options.key?(:value)
+          options[:value] = object.send(attribute) unless options.key?(:value)
 
-          text_field(attribute, static_options)
+          text_field(attribute, options)
         end
       end
     end

data/lib/rails_bootstrap_form/inputs/time_zone_select.rb

@@ -9,11 +9,11 @@ module RailsBootstrapForm
 
       included do
         def time_zone_select(attribute, priority_zones = nil, options = {}, html_options = {})
-          options = {bootstrap: {field_class: "form-select"}}.deep_merge!(options)
-
           bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
           return super if bootstrap.disabled?
 
+          bootstrap.set_field_class!("form-select")
+
           field_wrapper_builder(attribute, bootstrap, options, html_options) do
             super(attribute, priority_zones, options, html_options)
           end

data/lib/rails_bootstrap_form/inputs/weekday_select.rb

@@ -9,11 +9,11 @@ module RailsBootstrapForm
 
       included do
         def weekday_select(attribute, options = {}, html_options = {}, &block)
-          options = {bootstrap: {field_class: "form-select"}}.deep_merge!(options)
-
           bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
           return super if bootstrap.disabled?
 
+          bootstrap.set_field_class!("form-select")
+
           field_wrapper_builder(attribute, bootstrap, options, html_options) do
             super(attribute, options, html_options, &block)
           end

data/lib/rails_bootstrap_form/version.rb

@@ -3,6 +3,6 @@
 # -*- warn_indent: true -*-
 
 module RailsBootstrapForm
-  VERSION = "0.9.4".freeze
+  VERSION = "0.9.5".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.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Harshal LADHE (shivam091)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-17 00:00:00.000000000 Z
+date: 2023-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: generator_spec