pagy 5.7.5 → 8.6.2

data/lib/pagy/extras/size.rb

@@ -0,0 +1,40 @@
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/size
+# frozen_string_literal: true
+
+class Pagy # :nodoc:
+  # Implement the legacy bar using the array size.
+  # Unless you have very specific requirements, use the faster and better looking default bar.
+  module SizeExtra
+    # Setup @items based on the :gearbox_items variable
+    def series(size: @vars[:size], **_)
+      return super unless size.is_a?(Array)
+      return [] if size == []
+      raise VariableError.new(self, :size, 'to be an Array of 4 Integers or []', size) \
+            unless size.is_a?(Array) && size.size == 4 && size.all? { |num| !num.negative? rescue false } # rubocop:disable Style/RescueModifier
+
+      [].tap do |series|
+        # This algorithm is up to ~5x faster and ~2.3x lighter than the previous one (pagy < 4.3)
+        # However the behavior of the legacy nav bar was taken straight from WillPaginate and Kaminari:
+        # it's ill-concieved and complicates the experience of devs and users.
+        left_gap_start  = 1 + size[0]
+        left_gap_end    = @page - size[1] - 1
+        right_gap_start = @page + size[2] + 1
+        right_gap_end   = @last - size[3]
+        left_gap_end    = right_gap_end  if left_gap_end   > right_gap_end
+        right_gap_start = left_gap_start if left_gap_start > right_gap_start
+        start           = 1
+        if (left_gap_end - left_gap_start).positive?
+          series.push(*start...left_gap_start, :gap)
+          start = left_gap_end + 1
+        end
+        if (right_gap_end - right_gap_start).positive?
+          series.push(*start...right_gap_start, :gap)
+          start = right_gap_end + 1
+        end
+        series.push(*start..@last)
+        series[series.index(@page)] = @page.to_s
+      end
+    end
+  end
+  prepend SizeExtra
+end

data/lib/pagy/extras/standalone.rb

@@ -1,4 +1,4 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/standalone
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/standalone
 # frozen_string_literal: true
 
 require 'uri'
@@ -8,6 +8,7 @@ class Pagy # :nodoc:
   # even in the irb/rails console without any app or config.
   module StandaloneExtra
     # Extracted from Rack::Utils and reformatted for rubocop
+    # :nocov:
     module QueryUtils
       module_function
 
@@ -24,36 +25,31 @@ class Pagy # :nodoc:
             build_nested_query(v, prefix ? "#{prefix}[#{escape(k)}]" : escape(k))
           end.delete_if(&:empty?).join('&')
         when nil
-          prefix
+          escape(prefix)
         else
           raise ArgumentError, 'value must be a Hash' if prefix.nil?
 
-          "#{prefix}=#{escape(value)}"
+          "#{escape(prefix)}=#{escape(value)}"
         end
       end
     end
+    # :nocov:
 
     # Return the URL for the page. If there is no pagy.vars[:url]
     # it works exactly as the regular #pagy_url_for, relying on the params method and Rack.
     # If there is a defined pagy.vars[:url] variable it does not need the params method nor Rack.
-    def pagy_url_for(pagy, page, absolute: nil)
+    def pagy_url_for(pagy, page, absolute: false, **_)
       return super unless pagy.vars[:url]
 
-      vars                = pagy.vars
-      page_param          = vars[:page_param].to_s
-      items_param         = vars[:items_param].to_s
-      params              = pagy.params.is_a?(Hash) ? pagy.params.clone : {}  # safe when it gets reused
-      params[page_param]  = page
-      params[items_param] = vars[:items] if vars[:items_extra]
-      query_string        = "?#{QueryUtils.build_nested_query(pagy_deprecated_params(pagy, params))}"  # remove in 6.0
-      # params              = pagy.params.call(params) if pagy.params.is_a?(Proc)                      # add in 6.0
-      # query_string        = "?#{Rack::Utils.build_nested_query(params)}"                             # add in 6.0
+      vars         = pagy.vars
+      params       = vars[:params].is_a?(Hash) ? vars[:params].clone : {}  # safe when it gets reused
+      pagy_set_query_params(page, vars, params)
+      params       = vars[:params].(params) if vars[:params].is_a?(Proc)
+      query_string = "?#{QueryUtils.build_nested_query(params)}"
       "#{vars[:url]}#{query_string}#{vars[:fragment]}"
     end
   end
