effective_bootstrap 1.16.3 → 1.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a43d4059d694f254fb05f0cb43f12dc5f3b5fbeb5df8dc7aa7aa21fc8a3bad9
-  data.tar.gz: 8967aad36784c29bd334837b2bf9d4683258e7afafd61d509821dd31a860688c
+  metadata.gz: 911b7b8dbe6840081eac56f04deca54f72b96244d920b8ec552738ee322677b0
+  data.tar.gz: a84456a02edbc9ccefdb53d39e6f60356c8b1299a4942dba7ae59f7ea62781dc
 SHA512:
-  metadata.gz: 8dc33e68ff3d7383d22d60971c577490c4fbc9d93f606ec66b7ac45a38cb1fca4ef2ef514525b0b1a0fa974b65d36599791ae14d2f134bd8a5ad0b1ac3ca0670
-  data.tar.gz: 383b522a6c0839f578f545f7535aac54682a9640f1c88c3d61d48879a445683047f0a95d373b0b3b74777bed218be622fa5f1a387979d4841f06263fe5630928
+  metadata.gz: b563346c69e73baac5fbcb490296388294d73216af1b0a14c95178545870d12e182998b41dc57a5aed34ad61e5affe1ec06064d95cdfe0c0f68470cf4e0ddc53
+  data.tar.gz: fe8a5bce59a2b6876e9dddd8851b90e4c36da0498c8eb89ec8ce98d6cd7e999c10826bc9d6f56976b1f40f469357b078dde62ac8dfe0d78194141157c59b119e

data/app/helpers/effective_bootstrap_helper.rb

@@ -129,8 +129,9 @@ module EffectiveBootstrapHelper
     id = "collapse-#{effective_bootstrap_unique_id}"
     show = (opts.delete(:show) == true)
 
-    # Figure out all the button / link options
-    link_opts = { 'data-toggle': 'collapse', role: 'button', href: "##{id}", 'aria-controls': "##{id}", 'aria-expanded': show }
+    # The div and the card now
+    div_class = opts.delete(:div_class)
+    card_class = opts.delete(:card_class) || 'card card-body my-2'
 
     # Two link labels
     label_expand = opts.delete(:expand) || label.to_s.tap do |label|
@@ -142,13 +143,19 @@ module EffectiveBootstrapHelper
     end + icon('chevron-up')
 
     # The link html classes
-    link_opts[:class] = opts.delete(:link_class) || 'btn btn-link'
-    link_opts[:class] += ' effective-collapse-actions hidden-print'
-    link_opts[:class] += ' collapsed' unless show
+    link_class = opts.delete(:link_class) || 'btn btn-link'
+    link_class += ' effective-collapse-actions hidden-print'
+    link_class += ' collapsed' unless show
 
-    # The div and the card now
-    div_class = opts.delete(:div_class)
-    card_class = opts.delete(:card_class) || 'card card-body my-2'
+    # Figure out all the button / link options
+    link_opts = { 
+      'data-toggle': 'collapse', 
+      role: 'button', 
+      href: "##{id}", 
+      'aria-controls': "##{id}", 
+      'aria-expanded': show, 
+      class: link_class 
+    }.merge(opts)
 
     # Normal collapse
     link_tag = content_tag(:a, link_opts) do
@@ -562,7 +569,7 @@ module EffectiveBootstrapHelper
   # If you pass active 'label' it will make that tab active. Otherwise first.
   # Unique will make sure the tab html IDs are unique
   # $('#tab-demographics').tab('show')
-  def tabs(active: nil, unique: false, ignore_save_tab: false, list: {}, content: {}, &block)
+  def tabs(active: nil, unique: false, ignore_save_tab: false, benchmarks: EffectiveBootstrap.benchmarks, list: {}, content: {}, &block)
     raise 'expected a block' unless block_given?
 
     # The Active Tab might be set from a previous form submission, or passed into helper
@@ -580,31 +587,56 @@ module EffectiveBootstrapHelper
 
     tab_active ||= :first if tab_active.nil?
     @_tab_unique = effective_bootstrap_unique_id if unique
+    @_tab_benchmarks = {} if benchmarks # Enables benchmarks
 
     # Generate the html in two passes
-    content_tag(:ul, {class: 'nav nav-tabs', role: 'tablist'}.merge(list)) do
+    tabs_list = content_tag(:ul, {class: 'nav nav-tabs', role: 'tablist'}.merge(list)) do
       @_tab_mode = :tablist
       @_tab_active = tab_active
 
       yield # Yield to tab the first time
-    end +
-    content_tag(:div, {class: 'tab-content'}.merge(content)) do
+    end
+
+    tabs_divs = content_tag(:div, {class: 'tab-content'}.merge(content)) do
       @_tab_mode = :content
       @_tab_active = tab_active
 
       yield # Yield to tab the second time
     end
+
+    if benchmarks
+      total = @_tab_benchmarks.values.sum(&:real)
+
+      @_tab_benchmarks.each do |label, benchmark|
+        percent = (benchmark.real / total * 100).round(0)
+        amount = (benchmark.real * 1000).round(1)
+
+        badge_class = case amount
+        when (0.0..150.0) then ''
+        when (150.0..500.0) then 'badge-warning'
+        else 'badge-danger'
+        end
+
+        badge = content_tag(:span, "#{percent}% | #{amount}ms", class: "badge #{badge_class}")
+
+        tabs_list.sub!(label, label + '<br>' + badge)
+      end
+
+      tabs_list = tabs_list.html_safe
+    end
+
+    (tabs_list + tabs_divs)
   end
 
   NUMBERS = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9']
 
   def tab(resource, opts = {}, &block)
     return if resource.kind_of?(Class) && !EffectiveResources.authorized?(self, :index, resource)
-    label = opts.delete(:label) || effective_bootstrap_human_name(resource, plural: (opts.key?(:plural) ? opts.delete(:plural) : true), prefer_model_name: true)
+    label = opts[:label] || effective_bootstrap_human_name(resource, plural: opts.fetch(:plural, true), prefer_model_name: true)
 
     (@_tab_labels.push(label) and return) if @_tab_mode == :validate
 
-    controls = opts.delete(:controls) || label.to_s.parameterize.gsub('_', '-')
+    controls = opts[:controls] || label.to_s.parameterize.gsub('_', '-')
     controls = "item-#{controls}" if NUMBERS.include?(controls[0]) # Can't start with a number
     controls = controls[1..-1] if controls[0] == '#'
     controls = "#{controls}-#{@_tab_unique}" if @_tab_unique
@@ -622,7 +654,11 @@ module EffectiveBootstrapHelper
     else # Inserting the content into the tab itself
       classes = ['tab-pane', 'fade', ('show active' if active), opts[:class].presence].compact.join(' ')
       content_tag(:div, id: controls, class: classes, role: 'tabpanel', 'aria-labelledby': ('tab-' + controls), 'data-tab-label': label) do
-        yield
+        if @_tab_benchmarks.kind_of?(Hash)
+          @_tab_benchmarks[label] = Benchmark.measure { yield }
+        else
+          yield
+        end
       end
     end
   end

data/config/effective_bootstrap.rb

@@ -6,4 +6,7 @@ EffectiveBootstrap.setup do |config|
   # Adds a before_action to ApplicationController
   # To save and restore the active bootstrap tabs
   config.save_tabs = true
+
+  # Adds benchmark stats to each of the = tab helpers
+  config.benchmarks = false
 end

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '1.16.3'.freeze
+  VERSION = '1.17.0'.freeze
 end

data/lib/effective_bootstrap.rb

@@ -6,7 +6,7 @@ require 'effective_bootstrap/version'
 module EffectiveBootstrap
 
   def self.config_keys
-    [:use_custom_data_confirm, :save_tabs]
+    [:use_custom_data_confirm, :save_tabs, :benchmarks]
   end
 
   include EffectiveGem

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 1.16.3
+  version: 1.17.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-24 00:00:00.000000000 Z
+date: 2023-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails