pagy 6.5.0 → 7.0.9

data/lib/pagy/extras/foundation.rb

@@ -8,18 +8,24 @@ class Pagy # :nodoc:
   # The resulting code may not look very elegant, but produces the best benchmarks
   module FoundationExtra
     # Pagination for Foundation: it returns the html with the series of links to the pages
-    def pagy_foundation_nav(pagy, pagy_id: nil, link_extra: '', **vars)
+    def pagy_foundation_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 = +%(<nav#{p_id} class="pagy-foundation-nav" aria-label="Pagination"><ul class="pagination">)
-      html << pagy_foundation_prev_html(pagy, link)
+      html = +%(<nav#{p_id} class="pagy-foundation-nav" #{
+                 nav_aria_label_attr(pagy, nav_aria_label, nav_i18n_key)}><ul class="pagination">)
+      html << foundation_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>#{link.call item}</li>)                        # page link
-                when String  then %(<li class="current">#{pagy.label_for(item)}</li>)                  # active page
-                when :gap    then %(<li class="ellipsis gap" aria-hidden="true"></li>) # page gap
-                else raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
+                when Integer
+                  %(<li>#{link.call item}</li>)
+                when String
+                  %(<li class="current" role="link" aria-current="page" aria-disabled="true">#{pagy.label_for(item)}</li>)
+                when :gap
+                  %(<li class="ellipsis gap"></li>)
+                else
+                  raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
                 end
       end
       html << pagy_foundation_next_html(pagy, link)
@@ -27,64 +33,71 @@ class Pagy # :nodoc:
     end
 
     # Javascript pagination for foundation: it returns a nav and a JSON tag used by the pagy.js file
-    def pagy_foundation_nav_js(pagy, pagy_id: nil, link_extra: '', **vars)
+    def pagy_foundation_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' => %(<ul class="pagination">#{pagy_foundation_prev_html pagy, link}),
-               'link'   => %(<li>#{link.call(PAGE_PLACEHOLDER, LABEL_PLACEHOLDER)}</li>),
-               'active' => %(<li class="current">#{LABEL_PLACEHOLDER}</li>),
-               'gap'    => %(<li class="ellipsis gap" aria-hidden="true"></li>),
+      link = pagy_link_proc(pagy, link_extra:)
+      tags = { 'before' => %(<ul class="pagination">#{foundation_prev_html pagy, link}),
+               'link'   => %(<li>#{link.call(PAGE_TOKEN, LABEL_TOKEN)}</li>),
+               'active' => %(<li class="current" role="link" aria-current="page" aria-disabled="true">#{LABEL_TOKEN}</li>),
+               'gap'    => %(<li class="ellipsis gap"></li>),
                'after'  => %(#{pagy_foundation_next_html pagy, link}</ul>) }
 
-      %(<nav#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-foundation-nav-js" aria-label="Pagination" #{
-        pagy_data(pagy, :nav, tags, sequels, pagy.label_sequels(sequels))}></nav>)
+      %(<nav#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-foundation-nav-js" #{
+          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 for Foundation: it returns a nav and a JSON tag used by the pagy.js file
-    def pagy_foundation_combo_nav_js(pagy, pagy_id: nil, link_extra: '')
+    def pagy_foundation_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 class="input-group-field cell shrink" type="number" min="1" max="#{
                     p_pages}" value="#{p_page}" style="width: #{
-                    p_pages.to_s.length + 1}rem; padding: 0 0.3rem; margin: 0 0.3rem;">)
+                    p_pages.to_s.length + 1}rem; padding: 0 0.3rem; margin: 0 0.3rem;" aria-current="page">)
 
-      %(<nav#{p_id} class="pagy-foundation-combo-nav-js" aria-label="Pagination"><div class="input-group" #{
-          pagy_data(pagy, :combo, pagy_marked_link(link))}>#{
-          if (p_prev  = pagy.prev)
-            link.call p_prev, pagy_t('pagy.nav.prev'),
-                      'style="margin-bottom: 0" aria-label="previous" class="prev button primary"'
+      %(<nav#{p_id} class="pagy-foundation-combo-nav-js" #{
+          nav_aria_label_attr(pagy, nav_aria_label, nav_i18n_key)} #{
+          pagy_data(pagy, :combo, pagy_marked_link(link))}><div class="input-group">#{
+          if (p_prev = pagy.prev)
+            link.call(p_prev, pagy_t('pagy.prev'),
+                      %(style="margin-bottom: 0" class="prev button primary" #{prev_aria_label_attr}))
           else
-            %(<a style="margin-bottom: 0" class="prev button primary disabled" href="#">#{pagy_t 'pagy.nav.prev'}</a>)
+            %(<a style="margin-bottom: 0" class="prev button primary disabled" role="link" aria-disabled="true" #{
+                prev_aria_label_attr}>#{pagy_t('pagy.prev')}</a>)
           end
         }#{
           pagy_t('pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages)
           .sub!('<label>', '<label class="input-group-label">')}#{ # add the class to the official dictionary string
-          if (p_next  = pagy.next)
-            link.call p_next, pagy_t('pagy.nav.next'), 'style="margin-bottom: 0" aria-label="next" class="next button primary"'
+          if (p_next = pagy.next)
+            link.call(p_next, pagy_t('pagy.next'),
+                      %(style="margin-bottom: 0" class="next button primary" #{next_aria_label_attr}))
           else
-            %(<a style="margin-bottom: 0" class="next button primary disabled" href="#">#{pagy_t 'pagy.nav.next'}</a>)
+            %(<a style="margin-bottom: 0" class="next button primary disabled" role="link" aria-disabled="true" #{
+                next_aria_label_attr}>#{pagy_t 'pagy.next'}</a>)
           end
         }</div></nav>)
     end
 
     private
 
-    def pagy_foundation_prev_html(pagy, link)
+    def foundation_prev_html(pagy, link)
       if (p_prev = pagy.prev)
-        %(<li class="prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</li>)
+        %(<li class="prev">#{link.call(p_prev, pagy_t('pagy.prev'), prev_aria_label_attr)}</li>)
       else
-        %(<li class="prev disabled">#{pagy_t 'pagy.nav.prev'}</li>)
+        %(<li class="prev disabled" role="link" aria-disabled="true" #{prev_aria_label_attr}>#{pagy_t('pagy.prev')}</li>)
       end
     end
 
     def pagy_foundation_next_html(pagy, link)
       if (p_next = pagy.next)
-        %(<li class="next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</li>)
+        %(<li class="next">#{link.call(p_next, pagy_t('pagy.next'), next_aria_label_attr)}</li>)
       else
-        %(<li class="next disabled">#{pagy_t 'pagy.nav.next'}</li>)
+        %(<li class="next disabled" role="link" aria-disabled="true" #{next_aria_label_attr}>#{pagy_t('pagy.next')}</li>)
       end
     end
   end

data/lib/pagy/extras/frontend_helpers.rb

@@ -6,7 +6,7 @@ class Pagy # :nodoc:
   # Private module documented in the main classes
   module FrontendHelpers
     # Additions for the Pagy class
-    module Pagy
+    module PagyAddOn
       # `Pagy` instance method used by the `pagy*_nav_js` helpers.
       # It returns the sequels of width/series generated from the :steps hash
       # Example:
@@ -27,9 +27,10 @@ class Pagy # :nodoc:
       # Support for the Calendar API
       def label_sequels(*); end
     end
+    Pagy.prepend PagyAddOn
 
     # Additions for Calendar class
-    module Calendar
+    module CalendarOverride
       def label_sequels(sequels = self.sequels)
         {}.tap do |label_sequels|
           sequels.each do |width, series|
@@ -38,9 +39,10 @@ class Pagy # :nodoc:
         end
       end
     end
+    Calendar.prepend CalendarOverride if defined?(Calendar)
 
     # Additions for the Frontend
-    module Frontend
+    module FrontendAddOn
       if defined?(Oj)
         # Return a data tag with the base64 encoded JSON-serialized args generated with the faster oj gem
         # Base64 encoded JSON is smaller than HTML escaped JSON
@@ -60,13 +62,11 @@ class Pagy # :nodoc:
         end
       end
 
-      # Return the marked link to used by pagy.js
+      # Return the marked link used by pagy.js
       def pagy_marked_link(link)
-        link.call PAGE_PLACEHOLDER, '', 'style="display: none;"'
+        link.call PAGE_TOKEN, '', 'style="display: none;"'
       end
     end
+    Frontend.prepend FrontendAddOn
   end
-  prepend FrontendHelpers::Pagy
-  Calendar.prepend FrontendHelpers::Calendar if defined?(Calendar)
-  Frontend.prepend FrontendHelpers::Frontend
 end

data/lib/pagy/extras/headers.rb

@@ -4,10 +4,10 @@
 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
 
@@ -31,12 +31,12 @@ class Pagy # :nodoc:
       countless             = defined?(Countless) && pagy.is_a?(Countless)
       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
+      url_str               = pagy_url_for(pagy, PAGE_TOKEN, absolute: true)
+      link                  = rel.filter_map do |r, num|
                                 next unless num # rubocop:disable Layout/EmptyLineAfterGuardClause
-                                [r, url_str.sub(PAGE_PLACEHOLDER, num.to_s)]
+                                [r, url_str.sub(PAGE_TOKEN, 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

@@ -5,21 +5,21 @@ 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

@@ -11,7 +11,7 @@ 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
@@ -29,32 +29,33 @@ class Pagy # :nodoc:
         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)}>)
+        html  = +%(<span#{p_id} class="pagy 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

@@ -59,10 +59,8 @@ class Pagy # :nodoc:
         params[:page][vars[:items_param] || DEFAULT[:items_param]]
       end
     end
-    # Swap the next lines in ruby 3.0+ baseline
-    # ItemsExtra::Backend.prepend ItemsExtraOverride if defined?(ItemsExtra::Backend)
     # :nocov:
-    Backend.prepend ItemsExtraOverride if defined?(ItemsExtra::Backend)
+    ItemsExtra::BackendAddOn.prepend ItemsExtraOverride if defined?(ItemsExtra::BackendAddOn)
     # :nocov:
 
     # Module overriding UrlHelper
@@ -76,9 +74,6 @@ class Pagy # :nodoc:
         params['page'][vars[:items_param].to_s] = vars[:items] if vars[:items_extra]
       end
     end
-    # Swap the next lines in ruby 3.0+ baseline
-    # UrlHelpers.prepend UrlHelperOverride
-    Backend.prepend UrlHelperOverride
-    Frontend.prepend UrlHelperOverride
+    UrlHelpers.prepend UrlHelperOverride
   end
 end

data/lib/pagy/extras/materialize.rb

@@ -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"><a role="link" aria-current="page" aria-disabled="true">#{pagy.label_for(item)}</a></li>)
+                when :gap
+                  %(<li class="gap disabled"><a role="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_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">#{link.call(PAGE_TOKEN, LABEL_TOKEN)}</li>),
+               'active' => %(<li class="active"><a role="link" aria-current="page" aria-disabled="true">#{LABEL_TOKEN}</a></li>),
+               'gap'    => %(<li class="gap disabled"><a role="link" 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 role="link" 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 role="link" 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

@@ -7,7 +7,7 @@ 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(query, params = {})
@@ -15,9 +15,10 @@ class Pagy # :nodoc:
       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']
@@ -27,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
@@ -58,8 +60,6 @@ class Pagy # :nodoc:
         vars
       end
     end
+    Backend.prepend BackendAddOn
   end
-  Meilisearch = MeilisearchExtra::Meilisearch
-  extend MeilisearchExtra::Pagy
-  Backend.prepend MeilisearchExtra::Backend
 end

data/lib/pagy/extras/metadata.rb

@@ -15,17 +15,17 @@ 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_TOKEN, absolute:)
       {}.tap do |metadata|
         keys = defined?(Calendar) && pagy.is_a?(Calendar) ? pagy.vars[:metadata] - %i[count items] : pagy.vars[:metadata]
         keys.each do |key|
           metadata[key] = case key
                           when :scaffold_url then scaffold_url
-                          when :first_url    then scaffold_url.sub(PAGE_PLACEHOLDER, 1.to_s)
-                          when :prev_url     then scaffold_url.sub(PAGE_PLACEHOLDER, pagy.prev.to_s)
-                          when :page_url     then scaffold_url.sub(PAGE_PLACEHOLDER, pagy.page.to_s)
-                          when :next_url     then scaffold_url.sub(PAGE_PLACEHOLDER, pagy.next.to_s)
-                          when :last_url     then scaffold_url.sub(PAGE_PLACEHOLDER, pagy.last.to_s)
+                          when :first_url    then scaffold_url.sub(PAGE_TOKEN, 1.to_s)
+                          when :prev_url     then scaffold_url.sub(PAGE_TOKEN, pagy.prev.to_s)
+                          when :page_url     then scaffold_url.sub(PAGE_TOKEN, pagy.page.to_s)
+                          when :next_url     then scaffold_url.sub(PAGE_TOKEN, pagy.next.to_s)
+                          when :last_url     then scaffold_url.sub(PAGE_TOKEN, pagy.last.to_s)
                           else pagy.send(key)
                           end
         rescue NoMethodError

data/lib/pagy/extras/navs.rb

@@ -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'   => %(<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) }
-
-      %(<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>)
+      link = pagy_link_proc(pagy, link_extra:)
+      tags = { 'before' => prev_html(pagy, link),
+               'link'   => %(<span class="page">#{link.call(PAGE_TOKEN, LABEL_TOKEN)}</span>),
+               'active' => %(<span class="page active">) +
+                           %(<a role="link" aria-current="page" aria-disabled="true">#{LABEL_TOKEN}</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 pagy-nav-js pagination" #{
+          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#{p_id} class="pagy 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
-        }</span> #{
-          pagy_nav_next_html pagy, link
+          prev_html(pagy, link)
+      }<span class="pagy-combo-input">#{
+          pagy_t('pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages)
+        }</span>#{
+          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

@@ -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
@@ -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