katalyst-tables 2.2.5 → 2.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce0864bc72a6abeb1e6d2060d278650cc6788c3afd87b5ab161ed1fafbeb91b6
-  data.tar.gz: 668e674d96f58861e0a84e859c65dd3f9ad4ddd1c47f822f2d3a473b3b74709d
+  metadata.gz: 3b574c64df2689986e01f6b7a51709f80806790abf22a6b1134ab0e82ee0d058
+  data.tar.gz: 6127e32f529378ee36b923edbe0db1021b16c233edca12255150810b2cd69e92
 SHA512:
-  metadata.gz: 42004d7e06b23581d04a0e7d381179fa550350d8221127fbd6d15dc9e8b40ff219246baa302e1379c6a7f02abfc3e2b7c955cae7eaa18c9890be7f0bfa60df10
-  data.tar.gz: 066e394af2e31e1ebe060ed39fc67ecf9b80ad880a526c7ef1e233abb1116e9d4f16507fb89f800d755f2ffae7bad9aaeb4cd0ae4fb67724b86f46fa2eb16976
+  metadata.gz: f76db646ae34a587dcb466841729dcc404f4edffeabf9476b381b651f4757a198e088e9d643f9eb94acd19429438b73eb09565cd452af7ca4009fbf9577f6106
+  data.tar.gz: 54b9ad471e692a069ed04eebe2db54a52cc35eb9e54c3842e35e7ae58b70930c5a6361e0c22ee47001b7ecc118ed4c29ef11503a69c0f97b4649dbaef3c70b9c

data/app/components/concerns/katalyst/tables/has_html_attributes.rb

@@ -21,9 +21,31 @@ module Katalyst
         %i[data action],
       ].freeze
 
+      FLATTENABLE_ATTRIBUTES = [
+        %i[data controller],
+        %i[data action],
+      ].freeze
+
+      refine NilClass do
+        def flatten_html(*)
+          self
+        end
+      end
+
       refine Hash do
         def merge_html(attributes)
-          deep_merge_html_attributes(attributes, mergeable_attributes: MERGEABLE_ATTRIBUTES)
+          result = deep_merge_html_attributes(attributes, mergeable_attributes: MERGEABLE_ATTRIBUTES)
+          FLATTENABLE_ATTRIBUTES.each_with_object(result) do |path, flattened|
+            flattened.flatten_html(*path)
+          end
+        end
+
+        def flatten_html(key, *path)
+          if path.empty?
+            self[key] = self[key].join(" ") if self[key].is_a?(Array)
+          else
+            self[key].flatten_html(*path)
+          end
         end
       end
 

data/app/components/katalyst/turbo/table_component.rb

@@ -37,7 +37,7 @@ module Katalyst
         params = collection.to_params
         query_string = params.empty? ? "" : "?#{Rack::Utils.build_nested_query(params)}"
 
-        "#{request.path}#{query_string}"
+        "#{query_string}"
       end
 
       def default_header_options

data/app/models/concerns/katalyst/tables/collection/pagination.rb

@@ -27,7 +27,7 @@ module Katalyst
         def initialize(paginate: config.paginate, **options)
           super(**options)
 
-          @paginate = paginate
+          @paginate = paginate.freeze
         end
 
         def paginate?
@@ -50,7 +50,7 @@ module Katalyst
           def call(collection)
             @collection = @app.call(collection)
             if collection.paginate?
-              @collection.pagination, @collection.items = pagy(@collection.items, collection.paginate_options)
+              @collection.pagination, @collection.items = pagy(@collection.items, collection.paginate_options.dup)
             end
             @collection
           end

data/lib/katalyst/tables/version.rb

@@ -2,6 +2,6 @@
 
 module Katalyst
   module Tables
-    VERSION = "2.2.5"
+    VERSION = "2.2.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-tables
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.2.6
 platform: ruby
 authors:
 - Katalyst Interactive
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-28 00:00:00.000000000 Z
+date: 2023-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-attributes-utils