effective_bootstrap 1.22.1 → 1.22.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67309075b096a201f87cb46e5eb5a232320b9eb30f3d627f842d5a1a9d574a6b
-  data.tar.gz: 690e7121600303eb322ac8ae6f2f3dcf5cc1a5914e205b6dd5a2a97466075326
+  metadata.gz: 72dd156fce6da5b624d7ef6e666198def54c289676f1aaf024aea4c11eae7f8f
+  data.tar.gz: 3f6518cd35b2a1dd28159dcaad798631572b6fd4607e252d79990c468d693e7c
 SHA512:
-  metadata.gz: b86b1ee80275ce1bae0d8c1ab00856ab5d379fe1be90e7bdcdf7d9ec82f3d8ef7de6819cb660a27f3bbb25ed552be29ea0601d5df702e39f5ccff4140ff310f7
-  data.tar.gz: 65727df86bf8f294d377fda450f6404a18a0ab654fcccc0cd1369ef278e9fe3d6e17374e6c14cf41148bd6a42512d1412ec4a5d21f7b3406f39e00889bc8db1f
+  metadata.gz: ba618d917a6a0a312b40bd93d86ebd28e9022adf7d1cd530a75e6956de1e2cd72010e2f1631654963f1b8675d7f144c574efbe062ad0ad1d239d8d7839262665
+  data.tar.gz: 32e42a810c099983bfc764bc3d25d94a9c6dfba62c4966d5eeef84140cb84c3a02bb8a2d4a1f1429d7f6faa585300ccba158437b2d6fa2be1f0fb122c935209d

data/app/helpers/effective_bootstrap_helper.rb

@@ -64,13 +64,17 @@ module EffectiveBootstrapHelper
   # = card('title do')
   #   %p Stuff
   # = card('Stuff', header: 'header title')
+  # = card(partial: 'lares/dashboard')
   def card(resource = nil, opts = {}, &block)
-    raise('expected a block') unless block_given?
-
     if resource.kind_of?(Hash)
       opts = resource; resource = nil
     end
 
+    partial = opts.delete(:partial)
+    locals = opts.delete(:locals) || {}
+
+    raise('expected a block or a partial') unless block_given? || partial.present?
+
     return if resource.kind_of?(Class) && !EffectiveResources.authorized?(self, :index, resource)
 
     header = opts.delete(:header)
@@ -80,10 +84,12 @@ module EffectiveBootstrapHelper
       header = content_tag(:div, header, class: 'card-header') if header.present?
 
       body = content_tag(:div, class: 'card-body') do
+        content = (partial.present? ? render(partial, locals) : capture(&block))
+
         if title.present?
-          content_tag(:h5, title, class: 'card-title') + capture(&block)
+          content_tag(:h5, title, class: 'card-title') + content
         else
-          capture(&block)
+          content
         end
       end
 
@@ -91,6 +97,12 @@ module EffectiveBootstrapHelper
     end
   end
 
+  # A card_dashboard card that renders one dashboard partial
+  # = dashboard_card('effective/polls/dashboard')
+  def dashboard_card(partial, opts = {})
+    card(merge_class_key(opts, 'card-dashboard').merge(partial: partial))
+  end
+
   def clipboard_copy(text, opts = {})
     opts[:label] ||= 'Copy to Clipboard'
     opts[:class] ||= 'btn btn-secondary'
@@ -375,10 +387,7 @@ module EffectiveBootstrapHelper
 
     return ''.html_safe if content.blank?
 
-    if sort && !content.include?('dropdown-divider')
-      lines = content.gsub("\n", '').split("</a>").reject(&:blank?).map { |line| line + "</a>" }
-      content = lines.sort_by { |line| line.match(/<a[^>]*>([^<]*)<\/a>/)[1] || '' }.join("</a>\n")
-    end
+    content = effective_bootstrap_sort_dropdown_content(content) if sort
 
     content_tag(:li, class: 'nav-item dropdown') do
       content_tag(:a, class: 'nav-link dropdown-toggle', href: '#', id: id, role: 'button', 'data-toggle': 'dropdown', 'aria-haspopup': true, 'aria-expanded': false) do
@@ -739,6 +748,24 @@ module EffectiveBootstrapHelper
     end
   end
 
+  # Sorts the dropdown items of a nav_dropdown(sort: true) alphabetically by their label
+  # Each nav_divider starts a new section, and every section is sorted on its own, so the
+  # dividers keep grouping the menu just as they were written
+  # Any section with more than dropdown items in it is left exactly as-is
+  def effective_bootstrap_sort_dropdown_content(content)
+    divider = nav_divider
+
+    sections = content.split(divider).map do |section|
+      links = section.scan(/<a\b[^>]*>.*?<\/a>/m)
+      remaining = links.inject(section) { |result, link| result.sub(link, '') }
+
+      next section if remaining.present?
+      links.sort_by { |link| link.gsub(/<[^>]*>/, '').strip.downcase }.join("\n")
+    end
+
+    sections.join("\n#{divider}\n").html_safe
+  end
+
   def effective_bootstrap_unique_id
     # Set the first unique value
     @_effective_bootstrap_unique_id ||= Time.zone.now.to_i

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '1.22.1'.freeze
+  VERSION = '1.22.2'.freeze
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 1.22.1
+  version: 1.22.2
 platform: ruby
 authors:
 - Code and Effect
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-22 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -745,7 +744,6 @@ homepage: https://github.com/code-and-effect/effective_bootstrap
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -760,8 +758,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
-signing_key:
+rubygems_version: 4.0.17
 specification_version: 4
 summary: Everything you need to get set up with bootstrap 4.
 test_files: []