bootstrap_concerns 0.5.5 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebd29a3241d20980ce99866726de6fee7aac0b318e90070b74e9f0e301c0b9ed
-  data.tar.gz: 3b51a9f3f0612d7fd98507ccc5b3718bfbff2cf404d32939a926a0f009da9c23
+  metadata.gz: 707af3be707adde6b5fd86783f9d950253315464cd906e6a65057537f13cc9ff
+  data.tar.gz: c072837ef9eb4547bf7a460b6ba94d18e3ef7b18b7b5749c84ef6fe295725973
 SHA512:
-  metadata.gz: 6eeecf1fc605973c9439ab7dbfd1116d0e146322e61058cd87e272dd9ee41328087a18b139c3f625d40e6e5a6a525540a5d05556ca54d2b9d458f15bc93afc93
-  data.tar.gz: 7172244a7b5e848aa726e9bc2c8407ee86dc20c7a3a2a2a7f02bd52af80ca9752298ac0430c0184d64d745024616e92bd7122ba8586bdcfa880116b6c2c27301
+  metadata.gz: 8869c35220c6cb217d9532ca0ab6517860071e001b3a74fd1f527811d804fb7cfe9bca893dc8a7c2e7a9c426259254cd45572315275113931f1299f0c71586f7
+  data.tar.gz: 937efce856f940a04d3dc37a1503a32f36fd0b43b70a39af46e2680083e265e58e0f86536047a89716f264dee0b972c457b92812b798f61a67db407b9edca83b

data/lib/bootstrap_concerns/form_builder.rb

@@ -7,6 +7,8 @@ module BootstrapConcerns
     FORM_SELECT_BASE_CLASS = "form-select".freeze
     REQUIRED_CLASS = "required".freeze
 
+    delegate :content_tag, :concat, to: :@template, private: true
+
     def bs_button(value = nil, options = {}, &)
       normalized_options = value.is_a?(Hash) ? value : options
       normalized_options.deep_merge!(Option.options_with_button_class(normalized_options))
@@ -53,11 +55,21 @@ module BootstrapConcerns
     end
 
     def bs_form_group(method, type, *args)
-      options = args.find { it.is_a?(Hash) && it.has_key?(:required) }.to_h
-
-      @template.content_tag(:div, class: ComponentsHelper::MARGIN) do
-        @template.concat bs_label(method, options.slice(:required))
-        @template.concat public_send("bs_#{type}", method, *args)
+      options = args.find { it.is_a?(Hash) && it.key?(:required) }.to_h
+      input_group = args.find { it.is_a?(Hash) && it[:input_group] } || {}
+      input_group_flag = input_group[:input_group].present?
+
+      content_tag(:div, class: ComponentsHelper::MARGIN) do
+        concat bs_label(method, options.slice(:required))
+        if input_group_flag
+          concat(content_tag(:div, class: "input-group") do
+            public_send("bs_#{type}", method, *args)
+          end)
+          concat error_message(method, outside: true)
+        else
+          concat(public_send("bs_#{type}", method, *args))
+          concat error_message(method)
+        end
       end
     end
 
@@ -165,6 +177,14 @@ module BootstrapConcerns
 
     private
 
+    def error_message(method, outside: false)
+      return "".html_safe if object.errors[method].blank?
+
+      classes = ["invalid-feedback"]
+      classes << "d-block" if outside
+      content_tag(:div, object.errors[method].join(", "), class: classes.join(" "))
+    end
+
     def options_with_form_check_input_class(options)
       Option.options_with_base_class(options, FORM_CHECK_INPUT_BASE_CLASS)
     end

metadata

@@ -1,11 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_concerns
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.7
 platform: ruby
 authors:
 - Evan Brooks
 - Robert Keresnyei
+- Yuriy Kharchenko
 bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
@@ -92,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Concerns for building Bootstrap components with Ruby on Rails.
 test_files: []