rails_bootstrap_form 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6b50f9d02bd4dce2b18bcbf5ce63159d4b62ef9c9b28a4e6e696b9780721e5f
-  data.tar.gz: fdd32e9dff7e170d3a220f7ba06fb981e5fe1c24f7a292aa9f20133d624fc27f
+  metadata.gz: ed3da45cc2109afbc15026f1a12f80000890c7b7759bc7dbbbe855f3184bf0a2
+  data.tar.gz: 5e7897c4c60eb47a89f2eaf26a3f3ad46b5cc78cdc5519ff1dfe755302e7ab40
 SHA512:
-  metadata.gz: e769de6bd7e33924dda68e244acc498b8586ff7eb23242abe228c959335290f1869142dbff651166c958e5f7aa863961b69e0c85ee35ce3b2c7fef94c76e573c
-  data.tar.gz: 9e2dc6b8c51126c2b05760752c656ce6098c4ac178e66c9d7fc44f2e9a0013391dd82b3c36efb07562a6473adfff1af318905e3eb3a392bd6cce2db2dc83431d
+  metadata.gz: 6b84a087632ef6236a0b1975910ae6cabe61f5f1f70aa0f2950c765f53c23caa93de366b00517622a5fffabff0fb34794a563d04eb7ebe8bf4061bec6858ef57
+  data.tar.gz: 288e303d2c86355e5cd4a88d9046a84704d9091954981d7dee818f3f57f583995fa8bde1f28aa7f067ff851724deb6c8e00c03912a6c240da266000d353bd385

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails_bootstrap_form (0.5.0)
+    rails_bootstrap_form (0.5.2)
 
 GEM
   remote: http://rubygems.org/
@@ -83,6 +83,7 @@ GEM
     crass (1.0.6)
     date (3.3.3)
     diff-lcs (1.5.0)
+    docile (1.4.0)
     erubi (1.12.0)
     execjs (2.8.1)
     ffi (1.15.5)
@@ -176,6 +177,12 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
     sprockets (4.2.0)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
@@ -207,6 +214,7 @@ DEPENDENCIES
   rake (~> 13.0)
   rspec-rails
   sassc-rails
+  simplecov
   sprockets-rails
   sqlite3 (~> 1.4)
 

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

@@ -4,7 +4,7 @@
   </div>
   <div class="card-body">
     <%= bootstrap_form_for @user, bootstrap_form: {} do |form| %>
-      <%= form.text_field :name, autocomplete: "new-name", bootstrap_form: {} %>
+      <%= form.text_field :name, autocomplete: "new-name", class: "dsds", bootstrap_form: {} %>
       <%= form.text_field :email, autocomplete: "new-email", bootstrap_form: {} %>
       <%= form.text_field :password, autocomplete: "new-password" %>
       <%= form.phone_field :mobile_number %>
@@ -18,7 +18,7 @@
       <%= form.fields_for :address, include_id: false do |address_form| %>
         <%= address_form.text_area :street %>
         <%= address_form.text_field :state %>
-        <%= address_form.grouped_collection_select :city, ::Country.all, :cities, :name, :id, :name %>
+        <%= address_form.grouped_collection_select :city, ::Country.all, :cities, :name, :id, :name, {include_blank: "Select city"} %>
         <%= address_form.text_field :postal_code %>
         <%= address_form.select :country_id, options_for_select(::Country.pluck(:name, :id), address_form.object.country_id),
             {include_blank: "Select Country", bootstrap_form: {}} %>

data/demo/config/locales/en.rb

@@ -43,7 +43,9 @@
       help_texts: {
         user: {
           email: "Please use official email address",
-          terms: "You must first accept terms and conditions in order to continue"
+          terms: "You must first accept terms and conditions in order to continue",
+          skill_ids: "Select your strong skills",
+          fruit_id: "Select your favorite fruit"
         }
       },
     }

data/gemfiles/common.gemfile

@@ -18,6 +18,9 @@ gem "bootstrap", "~> 5.3.0.alpha3"
 # Use sqlite3 as the database for Active Record
 gem "sqlite3", "~> 1.4"
 
+# Library to show coverage of the code.
+gem "simplecov"
+
 group :development do
   gem "puma"
 end

data/lib/rails_bootstrap_form/bootstrap_form_builder.rb

