rails_bootstrap_form 0.7.2 → 0.8.1

data/demo/app/controllers/users_controller.rb

@@ -53,6 +53,13 @@ class UsersController < ApplicationController
       :blog_url,
       :fruit_id,
       :favorite_color,
+      :username,
+      :expected_ctc,
+      :interview_date,
+      :interview_time,
+      :interview_datetime,
+      :weekly_off,
+      :gender,
       skill_ids: [],
       address_attributes: [
         :street,

data/demo/app/models/user.rb

@@ -3,6 +3,9 @@
 # -*- warn_indent: true -*-
 
 class User < ApplicationRecord
+
+  attr_accessor :remember_me
+
   validates :name, presence: true, length: {in: 2..50}
   validates :terms, acceptance: true
   validates :email,

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

@@ -2,6 +2,14 @@
   <%= render partial: "users/form_without_bootstrap_helpers" %>
 <% end %>
 
-<%= render partial: "users/vertical_form" %>
+<% if true %>
+  <%= render partial: "users/inline_form" %>
+<% end %>
+
+<% if true %>
+  <%= render partial: "users/vertical_form" %>
+<% end %>
 
-<%= render partial: "users/horizontal_form" %>
+<% if true %>
+  <%= render partial: "users/horizontal_form" %>
+<% end %>

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

@@ -1,10 +1,11 @@
 <div class="card card-primary my-3">
   <div class="card-header fw-bold">
-    Profile Form (Horizontal layout)
+    Horizontal layout
   </div>
   <div class="card-body">
     <%= bootstrap_form_for @user, bootstrap_form: {layout: :horizontal} do |form| %>
       <%= form.text_field :name, autocomplete: "new-name" %>
+      <%= form.text_field :username, autocomplete: "new-username" %>
       <%= form.email_field :email, autocomplete: "new-email" %>
       <%= form.password_field :password, autocomplete: "new-password" %>
       <%= form.phone_field :mobile_number %>
@@ -23,10 +24,8 @@
             {include_blank: "Select Country"} %>
       <% end %>
       <%= form.check_box :terms, required: true %>
-      <div class="mt-3">
-        <%= form.primary "Register" %>
-        <%= link_to "Cancel", users_path, class: "btn btn-secondary" %>
-      </div>
+      <%= form.primary "Register" %>
+      <%= link_to "Cancel", users_path, class: "btn btn-secondary" %>
     <% end %>
   </div>
 </div>

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

@@ -0,0 +1,13 @@
+<div class="card card-primary my-3">
+  <div class="card-header fw-bold">
+    Inline layout
+  </div>
+  <div class="card-body">
+    <%= bootstrap_form_for @user, bootstrap_form: {layout: :inline} do |form| %>
+      <%= form.text_field :username, autocomplete: "new-username" %>
+      <%= form.password_field :password, autocomplete: "new-password" %>
+      <%= form.check_box :remember_me %>
+      <%= form.primary "Login" %>
+    <% end %>
+  </div>
+</div>

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

@@ -1,10 +1,11 @@
 <div class="card card-primary my-3">
   <div class="card-header fw-bold">
-    Profile Form (Vertical layout)
+    Vertical layout
   </div>
   <div class="card-body">
     <%= bootstrap_form_for @user do |form| %>
       <%= form.text_field :name, autocomplete: "new-name" %>
+      <%= form.text_field :username, autocomplete: "new-username" %>
       <%= form.email_field :email, autocomplete: "new-email" %>
       <%= form.password_field :password, autocomplete: "new-password" %>
       <%= form.phone_field :mobile_number %>
@@ -23,10 +24,8 @@
             {include_blank: "Select Country"} %>
       <% end %>
       <%= form.check_box :terms, required: true %>
-      <div class="mt-3">
-        <%= form.primary "Register" %>
-        <%= link_to "Cancel", users_path, class: "btn btn-secondary" %>
-      </div>
+      <%= form.primary "Register" %>
+      <%= link_to "Cancel", users_path, class: "btn btn-secondary" %>
     <% end %>
   </div>
 </div>

data/demo/config/locales/en.rb

@@ -27,6 +27,14 @@
           terms: "I accept terms and conditions",
           excellence: "Excellence",
           skill_ids: "Skills",
+          username: "Username",
+          remember_me: "Keep me signed in",
+          expected_ctc: "Expected CTC",
+          interview_date: "Interview date",
+          interview_time: "Interview time",
+          interview_datetime: "Interview date & time",
+          weekly_off: "Week off",
+          gender: "Gender",
         },
         user_skill: {
           user_id: "User",
@@ -45,7 +53,7 @@
           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"
+          fruit_id: "Select your favorite fruit",
         }
       },
     }

