katalyst-tables 3.10.0 → 3.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f28bfdf9aae3a6cf0fc5822baa12cfe8da12dbd23b4a3b28c2bd6b816fad9f2
-  data.tar.gz: 31828abc1872970d1d9f7280ff166074e5cd8444ccdcc599a9bcf03095296a0b
+  metadata.gz: 1e8456c713efa8b079198dff2fd156ba028258ff09eb056b6a9a95cc5eb1aeaf
+  data.tar.gz: 4f6045cabeecbb034134151167dae9e9ce1c0f8744e32576829665fde2ec9117
 SHA512:
-  metadata.gz: ac366753b188bb5a4d90da55fda2b6e285ca5640681a5aac053decad8ca499cded748569875de0647439cc08691830fed2517b01e05bc0308d8aa6b13a23b38d
-  data.tar.gz: a15ba7a25da90dda2bb5a235977d67c1ee8807058b83799ef6e56f15c16d7f573d0e44d11a511736a9669ac5184563c4e51579a4e930061f5917c29f8b5b398f
+  metadata.gz: b22f53a017c4e9120fab8d73fedc699d929c5ce855e659ce67cc20a592b27dd0400111ace41ddf0d0b5cc9646a5836263b82c564b3ed795fc2fff9b8137b7f61
+  data.tar.gz: 8bee047ee8e2ca64e849f8735a87f1f917ef4a83d757b9372d9be3e1f176a17de390ac0f57cab1140d967cc4dbc1c94496a9c5063bf68dc69cbbe5ddc6fd962e

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [3.11.0]
+
+* Support for Pagy 43
+
 ## [3.10.0]
 
 * Support for Rails 8.1

data/app/components/katalyst/tables/pagy_nav_component.rb

@@ -8,7 +8,15 @@ module Katalyst
       "Pagy::Frontend".safe_constantize&.tap { |pagy| include(pagy) }
 
       def self.pagy_legacy?
-        Pagy::VERSION.scan(/\d+/).first.to_i <= 8
+        pagy_major < 43
+      end
+
+      def self.pagy_pre_8?
+        pagy_major < 8
+      end
+
+      def self.pagy_major
+        @pagy_major ||= Pagy::VERSION.scan(/\d+/).first.to_i
       end
 
       delegate :pagy_legacy?, to: :class
@@ -25,7 +33,7 @@ module Katalyst
       end
 
       def call
-        pagy_nav(@pagy, **pagy_options).html_safe # rubocop:disable Rails/OutputSafety
+        render_nav.html_safe # rubocop:disable Rails/OutputSafety
       end
 
       def pagy_options
@@ -38,6 +46,12 @@ module Katalyst
 
       private
 
+      def render_nav
+        return pagy_nav(@pagy, **pagy_options) if pagy_legacy?
+
+        @pagy.series_nav(**pagy_options)
+      end
+
       def default_pagy_options
         pagy_legacy? ? {} : { anchor_string: 'data-turbo-action="replace"' }
       end

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

@@ -3,18 +3,25 @@
 module Katalyst
   module Tables
     module Collection
+      class Config
+        attr_accessor :paginate, :sorting
+      end
+
       module Core # :nodoc:
         extend ActiveSupport::Concern
 
         include ActiveModel::Model
         include ActiveModel::Attributes
         include ActiveModel::Dirty
-        include ActiveSupport::Configurable
 
         include HasParams
         include Reducers
 
         class_methods do
+          def config
+            @config ||= Config.new
+          end
+
           def permitted_params
             _default_attributes.to_h.each_with_object([]) do |(k, v), h|
               h << case v

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

@@ -20,11 +20,9 @@ module Katalyst
           attr_accessor :pagination
 
           attribute :page, :integer, default: 1, filter: false
-
-          config_accessor :paginate
         end
 
-        def initialize(paginate: config.paginate, **)
+        def initialize(paginate: self.class.config.paginate, **)
           super(**)
 
           @paginate = paginate.freeze
@@ -38,7 +36,7 @@ module Katalyst
           opts = @paginate.is_a?(Hash) ? @paginate : {}
           opts = opts.dup
 
-          if PagyNavComponent.pagy_legacy?
+          if PagyNavComponent.pagy_pre_8?
             opts[:anchor_string] ||= "data-turbo-action=\"replace\""
           end
 
@@ -48,7 +46,11 @@ module Katalyst
         class Paginate # :nodoc:
           # Pagy is not a required gem unless you're using pagination
           # Expect to see NoMethodError failures if pagy is not available
-          "Pagy::Backend".safe_constantize&.tap { |pagy| include(pagy) }
+          if (pagy_method = "Pagy::Method".safe_constantize)
+            include(pagy_method)
+          else
+            "Pagy::Backend".safe_constantize&.tap { |pagy| include(pagy) }
+          end
 
           def initialize(app)
             @app = app
@@ -64,7 +66,12 @@ module Katalyst
 
           # pagy shim
           def params
-            @collection.attributes.with_indifferent_access
+            @collection.to_params
+          end
+
+          # Pagy 43 expects a request object; provide the minimal hash interface it supports.
+          def request
+            { base_url: nil, path: nil, params:, cookie: nil }
           end
         end
       end

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

@@ -55,7 +55,7 @@ module Katalyst
           attr_reader :default_sort
         end
 
-        def initialize(sorting: config.sorting, **)
+        def initialize(sorting: self.class.config.sorting, **)
           @default_sort = sorting.to_param if sorting.present?
 
           super(sort: @default_sort, **) # set default sort based on config

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-tables
 version: !ruby/object:Gem::Version
-  version: 3.10.0
+  version: 3.11.1
 platform: ruby
 authors:
 - Katalyst Interactive