pagy 5.10.1 → 6.0.1

data/lib/pagy/calendar.rb

@@ -1,4 +1,4 @@
-# See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/api/calendar
+# See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/docs/api/calendar
 # frozen_string_literal: true
 
 require 'active_support'
@@ -12,6 +12,9 @@ require 'pagy'
 class Pagy # :nodoc:
   # Base class for time units subclasses (Year, Quarter, Month, Week, Day)
   class Calendar < Pagy
+    # Specific out of range error
+    class OutOfRangeError < StandardError; end
+
     # List of units in desc order of duration. It can be used for custom units.
     UNITS = %i[year quarter month week day]  # rubocop:disable Style/MutableConstant
 
@@ -45,6 +48,14 @@ class Pagy # :nodoc:
 
     protected
 
+    # The page that includes time
+    def page_at(time)
+      raise OutOfRangeError unless time.between?(@initial, @final)
+
+      offset = page_offset_at(time)   # offset starts from 0
+      @order == :asc ? offset + 1 : @pages - offset
+    end
+
     # Base class method for the setup of the unit variables (subclasses must implement it and call super)
     def setup_unit_vars
       raise VariableError.new(self, :format, 'to be a strftime format', @vars[:format]) unless @vars[:format].is_a?(String)
@@ -52,10 +63,9 @@ class Pagy # :nodoc:
             unless %i[asc desc].include?(@order = @vars[:order])
 
       @starting, @ending = @vars[:period]
-      raise VariableError.new(self, :period, 'to be a an Array of min and max local Time instances', @vars[:period]) \
-            unless @starting.is_a?(Time) && @ending.is_a?(Time) && !@starting.utc? && !@ending.utc? && @starting <= @ending
-
-      @with_zone = @starting.is_a?(ActiveSupport::TimeWithZone) # remove in 6.0 and replace Time in the line above
+      raise VariableError.new(self, :period, 'to be a an Array of min and max TimeWithZone instances', @vars[:period]) \
+            unless @starting.is_a?(ActiveSupport::TimeWithZone) \
+                && @ending.is_a?(ActiveSupport::TimeWithZone) && @starting <= @ending
     end
 
     # Apply the strftime format to the time (overridden by the i18n extra when localization is required)
@@ -63,9 +73,9 @@ class Pagy # :nodoc:
       time.strftime(opts[:format])
     end
 
-    # Number of units to offset from the @initial time, in order to get the ordered starting time for the page.
-    # Used in starting_time_for(page) with a logic equivalent to: @initial + (offset_units_for(page) * unit_time_length)
-    def offset_units_for(page)
+    # Number of time units to offset from the @initial time, in order to get the ordered starting time for the page.
+    # Used in starting_time_for(page) where page starts from 1 (e.g. page to starting_time means subtracting 1)
+    def time_offset_for(page)
       @order == :asc ? page - 1 : @pages - page
     end
 

data/lib/pagy/console.rb

@@ -1,4 +1,4 @@
-# See Pagy::Console API documentation: https://ddnexus.github.io/pagy/api/console
+# See Pagy::Console API documentation: https://ddnexus.github.io/pagy/docs/api/console
 # frozen_string_literal: true
 
 require 'pagy'  # so you can require just the extra in the console

data/lib/pagy/countless.rb

@@ -1,4 +1,4 @@
-# See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/api/countless
+# See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/docs/api/countless
 # frozen_string_literal: true
 
 require 'pagy'
@@ -30,7 +30,7 @@ class Pagy
 
     # Override the original series.
     # Return nil if :countless_minimal is enabled
-    def series(*)
+    def series(*, **)
       super unless @vars[:countless_minimal]
     end
   end

data/lib/pagy/extras/arel.rb

@@ -1,4 +1,4 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/arel
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/arel
 # frozen_string_literal: true
 
 class Pagy # :nodoc:

data/lib/pagy/extras/array.rb

@@ -1,4 +1,4 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/array
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/array
 # frozen_string_literal: true
 
 class Pagy # :nodoc:

data/lib/pagy/extras/bootstrap.rb

@@ -1,4 +1,4 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/bootstrap
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/bootstrap
 # frozen_string_literal: true
 
 require 'pagy/extras/frontend_helpers'