data/demo/db/migrate/20230528041919_add_columns_in_users.rb

@@ -0,0 +1,11 @@
+class AddColumnsInUsers < ActiveRecord::Migration[7.0]
+  def change
+    add_column :users, :username, :string
+    add_column :users, :expected_ctc, :float
+    add_column :users, :interview_date, :date
+    add_column :users, :interview_time, :time
+    add_column :users, :interview_datetime, :datetime
+    add_column :users, :weekly_off, :string
+    add_column :users, :gender, :string
+  end
+end

data/demo/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2023_05_16_044126) do
+ActiveRecord::Schema[7.0].define(version: 2023_05_28_041919) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -74,6 +74,13 @@ ActiveRecord::Schema[7.0].define(version: 2023_05_16_044126) do
     t.string "favorite_color"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.string "username"
+    t.float "expected_ctc"
+    t.date "interview_date"
+    t.time "interview_time"
+    t.datetime "interview_datetime"
+    t.string "weekly_off"
+    t.string "gender"
     t.index ["fruit_id"], name: "index_users_on_fruit_id"
   end
 

data/lib/rails_bootstrap_form/bootstrap_form_builder.rb

@@ -17,6 +17,7 @@ module RailsBootstrapForm
     def initialize(object_name, object, template, options)
       @bootstrap_form_options = RailsBootstrapForm::BootstrapFormOptions.new(options[:bootstrap_form])
       apply_default_form_options(options)
+      apply_default_form_classes(options)
       super(object_name, object, template, options)
     end
 
@@ -31,12 +32,20 @@ module RailsBootstrapForm
       options[:html].reverse_merge!(RailsBootstrapForm.config.default_form_attributes)
     end
 
+    def apply_default_form_classes(options)
+      return unless @bootstrap_form_options.layout_inline?
+
+      options[:html][:class] =
+        ([*options[:html][:class]&.split(/\s+/)] + %w[row row-cols-lg-auto g-3 align-items-center])
+        .compact.uniq.join(" ")
+    end
+
     def fields_for_options(record_object, fields_options)
       field_options = record_object if record_object.is_a?(Hash) && record_object.extractable_options?
       field_options = {bootstrap_form: options[:bootstrap_form]}.deep_merge!(field_options)
       field_options
     end
 
-    private :apply_default_form_options, :fields_for_options
+    private :apply_default_form_options, :fields_for_options, :apply_default_form_classes
   end
 end

data/lib/rails_bootstrap_form/bootstrap_form_options.rb

@@ -16,47 +16,47 @@ module RailsBootstrapForm
   #
   class BootstrapFormOptions
 
-    # Controls form and field layout. It can be "vertical, "horizontal", or "inline".
-    # It can also be "floating" if field should have floating labels.
+    # Controls layout of form and field helpers. It can be "vertical,
+    # "horizontal", or "inline". The default value is `vertical`.
     attr_accessor :layout
 
-    # A CSS class that will be applied to all form fields and it can be overridden
-    # by the `BootstrapFormOptions` object. Default is `form-control`.
+    # A CSS class that will be applied to all form fields.
+    # The default value is `form-control`.
     attr_accessor :field_class
 
     # An additional CSS class that will be added along with the existing
-    # `field_class` of the field. Default is nil.
+    # css classes of field helpers. The default value is nil.
     attr_accessor :additional_field_class
 
     # Describes help text for the HTML field. Help text is automatically read
     # from translation file. If you want to customize it, you can pass string.
     # You can also set it false if you do not want help text displayed.
-    # Default is nil.
+    # The default value is nil.
     attr_accessor :help_text
 
-    # An option to override automatically generated label text.
-    # Default is `nil`.
+    # An option to customize automatically generated label text.
+    # The default value is `nil`.
     attr_accessor :label_text
 
-    # An option to custmize whether the label is to be displayed or not.
-    # Default is `false`.
+    # An option to control whether the label is to be displayed or not.
+    # The default value is `false`.
     attr_accessor :skip_label
 