-  # In ruby 3+ `UrlHelpers.prepend StandaloneExtra` would be enough instead of using the next 2 lines
-  Frontend.prepend StandaloneExtra
-  Backend.prepend StandaloneExtra
+  UrlHelpers.prepend StandaloneExtra
 
   # Define a dummy params method if it's not already defined in the including module
   module Backend

data/lib/pagy/extras/trim.rb

@@ -1,4 +1,4 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/trim
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/trim
 # frozen_string_literal: true
 
 class Pagy # :nodoc:
@@ -6,23 +6,23 @@ class Pagy # :nodoc:
 
   # Remove the page=1 param from the first page link
   module TrimExtra
-    # Override the original pagy_link_proc.
-    # Call the pagy_trim method if the trim_extra is enabled.
-    def pagy_link_proc(pagy, link_extra: '')
-      link_proc = super(pagy, link_extra: link_extra)
-      return link_proc unless pagy.vars[:trim_extra]
+    # Override the original pagy_a_proc.
+    # Call the pagy_trim method for page 1 if the trim_extra is enabled
+    def pagy_anchor(pagy)
+      a_proc = super
+      return a_proc unless pagy.vars[:trim_extra]
 
-      lambda do |page, text = pagy.label_for(page), extra = ''|
-        link = +link_proc.call(page, text, extra)
-        return link unless page == 1
+      lambda do |page, text = pagy.label_for(page), **opts|
+        a = +a_proc.(page, text, **opts)
+        return a unless page.to_s == '1'
 
-        pagy_trim(pagy, link)
+        pagy_trim(pagy, a) # in method for isolated testing
       end
     end
 
