rails_bootstrap_form 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75f1c7df21987622c3341031991186ceff26dc21f48c301ee2017fb47dd1074a
-  data.tar.gz: e84fbf45f5bcff4bfad1904253c5e549fa616ebc9d646b762facb78cca121ce7
+  metadata.gz: 1031de2aa81bb74657e9a45f334c4dc4d67ee673e89874358881d8021388d8b9
+  data.tar.gz: 4a5d3c85afb71bd06005eb95c0b8abb76a429a46ea49f22b470943bba2a6f7ae
 SHA512:
-  metadata.gz: ee6cf0a877cff1e96ccc3e95495c331f41c5af536a23332b58669a10f6c6db6c3f1dc9f5fd3cd2fc2e51c0040380e18a7477231f4b108d306593dfc1f6844fa7
-  data.tar.gz: 39f8e46ae208727fd81127cb3c8de3f32878c16b957ff21fc882f6a250e7972bd00f573dd4dd6a958140d7564e57a4e70e1a86eb30c484e73b3ab42ece3a2bb5
+  metadata.gz: 188081d3651b5f6977df21c3bfb4436e44b3d96685ef8b6fc36b7805056b205ab77ced5f3ad4d3094217116e47f04e8a07a914db1f073c60be664bd4acf33694
+  data.tar.gz: 180295d5dbc0159f5181183be148203565d877d874d978074af43dd31ba0cfb7e7d8d2be3bcf3d3c72e1abe6d4ff58636da8c4386be3b09d64380edc4ef06b2d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails_bootstrap_form (0.5.1)
+    rails_bootstrap_form (0.5.3)
 
 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 %>
@@ -12,13 +12,13 @@
       <%= 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.collection_radio_buttons :fruit_id, ::Fruit.all, :id, :name, {bootstrap_form: {inline: true}, checked: form.object.fruit_id} %>
       <%= form.color_field :favorite_color %>
-      <%= form.collection_check_boxes :skill_ids, ::Skill.all, :id, :name, {bootstrap_form: {layout: :inline}} %>
+      <%= form.collection_check_boxes :skill_ids, ::Skill.all, :id, :name, {bootstrap_form: {inline: true}} %>
       <%= 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, {include_blank: "Select city"} %>
+        <%= address_form.grouped_collection_select :city, ::Country.includes(:cities), :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/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_options.rb

@@ -90,25 +90,40 @@ 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
+
+    # Option to render checkboxes and radio buttons inline.
+    # The default value if `false`.
+    #
+    # Example:
+    #   form.collection_radio_buttons :choices, ["yes", "no"], :to_s, :to_s, bootstrap_form: {inline: true}
+    attr_accessor :inline
+
     def initialize(options = {})
       set_defaults
       set_bootstrap_form_options(options)
     end
 
-    def horizontal?
+    def layout_horizontal?
       @layout.to_s == "horizontal"
     end
 
-    def inline?
+    def layout_inline?
       @layout.to_s == "inline"
     end
 
-    def vertical?
+    def layout_vertical?
       @layout.to_s == "vertical"
     end
 
-    def floating?
-      @layout.to_s == "floating"
+    def inline?
+      self.inline
     end
 
     # This will return a copy of `BootstrapFormOptions` object with new options set
@@ -152,6 +167,12 @@ module RailsBootstrapForm
       @static_field_class = "form-control-plaintext"
 
       @switch = false
+
+      @wrapper_options = {}
+
+      @size = nil
+
+      @inline = false
     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
@@ -56,6 +62,7 @@ module RailsBootstrapForm
           classes = Array("form-check")
           classes << "form-switch" if bootstrap_options.switch
           classes << "form-check-inline" if bootstrap_options.inline?
+          classes << "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
@@ -52,6 +58,7 @@ module RailsBootstrapForm
         def radio_button_wrapper_class(bootstrap_options)
           classes = Array("form-check")
           classes << "form-check-inline" if bootstrap_options.inline?
+          classes << "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

@@ -17,7 +17,11 @@ module RailsBootstrapForm
           "rails-bootstrap-forms-#{field_tag_name.to_s.tr("_", "-")}"
         end
 
-        private :collection_input_checked?, :control_specific_class
+        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

data/lib/rails_bootstrap_form/inputs.rb

@@ -45,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
@@ -137,7 +137,7 @@ 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) unless bootstrap_options.inline?
@@ -157,7 +157,7 @@ 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) unless bootstrap_options.inline?

data/lib/rails_bootstrap_form/version.rb

@@ -3,6 +3,6 @@
 # -*- warn_indent: true -*-
 
 module RailsBootstrapForm
-  VERSION = "0.5.1".freeze
+  VERSION = "0.5.3".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.1
+  version: 0.5.3
 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