-    # An option to customize whether the label is only visible to screen readers.
-    # Default is `false`.
+    # An option to control whether the label is only visible to a screen readers.
+    # The default value is `false`.
     attr_accessor :hide_label
 
-    # The CSS class that will be used when the label is only accessible by screen
-    # readers. Default is `visually-hidden`
+    # The CSS class that will be used when the label is only accessible to a
+    # screen readers. The default value is `visually-hidden`.
     attr_accessor :hide_class
 
-    # Default CSS class that will be applied to all label tags when layout is
+    # A CSS class that will be applied to all label tags when layout is
     # vertical.
     # The default value is `form-label`.
     attr_accessor :label_class
 
-    # An additional CSS class that will be added along with the existing
-    # `label_class` of the label. Default is `nil`.
+    # An additional CSS class that will be added along with the existing label
+    # css classes. The default value is `nil`.
     attr_accessor :additional_label_class
 
     # Input group specific options. Input groups allow prepending and appending
@@ -68,58 +68,57 @@ module RailsBootstrapForm
     #   form.text_field :search, bootstrap_form: {input_group: {append: button_tag("Go", type: :submit, class: "btn btn-secondary")}}
     #
     # Raw or HTML content to be prepended to the field.
-    # Default is `nil`.
+    # The default value is `nil`.
     attr_accessor :prepend
 
     # Raw or HTML content to be appended to the field.
-    # Default is `nil`.
+    # The default value is `nil`.
     attr_accessor :append
 
-    # Append additional CSS class added to the input group wrapper.
-    # Default is `nil`.
+    # An additional CSS class that will be added to existing input group wrapper
+    # css classes. The default value is `nil`.
     attr_accessor :additional_input_group_class
 
-    # Option to control whether the field should have a floating label.
-    # Default is false.
+    # An option to control whether the field should have a floating label.
+    # The default value is false.
     attr_accessor :floating
 
-    # Default CSS class that will be applied to all static fields.
-    # Default is `form-control-plaintext`.
+    # A CSS class that will be applied to all static fields.
+    # The default value is `form-control-plaintext`.
     attr_accessor :static_field_class
 
-    # Option to control whether the check box should look like bootstrap switches.
-    # Default is `false`.
+    # An option to control whether the check box should look like Bootstrap switches.
+    # The default value is `false`.
     attr_accessor :switch
 
-    # Controls the HTML attributes and options that will be added to the field wrapper.
-    # Default is `{}`.
+    # An option to control the HTML attributes and options that will be added to
+    # the field wrapper. The default value is `{}`.
     attr_accessor :wrapper_options
 
-    # Option to specify the size of input groups and fields.
+    # An option to control the size of input groups, buttons, labels, 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`.
+    # An option to group checkboxes and radio buttons on the same horizontal row.
+    # The default value is `false`.
     #
     # Example:
     #   form.collection_radio_buttons :choices, ["yes", "no"], :to_s, :to_s, bootstrap_form: {inline: true}
     attr_accessor :inline
 
-    # Default CSS class that will be applied to all label tags when layout is
-    # horizontal.
+    # A CSS class that will be applied to all labels when layout is horizontal.
     # The default value is `col-form-label`.
     attr_accessor :label_col_class
 
-    # Default CSS class for label column when using horizontal form.
+    # A CSS class for label column when layout is horizontal.
     # The default value is `col-sm-2`.
     attr_accessor :label_col_wrapper_class
 
-    # Default CSS class for control column when using horizontal form.
+    # A CSS class for field column when layout is horizontal.
     # The default value is `col-sm-10`.
     attr_accessor :field_col_wrapper_class
 
-    # Option to render submit button using `<button type="submit">` instead of
+    # An option to render submit button using `<button type="submit">` instead of
     # `<input type="submit">`.
     # The default value is `false`.
     attr_accessor :render_as_button
@@ -181,6 +180,10 @@ module RailsBootstrapForm
       @label_class = "form-label"
       @additional_label_class = nil
 
+      @prepend = nil
+      @append = nil
+      @additional_input_group_class = nil
+
       @floating = false
 
       @static_field_class = "form-control-plaintext"

data/lib/rails_bootstrap_form/field_wrapper_builder.rb

@@ -58,12 +58,12 @@ module RailsBootstrapForm
     def field_wrapper_classes(bootstrap_options)
       classes = []
       classes << "row" if bootstrap_options.layout_horizontal?
