rails_bootstrap_form 0.4.2 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5874a38745d73c1b0bb05c751711cdc380be8684c71187069e07224e9d40333a
-  data.tar.gz: ffe2043c13700e6015d7741b51550c52642098c412f29b1921a7e98ed20ec9cf
+  metadata.gz: 75f1c7df21987622c3341031991186ceff26dc21f48c301ee2017fb47dd1074a
+  data.tar.gz: e84fbf45f5bcff4bfad1904253c5e549fa616ebc9d646b762facb78cca121ce7
 SHA512:
-  metadata.gz: 657b116576955954f11ecd923cd61277613bd732d7b986effe3d5b908ed38531549413baa47436167fd7d675fb5aab709863cc53bfb19f99d4a39abb2148de63
-  data.tar.gz: '09d24eb35c72a56c834d0031ce85152e1a0241a1d4614dc69ebb5bc820b45780380d80132a9c882086b6524d8bb9fd5826d41c339f45bd87b335fcb0ceb97eeb'
+  metadata.gz: ee6cf0a877cff1e96ccc3e95495c331f41c5af536a23332b58669a10f6c6db6c3f1dc9f5fd3cd2fc2e51c0040380e18a7477231f4b108d306593dfc1f6844fa7
+  data.tar.gz: 39f8e46ae208727fd81127cb3c8de3f32878c16b957ff21fc882f6a250e7972bd00f573dd4dd6a958140d7564e57a4e70e1a86eb30c484e73b3ab42ece3a2bb5

data/Gemfile.lock

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

data/app/assets/stylesheets/rails_bootstrap_form.css