@@ -25,10 +25,6 @@ module RailsBootstrapForm
       options[:html].reverse_merge!(RailsBootstrapForm.config.default_form_attributes)
     end
 
-    def control_specific_class(field_tag_name)
-      "rails-bootstrap-forms-#{field_tag_name.to_s.tr("_", "-")}"
-    end
-
-    private :apply_default_form_options, :control_specific_class
+    private :apply_default_form_options
   end
 end

data/lib/rails_bootstrap_form/bootstrap_form_options.rb

@@ -90,6 +90,14 @@ module RailsBootstrapForm
     # Default is `false`.
     attr_accessor :switch
 
+    # Controls the HTML attributes and options that will be added to the field wrapper.
+    # Default is `{}`.
+    attr_accessor :wrapper_options
+
+    # Option to specify the size of input groups and fields.
+    # The valid values are `sm` and `lg`. The default value is `nil`.
+    attr_accessor :size
+
     def initialize(options = {})
       set_defaults
       set_bootstrap_form_options(options)
@@ -107,10 +115,6 @@ module RailsBootstrapForm
       @layout.to_s == "vertical"
     end
 
-    def floating?
-      @layout.to_s == "floating"
-    end
-
     # This will return a copy of `BootstrapFormOptions` object with new options set
     # that don't affect original object. This way we can have options specific
     # to a given form field. For example, we can change grid just for one field:
@@ -152,6 +156,10 @@ module RailsBootstrapForm
       @static_field_class = "form-control-plaintext"
 
       @switch = false
+
+      @wrapper_options = {}
+
+      @size = nil
     end
 
     private :set_defaults

data/lib/rails_bootstrap_form/components/check_box.rb

@@ -27,6 +27,12 @@ module RailsBootstrapForm
           end
         end
 
+        def check_box_wrapper_options(bootstrap_options)
+          {}.tap do |option|
+            option[:class] = check_box_wrapper_class(bootstrap_options)
+          end.merge(bootstrap_options.wrapper_options)
+        end
+
         def check_box_label_text(attribute, options, bootstrap_options, &block)
           block ? capture(&block) : label_text(attribute, bootstrap_options)
         end
@@ -46,16 +52,16 @@ module RailsBootstrapForm
 
         def check_box_label_class(attribute, bootstrap_options, options)
           classes = Array("form-check-label") << bootstrap_options.additional_label_class
-          classes << "required" if is_field_required?(attribute, options)
+          classes << "required" if is_field_required?(attribute, options) && !bootstrap_options.inline?
           classes << "is-invalid" if is_invalid?(attribute)
           classes << bootstrap_options.hide_class if bootstrap_options.hide_label
           classes.flatten.compact
         end
 
         def check_box_wrapper_class(bootstrap_options)
-          classes = ["mb-3", "form-check"]
+          classes = Array("form-check")
           classes << "form-switch" if bootstrap_options.switch
-          classes << "form-check-inline" if bootstrap_options.inline?
+          classes << (bootstrap_options.inline? ? "form-check-inline" : "mb-3")
           classes.flatten.compact
         end
 

data/lib/rails_bootstrap_form/components/labels.rb

@@ -8,12 +8,15 @@ module RailsBootstrapForm
       extend ActiveSupport::Concern
 
       def self.included(base_class)
-        def draw_label(attribute, bootstrap_options)
+        def draw_label(attribute, options, bootstrap_options)
           unless bootstrap_options.skip_label
-            label_class = label_classes(attribute, bootstrap_options)
+            label_options = {
+              class: label_classes(attribute, bootstrap_options)
+            }
+            label_options[:for] = options[:id] if options[:id].present?
             label_text = label_text(attribute, bootstrap_options)
 
-            label(attribute, label_text, class: label_class)
+            label(attribute, label_text, label_options)
           end
         end
 

data/lib/rails_bootstrap_form/components/radio_button.rb

@@ -28,6 +28,12 @@ module RailsBootstrapForm
           end
         end
 
+        def radio_button_wrapper_options(bootstrap_options)
+          {}.tap do |option|
+            option[:class] = radio_button_wrapper_class(bootstrap_options)
+          end.merge(bootstrap_options.wrapper_options)
+        end
+
         def radio_button_value(attribute, value)
           # label's `for` attribute needs to match checkbox tag's id,
           # IE sanitized value, IE