-      classes << form_wrapper_default_class
+      classes << form_wrapper_default_class(bootstrap_options)
       classes.flatten.compact
     end
 
-    def form_wrapper_default_class
-      "mb-3"
+    def form_wrapper_default_class(bootstrap_options)
+      bootstrap_options.layout_inline? ? "col-12" : "mb-3"
     end
 
     def field_css_options(attribute, bootstrap_options, options, html_options)
@@ -82,7 +82,7 @@ module RailsBootstrapForm
       css_options[:class] = field_classes.flatten.compact
       css_options.merge!(required_field_options(attribute, options))
 
-      if (bootstrap_options.floating? && !bootstrap_options.layout_horizontal?)
+      if placeholder_required?(bootstrap_options)
         css_options[:placeholder] ||= label_text(attribute, bootstrap_options)
       end
 
@@ -97,6 +97,10 @@ module RailsBootstrapForm
       classes
     end
 
+    def placeholder_required?(bootstrap_options)
+      (bootstrap_options.floating? && !bootstrap_options.layout_horizontal?) || bootstrap_options.layout_inline?
+    end
+
     private :field_wrapper, :field_wrapper_classes, :form_wrapper_default_class,
             :field_css_options, :floating_label_classes
   end

data/lib/rails_bootstrap_form/helpers/buttons.rb

@@ -12,11 +12,17 @@ module RailsBootstrapForm
           value, options = nil, value if value.is_a?(Hash)
           bootstrap_options = bootstrap_form_options.scoped(options.delete(:bootstrap_form))
 
-          if (bootstrap_options.render_as_button? || block)
+          button_html = if (bootstrap_options.render_as_button? || block)
             button(value, options, &block)
           else
             submit(value, options)
           end
+
+          if bootstrap_options.layout_inline?
+            tag.div(class: "col-12") { button_html }
+          else
+            button_html
+          end
         end
 
         def secondary(value = nil, options = {}, &block)

data/lib/rails_bootstrap_form/helpers/check_box.rb

@@ -62,7 +62,9 @@ module RailsBootstrapForm
           classes = Array("form-check")
           classes << "form-switch" if bootstrap_options.switch?
           classes << "form-check-inline" if bootstrap_options.inline?
-          classes << "mb-3" unless (bootstrap_options.layout_horizontal? || bootstrap_options.inline?)
+          if (bootstrap_options.layout_vertical? && !bootstrap_options.inline?)
+            classes << "mb-3"
+          end
           classes.flatten.compact
         end
 

data/lib/rails_bootstrap_form/helpers/labels.rb

@@ -11,7 +11,7 @@ module RailsBootstrapForm
         def draw_label(attribute, options, bootstrap_options)
           unless bootstrap_options.skip_label? && !bootstrap_options.floating?
             label_options = {
-              class: label_classes(attribute, bootstrap_options)
+              class: label_classes(attribute, options, bootstrap_options)
             }
             label_options[:for] = options[:id] if options[:id].present?
             label_text = label_text(attribute, bootstrap_options)
@@ -20,25 +20,34 @@ module RailsBootstrapForm
           end
         end
 
-        def label_classes(attribute, bootstrap_options)
+        def label_classes(attribute, options, bootstrap_options)
           classes = []
-          classes << if bootstrap_options.layout_horizontal?
+          classes << label_layout_classes(bootstrap_options)
+          classes << bootstrap_options.additional_label_class
+          classes << bootstrap_options.hide_class if hide_class_required?(bootstrap_options)
+          classes << "required" if is_field_required?(attribute, options)
+          classes << "is-invalid" if is_invalid?(attribute)
+          classes.flatten.compact
+        end
+
+        def label_layout_classes(bootstrap_options)
+          if bootstrap_options.layout_horizontal?
             [bootstrap_options.label_col_class, bootstrap_options.label_col_wrapper_class]
           else
             bootstrap_options.label_class
           end
-          classes << bootstrap_options.additional_label_class
-          classes << bootstrap_options.hide_class if bootstrap_options.hide_label?
-          classes << "required" if is_attribute_required?(attribute)
-          classes << "is-invalid" if is_invalid?(attribute)
-          classes.flatten.compact
         end
 
         def label_text(attribute, bootstrap_options)
           bootstrap_options.label_text || object&.class.try(:human_attribute_name, attribute)
         end
 
