effective_bootstrap 1.19.9 → 1.19.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8692390c09e3355687ccd1c09125b803b44314fad79874fbaeeb0b0001035810
-  data.tar.gz: 267e98689b2c21549b4710f8e5fbbd3d56291055bab497399a99ce258427f97d
+  metadata.gz: e4cb4c2ce75f80f7ba3b04734d1bfa31ab410bab84b370f141e547b82aba67a8
+  data.tar.gz: eaff1ef48a5e692d004e5f2c3417dc268fa826b5d074c74d58d515ec781ffd5b
 SHA512:
-  metadata.gz: a2942153086a3e8489bd8f6bf0264927e918ace32a9b80950224e0ff9592fbac8b2781985e9facc9da659c4dd75db27fa1d42b49f4f1add1563a2192e918c8ac
-  data.tar.gz: 682082c51cd0606ee83c4840a55247fa40db8914e1ead288498e2338ce93cf49054363bdb7ca0b3a3939515bce3678c24d8c87ebb3ff78b0dacd250bce5928cd
+  metadata.gz: 76be91962e5003b8f8dc7988e92d778677cf546752c7384a2cd89229ade0233c640efec92e7230b069483c840fdbab522dc46d987bb0eef3af57ce232cb9bf0d
+  data.tar.gz: 6481c5f53c327a6df5e25147606f358be60256e4661c21fc62fcd3b23a164291102854da5c70be3f3a5304eeca2589ed5b5c24ba269ad4ed6b8db2c824a9dfce

data/app/helpers/effective_bootstrap_helper.rb

@@ -340,8 +340,7 @@ module EffectiveBootstrapHelper
     end
   end
 
-
-  def nav_dropdown(label, right: false, groups: false, link_class: [], list_class: [], &block)
+  def nav_dropdown(label, right: false, groups: false, sort: false, link_class: [], list_class: [], &block)
     raise 'expected a block' unless block_given?
 
     id = "dropdown-#{effective_bootstrap_unique_id}"
@@ -354,11 +353,16 @@ 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_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
         label.html_safe
       end + content_tag(:div, class: div_class, 'aria-labelledby': id) do
-        content
+        content.html_safe
       end
     end
   end
@@ -632,7 +636,8 @@ module EffectiveBootstrapHelper
 
   def tab(resource, opts = {}, &block)
     return if resource.kind_of?(Class) && !EffectiveResources.authorized?(self, :index, resource)
-    label = opts[:label] || effective_bootstrap_human_name(resource, plural: opts.fetch(:plural, true), prefer_model_name: true)
+    plural = resource.kind_of?(ActiveRecord::Base) == false
+    label = opts[:label] || effective_bootstrap_human_name(resource, plural: opts.fetch(:plural, plural), prefer_model_name: true)
 
     (@_tab_labels.push(label) and return) if @_tab_mode == :validate
 

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '1.19.9'.freeze
+  VERSION = '1.19.11'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 1.19.9
+  version: 1.19.11
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-16 00:00:00.000000000 Z
+date: 2025-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails