effective_bootstrap 1.21.3 → 1.21.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec216828e00b4cfff3fb8e30858c50629681b9bbe39a1d72a3e820d5cdefc419
-  data.tar.gz: b1070b8663d763b2b4def30f28e271184603de76c831bf0eded927d28d5a7ed8
+  metadata.gz: 3d9fad7395dab8ef5344e348c5bc33ea0c16b31e4cb106c0493eefc3efe098b7
+  data.tar.gz: 7b6fd61bbe7dda965405d60eb3d28eedafa6669210e028001e63c27b0e410087
 SHA512:
-  metadata.gz: 5c7f9145e59c41703318d5ba73c7c8cb59cbe30cbb7318a2c775fa321eb4c5c59347579b3476ca5219f315a4ce2e226ca09b93ff4b1e05ad9eea32166af16f03
-  data.tar.gz: 3ce7db51d246e4251a4b7e080a609dacd33cfc2a73e07176164c579e401ff6ab6460bc3dc4a706253f5c74da82b36ddcc140470da6efc8a8781dd936c15f75ce
+  metadata.gz: 2b775dd66f8e69f719f9f3c2355dfcf54d7fbd678f8098cc8020f5b841595e3220c0aa491ad22abf72b43fd441d397e4cbbc25d055170d8410250d68564f8da9
+  data.tar.gz: 381b8d84acae09d68169ced5a9bb4caf7aa4dd958f862c584f873361ecce108791bfdbe42daea8173754eb75ffd670d69313ec9b1ec2b4ef616e8d76c1a2c45c

data/app/models/effective/table_builder.rb

@@ -37,7 +37,7 @@ module Effective
       # Using = f.content_for does not create a row.
       # So rows wille be blank when using the default syntax
       # And rows will be present when we render a form, or any form fields
-      build_resource_rows(only: only, except: except) if rows.blank?
+      build_resource_rows(only: only, except: except) unless block_given?
 
       # This gives us a second run through the rows, if you pass additionally
       build_resource_rows(only: additionally) if additionally.present?
@@ -47,10 +47,16 @@ module Effective
 
       # Filter out some hardcoded ones
       content = content.except(*filtered) if filtered.present?
-      content = content.except(*except) if except.present?
 
-      content_tag(:table, class: options.fetch(:class, 'table table-sm table-striped table-hover effective-table-summary')) do
-        content_tag(:tbody, content.values.join.html_safe)
+      if except.present?
+        content = content.except(*except)
+        content = content.reject { |key, _| except.any? { |ex| key.to_s.start_with?(ex.to_s + '_') } }
+      end
+
+      if content.present?
+        content_tag(:table, class: options.fetch(:class, 'table table-sm table-striped table-hover effective-table-summary')) do
+          content_tag(:tbody, content.values.join.html_safe)
+        end
       end
     end
 
@@ -252,7 +258,9 @@ module Effective
       nil
     end
 
-    def fields_for(name, object, options = {}, &block)
+    def fields_for(name, collection = nil, options = {}, &block)
+      options = collection if options.blank? && collection.kind_of?(Hash)
+
       values = value(name)
 
       if values.respond_to?(:each_with_index)
@@ -262,7 +270,7 @@ module Effective
           builder.rows.each { |child, content| rows["#{name}_#{child}_#{index}".to_sym] = content }
         end
       else
-        builder = TableBuilder.new(object, template, options.merge(prefix: human_attribute_name(name)))
+        builder = TableBuilder.new(object.send(name), template, options)
         builder.render(&block)
         builder.rows.each { |child, content| rows["#{name}_#{child}".to_sym] = content }
       end

data/app/models/effective/table_rows/article_editor.rb

@@ -16,6 +16,14 @@ module Effective
         end
       end
 
+      # Humanized label or the label from form
+      def label
+        text = options[:label] || EffectiveResources.et(builder.object, name).sub(/^Rich text /, '').capitalize
+        prefix = builder.options[:prefix]
+
+        [*prefix, text].join(': ')
+      end
+
     end
   end
 end

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '1.21.3'.freeze
+  VERSION = '1.21.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 1.21.3
+  version: 1.21.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-16 00:00:00.000000000 Z
+date: 2025-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails