katalyst-tables 2.2.4 → 2.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 450377488700ebc511da5b3d515c217811ef60ce631df86edf62778ef8a3c5c9
-  data.tar.gz: 90040f0e73ad2858fd6b683b8046c9726d6a9223676edafc555dadf3e416e97b
+  metadata.gz: 3b574c64df2689986e01f6b7a51709f80806790abf22a6b1134ab0e82ee0d058
+  data.tar.gz: 6127e32f529378ee36b923edbe0db1021b16c233edca12255150810b2cd69e92
 SHA512:
-  metadata.gz: 65cb752a4d5ad8620572f123f960b8378e31b5775b34b84bcc7787cd5d89234a5fee3ef2e5d850d19a4c422278aaed74eab8fddf254a92445c11d1e9f17296af
-  data.tar.gz: c72888fbed46322cc3adf8bb4a562079699ccacea0fac36a8b85879ddf4378c252f7090c35206b4ac0e7696b2d67e7baadd455c279be9e813efc81103efe7724
+  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/core.rb

@@ -13,6 +13,12 @@ module Katalyst
 
         include Reducers
 
+        class_methods do
+          def permitted_params
+            attribute_names
+          end
+        end
+
         included do
           attr_accessor :items
 
@@ -48,7 +54,7 @@ module Katalyst
         end
 
         def with_params(params)
-          self.attributes = params.permit(self.class.attribute_types.keys)
+          self.attributes = params.permit(self.class.permitted_params)
 
           self
         end

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.4"
+    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.4
+  version: 2.2.6
 platform: ruby
 authors:
 - Katalyst Interactive
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-22 00:00:00.000000000 Z
+date: 2023-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-attributes-utils
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.12
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: HTML table generator for Rails views