pagy 6.0.0 → 7.0.0

data/lib/pagy/extras/headers.rb

@@ -1,13 +1,13 @@
-# 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'
 
 class Pagy # :nodoc:
-  DEFAULT[:headers] = { page:  'Current-Page',
-                        items: 'Page-Items',
-                        count: 'Total-Count',
-                        pages: 'Total-Pages' }
+  DEFAULT[:headers] = { page:  'current-page',
+                        items: 'page-items',
+                        count: 'total-count',
+                        pages: 'total-pages' }
   # Add specialized backend methods to add pagination response headers
   module HeadersExtra
     include UrlHelpers
@@ -22,7 +22,7 @@ class Pagy # :nodoc:
     # Generate a hash of RFC-8288 compliant http headers
     def pagy_headers(pagy)
       pagy_headers_hash(pagy).tap do |hash|
-        hash['Link'] = hash['Link'].map { |rel, link| %(<#{link}>; rel="#{rel}") }.join(', ')
+        hash['link'] = hash['link'].map { |rel, link| %(<#{link}>; rel="#{rel}") }.join(', ')
       end
     end
 
@@ -32,11 +32,11 @@ class Pagy # :nodoc:
       rel                   = { 'first' => 1, 'prev' => pagy.prev, 'next' => pagy.next }
       rel['last']           = pagy.last unless countless
       url_str               = pagy_url_for(pagy, PAGE_PLACEHOLDER, absolute: true)
-      link                  = rel.map do |r, num| # filter_map if ruby >=2.7
+      link                  = rel.filter_map do |r, num|
                                 next unless num # rubocop:disable Layout/EmptyLineAfterGuardClause
                                 [r, url_str.sub(PAGE_PLACEHOLDER, num.to_s)]
                               end.compact.to_h
-      hash                  = { 'Link' => link }
+      hash                  = { 'link' => link }
       headers               = pagy.vars[:headers]
       hash[headers[:page]]  = pagy.page.to_s if headers[:page]
       if headers[:items] && !(defined?(Calendar) && pagy.is_a?(Calendar))  # items is not for Calendar

data/lib/pagy/extras/i18n.rb

@@ -1,25 +1,25 @@
-# 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:
   # Use ::I18n gem
   module I18nExtra
     # Frontend overriding for translation
-    module Frontend
+    module FrontendOverride
       def pagy_t(key, **opts)
         ::I18n.t(key, **opts)
       end
     end
+    Frontend.prepend I18nExtra::FrontendOverride
 
     # Calendar overriding for localization (see also the block in the calendar section of the config/pagy.rb initializer)
-    module Calendar
+    module CalendarOverride
       def localize(time, opts)
         ::I18n.l(time, **opts)
       end
     end
   end
-  Frontend.prepend I18nExtra::Frontend
-  Calendar.prepend I18nExtra::Calendar if defined?(Calendar)
+  Calendar.prepend I18nExtra::CalendarOverride if defined?(Calendar)
 
   # Add the pagy locales to the I18n.load_path
   ::I18n.load_path += Dir[Pagy.root.join('locales', '*.yml')]

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'
@@ -11,44 +11,51 @@ class Pagy # :nodoc:
   # Allow the client to request a custom number of items per page with an optional selector UI
   module ItemsExtra
     # Additions for the Backend module
-    module Backend
+    module BackendAddOn
       private
 
       # Set the items variable considering the params and other pagy variables
       def pagy_set_items_from_params(vars)
         return if vars[:items]                                                             # :items explicitly set
         return unless vars.key?(:items_extra) ? vars[:items_extra] : DEFAULT[:items_extra] # :items_extra is false
-        return unless (items = params[vars[:items_param] || DEFAULT[:items_param]])        # no items from request params
+        return unless (items_count = pagy_get_items_size(vars))                            # no items from request params
 
-        vars[:items] = [items.to_i, vars.key?(:max_items) ? vars[:max_items] : DEFAULT[:max_items]].compact.min
+        vars[:items] = [items_count.to_i, vars.key?(:max_items) ? vars[:max_items] : DEFAULT[:max_items]].compact.min
+      end
+
+      # Get the items count from the params
+      # Overridable by the jsonapi extra
+      def pagy_get_items_size(vars)
+        params[vars[:items_param] || DEFAULT[:items_param]]
       end
     end
+    Backend.prepend ItemsExtra::BackendAddOn
 
     # Additions for the Frontend module
-    module Frontend
+    module FrontendAddOn
       ITEMS_PLACEHOLDER = '__pagy_items__'
 
       # Return the items selector HTML. For example "Show [20] items per page"
-      def pagy_items_selector_js(pagy, pagy_id: nil, item_name: nil, i18n_key: nil, link_extra: '')
+      def pagy_items_selector_js(pagy, pagy_id: nil, item_name: nil, item_i18n_key: nil, link_extra: '')
         return '' unless pagy.vars[:items_extra]
 
         p_id           = %( id="#{pagy_id}") if pagy_id
         p_vars         = pagy.vars
         p_items        = p_vars[:items]
         p_vars[:items] = ITEMS_PLACEHOLDER
-        link           = pagy_marked_link(pagy_link_proc(pagy, link_extra: link_extra))
+        link           = pagy_marked_link(pagy_link_proc(pagy, link_extra:))
         p_vars[:items] = p_items # restore the items
 
         html  = +%(<span#{p_id} class="pagy-items-selector-js" #{pagy_data(pagy, :selector, pagy.from, link)}>)
         input = %(<input type="number" min="1" max="#{p_vars[:max_items]}" value="#{
                     p_items}" style="padding: 0; text-align: center; width: #{p_items.to_s.length + 1}rem;">)
-        html << pagy_t('pagy.items_selector_js', item_name: item_name || pagy_t(i18n_key || p_vars[:i18n_key], count: p_items),
-                                                 items_input: input,
-                                                 count: p_items)
+        html << pagy_t('pagy.items_selector_js',
+                       item_name: item_name || pagy_t(item_i18n_key || p_vars[:item_i18n_key], count: p_items),
+                       items_input: input,
+                       count: p_items)
         html << %(</span>)
       end
     end
+    Frontend.prepend ItemsExtra::FrontendAddOn
   end
-  Backend.prepend ItemsExtra::Backend
-  Frontend.prepend ItemsExtra::Frontend
 end

data/lib/pagy/extras/jsonapi.rb

@@ -0,0 +1,79 @@
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/jsonapi
+# frozen_string_literal: true
+
+require 'pagy/url_helpers'
+
+class Pagy # :nodoc:
+  DEFAULT[:jsonapi] = true
+
+  # Add a specialized backend method compliant with JSON:API
+  module JsonApiExtra
+    # JsonApi :page param error
+    class ReservedParamError < StandardError
+      # Inform about the actual value
+      def initialize(value)
+        super("expected reserved :page param to be nil or Hash-like; got #{value.inspect}")
+      end
+    end
+
+    # Module overriding Backend
+    module BackendOverride
+      private
+
+      include UrlHelpers
+
+      # Return the jsonapi links
+      def pagy_jsonapi_links(pagy, **opts)
+        { first: pagy_url_for(pagy, 1,         **opts),
+          last:  pagy_url_for(pagy, pagy.last, **opts),
+          prev:  pagy_url_for(pagy, pagy.prev, **opts),
+          next:  pagy_url_for(pagy, pagy.next, **opts) }
+      end
+
+      # Should skip the jsonapi
+      def pagy_skip_jsonapi?(vars)
+        return true if vars[:jsonapi] == false || (vars[:jsonapi].nil? && DEFAULT[:jsonapi] == false)
+        # check the reserved :page param
+        raise ReservedParamError, params[:page] unless params[:page].respond_to?(:fetch) || params[:page].nil?
+      end
+
+      # Override the Backend method
+      def pagy_get_page(vars)
+        return super if pagy_skip_jsonapi?(vars)
+        return 1 if params[:page].nil?
+
+        params[:page][vars[:page_param] || DEFAULT[:page_param]].to_i
+      end
+    end
+    Backend.prepend BackendOverride
+
+    # Module overriding ItemsExtra
+    module ItemsExtraOverride
+      private
+
+      # Override the ItemsExtra::Backend method
+      def pagy_get_items_size(vars)
+        return super if pagy_skip_jsonapi?(vars)
+        return if params[:page].nil?
+
+        params[:page][vars[:items_param] || DEFAULT[:items_param]]
+      end
+    end
+    # :nocov:
+    ItemsExtra::BackendAddOn.prepend ItemsExtraOverride if defined?(ItemsExtra::BackendAddOn)
+    # :nocov:
+
+    # Module overriding UrlHelper
+    module UrlHelperOverride
+      # Override UrlHelper method
+      def pagy_set_query_params(page, vars, params)
+        return super unless vars[:jsonapi]
+
+        params['page'] ||= {}
+        params['page'][vars[:page_param].to_s]  = page
+        params['page'][vars[:items_param].to_s] = vars[:items] if vars[:items_extra]
+      end
+    end
+    UrlHelpers.prepend UrlHelperOverride
+  end
+end

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'
@@ -8,75 +8,87 @@ class Pagy # :nodoc:
   # The resulting code may not look very elegant, but produces the best benchmarks
   module MaterializeExtra
     # Pagination for materialize: it returns the html with the series of links to the pages
-    def pagy_materialize_nav(pagy, pagy_id: nil, link_extra: '', **vars)
+    def pagy_materialize_nav(pagy, pagy_id: nil, link_extra: '',
+                             nav_aria_label: nil, nav_i18n_key: nil, **vars)
       p_id = %( id="#{pagy_id}") if pagy_id
-      link = pagy_link_proc(pagy, link_extra: link_extra)
+      link = pagy_link_proc(pagy, link_extra:)
 
-      html = +%(<div#{p_id} class="pagy-materialize-nav pagination" role="navigation"><ul class="pagination">)
-      html << pagy_materialize_prev_html(pagy, link)
+      html = +%(<div#{p_id} class="pagy-materialize-nav pagination" role="navigation" #{
+                  nav_aria_label_attr(pagy, nav_aria_label, nav_i18n_key)}><ul class="pagination">)
+      html << 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
-                when Integer then %(<li class="waves-effect">#{link.call item}</li>)                           # page link
-                when String  then %(<li class="active">#{link.call item}</li>)                                 # active page
-                when :gap    then %(<li class="gap disabled"><a href="#">#{pagy_t 'pagy.nav.gap'}</a></li>)    # page gap
-                else raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
+                when Integer
+                  %(<li class="waves-effect">#{link.call(item)}</li>)
+                when String
+                  %(<li class="active">#{link.call(item)}</li>)
+                when :gap
+                  %(<li class="gap disabled"><a href="#" 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_materialize_next_html(pagy, link)
+      html << materialize_next_html(pagy, link)
       html << %(</ul></div>)
     end
 
     # Javascript pagination for materialize: it returns a nav and a JSON tag used by the pagy.js file
-    def pagy_materialize_nav_js(pagy, pagy_id: nil, link_extra: '', **vars)
+    def pagy_materialize_nav_js(pagy, pagy_id: nil, link_extra: '',
+                                nav_aria_label: nil, nav_i18n_key: nil, **vars)
       sequels = pagy.sequels(**vars)
       p_id = %( id="#{pagy_id}") if pagy_id
-      link = pagy_link_proc(pagy, link_extra: link_extra)
+      link = pagy_link_proc(pagy, link_extra:)
 
-      tags = { 'before' => %(<ul class="pagination">#{pagy_materialize_prev_html pagy, link}),
-               'link'   => %(<li class="waves-effect">#{mark = link.call(PAGE_PLACEHOLDER, LABEL_PLACEHOLDER)}</li>),
-               'active' => %(<li class="active">#{mark}</li>),
-               'gap'    => %(<li class="gap disabled"><a href="#">#{pagy_t 'pagy.nav.gap'}</a></li>),
-               'after'  => %(#{pagy_materialize_next_html pagy, link}</ul>) }
+      tags = { 'before' => %(<ul class="pagination">#{materialize_prev_html pagy, link}),
+               'link'   => %(<li class="waves-effect">#{html = link.call(PAGE_PLACEHOLDER, LABEL_PLACEHOLDER)}</li>),
+               'active' => %(<li class="active">#{html}</li>),
+               'gap'    => %(<li class="gap disabled"><a href="#" aria-disabled="true">#{pagy_t 'pagy.gap'}</a></li>),
+               'after'  => %(#{materialize_next_html pagy, link}</ul>) }
 
       %(<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>)
+          nav_aria_label_attr(pagy, nav_aria_label, nav_i18n_key)} #{
+          pagy_data(pagy, :nav, tags, sequels, pagy.label_sequels(sequels))}></div>)
     end
 
     # Javascript combo pagination for materialize: it returns a nav and a JSON tag used by the pagy.js file
-    def pagy_materialize_combo_nav_js(pagy, pagy_id: nil, link_extra: '')
+    def pagy_materialize_combo_nav_js(pagy, pagy_id: nil, link_extra: '',
+                                      nav_aria_label: nil, nav_i18n_key: nil)
       p_id    = %( id="#{pagy_id}") if pagy_id
-      link    = pagy_link_proc(pagy, link_extra: link_extra)
+      link    = pagy_link_proc(pagy, link_extra:)
       p_page  = pagy.page
       p_pages = pagy.pages
       style   = ' style="vertical-align: middle"'
       input   = %(<input type="number" class="browser-default" min="1" max="#{p_pages}" value="#{
-                    p_page}" style="text-align: center; width: #{p_pages.to_s.length + 1}rem;">)
+                    p_page}" style="text-align: center; width: #{p_pages.to_s.length + 1}rem;" aria-current="page">)
 
-      html = %(<ul#{p_id} class="pagy-materialize-combo-nav-js pagination chip" role="navigation")
+      html = %(<ul#{p_id} class="pagy-materialize-combo-nav-js pagination chip" role="navigation" #{
+                 nav_aria_label_attr(pagy, nav_aria_label, nav_i18n_key)})
       %(#{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">#{
+          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>#{
-          pagy_materialize_next_html pagy, link, style}</ul>)
+          materialize_next_html pagy, link, style}</ul>)
     end
 
     private
 
-    def pagy_materialize_prev_html(pagy, link, style = '')
+    def materialize_prev_html(pagy, link, style = '')
       if (p_prev = pagy.prev)
         %(<li class="waves-effect prev"#{style}>#{
-            link.call p_prev, '<i class="material-icons">chevron_left</i>', 'aria-label="previous"'}</li>)
+            link.call(p_prev, '<i class="material-icons">chevron_left</i>', prev_aria_label_attr)}</li>)
       else
-        %(<li class="prev disabled"#{style}><a href="#"><i class="material-icons">chevron_left</i></a></li>)
+        %(<li class="prev disabled"#{style}><a href="#" aria-disabled="true" #{
+            prev_aria_label_attr}><i class="material-icons">chevron_left</i></a></li>)
       end
     end
 
-    def pagy_materialize_next_html(pagy, link, style = '')
+    def materialize_next_html(pagy, link, style = '')
       if (p_next = pagy.next)
         %(<li class="waves-effect next"#{style}>#{
-            link.call p_next, '<i class="material-icons">chevron_right</i>', 'aria-label="next"'}</li>)
+            link.call(p_next, '<i class="material-icons">chevron_right</i>', next_aria_label_attr)}</li>)
       else
-        %(<li class="next disabled"#{style}><a href="#"><i class="material-icons">chevron_right</i></a></li>)
+        %(<li class="next disabled"#{style}><a href="#" aria-disabled="true" #{
+            next_aria_label_attr}><i class="material-icons">chevron_right</i></a></li>)
       end
     end
   end

data/lib/pagy/extras/meilisearch.rb

@@ -1,3 +1,4 @@
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/meilisearch
 # frozen_string_literal: true
 
 class Pagy # :nodoc:
@@ -6,17 +7,18 @@ class Pagy # :nodoc:
 
   # Paginate Meilisearch results
   module MeilisearchExtra
-    module Meilisearch # :nodoc:
+    module ModelExtension # :nodoc:
       # Return an array used to delay the call of #search
       # after the pagination variables are merged to the options
-      def pagy_meilisearch(term = nil, **vars)
-        [self, term, vars]
+      def pagy_meilisearch(query, params = {})
+        [self, query, params]
       end
       alias_method DEFAULT[:meilisearch_pagy_search], :pagy_meilisearch
     end
+    Pagy::Meilisearch = ModelExtension
 
-    # Additions for the Pagy class
-    module Pagy
+    # Extension for the Pagy class
+    module PagyExtension
       # Create a Pagy object from a Meilisearch results
       def new_from_meilisearch(results, vars = {})
         vars[:items] = results.raw_answer['hitsPerPage']
@@ -26,9 +28,10 @@ class Pagy # :nodoc:
         new(vars)
       end
     end
+    Pagy.extend PagyExtension
 
     # Add specialized backend methods to paginate Meilisearch results
-    module Backend
+    module BackendAddOn
       private
 
       # Return Pagy object and results
@@ -37,7 +40,7 @@ class Pagy # :nodoc:
         vars                    = pagy_meilisearch_get_vars(nil, vars)
         options[:hits_per_page] = vars[:items]
         options[:page]          = vars[:page]
-        results                 = model.send(:ms_search, term, **options)
+        results                 = model.send(:ms_search, term, options)
         vars[:count]            = results.raw_answer['totalHits']
 
         pagy                    = ::Pagy.new(vars)
@@ -53,12 +56,10 @@ class Pagy # :nodoc:
       def pagy_meilisearch_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
-  Meilisearch = MeilisearchExtra::Meilisearch
-  extend MeilisearchExtra::Pagy
-  Backend.prepend MeilisearchExtra::Backend
 end

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'
@@ -15,7 +15,7 @@ class Pagy # :nodoc:
 
     # Return the metadata hash
     def pagy_metadata(pagy, absolute: nil)
-      scaffold_url = pagy_url_for(pagy, PAGE_PLACEHOLDER, absolute: absolute)
+      scaffold_url = pagy_url_for(pagy, PAGE_PLACEHOLDER, absolute:)
       {}.tap do |metadata|
         keys = defined?(Calendar) && pagy.is_a?(Calendar) ? pagy.vars[:metadata] - %i[count items] : pagy.vars[:metadata]
         keys.each do |key|

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'
@@ -8,56 +8,44 @@ class Pagy # :nodoc:
   # The resulting code may not look very elegant, but produces the best benchmarks
   module NavsExtra
     # Javascript pagination: it returns a nav and a JSON tag used by the pagy.js file
-    def pagy_nav_js(pagy, pagy_id: nil, link_extra: '', **vars)
+    def pagy_nav_js(pagy, pagy_id: nil, link_extra: '',
+                    nav_aria_label: nil, nav_i18n_key: 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_nav_prev_html(pagy, link),
+      link = pagy_link_proc(pagy, link_extra:)
+      tags = { 'before' => prev_html(pagy, link),
                'link'   => %(<span class="page">#{link.call(PAGE_PLACEHOLDER, LABEL_PLACEHOLDER)}</span> ),
-               'active' => %(<span class="page active">#{LABEL_PLACEHOLDER}</span> ),
-               'gap'    => %(<span class="page gap">#{pagy_t 'pagy.nav.gap'}</span> ),
-               'after'  => pagy_nav_next_html(pagy, link) }
+               'active' => %(<span class="page active">) +
+                           %(<a role="link" aria-current="page" aria-disabled="true">#{LABEL_PLACEHOLDER}</a></span> ),
+               'gap'    => %(<span class="page gap">#{pagy_t 'pagy.gap'}</span> ),
+               'after'  => next_html(pagy, link) }
 
       %(<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>)
+          nav_aria_label_attr(pagy, nav_aria_label, nav_i18n_key)} #{
+          pagy_data(pagy, :nav, tags, sequels, pagy.label_sequels(sequels))
+        }></nav>)
     end
 
     # Javascript combo pagination: it returns a nav and a JSON tag used by the pagy.js file
-    def pagy_combo_nav_js(pagy, pagy_id: nil, link_extra: '')
+    def pagy_combo_nav_js(pagy, pagy_id: nil, link_extra: '',
+                          nav_aria_label: nil, nav_i18n_key: nil)
       p_id    = %( id="#{pagy_id}") if pagy_id
-      link    = pagy_link_proc(pagy, link_extra: link_extra)
+      link    = pagy_link_proc(pagy, link_extra:)
       p_page  = pagy.page
       p_pages = pagy.pages
-      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;">)
+      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;" aria-current="page">)
 
       %(<nav#{p_id} class="pagy-combo-nav-js pagination" #{
+          nav_aria_label_attr(pagy, nav_aria_label, nav_i18n_key)} #{
           pagy_data(pagy, :combo, pagy_marked_link(link))}>#{
-          pagy_nav_prev_html pagy, link
-        }<span class="pagy-combo-input" style="margin: 0 0.6rem;">#{
-          pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages
+          prev_html(pagy, link)
+      }<span class="pagy-combo-input" style="margin: 0 0.6rem;">#{
+          pagy_t('pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages)
         }</span> #{
-          pagy_nav_next_html pagy, link
+          next_html(pagy, link)
         }</nav>)
     end
-
-    private
-
-    def pagy_nav_prev_html(pagy, link)
-      if (p_prev = pagy.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
-    end
-
-    def pagy_nav_next_html(pagy, link)
-      if (p_next = pagy.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
-    end
   end
   Frontend.prepend NavsExtra
 end

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:
@@ -7,7 +7,7 @@ class Pagy # :nodoc:
   # Handles OverflowError exceptions for different classes with different options
   module OverflowExtra
     # Support for Pagy class
-    module Pagy
+    module PagyOverride
       # Is the requested page overflowing?
       def overflow?
         @overflow
@@ -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)
@@ -50,9 +50,11 @@ class Pagy # :nodoc:
         end
       end
     end
+    Pagy.prepend PagyOverride
+    Pagy::Calendar.prepend PagyOverride if defined?(Calendar)
 
     # Support for Pagy::Countless class
-    module Countless
+    module CountlessOverride
       # Add rescue clause for different behaviors
       def finalize(items)
         @overflow = false
@@ -71,8 +73,8 @@ class Pagy # :nodoc:
         end
       end
     end
+    # :nocov:
+    Pagy::Countless.prepend CountlessOverride if defined?(Countless)
+    # :nocov:
   end
-  prepend OverflowExtra::Pagy
-  Calendar.prepend OverflowExtra::Pagy if defined?(Calendar)
-  Countless.prepend OverflowExtra::Countless if defined?(Countless)
 end

data/lib/pagy/extras/searchkick.rb

@@ -1,4 +1,4 @@
-# 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:
@@ -7,7 +7,7 @@ class Pagy # :nodoc:
 
   # Paginate Searchkick::Results objects
   module SearchkickExtra
-    module Searchkick # :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.
@@ -18,9 +18,10 @@ class Pagy # :nodoc:
       end
       alias_method Pagy::DEFAULT[:searchkick_pagy_search], :pagy_searchkick
     end
+    Pagy::Searchkick = ModelExtension
 
     # Additions for the Pagy class
-    module Pagy
+    module PagyExtension
       # Create a Pagy object from a Searchkick::Results object
       def new_from_searchkick(results, vars = {})
         vars[:items] = results.options[:per_page]
@@ -29,9 +30,10 @@ class Pagy # :nodoc:
         new(vars)
       end
     end
+    Pagy.extend PagyExtension
 
     # Add specialized backend methods to paginate Searchkick::Results
-    module Backend
+    module BackendAddOn
       private
 
       # Return Pagy object and results
@@ -56,12 +58,10 @@ class Pagy # :nodoc:
       def pagy_searchkick_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
-  Searchkick = SearchkickExtra::Searchkick
-  extend SearchkickExtra::Pagy
-  Backend.prepend SearchkickExtra::Backend
 end