@@ -1,8 +1,8 @@
 label.is-invalid, .invalid-feedback {
-  color: var(--bs-danger);
+  color: var(--bs-form-invalid-color);
 }
 label.required::after {
-  color: var(--bs-danger);
+  color: var(--bs-form-invalid-color);
   content: "*";
   padding-left: .25rem;
   top: -2px;

data/demo/app/models/address.rb

@@ -3,6 +3,8 @@
 # -*- warn_indent: true -*-
 
 class Address < ApplicationRecord
+  validates :street, :city, :country_id, presence: true
+
   belongs_to :user
   belongs_to :country
 

data/demo/app/models/user.rb

@@ -4,7 +4,15 @@
 
 class User < ApplicationRecord
   validates :name, presence: true, length: {in: 2..50}
-  validates :email, presence: true
+  validates :terms, acceptance: true
+  validates :email,
+            :password,
+            :mobile_number,
+            :birth_date,
+            :favorite_color,
+            :fruit_id,
+            :skill_ids,
+            presence: true
 
   has_one :address, dependent: :destroy
 

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

@@ -9,19 +9,16 @@
       <%= form.text_field :password, autocomplete: "new-password" %>
       <%= form.phone_field :mobile_number %>
       <%= form.date_field :birth_date %>
-      <%= form.check_box :terms %>
+      <%= form.check_box :terms, bootstrap_form: {switch: false}, required: true %>
       <%= form.range_field :excellence %>
       <%= form.url_field :blog_url %>
+      <%= form.collection_radio_buttons :fruit_id, ::Fruit.all, :id, :name, {bootstrap_form: {layout: :inline}, checked: form.object.fruit_id} %>
       <%= form.color_field :favorite_color %>
-      <%= form.select :fruit_id, options_for_select(::Fruit.pluck(:name, :id), form.object.fruit_id),
-          {include_blank: "Select Favorite Fruit"} %>
-      <%= form.collection_check_boxes :skill_ids, ::Skill.all, :id, :name do |b| %>
-        <%= b.check_box + b.text %>
-      <% end %>
+      <%= form.collection_check_boxes :skill_ids, ::Skill.all, :id, :name, {bootstrap_form: {layout: :inline}} %>
       <%= 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

@@ -42,7 +42,10 @@
       },
       help_texts: {
         user: {
-          email: "Please use official email address"
+          email: "Please use official email address",
+          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/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

@@ -86,6 +86,10 @@ module RailsBootstrapForm
     # Default is `form-control-plaintext`.
     attr_accessor :static_field_class
 
+    # Option to control whether the check box should look like bootstrap switches.
+    # Default is `false`.
+    attr_accessor :switch
+
     def initialize(options = {})
       set_defaults
       set_bootstrap_form_options(options)
@@ -146,6 +150,8 @@ module RailsBootstrapForm
       @floating = false
 
       @static_field_class = "form-control-plaintext"
+
+      @switch = false
     end
 
     private :set_defaults

data/lib/rails_bootstrap_form/components/check_box.rb

@@ -0,0 +1,66 @@
+# -*- encoding: utf-8 -*-
+# -*- frozen_string_literal: true -*-
+# -*- warn_indent: true -*-
+
+module RailsBootstrapForm
+  module Components
+    module CheckBox
+      extend ActiveSupport::Concern
+
+      def self.included(base_class)
+        def check_box_label(attribute, checked_value, options, bootstrap_options, &block)
+          unless bootstrap_options.skip_label
+            label_options = {
+              class: check_box_label_class(attribute, bootstrap_options, options)
+            }
+            label_options[:for] = options[:id] if options[:id].present?
+
+            label_name = if options[:multiple]
+              check_box_value(attribute, checked_value)
+            else
+              attribute
+            end
+
+            label_text = check_box_label_text(attribute, options, bootstrap_options, &block)
+
+            label(label_name, label_text, label_options)
+          end
+        end
+
+        def check_box_label_text(attribute, options, bootstrap_options, &block)
+          block ? capture(&block) : label_text(attribute, bootstrap_options)
+        end
+
+        def check_box_value(attribute, value)
+          # label's `for` attribute needs to match checkbox tag's id,
+          # IE sanitized value, IE
+          # https://github.com/rails/rails/blob/5-0-stable/actionview/lib/action_view/helpers/tags/base.rb#L123-L125
+          "#{attribute}_#{value.to_s.gsub(/\s/, "_").gsub(/[^-[[:word:]]]/, "").mb_chars.downcase}"
+        end
+
+        def check_box_classes(attribute, options)
+          classes = Array(options[:class]) << "form-check-input"
+          classes << "is-invalid" if is_invalid?(attribute)
+          classes.flatten.compact
+        end
+
+        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) && !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 = Array("form-check")
+          classes << "form-switch" if bootstrap_options.switch
+          classes << "form-check-inline" if bootstrap_options.inline?
+          classes.flatten.compact
+        end
+
+        private :check_box_label, :check_box_classes, :check_box_label_class, :check_box_wrapper_class
+      end
+    end
+  end
+end

data/lib/rails_bootstrap_form/components/help_text.rb

@@ -13,7 +13,7 @@ module RailsBootstrapForm
 
           help_text = (bootstrap_options.help_text || scoped_help_text(attribute))
 
-          tag.span(help_text, class: "form-text text-muted") if help_text.present?
+          tag.div(help_text, class: "form-text text-muted") if help_text.present?
         end
 
         def object_class

data/lib/rails_bootstrap_form/components/labels.rb

@@ -8,12 +8,12 @@ module RailsBootstrapForm
       extend ActiveSupport::Concern
 
       def self.included(base_class)
-        def label(attribute, bootstrap_options)
+        def draw_label(attribute, bootstrap_options)
           unless bootstrap_options.skip_label
             label_class = label_classes(attribute, bootstrap_options)
             label_text = label_text(attribute, bootstrap_options)
 
-            super(attribute, label_text, class: label_class)
+            label(attribute, label_text, class: label_class)
           end
         end
 
@@ -29,7 +29,7 @@ module RailsBootstrapForm
           bootstrap_options.label_text || object&.class.try(:human_attribute_name, attribute)
         end
 
-        private :label, :label_classes, :label_text
+        private :draw_label, :label_classes, :label_text
       end
     end
   end

data/lib/rails_bootstrap_form/components/radio_button.rb

@@ -0,0 +1,62 @@
+# -*- encoding: utf-8 -*-
+# -*- frozen_string_literal: true -*-
+# -*- warn_indent: true -*-
+
+module RailsBootstrapForm
+  module Components
+    module RadioButton
+      extend ActiveSupport::Concern
+
+      def self.included(base_class)
+        def radio_button_label(attribute, value, options, bootstrap_options)
+          unless bootstrap_options.skip_label
+            label_options = {
+              value: value,
+              class: radio_button_label_class(attribute, bootstrap_options, options)
+            }
+            label_options[:for] = options[:id] if options[:id].present?
+
+            label_name = if options[:multiple]
+              radio_button_value(attribute, checked_value)
+            else
+              attribute
+            end
+
+            label_text = label_text(attribute, bootstrap_options)
+
+            label(label_name, label_text, label_options)
+          end
+        end
+
+        def radio_button_value(attribute, value)
+          # label's `for` attribute needs to match checkbox tag's id,
+          # IE sanitized value, IE
+          # https://github.com/rails/rails/blob/5-0-stable/actionview/lib/action_view/helpers/tags/base.rb#L123-L125
+          "#{attribute}_#{value.to_s.gsub(/\s/, "_").gsub(/[^-[[:word:]]]/, "").mb_chars.downcase}"
+        end
+
+        def radio_button_classes(attribute, options)
+          classes = Array(options[:class]) << "form-check-input"
+          classes << "is-invalid" if is_invalid?(attribute)
+          classes.flatten.compact
+        end
+
+        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) && !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 = Array("form-check")
+          classes << "form-check-inline" if bootstrap_options.inline?
+          classes.flatten.compact
+        end
+
+        private :radio_button_label, :radio_button_classes, :radio_button_label_class, :radio_button_wrapper_class
+      end
+    end
+  end
+end

