bootstrap_concerns 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54d6fadae8d3435e71f18a129f730f84e6eb593f921629afb0b8436eb8e71ba1
-  data.tar.gz: 9b037a3e209b826d331f7c2347485fdb7dfaaf87dcc6f3cdc74d036d6661b9df
+  metadata.gz: 95a72c03e44647232b0738d11cc3a02f73a5a0c4b4f36ca3772dda008d79b123
+  data.tar.gz: f26bdb6a4f6ddc4a0441683dc97e9ab037d0e53089976b52eda0c8f2b511c913
 SHA512:
-  metadata.gz: bdb09dfd0860b605011bd011dbef733a8352a64199f93345e28de5faa9428c5f9970cd67ec04ea17de0e548fe6a3ef9103922b82c261e19d26323276988db735
-  data.tar.gz: 6b5680b83de1d2efe7c74fc39686536647dfde6f2fff23b3290da4c1197b57822d2af3b5f82394a045bbd4b51bb551559b01f11747eb20a94cf60b75ad0305a5
+  metadata.gz: 653a147bcb0d7f3e3c4068fd1538c7a79b7f2a0150ccc081195a6f55647deb9653354fdc3594bfde86e7ded36e0cf1c6e95940e2ec35b7231a41eaa798698daa
+  data.tar.gz: b78ca83f09bd8763b44811a85f77ee313ba81aebba1e462bb1053c6ebd37bcf38ac2552acb4e87fa99c4f03a658c428ba8e59b5de6db536cbe364ff496905657

data/lib/bootstrap_concerns/components_helper.rb

@@ -1,17 +1,30 @@
 module BootstrapConcerns
   module ComponentsHelper
-    SEARCH_COL_MARGIN = "mb-3".freeze
+    MARGIN = "mb-3".freeze
 
     def assign_icon
       icon("box-arrow-in-left", "Assign")
     end
 
     def boolean_false_icon
-      content_tag(:i, "", class: "bi bi-x-circle-fill")
+      icon("x-circle-fill")
     end
 
     def boolean_true_icon
-      content_tag(:i, "", class: "bi bi-check-circle-fill")
+      icon("check-circle-fill")
+    end
+
+    def bs_button_tag(content_or_options = nil, options = nil, &)
+      normalized_options =
+        if content_or_options.is_a?(Hash)
+          content_or_options
+        else
+          options ||= {}
+        end
+
+      normalized_options.merge!(Option.options_with_button_class(normalized_options))
+
+      button_tag(content_or_options, options, &)
     end
 
     def bs_button_to(name = nil, options = nil, html_options = nil, &)
@@ -21,7 +34,7 @@ module BootstrapConcerns
     def bs_errors(record)
       return if record.errors.empty?
 
-      content_tag(:div, class: "alert alert-danger alert-dismissible fade show mt-3") do
+      content_tag(:div, class: "alert alert-danger alert-dismissible fade show #{MARGIN}") do
         concat content_tag(:h5, "Errors")
         concat(
           content_tag(:ul, class: "mb-0") do
@@ -34,6 +47,19 @@ module BootstrapConcerns
       end
     end
 
+    def bs_form_with(model: false, **options, &)
+      form_with(model: model, **options) do |form|
+        concat(bs_errors(model)) if model
+        concat(
+          content_tag(:div, class: "row") do
+            content_tag(:div, class: "col-md-6") do
+              yield(form)
+            end
+          end
+        )
+      end
+    end
+
     def bs_link_or_button_to(method_name, name, options, html_options, &)
       normalized_html_options =
         if block_given?
@@ -58,11 +84,11 @@ module BootstrapConcerns
     end
 
     def bs_search_col(&)
-      content_tag(:div, class: "col-12 col-sm #{SEARCH_COL_MARGIN}", &)
+      content_tag(:div, class: "col-12 col-sm #{MARGIN}", &)
     end
 
     def bs_search_submit_col
-      content_tag(:div, class: "col-auto #{SEARCH_COL_MARGIN}") do
+      content_tag(:div, class: "col-auto #{MARGIN}") do
         content_tag(:button, BootstrapConcerns::Option.options_with_button_class) do
           search_icon
         end
@@ -100,8 +126,9 @@ module BootstrapConcerns
       end
     end
 
-    def icon(name, text)
-      content_tag("i", "", class: "bi bi-#{name}") + content_tag(:span, text, class: "ms-1 d-none d-sm-inline")
+    def icon(name, text = nil)
+      i = content_tag("i", nil, class: "bi bi-#{name}")
+      text ? i + content_tag(:span, text, class: "ms-1 d-none d-sm-inline") : i
     end
 
     def import_icon

data/lib/bootstrap_concerns/form_builder.rb

@@ -52,6 +52,15 @@ module BootstrapConcerns
       email_field(method, options_with_form_control_class(options))
     end
 
+    def bs_form_group(method, type, *args)
+      options = args.find { it.is_a?(Hash) }.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)
+      end
+    end
+
     def bs_grouped_collection_select(
       method,
       collection,

data/lib/bootstrap_concerns/option.rb

@@ -11,7 +11,7 @@ module BootstrapConcerns
       end
 
       def prefixed_option(options, key:, prefix:, default: nil)
-        (options.delete(key) || default)&.then { "#{prefix}-#{_1}" }
+        (options.delete(key) || default)&.then { "#{prefix}-#{it}" }
       end
 
       def options_with_base_class(options, *base_class)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_concerns
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Evan Brooks
 - Robert Keresnyei
 bindir: bin
 cert_chain: []
-date: 2025-04-09 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.5
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Concerns for building Bootstrap components with Ruby on Rails.
 test_files: []