rails_bootstrap_form 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54148096404aa5a60bc550aca63ac09e15c0ec5b6bc9de993bd908879d366908
-  data.tar.gz: 85a7d48bf6ccf530828395265f9aa41db7be3b1bf9fc6a8f83455614449ec02a
+  metadata.gz: 25354c2cb11c5971bf3435e2415ca37c0fcfabeeb45cd269a8dbecba7d582fd7
+  data.tar.gz: f695f139348b6fb1f2c054e90f79c6d5c53805ec047ac6d239df946a09039278
 SHA512:
-  metadata.gz: d9569aeb686d7bef2a2c15018c46e14413c35ecb9eb18ce784cc4b074dcfdc2e5205e583cbf9ad85a6d98da8ab2939af772903c12c5d1a2d3bc0812bd908bf4f
-  data.tar.gz: 6b7222a2477195f38db5b63aeddecf28777e8f1de3dcb17ddbcd3126c747aa61903d411bad1341976590ccfb92e1cab07c93dcb31c4e49e7743b607478acce8b
+  metadata.gz: ed91e2feb0354818a43161b165ed8bba83b8e29a9f3013d2a3f7df54e23158768332d2381f36132399dedb7531a65abcd9234a70814c9b05f63c6af3ed66c245
+  data.tar.gz: ea1cf098b34f86c6f5ca4bb1cfc6031a93f81865515e484f6322934e33673b9980c053ccf02db70d302feb520e8766998678505f3e406b805b426dada7d000ee

data/Gemfile.lock

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

data/app/assets/stylesheets/rails_bootstrap_form.css

@@ -14,3 +14,9 @@ label.required::after {
   background-position: right 0.5rem center, center right 2rem !important;
   background-size: 24px 24px, calc(0.75em + 0.375rem) calc(0.75em + 0.375rem) !important;
 }
+.rails-bootstrap-forms-date-select select,
+.rails-bootstrap-forms-time-select select,
+.rails-bootstrap-forms-datetime-select select {
+  display: inline-block;
+  width: auto;
+}

data/demo/app/models/user.rb

@@ -3,6 +3,9 @@
 # -*- warn_indent: true -*-
 
 class User < ApplicationRecord
+  validates :name, presence: true, length: {in: 2..50}
+  validates :email, presence: true
+
   has_one :address, dependent: :destroy
 
   has_many :user_skills, dependent: :destroy

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", required: true, bootstrap_form: {} %>
+      <%= form.text_field :name, autocomplete: "new-name", bootstrap_form: {} %>
       <%= form.text_field :email, autocomplete: "new-email", bootstrap_form: {} %>
       <%= form.text_field :password, autocomplete: "new-password" %>
       <%= form.phone_field :mobile_number %>
@@ -12,8 +12,8 @@
       <%= form.check_box :terms %>
       <%= form.range_field :excellence %>
       <%= form.url_field :blog_url %>
-      <%= form.url_field :favorite_color %>
-      <%= form.select :fruit_id, options_for_select(::Fruit.pluck(:name, :id), form.object.fruit_id), include_blank: "Select Favorite Fruit" %>
+      <%= 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 %>
@@ -22,7 +22,7 @@
         <%= address_form.text_field :state %>
         <%= address_form.text_field :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: {}} %>
+        <%= address_form.select :country_id, options_for_select(::Country.pluck(:name, :id), address_form.object.country_id), {include_blank: "Select Country", bootstrap_form: {}} %>
       <% end %>
       <div class="mt-3">
         <%= form.submit "Register", class: "btn btn-primary" %>

data/demo/config/locales/en.rb

@@ -26,6 +26,7 @@
           fruit_id: "Favorite fruit",
           terms: "I accept terms and conditions",
           excellence: "Excellence",