@@ -43,15 +49,15 @@ module RailsBootstrapForm
 
         def radio_button_label_class(attribute, bootstrap_options, options)
           classes = Array("form-check-label") << bootstrap_options.additional_label_class
-          classes << "required" if is_field_required?(attribute, options)
+          classes << "required" if is_field_required?(attribute, options) && !bootstrap_options.inline?
           classes << "is-invalid" if is_invalid?(attribute)
           classes << bootstrap_options.hide_class if bootstrap_options.hide_label
           classes.flatten.compact
         end
 
         def radio_button_wrapper_class(bootstrap_options)
-          classes = ["mb-3", "form-check"]
-          classes << "form-check-inline" if bootstrap_options.inline?
+          classes = Array("form-check")
+          classes << (bootstrap_options.inline? ? "form-check-inline" : "mb-3")
           classes.flatten.compact
         end
 

data/lib/rails_bootstrap_form/field_wrapper_builder.rb

@@ -13,11 +13,11 @@ module RailsBootstrapForm
     end
 
     def field_wrapper(attribute, bootstrap_options, options, &block)
-      label = draw_label(attribute, bootstrap_options)
+      label = draw_label(attribute, options, bootstrap_options)
       help_text = help_text(attribute, bootstrap_options)
 
       if bootstrap_options.floating
