Merge pull request #14 from shivam091/0.5.1

0.5.1

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails_bootstrap_form (0.5.0)
+    rails_bootstrap_form (0.5.1)
 
 GEM
   remote: http://rubygems.org/

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

@@ -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: {}} %>

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"
         }
       },
     }

lib/rails_bootstrap_form/bootstrap_form_builder.rb

@@ -25,10 +25,6 @@ def apply_default_form_options(options)
       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

lib/rails_bootstrap_form/components/check_box.rb

@@ -46,14 +46,14 @@ def check_box_classes(attribute, options)
 
         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.flatten.compact

lib/rails_bootstrap_form/components/radio_button.rb

@@ -43,14 +43,14 @@ def radio_button_classes(attribute, options)
 
         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 = Array("form-check")
           classes << "form-check-inline" if bootstrap_options.inline?
           classes.flatten.compact
         end

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
@@ -134,8 +140,8 @@ def check_box(attribute, options = {}, checked_value = "1", unchecked_value = "0
       check_box_html = tag.div(class: check_box_wrapper_class(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
@@ -154,8 +160,8 @@ def radio_button(attribute, value, options = {})
       radio_button_html = tag.div(class: radio_button_wrapper_class(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 @@ def collection_check_boxes(attribute, collection, value_method, text_method, opt
         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 @@ def collection_radio_buttons(attribute, collection, value_method, text_method, o
         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

lib/rails_bootstrap_form/inputs/base.rb

@@ -0,0 +1,24 @@
+# -*- 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
+
+        private :collection_input_checked?, :control_specific_class
+      end
+    end
+  end
+end

lib/rails_bootstrap_form/version.rb

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

spec/rails_bootstrap_form_spec.rb

@@ -6,7 +6,7 @@
 
 RSpec.describe RailsBootstrapForm do
   it "has a valid version number" do
-    expect(RailsBootstrapForm::VERSION).to eq("0.5.0")
+    expect(RailsBootstrapForm::VERSION).to eq("0.5.1")
   end
 
   it "has a valid rails version number" do