-    # Remove the the :page_param param from the first page link
-    def pagy_trim(pagy, link)
-      link.sub!(/[?&]#{pagy.vars[:page_param]}=1\b(?!&)|\b#{pagy.vars[:page_param]}=1&/, '')
+    # Remove the the :page_param param from the first page anchor
+    def pagy_trim(pagy, a)
+      a.sub!(/[?&]#{pagy.vars[:page_param]}=1\b(?!&)|\b#{pagy.vars[:page_param]}=1&/, '')
     end
   end
   Frontend.prepend TrimExtra

data/lib/pagy/extras/uikit.rb

@@ -1,82 +1,96 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/uikit
 # frozen_string_literal: true
 
-require 'pagy/extras/frontend_helpers'
+warn '[PAGY WARNING] The uikit extra has been discontinued and it will be removed in v9 ' \
+     '(https://github.com/ddnexus/pagy/discussions/672#discussioncomment-9212328)'
+
+require_relative 'js_tools'
 
 class Pagy # :nodoc:
   # Frontend modules are specially optimized for performance.
   # The resulting code may not look very elegant, but produces the best benchmarks
   module UikitExtra
     # Pagination for uikit: it returns the html with the series of links to the pages
-    def pagy_uikit_nav(pagy, pagy_id: nil, link_extra: '', **vars)
-      p_id = %( id="#{pagy_id}") if pagy_id
-      link = pagy_link_proc(pagy, link_extra: link_extra)
+    def pagy_uikit_nav(pagy, id: nil, aria_label: nil, **vars)
+      id = %( id="#{id}") if id
+      a  = pagy_anchor(pagy)
 
-      html = +%(<ul#{p_id} class="pagy-uikit-nav uk-pagination uk-flex-center">#{pagy_uikit_prev_html pagy, link})
+      html = %(<ul#{id} class="pagy-uikit nav uk-pagination uk-flex-center" role="navigation" #{
+                nav_aria_label(pagy, aria_label:)}>#{
+                uikit_prev_html(pagy, a)})
       pagy.series(**vars).each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
         html << case item
-                when Integer then %(<li>#{link.call item}</li>)
-                when String  then %(<li class="uk-active"><span>#{pagy.label_for(item)}</span></li>)
-                when :gap    then %(<li class="uk-disabled"><span>#{pagy_t 'pagy.nav.gap'}</span></li>)
-                else raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
+                when Integer
+                  %(<li>#{a.(item)}</li>)
+                when String
+                  %(<li class="uk-active"><span role="link" aria-current="page" aria-disabled="true">#{
+                      pagy.label_for(item)}</span></li>)
+                when :gap
+                  %(<li class="uk-disabled"><span>#{pagy_t 'pagy.gap'}</span></li>)
+                else
+                  raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
                 end
       end
-      html << pagy_uikit_next_html(pagy, link)
-      html << %(</ul>)
+      html << %(#{uikit_next_html(pagy, a)}</ul>)
     end
 
-    # Javascript pagination for uikit: it returns a nav and a JSON tag used by the pagy.js file
-    def pagy_uikit_nav_js(pagy, pagy_id: nil, link_extra: '', **vars)
+    # Javascript pagination for uikit: it returns a nav with a data-pagy attribute used by the pagy.js file
+    def pagy_uikit_nav_js(pagy, id: nil, aria_label: nil, **vars)
       sequels = pagy.sequels(**vars)
-      p_id = %( id="#{pagy_id}") if pagy_id
-      link = pagy_link_proc(pagy, link_extra: link_extra)
-      tags = { 'before' => pagy_uikit_prev_html(pagy, link),
-               'link'   => %(<li>#{link.call(PAGE_PLACEHOLDER, LABEL_PLACEHOLDER)}</li>),
-               'active' => %(<li class="uk-active"><span>#{LABEL_PLACEHOLDER}</span></li>),
-               'gap'    => %(<li class="uk-disabled"><span>#{pagy_t 'pagy.nav.gap'}</span></li>),
-               'after'  => pagy_uikit_next_html(pagy, link) }
+      id      = %( id="#{id}") if id
+      a       = pagy_anchor(pagy)
+      tokens  = { 'before'  => uikit_prev_html(pagy, a),
+                  'a'       => %(<li>#{a.(PAGE_TOKEN, LABEL_TOKEN)}</li>),
+                  'current' => %(<li class="uk-active"><span role="link" aria-current="page" aria-disabled="true">#{
+                                   LABEL_TOKEN}</span></li>),
+                  'gap'     => %(<li class="uk-disabled"><span>#{pagy_t 'pagy.gap'}</span></li>),
+                  'after'   => uikit_next_html(pagy, a) }
 
-      %(<ul#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-uikit-nav-js uk-pagination uk-flex-center" #{
-        pagy_json_attr(pagy, :nav, tags, sequels, pagy.label_sequels(sequels))}></ul>)
+      %(<ul#{id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-uikit nav-js uk-pagination uk-flex-center" role="navigation" #{
+          nav_aria_label(pagy, aria_label:)} #{
+          pagy_data(pagy, :nav, tokens, sequels, pagy.label_sequels(sequels))
+        }></ul>)
     end
 
-    # Javascript combo pagination for uikit: it returns a nav and a JSON tag used by the pagy.js file
-    def pagy_uikit_combo_nav_js(pagy, pagy_id: nil, link_extra: '')
-      p_id    = %( id="#{pagy_id}") if pagy_id
-      link    = pagy_link_proc(pagy, link_extra: link_extra)
-      p_page  = pagy.page
-      p_pages = pagy.pages
-      input   = %(<input type="number" min="1" max="#{p_pages}" value="#{
-                    p_page}" style="text-align: center; width: #{p_pages.to_s.length + 1}rem;">)
+    # Javascript combo pagination for uikit: it returns a nav with a data-pagy attribute used by the pagy.js file
+    def pagy_uikit_combo_nav_js(pagy, id: nil, aria_label: nil)
+      id    = %( id="#{id}") if id
+      a     = pagy_anchor(pagy)
+      pages = pagy.pages
+
+      page_input = %(<input name="page" type="number" min="1" max="#{pages}" value="#{pagy.page}" aria-current="page" ) <<
+                   %(style="text-align: center; width: #{pages.to_s.length + 1}rem;">#{JSTools::A_TAG})
 
-      %(<ul#{p_id} class="pagy-uikit-combo-nav-js uk-button-group uk-pagination uk-flex-center" #{
-          pagy_json_attr pagy, :combo, pagy_marked_link(link)
+      %(<ul#{id} class="pagy-uikit combo-nav-js uk-button-group uk-pagination uk-flex-center" role="navigation" #{
+          nav_aria_label(pagy, aria_label:)} #{
+          pagy_data(pagy, :combo, pagy_url_for(pagy, PAGE_TOKEN))
         }>#{
-          pagy_uikit_prev_html pagy, link
-        }<li>#{
-          pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages
-        }</li>#{
-          pagy_uikit_next_html pagy, link
+          uikit_prev_html(pagy, a)
+        }<li><label>#{
+          pagy_t('pagy.combo_nav_js', page_input:, pages:)
+        }</label></li>#{
+          uikit_next_html(pagy, a)
         }</ul>)
     end
 
     private
 
-    def pagy_uikit_prev_html(pagy, link)
-      previous_span = %(<span uk-pagination-previous>#{pagy_t 'pagy.nav.prev'}</span>)
+    def uikit_prev_html(pagy, a)
+      span = %(<span uk-pagination-previous></span>)
       if (p_prev = pagy.prev)
-        %(<li>#{link.call p_prev, previous_span}</li>)
+        %(<li>#{a.(p_prev, span, aria_label: pagy_t('pagy.aria_label.prev'))}</li>)
       else
-        %(<li class="uk-disabled"><a href="#">#{previous_span}</a></li>)
+        %(<li class="uk-disabled"><a role="link" aria-disabled="true" aria-label="#{
+            pagy_t('pagy.aria_label.prev')}">#{span}</a></li>)
       end
     end
 
-    def pagy_uikit_next_html(pagy, link)
-      next_span = %(<span uk-pagination-next>#{pagy_t 'pagy.nav.next'}</span>)
+    def uikit_next_html(pagy, a)
+      span = %(<span uk-pagination-next></span>)
       if (p_next = pagy.next)
-        %(<li>#{link.call p_next, next_span}</li>)
+        %(<li>#{a.(p_next, span, aria_label: pagy_t('pagy.aria_label.prev'))}</li>)
       else
-        %(<li class="uk-disabled"><a href="#">#{next_span}</a></li>)
+        %(<li class="uk-disabled"><a role="link" aria-disabled="true" aria-label="#{
+            pagy_t('pagy.aria_label.next')}">#{span}</a></li>)
       end
     end
   end

data/lib/pagy/frontend.rb

@@ -1,13 +1,13 @@
-# See Pagy::Frontend API documentation: https://ddnexus.github.io/pagy/api/frontend
+# See Pagy::Frontend API documentation: https://ddnexus.github.io/pagy/docs/api/frontend
 # frozen_string_literal: true
 
-require 'pagy/url_helpers'
-require 'pagy/i18n'
+require_relative 'url_helpers'
+require_relative 'i18n'
 
 class Pagy
   # Used for search and replace, hardcoded also in the pagy.js file
-  PAGE_PLACEHOLDER  = '__pagy_page__'
-  LABEL_PLACEHOLDER = '__pagy_label__'
+  PAGE_TOKEN  = '__pagy_page__'
+  LABEL_TOKEN = '__pagy_label__'
 
   # Frontend modules are specially optimized for performance.
   # The resulting code may not look very elegant, but produces the best benchmarks
@@ -15,62 +15,56 @@ class Pagy
     include UrlHelpers
 
     # Generic pagination: it returns the html with the series of links to the pages
-    def pagy_nav(pagy, pagy_id: nil, link_extra: '', **vars)
-      p_id   = %( id="#{pagy_id}") if pagy_id
-      link   = pagy_link_proc(pagy, link_extra: link_extra)
-      p_prev = pagy.prev
-      p_next = pagy.next
+    def pagy_nav(pagy, id: nil, aria_label: nil, **vars)
+      id = %( id="#{id}") if id
+      a  = pagy_anchor(pagy)
 
-      html = +%(<nav#{p_id} class="pagy-nav pagination" aria-label="pager">)
-      html << if p_prev
-                %(<span class="page prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</span> )
-              else
-                %(<span class="page prev disabled">#{pagy_t('pagy.nav.prev')}</span> )
-              end
+      html = %(<nav#{id} class="pagy nav" #{nav_aria_label(pagy, aria_label:)}>#{
+                 prev_a(pagy, a)})
       pagy.series(**vars).each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
         html << case item
-                when Integer then %(<span class="page">#{link.call item}</span> )
-                when String  then %(<span class="page active">#{pagy.label_for(item)}</span> )
-                when :gap    then %(<span class="page gap">#{pagy_t('pagy.nav.gap')}</span> )
-                else raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
+                when Integer
+                  a.(item)
+                when String
+                  %(<a role="link" aria-disabled="true" aria-current="page" class="current">#{pagy.label_for(item)}</a>)
+                when :gap
+                  %(<a role="link" aria-disabled="true" class="gap">#{pagy_t('pagy.gap')}</a>)
+                else
+                  raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
                 end
       end
-      html << if p_next
-                %(<span class="page next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</span>)
-              else
-                %(<span class="page next disabled">#{pagy_t('pagy.nav.next')}</span>)
-              end
-      html << %(</nav>)
+      html << %(#{next_a(pagy, a)}</nav>)
     end
 
     # Return examples: "Displaying items 41-60 of 324 in total" or "Displaying Products 41-60 of 324 in total"
-    def pagy_info(pagy, pagy_id: nil, item_name: nil, i18n_key: nil)
-      p_id    = %( id="#{pagy_id}") if pagy_id
+    def pagy_info(pagy, id: nil, item_name: nil)
+      id      = %( id="#{id}") if id
       p_count = pagy.count
-      key     = if    p_count.zero?   then 'pagy.info.no_items'
-                elsif pagy.pages == 1 then 'pagy.info.single_page'
-                else                       'pagy.info.multiple_pages' # rubocop:disable Lint/ElseLayout
+      key     = if p_count.zero?
+                  'pagy.info.no_items'
+                elsif pagy.pages == 1
+                  'pagy.info.single_page'
+                else
+                  'pagy.info.multiple_pages'
                 end
 
-      %(<span#{p_id} class="pagy-info">#{
-          pagy_t key, item_name: item_name || pagy_t(i18n_key || pagy.vars[:i18n_key], count: p_count),
+      %(<span#{id} class="pagy info">#{
+          pagy_t key, item_name: item_name || pagy_t('pagy.item_name', count: p_count),
                       count: p_count, from: pagy.from, to: pagy.to
         }</span>)
     end
 
-    # Return a performance optimized proc to generate the HTML links
+    # Return a performance optimized lambda to generate the HTML anchor element (a tag)
     # Benchmarked on a 20 link nav: it is ~22x faster and uses ~18x less memory than rails' link_to
-    def pagy_link_proc(pagy, link_extra: '')
-      p_prev      = pagy.prev
-      p_next      = pagy.next
-      left, right = %(<a href="#{pagy_url_for pagy, PAGE_PLACEHOLDER}" #{
-                        pagy.vars[:link_extra]} #{link_extra}).split(PAGE_PLACEHOLDER, 2)
-      lambda do |page, text = pagy.label_for(page), extra_attrs = ''|
-        %(#{left}#{page}#{right}#{ case page
-                                   when p_prev then ' rel="prev"'
-                                   when p_next then ' rel="next"'
-                                   else             ''
-                                   end } #{extra_attrs}>#{text}</a>)
+    def pagy_anchor(pagy)
+      a_string    = pagy.vars[:anchor_string]
+      a_string    = %( #{a_string}) if a_string
+      left, right = %(<a#{a_string} href="#{pagy_url_for(pagy, PAGE_TOKEN)}").split(PAGE_TOKEN, 2)
+      # lambda used by all the helpers
+      lambda do |page, text = pagy.label_for(page), classes: nil, aria_label: nil|
+        classes    = %( class="#{classes}") if classes
+        aria_label = %( aria-label="#{aria_label}") if aria_label
+        %(#{left}#{page}#{right}#{classes}#{aria_label}>#{text}</a>)
       end
     end
 
@@ -79,5 +73,28 @@ class Pagy
     def pagy_t(key, opts = {})
       Pagy::I18n.translate(@pagy_locale ||= nil, key, opts)
     end
+
+    private
+
+    def nav_aria_label(pagy, aria_label: nil)
+      aria_label ||= pagy_t('pagy.aria_label.nav', count: pagy.pages)
+      %(aria-label="#{aria_label}")
+    end
+
+    def prev_a(pagy, a, text: pagy_t('pagy.prev'), aria_label: pagy_t('pagy.aria_label.prev'))
+      if (p_prev = pagy.prev)
+        a.(p_prev, text, aria_label:)
+      else
+        %(<a role="link" aria-disabled="true" aria-label="#{aria_label}">#{text}</a>)
+      end
+    end
+
+    def next_a(pagy, a, text: pagy_t('pagy.next'), aria_label: pagy_t('pagy.aria_label.next'))
+      if (p_next = pagy.next)
+        a.(p_next, text, aria_label:)
+      else
+        %(<a role="link" aria-disabled="true" aria-label="#{aria_label}">#{text}</a>)
+      end
+    end
   end
 end

data/lib/pagy/i18n.rb

@@ -1,4 +1,4 @@
-# See Pagy::I18n API documentation https://ddnexus.github.io/pagy/api/i18n
+# See Pagy::I18n API documentation https://ddnexus.github.io/pagy/docs/api/i18n
 # frozen_string_literal: true
 
 require 'yaml'
@@ -94,7 +94,9 @@ class Pagy
       # the :one_other RULE is the default for locales missing from this list
       LOCALE = Hash.new(RULE[:one_other]).tap do |hash|
                  hash['ar']    = RULE[:arabic]
+                 hash['be']    = RULE[:east_slavic]
                  hash['bs']    = RULE[:east_slavic]
+                 hash['ckb']   = RULE[:other]
                  hash['cs']    = RULE[:west_slavic]
                  hash['id']    = RULE[:other]
                  hash['fr']    = RULE[:one_upto_two_other]
@@ -105,10 +107,9 @@ class Pagy
                  hash['pl']    = RULE[:polish]
                  hash['ru']    = RULE[:east_slavic]
                  hash['sr']    = RULE[:east_slavic]
-                 hash['sv']    = RULE[:one_two_other]
-                 hash['sv-SE'] = RULE[:one_two_other]
                  hash['tr']    = RULE[:other]
                  hash['uk']    = RULE[:east_slavic]
+                 hash['vi']    = RULE[:other]
                  hash['zh-CN'] = RULE[:other]
                  hash['zh-HK'] = RULE[:other]
                  hash['zh-TW'] = RULE[:other]

data/lib/pagy/url_helpers.rb

@@ -6,33 +6,21 @@ class Pagy
     # Return the URL for the page, relying on the params method and Rack by default.
     # It supports all Rack-based frameworks (Sinatra, Padrino, Rails, ...).
     # For non-rack environments you can use the standalone extra
-    def pagy_url_for(pagy, page, absolute: nil)
-      vars                = pagy.vars
-      page_param          = vars[:page_param].to_s
-      items_param         = vars[:items_param].to_s
-      params              = pagy.params.is_a?(Hash) ? pagy.params.transform_keys(&:to_s) : {}
-      params              = request.GET.merge(params)
-      params[page_param]  = page
-      params[items_param] = vars[:items] if vars[:items_extra]
-      query_string        = "?#{Rack::Utils.build_nested_query(pagy_deprecated_params(pagy, params))}"  # remove in 6.0
-      # params              = pagy.params.call(params) if pagy.params.is_a?(Proc)                       # add in 6.0
-      # query_string        = "?#{Rack::Utils.build_nested_query(params)}"                              # add in 6.0
-      "#{request.base_url if absolute}#{request.path}#{query_string}#{vars[:fragment]}"
+    def pagy_url_for(pagy, page, absolute: false, **_)
+      vars         = pagy.vars
+      query_params = request.GET.clone
+      query_params.merge!(vars[:params].transform_keys(&:to_s)) if vars[:params].is_a?(Hash)
+      pagy_set_query_params(page, vars, query_params)
+      query_params = vars[:params].(query_params) if vars[:params].is_a?(Proc)
+      query_string = "?#{Rack::Utils.build_nested_query(query_params)}"
+      "#{request.base_url if absolute}#{vars[:request_path] || request.path}#{query_string}#{vars[:fragment]}"
     end
 
-    private
-
-    # Transitional code to handle params deprecations. It will be removed in version 6.0
-    def pagy_deprecated_params(pagy, params)    # remove in 6.0
-      if pagy.params.is_a?(Proc)                # new code
-        pagy.params.call(params)
-      elsif respond_to?(:pagy_massage_params)   # deprecated code
-        Warning.warn '[PAGY WARNING] The pagy_massage_params method has been deprecated and it will be ignored from version 6. ' \
-                     'Set the :params variable to a Proc with the same code as the pagy_massage_params method.'
-        pagy_massage_params(params)
-      else
-        params                                  # no massage params
-      end
+    # Add the page and items params
+    # Overridable by the jsonapi extra
+    def pagy_set_query_params(page, vars, query_params)
+      query_params[vars[:page_param].to_s]  = page
+      query_params[vars[:items_param].to_s] = vars[:items] if vars[:items_extra]
     end
   end
 end