@@ -12,7 +12,7 @@ class Pagy # :nodoc:
       p_id = %( id="#{pagy_id}") if pagy_id
       link = pagy_link_proc(pagy, link_extra: %(class="page-link" #{link_extra}))
 
-      html = +%(<nav#{p_id} class="pagy-bootstrap-nav" aria-label="pager"><ul class="pagination">)
+      html = +%(<nav#{p_id} class="pagy-bootstrap-nav"><ul class="pagination">)
       html << pagy_bootstrap_prev_html(pagy, link)
       pagy.series(**vars).each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
         html << case item
@@ -40,7 +40,7 @@ class Pagy # :nodoc:
                'gap'    => %(<li class="page-item gap disabled"><a href="#" class="page-link">#{pagy_t 'pagy.nav.gap'}</a></li>),
                'after'  => %(#{pagy_bootstrap_next_html pagy, link}</ul>) }
 
-      %(<nav#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-bootstrap-nav-js" aria-label="pager" #{
+      %(<nav#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-bootstrap-nav-js" #{
         pagy_data(pagy, :nav, tags, sequels, pagy.label_sequels(sequels))}></nav>)
     end
 
@@ -51,17 +51,17 @@ class Pagy # :nodoc:
       p_page  = pagy.page
       p_pages = pagy.pages
       input   = %(<input type="number" min="1" max="#{p_pages}" value="#{
-                    p_page}" class="text-primary" style="padding: 0; border: none; text-align: center; width: #{
+                    p_page}" style="padding: 0; border: none; text-align: center; width: #{
                     p_pages.to_s.length + 1}rem;">)
 
-      %(<nav#{p_id} class="pagy-bootstrap-combo-nav-js pagination" aria-label="pager"><div class="btn-group" role="group" #{
+      %(<nav#{p_id} class="pagy-bootstrap-combo-nav-js pagination"><div class="btn-group" role="group" #{
           pagy_data(pagy, :combo, pagy_marked_link(link))}>#{
           if (p_prev = pagy.prev)
             link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous" class="prev btn btn-primary"'
           else
             %(<a class="prev btn btn-primary disabled" href="#">#{pagy_t('pagy.nav.prev')}</a>)
           end
-        }<div class="pagy-combo-input btn btn-primary disabled" style="white-space: nowrap;">#{
+        }<div class="pagy-combo-input btn btn-secondary" style="white-space: nowrap;">#{
           pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages}</div>#{
           if (p_next  = pagy.next)
             link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next" class="next btn btn-primary"'

data/lib/pagy/extras/bulma.rb

@@ -1,4 +1,4 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/bulma
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/bulma
 # frozen_string_literal: true
 
 require 'pagy/extras/frontend_helpers'

data/lib/pagy/extras/calendar.rb

@@ -1,7 +1,8 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/calendar
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/calendar
 # frozen_string_literal: true
 
 require 'pagy/calendar'
+require 'pagy/calendar/helper'
 
 class Pagy # :nodoc:
   # Add pagination filtering by calendar unit (:year, :quarter, :month, :week, :day) to the regular pagination
@@ -18,47 +19,29 @@ class Pagy # :nodoc:
           raise ArgumentError, "keys must be in #{CONF_KEYS.inspect} and object values must be Hashes; got #{conf.inspect}"
         end
 
-        conf[:pagy]          = {} unless conf[:pagy]  # use default Pagy object when omitted
-        calendar, collection = pagy_setup_calendar(collection, conf) unless conf.key?(:active) && !conf[:active]
-        pagy, results        = send(conf[:pagy][:backend] || :pagy, collection, conf[:pagy])  # use backend: :pagy when omitted
+        conf[:pagy] = {} unless conf[:pagy]  # use default Pagy object when omitted
+        unless conf.key?(:active) && !conf[:active]
+          calendar, from, to = Calendar::Helper.send(:init, conf, pagy_calendar_period(collection), params)
+          collection         = pagy_calendar_filter(collection, from, to)
+        end
+        pagy, results = send(conf[:pagy][:backend] || :pagy, collection, conf[:pagy])  # use backend: :pagy when omitted
         [calendar, pagy, results]
       end
 
-      # Setup and return the calendar objects and the filtered collection
-      def pagy_setup_calendar(collection, conf)
-        units = Calendar::UNITS & conf.keys # get the units in time length desc order
-        raise ArgumentError, 'no calendar unit found in pagy_calendar configuration' if units.empty?
-
-        page_param = conf[:pagy][:page_param] || DEFAULT[:page_param]
-        units.each do |unit|  # set all the :page_param vars for later deletion
-          unit_page_param         = :"#{unit}_#{page_param}"
-          conf[unit][:page_param] = unit_page_param
-          conf[unit][:page]       = params[unit_page_param]
-        end
-        calendar = {}
-        last_obj = nil
-        units.each_with_index do |unit, index|
-          params_to_delete    = units[(index + 1), units.size].map { |sub| conf[sub][:page_param] } + [page_param]
-          conf[unit][:params] = lambda do |params|  # delete page_param from the sub-units
-                                  params_to_delete.each { |p| params.delete(p.to_s) } # Hash#except missing from ruby 2.5 baseline
-                                  params
-                                end
-          conf[unit][:period] = last_obj&.send(:active_period) || pagy_calendar_period(collection)
-          calendar[unit]      = last_obj = Calendar.send(:create, unit, conf[unit])
-        end
-        [calendar, pagy_calendar_filter(collection, last_obj.from, last_obj.to)]
+      def pagy_calendar_url_at(calendar, time)
+        pagy_url_for(calendar.send(:last_object_at, time), 1)
       end
 
       # This method must be implemented by the application
       def pagy_calendar_period(*)
         raise NoMethodError, 'the pagy_calendar_period method must be implemented by the application ' \
-                             '(see https://ddnexus.github.io/pagy/extras/calendar#pagy_calendar_periodcollection)'
+                             '(see https://ddnexus.github.io/pagy/docs/extras/calendar/#pagy-calendar-period-collection)'
       end
 
       # This method must be implemented by the application
       def pagy_calendar_filter(*)
         raise NoMethodError, 'the pagy_calendar_filter method must be implemented by the application ' \
-                             '(see https://ddnexus.github.io/pagy/extras/calendar#pagy_calendar_filtercollection-from-to)'
+                             '(see https://ddnexus.github.io/pagy/docs/extras/calendar/#pagy-calendar-filter-collection-from-to)'
       end
     end
   end

data/lib/pagy/extras/countless.rb

@@ -1,4 +1,4 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/countless
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/countless
 # frozen_string_literal: true
 
 require 'pagy/countless'

data/lib/pagy/extras/elasticsearch_rails.rb

@@ -1,18 +1,9 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/elasticsearch_rails
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/elasticsearch_rails
 # frozen_string_literal: true
 
 class Pagy # :nodoc:
   DEFAULT[:elasticsearch_rails_search]      ||= :search
-  DEFAULT[:elasticsearch_rails_pagy_search] ||= if DEFAULT[:elasticsearch_rails_search_method]  #  remove in 6.0
-                                                  # :nocov:
-                                                  Warning.warn '[PAGY WARNING] The :elasticsearch_rails_search_method variable ' \
-                                                               'has been deprecated and will be ignored from pagy 6. ' \
-                                                               'Use :elasticsearch_rails_pagy_search instead.'
-                                                  DEFAULT[:elasticsearch_rails_search_method]
-                                                  # :nocov:
-                                                else
-                                                  :pagy_search
-                                                end
+  DEFAULT[:elasticsearch_rails_pagy_search] ||= :pagy_search
 
   # Paginate ElasticsearchRails response objects
   module ElasticsearchRailsExtra

data/lib/pagy/extras/foundation.rb

@@ -1,4 +1,4 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/foundation
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/foundation
 # frozen_string_literal: true
 
 require 'pagy/extras/frontend_helpers'

data/lib/pagy/extras/gearbox.rb

@@ -1,4 +1,4 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/gearbox
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/gearbox
 # frozen_string_literal: true
 
 class Pagy # :nodoc:

data/lib/pagy/extras/headers.rb

@@ -1,4 +1,4 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/headers
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/headers
 # frozen_string_literal: true
 
 require 'pagy/url_helpers'

data/lib/pagy/extras/i18n.rb

@@ -1,4 +1,4 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/i18n
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/i18n
 # frozen_string_literal: true
 
 class Pagy # :nodoc:

data/lib/pagy/extras/items.rb

@@ -1,4 +1,4 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/items
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/items
 # frozen_string_literal: true
 
 require 'pagy/extras/frontend_helpers'

data/lib/pagy/extras/materialize.rb

@@ -1,4 +1,4 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/materialize
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/materialize
 # frozen_string_literal: true
 
 require 'pagy/extras/frontend_helpers'
@@ -12,7 +12,7 @@ class Pagy # :nodoc:
       p_id = %( id="#{pagy_id}") if pagy_id
       link = pagy_link_proc(pagy, link_extra: link_extra)
 
-      html = +%(<div#{p_id} class="pagy-materialize-nav pagination" role="navigation" aria-label="pager"><ul class="pagination">)
+      html = +%(<div#{p_id} class="pagy-materialize-nav pagination" role="navigation"><ul class="pagination">)
       html << pagy_materialize_prev_html(pagy, link)
       pagy.series(**vars).each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
         html << case item
@@ -38,7 +38,7 @@ class Pagy # :nodoc:
                'gap'    => %(<li class="gap disabled"><a href="#">#{pagy_t 'pagy.nav.gap'}</a></li>),
                'after'  => %(#{pagy_materialize_next_html pagy, link}</ul>) }
 
-      %(<div#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-materialize-nav-js" role="navigation" aria-label="pager" #{
+      %(<div#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-materialize-nav-js" role="navigation" #{
         pagy_data(pagy, :nav, tags, sequels, pagy.label_sequels(sequels))}></div>)
     end
 
@@ -53,7 +53,7 @@ class Pagy # :nodoc:
                     p_page}" style="text-align: center; width: #{p_pages.to_s.length + 1}rem;">)
 
       html = %(<ul#{p_id} class="pagy-materialize-combo-nav-js pagination chip" role="navigation")
-      %(#{html} aria-label="pager" style="padding-right: 0" #{
+      %(#{html} style="padding-right: 0" #{
           pagy_data(pagy, :combo, pagy_marked_link(link))}>#{
           pagy_materialize_prev_html pagy, link, style}<li class="pagy-combo-input">#{
           pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages}</li>#{

data/lib/pagy/extras/meilisearch.rb

@@ -2,16 +2,8 @@
 
 class Pagy # :nodoc:
   DEFAULT[:meilisearch_search]      ||= :ms_search
-  DEFAULT[:meilisearch_pagy_search] ||= if DEFAULT[:meilisearch_search_method]   # remove in 6.0
-                                          # :nocov:
-                                          Warning.warn '[PAGY WARNING] The :meilisearch_search_method variable ' \
-                                                       'has been deprecated and will be ignored from pagy 6. ' \
-                                                       'Use :meilisearch_pagy_search instead.'
-                                          DEFAULT[:meilisearch_search_method]
-                                          # :nocov:
-                                        else
-                                          :pagy_search
-                                        end
+  DEFAULT[:meilisearch_pagy_search] ||= :pagy_search
+
   # Paginate Meilisearch results
   module MeilisearchExtra
     module Meilisearch # :nodoc:
@@ -27,9 +19,10 @@ class Pagy # :nodoc:
     module Pagy
       # Create a Pagy object from a Meilisearch results
       def new_from_meilisearch(results, vars = {})
-        vars[:items] = results.raw_answer['limit']
-        vars[:page]  = (results.raw_answer['offset'] / vars[:items]) + 1
-        vars[:count] = results.raw_answer['nbHits']
+        vars[:items] = results.raw_answer['hitsPerPage']
+        vars[:page]  = results.raw_answer['page']
+        vars[:count] = results.raw_answer['totalHits']
+
         new(vars)
       end
     end
@@ -40,13 +33,14 @@ class Pagy # :nodoc:
 
       # Return Pagy object and results
       def pagy_meilisearch(pagy_search_args, vars = {})
-        model, term, options = pagy_search_args
-        vars                 = pagy_meilisearch_get_vars(nil, vars)
-        options[:limit]      = vars[:items]
-        options[:offset]     = (vars[:page] - 1) * vars[:items]
-        results              = model.send(DEFAULT[:meilisearch_search], term, **options)
-        vars[:count]         = results.raw_answer['nbHits']
-        pagy                 = ::Pagy.new(vars)
+        model, term, options    = pagy_search_args
+        vars                    = pagy_meilisearch_get_vars(nil, vars)
+        options[:hits_per_page] = vars[:items]
+        options[:page]          = vars[:page]
+        results                 = model.send(:ms_search, term, **options)
+        vars[:count]            = results.raw_answer['totalHits']
+
+        pagy                    = ::Pagy.new(vars)
         # with :last_page overflow we need to re-run the method in order to get the hits
         return pagy_meilisearch(pagy_search_args, vars.merge(page: pagy.page)) \
                if defined?(::Pagy::OverflowExtra) && pagy.overflow? && pagy.vars[:overflow] == :last_page

data/lib/pagy/extras/metadata.rb

@@ -1,4 +1,4 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/metadata
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/metadata
 # frozen_string_literal: true
 
 require 'pagy/url_helpers'

data/lib/pagy/extras/navs.rb

@@ -1,4 +1,4 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/navs
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/navs
 # frozen_string_literal: true
 
 require 'pagy/extras/frontend_helpers'
@@ -18,7 +18,7 @@ class Pagy # :nodoc:
                'gap'    => %(<span class="page gap">#{pagy_t 'pagy.nav.gap'}</span> ),
                'after'  => pagy_nav_next_html(pagy, link) }
 
-      %(<nav#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-nav-js pagination" aria-label="pager" #{
+      %(<nav#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-nav-js pagination" #{
         pagy_data(pagy, :nav, tags, sequels, pagy.label_sequels(sequels))}></nav>)
     end
 
@@ -31,7 +31,7 @@ class Pagy # :nodoc:
       input   = %(<input type="number" min="1" max="#{p_pages}" value="#{
                     p_page}" style="padding: 0; text-align: center; width: #{p_pages.to_s.length + 1}rem;">)
 
-      %(<nav#{p_id} class="pagy-combo-nav-js pagination" aria-label="pager" #{
+      %(<nav#{p_id} class="pagy-combo-nav-js pagination" #{
           pagy_data(pagy, :combo, pagy_marked_link(link))}>#{
           pagy_nav_prev_html pagy, link
         }<span class="pagy-combo-input" style="margin: 0 0.6rem;">#{

data/lib/pagy/extras/overflow.rb

@@ -1,4 +1,4 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/overflow
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/overflow
 # frozen_string_literal: true
 
 class Pagy # :nodoc:
@@ -41,7 +41,7 @@ class Pagy # :nodoc:
 
       # Special series for empty page
       module Series
-        def series(*)
+        def series(*, **)
           @page = @last                                # series for last page
           super.tap do |s|                             # call original series
             s[s.index(@page.to_s)] = @page             # string to integer (i.e. no current page)

data/lib/pagy/extras/searchkick.rb

@@ -1,18 +1,10 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/searchkick
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/searchkick
 # frozen_string_literal: true
 
 class Pagy # :nodoc:
   DEFAULT[:searchkick_search]      ||= :search
-  DEFAULT[:searchkick_pagy_search] ||= if DEFAULT[:searchkick_search_method]   # remove in 6.0
-                                         # :nocov:
-                                         Warning.warn '[PAGY WARNING] The :searchkick_search_method variable ' \
-                                                      'has been deprecated and will be ignored from pagy 6. ' \
-                                                      'Use :searchkick_pagy_search instead.'
-                                         DEFAULT[:searchkick_search_method]
-                                         # :nocov:
-                                       else
-                                         :pagy_search
-                                       end
+  DEFAULT[:searchkick_pagy_search] ||= :pagy_search
+
   # Paginate Searchkick::Results objects
   module SearchkickExtra
     module Searchkick # :nodoc:

data/lib/pagy/extras/semantic.rb

@@ -1,4 +1,4 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/semantic
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/semantic
 # frozen_string_literal: true
 
 require 'pagy/extras/frontend_helpers'

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
 
@@ -32,6 +33,7 @@ class Pagy # :nodoc:
         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.
@@ -45,9 +47,8 @@ class Pagy # :nodoc:
       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
+      params              = pagy.params.call(params) if pagy.params.is_a?(Proc)
+      query_string        = "?#{QueryUtils.build_nested_query(params)}"
       query_string        = query_string.gsub('&', '&') if html_escaped  # the only unescaped entity
       "#{vars[:url]}#{query_string}#{vars[:fragment]}"
     end

data/lib/pagy/extras/support.rb

@@ -1,4 +1,4 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/support
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/support
 # frozen_string_literal: true
 
 class Pagy # :nodoc:

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:

data/lib/pagy/extras/uikit.rb

@@ -1,4 +1,4 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/uikit
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/uikit
 # frozen_string_literal: true
 
 require 'pagy/extras/frontend_helpers'

data/lib/pagy/frontend.rb

@@ -1,4 +1,4 @@
-# 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'
@@ -21,7 +21,7 @@ class Pagy
       p_prev = pagy.prev
       p_next = pagy.next
 
-      html = +%(<nav#{p_id} class="pagy-nav pagination" aria-label="pager">)
+      html = +%(<nav#{p_id} class="pagy-nav pagination">)
       html << if p_prev
                 %(<span class="page prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</span> )
               else

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'

data/lib/pagy/url_helpers.rb

@@ -8,32 +8,17 @@ class Pagy
     # For non-rack environments you can use the standalone extra
     def pagy_url_for(pagy, page, absolute: false, html_escaped: false)
       vars                = pagy.vars
+      request_path        = vars[:request_path].to_s.empty? ? request.path : vars[:request_path]
       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
+      params              = pagy.params.call(params) if pagy.params.is_a?(Proc)
+      query_string        = "?#{Rack::Utils.build_nested_query(params)}"
       query_string        = query_string.gsub('&', '&') if html_escaped  # the only unescaped entity
-      "#{request.base_url if absolute}#{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
+      "#{request.base_url if absolute}#{request_path}#{query_string}#{vars[:fragment]}"
     end
   end
 end

data/lib/pagy.rb

@@ -1,11 +1,11 @@
-# See Pagy API documentation: https://ddnexus.github.io/pagy/api/pagy
+# See Pagy API documentation: https://ddnexus.github.io/pagy/docs/api/pagy
 # frozen_string_literal: true
 
 require 'pathname'
 
 # Core class
 class Pagy
-  VERSION = '5.10.1'
+  VERSION = '6.0.1'
 
   # Root pathname to get the path of Pagy files like templates or dictionaries
   def self.root
@@ -22,9 +22,10 @@ class Pagy
               fragment:   '',
               link_extra: '',
               i18n_key:   'pagy.item_name',
-              cycle:      false }
+              cycle:      false,
+              request_path: '' }
 
-  attr_reader :count, :page, :items, :vars, :pages, :last, :offset, :in, :from, :to, :prev, :next, :params
+  attr_reader :count, :page, :items, :vars, :pages, :last, :offset, :in, :from, :to, :prev, :next, :params, :request_path
 
   # Merge and validate the options, do some simple arithmetic and set the instance variables
   def initialize(vars)
@@ -34,6 +35,7 @@ class Pagy
     setup_pages_var
     setup_offset_var
     setup_params_var
+    setup_request_path_var
     raise OverflowError.new(self, :page, "in 1..#{@last}", @page) if @page > @last
 
     @from   = [@offset - @outset + 1, @count].min
@@ -92,7 +94,7 @@ class Pagy
   def setup_vars(name_min)
     name_min.each do |name, min|
       raise VariableError.new(self, name, ">= #{min}", @vars[name]) \
-            unless @vars[name] && instance_variable_set(:"@#{name}", @vars[name].to_i) >= min
+            unless @vars[name]&.respond_to?(:to_i) && instance_variable_set(:"@#{name}", @vars[name].to_i) >= min
     end
   end
 
@@ -116,6 +118,16 @@ class Pagy
     raise VariableError.new(self, :params, 'must be a Hash or a Proc', @params) \
           unless (@params = @vars[:params]).is_a?(Hash) || @params.is_a?(Proc)
   end
+
+  def setup_request_path_var
+    request_path = @vars[:request_path]
+    return if request_path.to_s.empty?
+
+    raise VariableError.new(self, :request_path, 'must be a bare path like "/foo"', request_path) \
+          if !request_path.start_with?('/') || request_path.include?('?')
+
+    @request_path = request_path
+  end
 end
 
 require 'pagy/backend'

data/lib/templates/bootstrap_nav.html.erb

@@ -6,7 +6,7 @@
   Usage: link.call( page_number [, text [, extra_attributes_string ]])
 -%>
 <% link = pagy_link_proc(pagy, link_extra: 'class="page-link"') -%>
-<%#                            -%><nav aria-label="pager"  class="pagy-bootstrap-nav" role="navigation">
+<%#                            -%><nav class="pagy-bootstrap-nav" role="navigation">
 <%#                            -%>  <ul class="pagination">
 <% if pagy.prev                -%>    <li class="page-item prev"><%== link.call(pagy.prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"') %></li>
 <% else                        -%>    <li class="page-item prev disabled"><a href="#" class="page-link"><%== pagy_t('pagy.nav.prev') %></a></li>