pagy 5.7.5 → 8.6.2

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:
@@ -16,7 +16,7 @@ class Pagy # :nodoc:
     def pagy_array_get_vars(array, vars)
       pagy_set_items_from_params(vars) if defined?(ItemsExtra)
       vars[:count] ||= array.size
-      vars[:page]  ||= params[vars[:page_param] || DEFAULT[:page_param]]
+      vars[:page]  ||= pagy_get_page(vars)
       vars
     end
   end

data/lib/pagy/extras/bootstrap.rb

@@ -1,91 +1,95 @@
-# 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'
+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 BootstrapExtra
     # Pagination for bootstrap: it returns the html with the series of links to the pages
-    def pagy_bootstrap_nav(pagy, pagy_id: nil, link_extra: '', **vars)
-      p_id = %( id="#{pagy_id}") if pagy_id
-      link = pagy_link_proc(pagy, link_extra: %(class="page-link" #{link_extra}))
+    def pagy_bootstrap_nav(pagy, id: nil, classes: 'pagination', aria_label: nil, **vars)
+      id = %( id="#{id}") if id
+      a  = pagy_anchor(pagy)
 
-      html = +%(<nav#{p_id} class="pagy-bootstrap-nav" aria-label="pager"><ul class="pagination">)
-      html << pagy_bootstrap_prev_html(pagy, link)
+      html = %(<nav#{id} class="pagy-bootstrap nav" #{nav_aria_label(pagy, aria_label:)}><ul class="#{classes}">#{
+                 bootstrap_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
-                  %(<li class="page-item">#{link.call item}</li>)
+                  %(<li class="page-item">#{a.(item, classes: 'page-link')}</li>)
                 when String
-                  %(<li class="page-item active">#{link.call item}</li>)
+                  %(<li class="page-item active"><a role="link" class="page-link" aria-current="page" aria-disabled="true">#{
+                      pagy.label_for(item)}</a></li>)
                 when :gap
-                  %(<li class="page-item gap disabled"><a href="#" class="page-link">#{pagy_t 'pagy.nav.gap'}</a></li>)
+                  %(<li class="page-item gap disabled"><a role="link" class="page-link" aria-disabled="true">#{
+                      pagy_t('pagy.gap')}</a></li>)
                 else raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
                 end
       end
-      html << pagy_bootstrap_next_html(pagy, link)
-      html << %(</ul></nav>)
+      html << %(#{bootstrap_next_html(pagy, a)}</ul></nav>)
     end
 
-    # Javascript pagination for bootstrap: it returns a nav and a JSON tag used by the pagy.js file
-    def pagy_bootstrap_nav_js(pagy, pagy_id: nil, link_extra: '', **vars)
+    # Javascript pagination for bootstrap: it returns a nav with a data-pagy attribute used by the pagy.js file
+    def pagy_bootstrap_nav_js(pagy, id: nil, classes: 'pagination', aria_label: nil, **vars)
       sequels = pagy.sequels(**vars)
-      p_id = %( id="#{pagy_id}") if pagy_id
-      link = pagy_link_proc(pagy, link_extra: %(class="page-link" #{link_extra}))
-      tags = { 'before' => %(<ul class="pagination">#{pagy_bootstrap_prev_html pagy, link}),
-               'link'   => %(<li class="page-item">#{mark = link.call(PAGE_PLACEHOLDER, LABEL_PLACEHOLDER)}</li>),
-               'active' => %(<li class="page-item active">#{mark}</li>),
-               '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>) }
+      id      = %( id="#{id}") if id
+      a       = pagy_anchor(pagy)
+      tokens  = { 'before'  => %(<ul class="#{classes}">#{bootstrap_prev_html(pagy, a)}),
+                  'a'       => %(<li class="page-item">#{a.(PAGE_TOKEN, LABEL_TOKEN, classes: 'page-link')}</li>),
+                  'current' => %(<li class="page-item active"><a role="link" class="page-link" ) +
+                               %(aria-current="page" aria-disabled="true">#{LABEL_TOKEN}</a></li>),
+                  'gap'     => %(<li class="page-item gap disabled"><a role="link" class="page-link" aria-disabled="true">#{
+                                   pagy_t('pagy.gap')}</a></li>),
+                  'after'   => %(#{bootstrap_next_html pagy, a}</ul>) }
 
-      %(<nav#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-bootstrap-nav-js" aria-label="pager" #{
-        pagy_json_attr(pagy, :nav, tags, sequels, pagy.label_sequels(sequels))}></nav>)
+      %(<nav#{id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-bootstrap nav-js" #{
+          nav_aria_label(pagy, aria_label:)} #{
+          pagy_data(pagy, :nav, tokens, sequels, pagy.label_sequels(sequels))
+        }></nav>)
     end
 
-    # Javascript combo pagination for bootstrap: it returns a nav and a JSON tag used by the pagy.js file
-    def pagy_bootstrap_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}" class="text-primary" style="padding: 0; border: none; text-align: center; width: #{
-                    p_pages.to_s.length + 1}rem;">)
+    # Javascript combo pagination for bootstrap: it returns a nav with a data-pagy attribute used by the pagy.js file
+    def pagy_bootstrap_combo_nav_js(pagy, id: nil, classes: 'pagination', aria_label: nil)
+      id    = %( id="#{id}") if id
+      a     = pagy_anchor(pagy)
+      pages = pagy.pages
 
-      %(<nav#{p_id} class="pagy-bootstrap-combo-nav-js pagination" aria-label="pager"><div class="btn-group" role="group" #{
-          pagy_json_attr 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;">#{
-          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"'
-          else
-            %(<a class="next btn btn-primary disabled" href="#">#{pagy_t 'pagy.nav.next'}</a>)
-          end
-        }</div></nav>)
+      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; padding: 0; ) <<
+                   %(border: none; display: inline-block;" class="page-link active">#{JSTools::A_TAG})
+
+      %(<nav#{id} class="pagy-bootstrap combo-nav-js" #{
+          nav_aria_label(pagy, aria_label:)} #{
+          pagy_data(pagy, :combo, pagy_url_for(pagy, PAGE_TOKEN))
+        }><ul class="#{classes}">#{
+          bootstrap_prev_html(pagy, a)
+        }<li class="page-item pagy-bootstrap"><label class="page-link">#{
+          pagy_t('pagy.combo_nav_js', page_input:, pages:)
+        }</label></li>#{
+          bootstrap_next_html(pagy, a)
+        }</ul></nav>)
     end
 
     private
 
-    def pagy_bootstrap_prev_html(pagy, link)
+    def bootstrap_prev_html(pagy, a)
       if (p_prev = pagy.prev)
-        %(<li class="page-item prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</li>)
+        %(<li class="page-item prev">#{
+            a.(p_prev, pagy_t('pagy.prev'), classes: 'page-link', aria_label: pagy_t('pagy.aria_label.prev'))}</li>)
       else
-        %(<li class="page-item prev disabled"><a href="#" class="page-link">#{pagy_t 'pagy.nav.prev'}</a></li>)
+        %(<li class="page-item prev disabled"><a role="link" class="page-link" aria-disabled="true" aria-label="#{
+            pagy_t('pagy.aria_label.prev')}">#{pagy_t('pagy.prev')}</a></li>)
       end
     end
 
-    def pagy_bootstrap_next_html(pagy, link)
+    def bootstrap_next_html(pagy, a)
       if (p_next = pagy.next)
-        %(<li class="page-item next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</li>)
+        %(<li class="page-item next">#{
+            a.(p_next, pagy_t('pagy.next'), classes: 'page-link', aria_label: pagy_t('pagy.aria_label.next'))}</li>)
       else
-        %(<li class="page-item next disabled"><a href="#" class="page-link">#{pagy_t 'pagy.nav.next'}</a></li>)
+        %(<li class="page-item next disabled"><a role="link" class="page-link" aria-disabled="true" aria-label="#{
+            pagy_t('pagy.aria_label.next')}">#{pagy_t('pagy.next')}</a></li>)
       end
     end
   end

data/lib/pagy/extras/bulma.rb

@@ -1,92 +1,88 @@
-# 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'
+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 BulmaExtra
     # Pagination for bulma: it returns the html with the series of links to the pages
-    def pagy_bulma_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_bulma_nav(pagy, id: nil, classes: 'pagy-bulma nav pagination is-centered', aria_label: nil, **vars)
+      id = %( id="#{id}") if id
+      a  = pagy_anchor(pagy)
 
-      html = +%(<nav#{p_id} class="pagy-bulma-nav pagination is-centered" aria-label="pagination">)
-      html << pagy_bulma_prev_next_html(pagy, link)
+      html = %(<nav#{id} class="#{classes}" #{nav_aria_label(pagy, aria_label:)}>)
+      html << bulma_prev_next_html(pagy, a)
       html << %(<ul class="pagination-list">)
       pagy.series(**vars).each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
         html << case item
                 when Integer
-                  %(<li>#{link.call item, pagy.label_for(item), %(class="pagination-link" aria-label="goto page #{item}")}</li>)
+                  %(<li>#{a.(item, pagy.label_for(item), classes: 'pagination-link')}</li>)
                 when String
-                  %(<li>#{link.call item, pagy.label_for(item),
-                                    %(class="pagination-link is-current" aria-label="page #{item}" aria-current="page")}</li>)
+                  %(<li><a role="link" class="pagination-link is-current" aria-current="page" aria-disabled="true">#{
+                      pagy.label_for(item)}</a></li>)
                 when :gap
-                  %(<li><span class="pagination-ellipsis">#{pagy_t 'pagy.nav.gap'}</span></li>)
+                  %(<li><span class="pagination-ellipsis">#{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 << %(</ul></nav>)
     end
 
-    # Javascript pagination for bulma: it returns a nav and a JSON tag used by the Pagy.nav javascript
-    def pagy_bulma_nav_js(pagy, pagy_id: nil, link_extra: '', **vars)
+    # Javascript pagination for bulma: it returns a nav with a data-pagy attribute used by the Pagy.nav javascript
+    def pagy_bulma_nav_js(pagy, id: nil, classes: 'pagy-bulma nav-js pagination is-centered', 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_bulma_prev_next_html(pagy, link)}<ul class="pagination-list">),
-               'link'   => %(<li>#{link.call PAGE_PLACEHOLDER, LABEL_PLACEHOLDER,
-                                             %(class="pagination-link" aria-label="goto page #{PAGE_PLACEHOLDER}")}</li>),
-               'active' => %(<li>#{link.call PAGE_PLACEHOLDER, LABEL_PLACEHOLDER,
-                                             %(class="pagination-link is-current" aria-current="page" aria-label="page #{
-                                                 PAGE_PLACEHOLDER}")}</li>),
-               'gap'    => %(<li><span class="pagination-ellipsis">#{pagy_t 'pagy.nav.gap'}</span></li>),
-               'after'  => '</ul>' }
+      id      = %( id="#{id}") if id
+      a       = pagy_anchor(pagy)
+      tokens = { 'before'  => %(#{bulma_prev_next_html(pagy, a)}<ul class="pagination-list">),
+                 'a'       => %(<li>#{a.(PAGE_TOKEN, LABEL_TOKEN, classes: 'pagination-link')}</li>),
+                 'current' => %(<li><a role="link" class="pagination-link is-current" aria-current="page" aria-disabled="true">#{
+                                  LABEL_TOKEN}</a></li>),
+                 'gap'     => %(<li><span class="pagination-ellipsis">#{pagy_t 'pagy.gap'}</span></li>),
+                 'after'   => '</ul>' }
 
-      %(<nav#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-bulma-nav-js pagination is-centered" aria-label="pagination" #{
-        pagy_json_attr(pagy, :nav, tags, sequels, pagy.label_sequels(sequels))}></nav>)
+      %(<nav#{id} class="#{'pagy-rjs ' if sequels.size > 1}#{classes}" #{
+          nav_aria_label(pagy, aria_label:)} #{
+          pagy_data(pagy, :nav, tokens, sequels, pagy.label_sequels(sequels))
+        }></nav>)
     end
 
-    # Javascript combo pagination for bulma: it returns a nav and a JSON tag used by the pagy.js file
-    def pagy_bulma_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 class="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; margin:0 0.3rem;">)
+    # Javascript combo pagination for bulma: it returns a nav with a data-pagy attribute used by the pagy.js file
+    def pagy_bulma_combo_nav_js(pagy, id: nil, classes: 'pagy-bulma combo-nav-js pagination is-centered', aria_label: nil)
+      id    = %( id="#{id}") if id
+      a     = pagy_anchor(pagy)
+      pages = pagy.pages
 
-      html = %(<nav#{p_id} class="pagy-bulma-combo-nav-js" aria-label="pagination">)
-      %(#{html}<div class="field is-grouped is-grouped-centered" role="group" #{
-          pagy_json_attr pagy, :combo, pagy_marked_link(link)}>#{
-          if (p_prev  = pagy.prev)
-            %(<p class="control">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'class="button" aria-label="previous page"'}</p>)
-          else
-            %(<p class="control"><a class="button" disabled>#{pagy_t 'pagy.nav.prev'}</a></p>)
-          end
-        }<div class="pagy-combo-input control level is-mobile">#{
-          pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages}</div>#{
-          if (p_next  = pagy.next)
-            %(<p class="control">#{link.call p_next, pagy_t('pagy.nav.next'), 'class="button" aria-label="next page"'}</p>)
-          else
-            %(<p class="control"><a class="button" disabled>#{pagy_t 'pagy.nav.next'}</a></p>)
-          end
-        }</div></nav>)
+      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; height: 1.7rem; margin:0 0.3rem; ) <<
+                   %(border: none; border-radius: 4px; padding: 0; font-size: 1.1rem; color: white; ) <<
+                   %(background-color: #485fc7;">#{JSTools::A_TAG})
+
+      %(<nav#{id} class="#{classes}" #{
+          nav_aria_label(pagy, aria_label:)} #{
+          pagy_data(pagy, :combo, pagy_url_for(pagy, PAGE_TOKEN))
+        }>#{
+          bulma_prev_next_html(pagy, a)
+        }<ul class="pagination-list"><li class="pagination-link"><label>#{
+           pagy_t('pagy.combo_nav_js', page_input:, pages:)
+        }</label></li></ul></nav>)
     end
 
     private
 
-    def pagy_bulma_prev_next_html(pagy, link)
-      html = +if (p_prev = pagy.prev)
-                link.call p_prev, pagy_t('pagy.nav.prev'), 'class="pagination-previous" aria-label="previous page"'
-              else
-                %(<a class="pagination-previous" disabled>#{pagy_t 'pagy.nav.prev'}</a>)
-              end
+    def bulma_prev_next_html(pagy, a)
+      html = if (p_prev = pagy.prev)
+               a.(p_prev, pagy_t('pagy.prev'), classes: 'pagination-previous', aria_label: pagy_t('pagy.aria_label.prev'))
+             else
+               %(<a role="link" class="pagination-previous" disabled aria-disabled="true" aria-label="#{
+                   pagy_t('pagy.aria_label.prev')}">#{pagy_t 'pagy.prev'}</a>)
+             end
       html << if (p_next = pagy.next)
-                link.call p_next, pagy_t('pagy.nav.next'), 'class="pagination-next" aria-label="next page"'
+                a.(p_next, pagy_t('pagy.next'), classes: 'pagination-next', aria_label: pagy_t('pagy.aria_label.next'))
               else
-                %(<a class="pagination-next" disabled>#{pagy_t 'pagy.nav.next'}</a>)
+                %(<a role="link" class="pagination-next" disabled aria-disabled="true" aria-label="#{
+                    pagy_t('pagy.aria_label.next')}">#{pagy_t('pagy.next')}</a>)
               end
     end
   end

data/lib/pagy/extras/calendar.rb

@@ -1,66 +1,83 @@
-# 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_relative '../calendar'
 
 class Pagy # :nodoc:
   # Add pagination filtering by calendar unit (:year, :quarter, :month, :week, :day) to the regular pagination
   module CalendarExtra
     # Additions for the Backend module
-    module Backend
+    module BackendAddOn
       CONF_KEYS = (Calendar::UNITS + %i[pagy active]).freeze
 
       private
 
       # Take a collection and a conf Hash with keys in CONF_KEYS and return an array with 3 items: [calendar, pagy, results]
       def pagy_calendar(collection, conf)
-        unless conf.is_a?(Hash) && (conf.keys - CONF_KEYS).empty? && conf.all? { |k, v| v.is_a?(Hash) || k == :active }
-          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
-        [calendar, pagy, results]
-      end
+        raise ArgumentError, "keys must be in #{CONF_KEYS.inspect}" \
+              unless conf.is_a?(Hash) && (conf.keys - CONF_KEYS).empty?
 
-      # 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])
+        conf[:pagy] ||= {}
+        unless conf.key?(:active) && !conf[:active]
+          calendar, from, to = Calendar.send(:init, conf, pagy_calendar_period(collection), params)
+          if respond_to?(:pagy_calendar_counts)
+            calendar.each_key do |unit|
+              calendar[unit].vars[:counts] = pagy_calendar_counts(collection, unit, *calendar[unit].vars[:period])
+            end
+          end
+          collection = pagy_calendar_filter(collection, from, to)
         end
-        [calendar, pagy_calendar_filter(collection, last_obj.from, last_obj.to)]
+        pagy, results = send(conf[:pagy][:backend] || :pagy, collection, conf[:pagy])  # use backend: :pagy when omitted
+        [calendar, pagy, results]
       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
+
+    # Override the pagy_anchor
+    module FrontendOverride
+      # Consider the vars[:count]
+      def pagy_anchor(pagy)
+        return super unless (counts = pagy.vars[:counts])
+
+        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|
+          count     = counts[page - 1]
+          item_name = pagy_t('pagy.item_name', count:)
+          if count.zero?
+            classes = "#{classes && (classes + ' ')}empty-page"
+            title   = %( title="#{pagy_t('pagy.info.no_items', item_name:, count:)}")
+          else
+            title   = %( title="#{pagy_t('pagy.info.single_page', item_name:, count:)}")
+          end
+          classes    = %( class="#{classes}") if classes
+          aria_label = %( aria-label="#{aria_label}") if aria_label
+          %(#{left}#{page}#{right}#{title}#{classes}#{aria_label}>#{text}</a>)
+        end
+      end
+    end
+
+    # Additions for the Frontend module
+    module UrlHelperAddOn
+      # Return the url for the calendar page at time
+      def pagy_calendar_url_at(calendar, time, **opts)
+        pagy_url_for(calendar.send(:calendar_at, time, **opts), 1, **opts)
       end
     end
   end
-  Backend.prepend CalendarExtra::Backend
+  Backend.prepend CalendarExtra::BackendAddOn, CalendarExtra::UrlHelperAddOn
+  Frontend.prepend CalendarExtra::UrlHelperAddOn, CalendarExtra::FrontendOverride
 end

data/lib/pagy/extras/countless.rb

@@ -1,7 +1,7 @@
-# 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'
+require_relative '../countless'
 
 class Pagy # :nodoc:
   DEFAULT[:countless_minimal] = false
@@ -19,7 +19,7 @@ class Pagy # :nodoc:
     # Sub-method called only by #pagy_countless: here for easy customization of variables by overriding
     def pagy_countless_get_vars(_collection, vars)
       pagy_set_items_from_params(vars) if defined?(ItemsExtra)
-      vars[:page] ||= params[vars[:page_param] || DEFAULT[:page_param]]
+      vars[:page] ||= pagy_get_page(vars)
       vars
     end
 

data/lib/pagy/extras/elasticsearch_rails.rb

@@ -1,8 +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_method] ||= :pagy_search
+  DEFAULT[:elasticsearch_rails_search]      ||= :search
+  DEFAULT[:elasticsearch_rails_pagy_search] ||= :pagy_search
 
   # Paginate ElasticsearchRails response objects
   module ElasticsearchRailsExtra
@@ -18,7 +19,7 @@ class Pagy # :nodoc:
       total.is_a?(Hash) ? total['value'] : total
     end
 
-    module ElasticsearchRails # :nodoc:
+    module ModelExtension # :nodoc:
       # Return an array used to delay the call of #search
       # after the pagination variables are merged to the options.
       # It also pushes to the same array an optional method call.
@@ -27,11 +28,12 @@ class Pagy # :nodoc:
           args.define_singleton_method(:method_missing) { |*a| args += a }
         end
       end
-      alias_method Pagy::DEFAULT[:elasticsearch_rails_search_method], :pagy_elasticsearch_rails
+      alias_method Pagy::DEFAULT[:elasticsearch_rails_pagy_search], :pagy_elasticsearch_rails
     end
+    Pagy::ElasticsearchRails = ModelExtension
 
     # Additions for the Pagy class
-    module Pagy
+    module PagyAddOn
       # Create a Pagy object from an Elasticsearch::Model::Response::Response object
       def new_from_elasticsearch_rails(response, vars = {})
         vars[:items] = response.search.options[:size] || 10
@@ -40,9 +42,10 @@ class Pagy # :nodoc:
         new(vars)
       end
     end
+    Pagy.extend PagyAddOn
 
     # Add specialized backend methods to paginate ElasticsearchRails searches
-    module Backend
+    module BackendAddOn
       private
 
       # Return Pagy object and items
@@ -52,7 +55,7 @@ class Pagy # :nodoc:
         vars             = pagy_elasticsearch_rails_get_vars(nil, vars)
         options[:size]   = vars[:items]
         options[:from]   = vars[:items] * (vars[:page] - 1)
-        response         = model.search(query_or_payload, **options)
+        response         = model.send(DEFAULT[:elasticsearch_rails_search], query_or_payload, **options)
         vars[:count]     = ElasticsearchRailsExtra.total_count(response)
 
         pagy = ::Pagy.new(vars)
@@ -68,12 +71,10 @@ class Pagy # :nodoc:
       def pagy_elasticsearch_rails_get_vars(_collection, vars)
         pagy_set_items_from_params(vars) if defined?(ItemsExtra)
         vars[:items] ||= DEFAULT[:items]
-        vars[:page]  ||= (params[vars[:page_param] || DEFAULT[:page_param]] || 1).to_i
+        vars[:page]  ||= pagy_get_page(vars)
         vars
       end
     end
+    Backend.prepend BackendAddOn
   end
-  ElasticsearchRails = ElasticsearchRailsExtra::ElasticsearchRails
-  extend ElasticsearchRailsExtra::Pagy
-  Backend.prepend ElasticsearchRailsExtra::Backend
 end