activeadmin_table_footer 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd4e5d13097968b6dd656ac4385181e8f2016951126737dff695a72453c5a9c8
-  data.tar.gz: 19644d91c95753b13c2e7248ad1ac29802dc4dcb180316c3c657a82029c7044b
+  metadata.gz: a9874aaf42089efb8297cda5f60411bad438d691a12098a19439f38d5986d308
+  data.tar.gz: fff210775c3c1e30d1ee09ae20d596ff7a684f0091f47209b9fbd95d9f3a0053
 SHA512:
-  metadata.gz: 95c22fca6a7286f3f1bb611658442f6938a07846298d80c713ce1d3de97e5f41405ea2cdc7163f3e53b990dd26ec12c1cb0d8191022378dfe8df45a50aaea067
-  data.tar.gz: 24a2a4bab3736f134cb7bd5b7062b9a4b3c9dbb409da369adcf11eb83c6b33da3a6668e187545bd61e35190843dd5e909865ce4178fa0fe0a5869e629fc9302c
+  metadata.gz: ef0407e70f5a3129e88db017a39bc252745fcaba6cc015783b445528b9f572bc694d957b28aef299f15214d09e0e84e0e76caee32c6f2d8b175dc28262637356
+  data.tar.gz: 89bf638f6ab6ff73023dd42de1ce8f62afc8305a11339e15347d00f626f0ccfea2896c5a562aa2eb243993c22780044d89963ab7907c870bb34615dabdf0b520

data/lib/activeadmin_table_footer/index_as_table_extension.rb

@@ -7,17 +7,20 @@ module ActiveadminTableFooter
   module IndexAsTableExtension
     def build(page_presenter, collection)
       footer_proc = page_presenter[:footer_data]
+      return super unless footer_proc && page_presenter.block
 
-      if footer_proc && page_presenter.block
-        original_block = page_presenter.block
-        wrapped = lambda do |table|
-          table.instance_variable_set(:@footer_data_proc, footer_proc)
-          instance_exec(table, &original_block)
-        end
-        page_presenter.instance_variable_set(:@block, wrapped)
+      original_block = page_presenter.block
+      wrapped = lambda do |table|
+        table.instance_variable_set(:@footer_data_proc, footer_proc)
+        instance_exec(table, &original_block)
       end
 
-      super
+      # Render against a copy. ActiveAdmin builds one PagePresenter per
+      # `index do ... end` when it loads the resource and hands that same
+      # object to every render, so writing the wrapper back into the presenter
+      # would wrap the previous wrapper once per request — growing retained
+      # closures and block call depth until a render raises SystemStackError.
+      super(ActiveAdmin::PagePresenter.new(page_presenter.options, &wrapped), collection)
     end
   end
 end

data/lib/activeadmin_table_footer/table_for_extension.rb

@@ -8,10 +8,12 @@ module ActiveadminTableFooter
       super(obj, *attrs, options)
     end
 
+    # Any falsy callback means "no footer" — `&.` would only skip nil and raise
+    # on `footer_data: false`, which is what `footer_data: flag && ->(c) { ... }`
+    # passes when the flag is off.
     def footer_data
       return @footer_data if defined?(@footer_data)
-      return (@footer_data = nil) unless @footer_data_proc
-      @footer_data = @footer_data_proc.call(unscoped_collection_for_footer)
+      @footer_data = (@footer_data_proc.call(unscoped_collection_for_footer) if @footer_data_proc)
     end
 
     # The collection AA passes us is the paginated + ordered slice. Aggregates
@@ -49,14 +51,15 @@ module ActiveadminTableFooter
     def build_footer_cell_for(col)
       within @aatf_footer_row do
         column_key = column_key_for(col)
-        # Always include `col col-<key>` so capybara_active_admin matchers
-        # (`have_table_cell(column: ...)`) work in both AA 3 and AA 4 — the
-        # selector convention is `td.col.col-<key>`.
-        compat_classes = column_key ? "col col-#{column_key}" : "col"
-        classes = [col.html_class, compat_classes, ActiveadminTableFooter.footer_th_class]
-                    .reject { |c| c.nil? || c.to_s.empty? }
-                    .join(" ")
-        attrs = { class: classes.empty? ? nil : classes }
+        # `col` + `col-<key>` keeps capybara_active_admin's
+        # `have_table_cell(column: ...)` matcher working on AA 3 and AA 4.
+        classes = [
+          col.html_class,
+          "col",
+          ("col-#{column_key}" if column_key),
+          ActiveadminTableFooter.footer_th_class
+        ].compact_blank.join(" ").presence
+        attrs = { class: classes }
         attrs[:"data-column"] = column_key if column_key
         td(**attrs) do
           render_footer_value(col) if column_has_footer?(col)
@@ -66,12 +69,8 @@ module ActiveadminTableFooter
 
     def column_key_for(col)
       # AA 4 exposes Column#title_id; AA 3 does not — derive from title.
-      if col.respond_to?(:title_id) && col.title_id.respond_to?(:presence)
-        return col.title_id.presence
-      end
-      title = col.title.to_s
-      return nil if title.empty?
-      title.parameterize(separator: "_")
+      return col.title_id.presence if col.respond_to?(:title_id)
+      col.title.to_s.presence&.parameterize(separator: "_")
     end
 
     def ensure_tfoot!

data/lib/activeadmin_table_footer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveadminTableFooter
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_table_footer
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Igor Fedoronchuk