data/lib/rails_bootstrap_form/components.rb

@@ -10,10 +10,14 @@ module RailsBootstrapForm
     autoload :Labels
     autoload :RequiredField
     autoload :Errors
+    autoload :CheckBox
+    autoload :RadioButton
 
     include HelpText
     include Labels
     include RequiredField
     include Errors
+    include CheckBox
+    include RadioButton
   end
 end

data/lib/rails_bootstrap_form/field_wrapper_builder.rb

@@ -13,7 +13,7 @@ module RailsBootstrapForm
     end
 
     def field_wrapper(attribute, bootstrap_options, options, &block)
-      label = label(attribute, bootstrap_options)
+      label = draw_label(attribute, bootstrap_options)
       help_text = help_text(attribute, bootstrap_options)
 
       if bootstrap_options.floating

data/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

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
@@ -120,5 +126,97 @@ module RailsBootstrapForm
 
       text_field(attribute, static_options)
     end
+
+    def check_box(attribute, options = {}, checked_value = "1", unchecked_value = "0", &block)
+      bootstrap_options = bootstrap_form_options.scoped(options.delete(:bootstrap_form))
+
+      options[:class] = check_box_classes(attribute, options)
+
+      check_box_field = super(attribute, options, checked_value, unchecked_value)
+      check_box_help_text = help_text(attribute, bootstrap_options)
+
+      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
+        concat(check_box_field)
+        concat(check_box_label)
+        concat(check_box_help_text) unless bootstrap_options.inline?
+        concat(generate_error(attribute)) if is_invalid?(attribute) && !bootstrap_options.inline?
+      end
+
+      check_box_html
+    end
+
+    def radio_button(attribute, value, options = {})
+      bootstrap_options = bootstrap_form_options.scoped(options.delete(:bootstrap_form))
+
+      options[:class] = radio_button_classes(attribute, options)
+
+      radio_button_field = super(attribute, value, options)
+      radio_button_help_text = help_text(attribute, bootstrap_options)
+
+      radio_button_label = radio_button_label(attribute, value, options, bootstrap_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) unless bootstrap_options.inline?
+        concat(generate_error(attribute)) if is_invalid?(attribute) && !bootstrap_options.inline?
+      end
+
+      radio_button_html
+    end
+
+    def collection_check_boxes(attribute, collection, value_method, text_method, options = {}, html_options = {}, &block)
+      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_form: {
+            label_text: text_method.respond_to?(:call) ? text_method.call(object) : object.send(text_method)
+          }
+        }.deep_merge!(options)
+
+        inputs << check_box(attribute, input_options, input_value, nil)
+      end
+
+      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)
+      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_form: {
+            label_text: text_method.respond_to?(:call) ? text_method.call(object) : object.send(text_method)
+          }
+        }.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)
+      end
+
+      field_wrapper_builder(attribute, options, html_options) do
+        concat(tag.div(class: control_specific_class(:collection_radio_buttons)) do
+          concat(inputs)
+        end)
+      end
+    end
   end
 end

data/lib/rails_bootstrap_form/version.rb

@@ -3,6 +3,6 @@
 # -*- warn_indent: true -*-
 
 module RailsBootstrapForm
-  VERSION = "0.4.2".freeze
+  VERSION = "0.5.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.4.2
+  version: 0.5.1
 platform: ruby
 authors:
 - Harshal LADHE (shivam091)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-16 00:00:00.000000000 Z
+date: 2023-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: generator_spec
@@ -111,15 +111,18 @@ files:
 - lib/rails_bootstrap_form/bootstrap_form_builder.rb
 - lib/rails_bootstrap_form/bootstrap_form_options.rb
 - lib/rails_bootstrap_form/components.rb
+- lib/rails_bootstrap_form/components/check_box.rb
 - lib/rails_bootstrap_form/components/errors.rb
 - lib/rails_bootstrap_form/components/help_text.rb
 - lib/rails_bootstrap_form/components/labels.rb
+- lib/rails_bootstrap_form/components/radio_button.rb
 - lib/rails_bootstrap_form/components/required_field.rb
 - lib/rails_bootstrap_form/configuration.rb
 - lib/rails_bootstrap_form/engine.rb
 - 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