+          skill_ids: "Skills",
         },
         user_skill: {
           user_id: "User",

data/lib/rails_bootstrap_form/bootstrap_form_builder.rb

@@ -25,6 +25,10 @@ module RailsBootstrapForm
       options[:html].reverse_merge!(RailsBootstrapForm.config.default_form_attributes)
     end
 
-    private :apply_default_form_options
+    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
   end
 end

data/lib/rails_bootstrap_form/bootstrap_form_options.rb

@@ -82,6 +82,10 @@ module RailsBootstrapForm
     # Default is false.
     attr_accessor :floating
 
+    # Default CSS class that will be applied to all static fields.
+    # Default is `form-control-plaintext`.
+    attr_accessor :static_field_class
+
     def initialize(options = {})
       set_defaults
       set_bootstrap_form_options(options)
@@ -140,6 +144,8 @@ module RailsBootstrapForm
       @additional_label_class = nil
 
       @floating = false
+
+      @static_field_class = "form-control-plaintext"
     end
 
     private :set_defaults

data/lib/rails_bootstrap_form/input_group_builder.rb

@@ -10,13 +10,17 @@ module RailsBootstrapForm
       def input_group_wrapper(attribute, bootstrap_options, &block)
         input = capture(&block) || ActiveSupport::SafeBuffer.new
 
-        prepend = attach_input(bootstrap_options, :prepend)
-        append = attach_input(bootstrap_options, :append)
+        if input_group_required?(bootstrap_options)
+          prepend = attach_input(bootstrap_options, :prepend)
+          append = attach_input(bootstrap_options, :append)
 
-        input = prepend + input + append
-        input += generate_error(attribute)
+          input = prepend + input + append
+          input += generate_error(attribute)
 
-        input = tag.div(input, class: input_group_classes(attribute, bootstrap_options))
+          input = tag.div(input, class: input_group_classes(attribute, bootstrap_options))
+        else
+          input += generate_error(attribute)
+        end
 
         input
       end
@@ -42,8 +46,15 @@ module RailsBootstrapForm
         tag.span(content.html_safe, class: "input-group-text")
       end
 
+      def input_group_required?(bootstrap_options)
+        [
+          bootstrap_options.prepend,
+          bootstrap_options.append
+        ].any?(&:present?)
+      end
+
       private :input_group_wrapper, :input_group_classes, :attach_input,
-              :input_group_content
+              :input_group_content, :input_group_required?
     end
   end
 end

data/lib/rails_bootstrap_form/inputs.rb

@@ -24,6 +24,12 @@ module RailsBootstrapForm
       week_field
     ].freeze
 
+    DATE_SELECT_HELPERS = %i[
+      date_select
+      time_select
+      datetime_select
+    ].freeze
+
     FIELD_HELPERS.each do |field_tag_name|
       define_method(field_tag_name) do |attribute, options = {}|
         field_wrapper_builder(attribute, options) do
@@ -32,6 +38,18 @@ module RailsBootstrapForm
       end
     end
 
+    DATE_SELECT_HELPERS.each do |field_tag_name|
+      define_method(field_tag_name) do |attribute, options = {}, html_options = {}, &block|
+        options = options.reverse_merge(bootstrap_form: {field_class: "form-select"})
+
+        field_wrapper_builder(attribute, options, html_options) do
+          tag.div(class: control_specific_class(field_tag_name)) do
+            super(attribute, options, html_options)
+          end
+        end
+      end
+    end
+
     def select(attribute, choices = nil, options = {}, html_options = {}, &block)
       options = options.reverse_merge(bootstrap_form: {field_class: "form-select"})
 
@@ -39,5 +57,60 @@ module RailsBootstrapForm
         super(attribute, choices, options, html_options, &block)
       end
     end
+
+    def collection_select(attribute, collection, value_method, text_method, options = {}, html_options = {})
+      options = options.reverse_merge(bootstrap_form: {field_class: "form-select"})
+
+      field_wrapper_builder(attribute, options, html_options) do
+        super(attribute, collection, value_method, text_method, options, html_options)
+      end
+    end
+
+    def range_field(attribute, options = {})
+      options = options.reverse_merge(bootstrap_form: {field_class: "form-range"})
+
+      field_wrapper_builder(attribute, options) do
+        super(attribute, options)
+      end
+    end
+
+    def color_field(attribute, options = {})
+      options = options.reverse_merge(bootstrap_form: {field_class: "form-control form-control-color"})
+
+      field_wrapper_builder(attribute, options) do
+        super(attribute, options)
+      end
+    end
+
+    def time_zone_select(attribute, priority_zones = nil, options = {}, html_options = {})
+      options = options.reverse_merge(bootstrap_form: {field_class: "form-select"})
+
+      field_wrapper_builder(attribute, options, html_options) do
+        super(attribute, priority_zones, options, html_options)
+      end
+    end
+
+    def hidden_field(attribute, options = {})
+      options[:value] = object.send(attribute) unless options.key?(:value)
+
+      super(attribute, options)
+    end
+
+    def static_field(*args)
+      options = args.extract_options!
+      attribute = args.first
+
+      static_options = options.merge(
+        readonly: true,
+        disabled: true,
+        bootstrap_form: {
+          field_class: bootstrap_form_options.static_field_class
+        }
+      )
+
+      static_options[:value] = object.send(attribute) unless options.key?(:value)
+
+      text_field(attribute, static_options)
+    end
   end
 end

data/lib/rails_bootstrap_form/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_bootstrap_form
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Harshal LADHE (shivam091)