-        private :draw_label, :label_classes, :label_text
+        def hide_class_required?(bootstrap_options)
+          bootstrap_options.hide_label? || (bootstrap_options.layout_inline? && !bootstrap_options.floating?)
+        end
+
+        private :draw_label, :label_classes, :label_text, :label_layout_classes,
+                :hide_class_required?
       end
     end
   end

data/lib/rails_bootstrap_form/helpers/radio_button.rb

@@ -58,7 +58,9 @@ module RailsBootstrapForm
         def radio_button_wrapper_class(bootstrap_options)
           classes = Array("form-check")
           classes << "form-check-inline" if bootstrap_options.inline?
-          classes << "mb-3" unless (bootstrap_options.layout_horizontal? || bootstrap_options.inline?)
+          if (bootstrap_options.layout_vertical? && !bootstrap_options.inline?)
+            classes << "mb-3"
+          end
           classes.flatten.compact
         end
 

data/lib/rails_bootstrap_form/inputs/base.rb

@@ -21,7 +21,7 @@ module RailsBootstrapForm
             options = {bootstrap_form: {field_class: "form-select"}}.deep_merge!(options)
 
             field_wrapper_builder(attribute, options, html_options) do
-              tag.div(class: control_specific_class(field_name)) do
+              tag.fieldset(class: control_specific_class(field_name)) do
                 super(attribute, options, html_options)
               end
             end

data/lib/rails_bootstrap_form/inputs/check_box.rb

@@ -34,6 +34,8 @@ module RailsBootstrapForm
                   check_box_html
                 end
               end
+            elsif bootstrap_options.layout_inline?
+              tag.div(class: "col-12") { check_box_html }
             else
               check_box_html
             end

data/lib/rails_bootstrap_form/inputs/collection_check_boxes.rb

@@ -8,7 +8,7 @@ module RailsBootstrapForm
       extend ActiveSupport::Concern
 
       included do
-        def collection_check_boxes(attribute, collection, value_method, text_method, options = {}, html_options = {}, &block)
+        def collection_check_boxes(attribute, collection, value_method, text_method, options = {}, html_options = {})
           options[:multiple] = true
 
           inputs = ActiveSupport::SafeBuffer.new

data/lib/rails_bootstrap_form/inputs/collection_radio_buttons.rb

@@ -8,7 +8,7 @@ module RailsBootstrapForm
       extend ActiveSupport::Concern
 
       included do
-        def collection_radio_buttons(attribute, collection, value_method, text_method, options = {}, html_options = {}, &block)
+        def collection_radio_buttons(attribute, collection, value_method, text_method, options = {}, html_options = {})
           inputs = ActiveSupport::SafeBuffer.new
 
           collection.each do |object|

data/lib/rails_bootstrap_form/inputs/radio_button.rb

@@ -34,6 +34,8 @@ module RailsBootstrapForm
                   radio_button_html
                 end
               end
+            elsif bootstrap_options.layout_inline?
+              tag.div(class: "col-12") { radio_button_html }
             else
               radio_button_html
             end

data/lib/rails_bootstrap_form/version.rb

@@ -3,6 +3,6 @@
 # -*- warn_indent: true -*-
 
 module RailsBootstrapForm
-  VERSION = "0.7.2".freeze
+  VERSION = "0.8.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.7.2
+  version: 0.8.1
 platform: ruby
 authors:
 - Harshal LADHE (shivam091)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-25 00:00:00.000000000 Z
+date: 2023-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: generator_spec
@@ -94,6 +94,7 @@ files:
 - demo/app/views/users/_form.html.erb
 - demo/app/views/users/_form_without_bootstrap_helpers.html.erb
 - demo/app/views/users/_horizontal_form.html.erb
+- demo/app/views/users/_inline_form.html.erb
 - demo/app/views/users/_vertical_form.html.erb
 - demo/app/views/users/edit.html.erb
 - demo/app/views/users/index.html.erb
@@ -128,6 +129,7 @@ files:
 - demo/db/migrate/20230514060556_create_skills.rb
 - demo/db/migrate/20230514061100_create_user_skills.rb
 - demo/db/migrate/20230516044126_create_cities.rb
+- demo/db/migrate/20230528041919_add_columns_in_users.rb
 - demo/db/schema.rb
 - demo/db/seeds.rb
 - demo/public/favicon.ico