-        tag.div(class: field_wrapper_classes) do
+        tag.div(**field_wrapper_options(bootstrap_options)) do
           concat(input_group_wrapper(attribute, bootstrap_options) do
             tag.div(class: floating_label_classes(attribute)) do
               concat(capture(&block))
@@ -27,7 +27,7 @@ module RailsBootstrapForm
           concat(help_text)
         end
       else
-        tag.div(class: field_wrapper_classes) do
+        tag.div(**field_wrapper_options(bootstrap_options)) do
           concat(label)
           concat(input_group_wrapper(attribute, bootstrap_options) do
             capture(&block)
@@ -37,14 +37,17 @@ module RailsBootstrapForm
       end
     end
 
+    def field_wrapper_options(bootstrap_options)
+      {}.tap do |option|
+        option[:class] = field_wrapper_classes
+      end.merge(bootstrap_options.wrapper_options)
+    end
+
     def field_wrapper_classes
       classes = [form_wrapper_default_class]
       classes.flatten.compact
     end
 
-    def field_wrapper_options
-    end
-
     def form_wrapper_default_class
       "mb-3"
     end
@@ -52,14 +55,17 @@ module RailsBootstrapForm
     def field_css_options(attribute, bootstrap_options, options, html_options)
       css_options = (html_options || options)
 
-      field_classes = [
+      field_classes = Array(options[:class])
+      field_classes << [
         bootstrap_options.field_class,
         bootstrap_options.additional_field_class
       ]
       field_classes << "is-invalid" if is_invalid?(attribute)
+      if is_size_valid?(bootstrap_options)
+        field_classes << "#{bootstrap_options.field_class}-#{bootstrap_options.size}"
+      end
 
       css_options[:class] = field_classes.flatten.compact
-
       css_options.merge!(required_field_options(attribute, options))
 
       if bootstrap_options.floating

data/lib/rails_bootstrap_form/input_group_builder.rb

@@ -26,7 +26,10 @@ module RailsBootstrapForm
       end
 
       def input_group_classes(attribute, bootstrap_options)
-        classes = ["input-group", bootstrap_options.additional_input_group_class]
+        classes = Array("input-group") << bootstrap_options.additional_input_group_class
+        if is_size_valid?(bootstrap_options)
+          classes << "input-group-#{bootstrap_options.size}"
+        end
         # Require `has-validation` class if field has errors.
         classes << "has-validation" if is_invalid?(attribute)
         classes.flatten.compact

data/lib/rails_bootstrap_form/inputs/base.rb

@@ -0,0 +1,28 @@
+# -*- encoding: utf-8 -*-
+# -*- frozen_string_literal: true -*-
+# -*- warn_indent: true -*-
+
+module RailsBootstrapForm
+  module Inputs
+    module Base
+      extend ActiveSupport::Concern
+
+      def self.included(base_class)
+        def collection_input_checked?(checked, obj, input_value)
+          checked == input_value || Array(checked).try(:include?, input_value) ||
+            checked == obj || Array(checked).try(:include?, obj)
+        end
+
+        def control_specific_class(field_tag_name)
+          "rails-bootstrap-forms-#{field_tag_name.to_s.tr("_", "-")}"
+        end
+
+        def is_size_valid?(bootstrap_options)
+          bootstrap_options.size && %i(sm lg).include?(bootstrap_options.size)
+        end
+
+        private :collection_input_checked?, :control_specific_class, :is_size_valid?
+      end
+    end
+  end
+end

data/lib/rails_bootstrap_form/inputs.rb

@@ -5,6 +5,12 @@
 module RailsBootstrapForm
   module Inputs
 
+    extend ActiveSupport::Autoload
+
+    autoload :Base
+
+    include Base
+
     FIELD_HELPERS = %i[
       text_field
       url_field
@@ -39,7 +45,7 @@ module RailsBootstrapForm
     end
 
     DATE_SELECT_HELPERS.each do |field_tag_name|
-      define_method(field_tag_name) do |attribute, options = {}, html_options = {}, &block|
+      define_method(field_tag_name) do |attribute, options = {}, html_options = {}|
         options = {bootstrap_form: {field_class: "form-select"}}.deep_merge!(options)
 
         field_wrapper_builder(attribute, options, html_options) do
@@ -131,11 +137,11 @@ module RailsBootstrapForm
 
       check_box_label = check_box_label(attribute, checked_value, options, bootstrap_options, &block)
 
-      check_box_html = tag.div(class: check_box_wrapper_class(bootstrap_options)) do
+      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)
-        concat(generate_error(attribute)) if is_invalid?(attribute)
+        concat(check_box_help_text) unless bootstrap_options.inline?
+        concat(generate_error(attribute)) if is_invalid?(attribute) && !bootstrap_options.inline?
       end
 
       check_box_html
@@ -151,11 +157,11 @@ module RailsBootstrapForm
 
       radio_button_label = radio_button_label(attribute, value, options, bootstrap_options)
 
-      radio_button_html = tag.div(class: radio_button_wrapper_class(bootstrap_options)) do
+      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)
-        concat(generate_error(attribute)) if is_invalid?(attribute)
+        concat(radio_button_help_text) unless bootstrap_options.inline?
+        concat(generate_error(attribute)) if is_invalid?(attribute) && !bootstrap_options.inline?
       end
 
       radio_button_html
@@ -177,7 +183,15 @@ module RailsBootstrapForm
         inputs << check_box(attribute, input_options, input_value, nil)
       end
 
-      inputs
+      if options.delete(:include_hidden) { true }
+        inputs.prepend hidden_field(attribute, value: "", multiple: true)
+      end
+
+      field_wrapper_builder(attribute, options, html_options) do
+        concat(tag.div(class: control_specific_class(:collection_check_boxes)) do
+          concat(inputs)
+        end)
+      end
     end
 
     def collection_radio_buttons(attribute, collection, value_method, text_method, options = {}, html_options = {}, &block)
@@ -198,14 +212,11 @@ module RailsBootstrapForm
         inputs << radio_button(attribute, input_value, input_options)
       end
 
-      inputs
-    end
-
-    def collection_input_checked?(checked, obj, input_value)
-      checked == input_value || Array(checked).try(:include?, input_value) ||
-        checked == obj || Array(checked).try(:include?, obj)
+      field_wrapper_builder(attribute, options, html_options) do
+        concat(tag.div(class: control_specific_class(:collection_radio_buttons)) do
+          concat(inputs)
+        end)
+      end
     end
-
-    private :collection_input_checked?
   end
 end

data/lib/rails_bootstrap_form/version.rb

@@ -3,6 +3,6 @@
 # -*- warn_indent: true -*-
 
 module RailsBootstrapForm
-  VERSION = "0.5.0".freeze
+  VERSION = "0.5.2".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.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Harshal LADHE (shivam091)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-20 00:00:00.000000000 Z
+date: 2023-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: generator_spec
@@ -122,6 +122,7 @@ files:
 - lib/rails_bootstrap_form/field_wrapper_builder.rb
 - lib/rails_bootstrap_form/input_group_builder.rb
 - lib/rails_bootstrap_form/inputs.rb
+- lib/rails_bootstrap_form/inputs/base.rb
 - lib/rails_bootstrap_form/version.rb
 - sig/rails_bootstrap_form.rbs
 homepage: https://github.com/shivam091/rails_bootstrap_form