pagy 6.5.0 → 7.0.9

data/lib/pagy/extras/searchkick.rb

@@ -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
@@ -60,8 +62,6 @@ class Pagy # :nodoc:
         vars
       end
     end
+    Backend.prepend BackendAddOn
   end
-  Searchkick = SearchkickExtra::Searchkick
-  extend SearchkickExtra::Pagy
-  Backend.prepend SearchkickExtra::Backend
 end

data/lib/pagy/extras/semantic.rb

@@ -8,73 +8,86 @@ class Pagy # :nodoc:
   # The resulting code may not look very elegant, but produces the best benchmarks
   module SemanticExtra
     # Pagination for semantic: it returns the html with the series of links to the pages
-    def pagy_semantic_nav(pagy, pagy_id: nil, link_extra: '', **vars)
+    def pagy_semantic_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: %(class="item" #{link_extra}))
+      link = pagy_link_proc(pagy, link_extra:)
 
-      html = +%(<div#{p_id} class="pagy-semantic-nav ui pagination menu">)
-      html << pagy_semantic_prev_html(pagy, link)
+      html = +%(<div#{p_id} role="navigation" class="pagy-semantic-nav ui pagination menu" #{
+                  nav_aria_label_attr(pagy, nav_aria_label, nav_i18n_key)}>)
+      html << semantic_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 link.call item
-                when String  then %(<a class="item active">#{pagy.label_for(item)}</a>)
-                when :gap    then %(<div class="disabled item">#{pagy_t 'pagy.nav.gap'}</div>)
-                else raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
+                when Integer
+                  link.call(item, pagy.label_for(item), %(class="item"))
+                when String
+                  %(<a role="link" class="item active" aria-current="page" aria-disabled="true">#{pagy.label_for(item)}</a>)
+                when :gap
+                  %(<div class="disabled item">#{pagy_t 'pagy.gap'}</div>)
+                else
+                  raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
                 end
       end
-      html << pagy_semantic_next_html(pagy, link)
+      html << semantic_next_html(pagy, link)
       html << %(</div>)
     end
 
     # Javascript pagination for semantic: it returns a nav and a JSON tag used by the pagy.js file
-    def pagy_semantic_nav_js(pagy, pagy_id: nil, link_extra: '', **vars)
+    def pagy_semantic_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: %(class="item" #{link_extra}))
-      tags = { 'before' => pagy_semantic_prev_html(pagy, link),
-               'link'   => link.call(PAGE_PLACEHOLDER, LABEL_PLACEHOLDER),
-               'active' => %(<a class="item active">#{LABEL_PLACEHOLDER}</a>),
-               'gap'    => %(<div class="disabled item">#{pagy_t('pagy.nav.gap')}</div>),
-               'after'  => pagy_semantic_next_html(pagy, link) }
+      link = pagy_link_proc(pagy, link_extra:)
+      tags = { 'before' => semantic_prev_html(pagy, link),
+               'link'   => link.call(PAGE_TOKEN, LABEL_TOKEN, %(class="item")),
+               'active' => %(<a role="link" class="item active" aria-current="page" aria-disabled="true">#{LABEL_TOKEN}</a>),
+               'gap'    => %(<div class="disabled item">#{pagy_t('pagy.gap')}</div>),
+               'after'  => semantic_next_html(pagy, link) }
 
       %(<div#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-semantic-nav-js ui pagination menu" 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
 
     # Combo pagination for semantic: it returns a nav and a JSON tag used by the pagy.js file
-    def pagy_semantic_combo_nav_js(pagy, pagy_id: nil, link_extra: '')
+    def pagy_semantic_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: %(class="item" #{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; margin: 0 0.3rem">)
+                    p_page}" style="padding: 0; text-align: center; width: #{
+                    p_pages.to_s.length + 1}rem; margin: 0 0.3rem" aria-current="page">)
 
       %(<div#{p_id} class="pagy-semantic-combo-nav-js ui compact menu" role="navigation" #{
+          nav_aria_label_attr(pagy, nav_aria_label, nav_i18n_key)} #{
           pagy_data(pagy, :combo, pagy_marked_link(link))}>#{
-          pagy_semantic_prev_html pagy, link
+          semantic_prev_html pagy, link
         }<div class="pagy-combo-input item">#{
           pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages
         }</div> #{
-          pagy_semantic_next_html pagy, link
+          semantic_next_html pagy, link
         }</div>)
     end
 
     private
 
-    def pagy_semantic_prev_html(pagy, link)
+    def semantic_prev_html(pagy, link)
       if (p_prev = pagy.prev)
-        link.call p_prev, '<i class="left small chevron icon"></i>', 'aria-label="previous"'
+        link.call(p_prev, pagy_t('pagy.prev'), %(#{prev_aria_label_attr} class="item"))
       else
-        +%(<div class="item disabled"><i class="left small chevron icon"></i></div>)
+        +%(<div class="item disabled" role="link" aria-disabled="true" #{
+             prev_aria_label_attr}>#{pagy_t('pagy.prev')}</div>)
       end
     end
 
-    def pagy_semantic_next_html(pagy, link)
+    def semantic_next_html(pagy, link)
       if (p_next = pagy.next)
-        link.call p_next, '<i class="right small chevron icon"></i>', 'aria-label="next"'
+        link.call(p_next, pagy_t('pagy.next'), %(#{next_aria_label_attr} class="item"))
       else
-        +%(<div class="item disabled"><i class="right small chevron icon"></i></div>)
+        +%(<div class="item disabled" role="link" aria-disabled="true" #{
+             next_aria_label_attr}>#{pagy_t('pagy.next')}</div>)
       end
     end
   end

data/lib/pagy/extras/standalone.rb

@@ -25,11 +25,11 @@ class Pagy # :nodoc:
             build_nested_query(v, prefix ? "#{prefix}[#{escape(k)}]" : escape(k))
           end.delete_if(&:empty?).join('&')
         when nil
-          prefix
+          escape(prefix)
         else
           raise ArgumentError, 'value must be a Hash' if prefix.nil?
 
-          "#{prefix}=#{escape(value)}"
+          "#{escape(prefix)}=#{escape(value)}"
         end
       end
     end
@@ -38,7 +38,7 @@ class Pagy # :nodoc:
     # Return the URL for the page. If there is no pagy.vars[:url]
     # it works exactly as the regular #pagy_url_for, relying on the params method and Rack.
     # If there is a defined pagy.vars[:url] variable it does not need the params method nor Rack.
-    def pagy_url_for(pagy, page, absolute: false, html_escaped: false, **_)
+    def pagy_url_for(pagy, page, absolute: false, **_)
       return super unless pagy.vars[:url]
 
       vars         = pagy.vars
@@ -46,13 +46,10 @@ class Pagy # :nodoc:
       pagy_set_query_params(page, vars, params)
       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
   end
-  # In ruby 3+ `UrlHelpers.prepend StandaloneExtra` would be enough instead of using the next 2 lines
-  Frontend.prepend StandaloneExtra
-  Backend.prepend StandaloneExtra
+  UrlHelpers.prepend StandaloneExtra
 
   # Define a dummy params method if it's not already defined in the including module
   module Backend

data/lib/pagy/extras/support.rb

@@ -5,49 +5,35 @@ class Pagy # :nodoc:
   # Extra support for features like: incremental, auto-incremental and infinite pagination
   module SupportExtra
     # Return the previous page URL string or nil
-    def pagy_prev_url(pagy)
-      pagy_url_for(pagy, pagy.prev) if pagy.prev
+    def pagy_prev_url(pagy, absolute: false)
+      pagy_url_for(pagy, pagy.prev, absolute:) if pagy.prev
     end
 
     # Return the next page URL string or nil
-    def pagy_next_url(pagy)
-      pagy_url_for(pagy, pagy.next) if pagy.next
+    def pagy_next_url(pagy, absolute: false)
+      pagy_url_for(pagy, pagy.next, absolute:) if pagy.next
     end
 
-    # Return the HTML string for the previous page link
-    def pagy_prev_link(pagy, text: pagy_t('pagy.nav.prev'), link_extra: '')
-      if pagy.prev
-        %(<span class="page prev"><a href="#{
-            pagy_url_for(pagy, pagy.prev, html_escaped: true)
-          }" rel="prev" aria-label="previous" #{
-            pagy.vars[:link_extra]
-          } #{link_extra}>#{text}</a></span>)
-      else
-        %(<span class="page prev disabled">#{text}</span>)
-      end
+    # Return the HTML string for the enabled/disabled previous page link
+    def pagy_prev_html(pagy, text: pagy_t('pagy.prev'), link_extra: '')
+      link = pagy_link_proc(pagy, link_extra:)
+      prev_html(pagy, link, text:)
     end
 
-    # Return the HTML string for the next page link
-    def pagy_next_link(pagy, text: pagy_t('pagy.nav.next'), link_extra: '')
-      if pagy.next
-        %(<span class="page next"><a href="#{
-            pagy_url_for(pagy, pagy.next, html_escaped: true)
-          }" rel="next" aria-label="next" #{
-            pagy.vars[:link_extra]
-          } #{link_extra}>#{text}</a></span>)
-      else
-        %(<span class="page next disabled">#{text}</span>)
-      end
+    # Return the HTML string for the enabled/disabled next page link
+    def pagy_next_html(pagy, text: pagy_t('pagy.next'), link_extra: '')
+      link = pagy_link_proc(pagy, link_extra:)
+      next_html(pagy, link, text:)
     end
 
-    # Return the HTML link tag for the previous page or nil
-    def pagy_prev_link_tag(pagy)
-      %(<link href="#{pagy_url_for(pagy, pagy.prev, html_escaped: true)}" rel="prev"/>) if pagy.prev
+    # Conditionally return the HTML link tag string for the previous page
+    def pagy_prev_link_tag(pagy, absolute: false)
+      %(<link href="#{pagy_url_for(pagy, pagy.prev, absolute:)}" rel="prev"/>) if pagy.prev
     end
 
-    # Return the HTML link tag for the next page or nil
-    def pagy_next_link_tag(pagy)
-      %(<link href="#{pagy_url_for(pagy, pagy.next, html_escaped: true)}" rel="next"/>) if pagy.next
+    # Conditionally return the HTML link tag string for the next page
+    def pagy_next_link_tag(pagy, absolute: false)
+      %(<link href="#{pagy_url_for(pagy, pagy.next, absolute:)}" rel="next"/>) if pagy.next
     end
   end
   Frontend.prepend SupportExtra

data/lib/pagy/extras/trim.rb

@@ -9,7 +9,7 @@ class Pagy # :nodoc:
     # Override the original pagy_link_proc.
     # Call the pagy_trim method if the trim_extra is enabled.
     def pagy_link_proc(pagy, link_extra: '')
-      link_proc = super(pagy, link_extra: link_extra)
+      link_proc = super(pagy, link_extra:)
       return link_proc unless pagy.vars[:trim_extra]
 
       lambda do |page, text = pagy.label_for(page), extra = ''|
@@ -22,7 +22,7 @@ class Pagy # :nodoc:
 
     # Remove the the :page_param param from the first page link
     def pagy_trim(pagy, link)
-      link.sub!(/(\?|&)#{pagy.vars[:page_param]}=1\b(?!&)|\b#{pagy.vars[:page_param]}=1&/, '')
+      link.sub!(/[?&]#{pagy.vars[:page_param]}=1\b(?!&)|\b#{pagy.vars[:page_param]}=1&/, '')
     end
   end
   Frontend.prepend TrimExtra

data/lib/pagy/extras/uikit.rb

@@ -8,75 +8,88 @@ class Pagy # :nodoc:
   # The resulting code may not look very elegant, but produces the best benchmarks
   module UikitExtra
     # Pagination for uikit: it returns the html with the series of links to the pages
-    def pagy_uikit_nav(pagy, pagy_id: nil, link_extra: '', **vars)
+    def pagy_uikit_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 = +%(<ul#{p_id} class="pagy-uikit-nav uk-pagination uk-flex-center">#{pagy_uikit_prev_html pagy, link})
+      html = +%(<ul#{p_id} class="pagy-uikit-nav uk-pagination uk-flex-center" role="navigation"  #{
+
+      nav_aria_label_attr(pagy, nav_aria_label, nav_i18n_key)}>#{uikit_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>)
-                when String  then %(<li class="uk-active"><span>#{pagy.label_for(item)}</span></li>)
-                when :gap    then %(<li class="uk-disabled"><span>#{pagy_t 'pagy.nav.gap'}</span></li>)
-                else raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
+                when Integer
+                  %(<li>#{link.call(item)}</li>)
+                when String
+                  %(<li class="uk-active"><span role="link" aria-current="page" aria-disabled="true">#{
+                      pagy.label_for(item)}</span></li>)
+                when :gap
+                  %(<li class="uk-disabled"><span>#{pagy_t 'pagy.gap'}</span></li>)
+                else
+                  raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
                 end
       end
-      html << pagy_uikit_next_html(pagy, link)
+      html << uikit_next_html(pagy, link)
       html << %(</ul>)
     end
 
     # Javascript pagination for uikit: it returns a nav and a JSON tag used by the pagy.js file
-    def pagy_uikit_nav_js(pagy, pagy_id: nil, link_extra: '', **vars)
+    def pagy_uikit_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_uikit_prev_html(pagy, link),
-               'link'   => %(<li>#{link.call(PAGE_PLACEHOLDER, LABEL_PLACEHOLDER)}</li>),
-               'active' => %(<li class="uk-active"><span>#{LABEL_PLACEHOLDER}</span></li>),
-               'gap'    => %(<li class="uk-disabled"><span>#{pagy_t 'pagy.nav.gap'}</span></li>),
-               'after'  => pagy_uikit_next_html(pagy, link) }
+      link = pagy_link_proc(pagy, link_extra:)
+      tags = { 'before' => uikit_prev_html(pagy, link),
+               'link'   => %(<li>#{link.call(PAGE_TOKEN, LABEL_TOKEN)}</li>),
+               'active' => %(<li class="uk-active"><span role="link" aria-current="page" aria-disabled="true">#{
+                               LABEL_TOKEN}</span></li>),
+               'gap'    => %(<li class="uk-disabled"><span>#{pagy_t 'pagy.gap'}</span></li>),
+               'after'  => uikit_next_html(pagy, link) }
 
-      %(<ul#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-uikit-nav-js uk-pagination uk-flex-center" #{
-        pagy_data(pagy, :nav, tags, sequels, pagy.label_sequels(sequels))}></ul>)
+      %(<ul#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-uikit-nav-js uk-pagination uk-flex-center" role="navigation" #{
+          nav_aria_label_attr(pagy, nav_aria_label, nav_i18n_key)} #{
+          pagy_data(pagy, :nav, tags, sequels, pagy.label_sequels(sequels))}></ul>)
     end
 
     # Javascript combo pagination for uikit: it returns a nav and a JSON tag used by the pagy.js file
-    def pagy_uikit_combo_nav_js(pagy, pagy_id: nil, link_extra: '')
+    def pagy_uikit_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="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">)
 
-      %(<ul#{p_id} class="pagy-uikit-combo-nav-js uk-button-group uk-pagination uk-flex-center" #{
+      %(<ul#{p_id} class="pagy-uikit-combo-nav-js uk-button-group uk-pagination uk-flex-center" role="navigation" #{
+          nav_aria_label_attr(pagy, nav_aria_label, nav_i18n_key)} #{
           pagy_data(pagy, :combo, pagy_marked_link(link))
         }>#{
-          pagy_uikit_prev_html pagy, link
+          uikit_prev_html pagy, link
         }<li>#{
           pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages
         }</li>#{
-          pagy_uikit_next_html pagy, link
+          uikit_next_html pagy, link
         }</ul>)
     end
 
     private
 
-    def pagy_uikit_prev_html(pagy, link)
-      previous_span = %(<span uk-pagination-previous>#{pagy_t 'pagy.nav.prev'}</span>)
+    def uikit_prev_html(pagy, link)
+      previous_span = %(<span uk-pagination-previous></span>)
       if (p_prev = pagy.prev)
-        %(<li>#{link.call p_prev, previous_span}</li>)
+        %(<li>#{link.call(p_prev, previous_span, prev_aria_label_attr)}</li>)
       else
-        %(<li class="uk-disabled"><a href="#">#{previous_span}</a></li>)
+        %(<li class="uk-disabled"><span role="link" aria-disabled="true" #{prev_aria_label_attr}>#{previous_span}</a></li>)
       end
     end
 
-    def pagy_uikit_next_html(pagy, link)
-      next_span = %(<span uk-pagination-next>#{pagy_t 'pagy.nav.next'}</span>)
+    def uikit_next_html(pagy, link)
+      next_span = %(<span uk-pagination-next></span>)
       if (p_next = pagy.next)
-        %(<li>#{link.call p_next, next_span}</li>)
+        %(<li>#{link.call(p_next, next_span, next_aria_label_attr)}</li>)
       else
-        %(<li class="uk-disabled"><a href="#">#{next_span}</a></li>)
+        %(<li class="uk-disabled"><span role="link" aria-disabled="true" #{prev_aria_label_attr}>#{next_span}</span></li>)
       end
     end
   end

data/lib/pagy/frontend.rb

@@ -6,8 +6,8 @@ require 'pagy/i18n'
 
 class Pagy
   # Used for search and replace, hardcoded also in the pagy.js file
-  PAGE_PLACEHOLDER  = '__pagy_page__'
-  LABEL_PLACEHOLDER = '__pagy_label__'
+  PAGE_TOKEN  = '__pagy_page__'
+  LABEL_TOKEN = '__pagy_label__'
 
   # Frontend modules are specially optimized for performance.
   # The resulting code may not look very elegant, but produces the best benchmarks
@@ -15,36 +15,31 @@ class Pagy
     include UrlHelpers
 
     # Generic pagination: it returns the html with the series of links to the pages
-    def pagy_nav(pagy, pagy_id: nil, link_extra: '', **vars)
-      p_id   = %( id="#{pagy_id}") if pagy_id
-      link   = pagy_link_proc(pagy, link_extra: link_extra)
-      p_prev = pagy.prev
-      p_next = pagy.next
+    def pagy_nav(pagy, 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:)
 
-      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
-                %(<span class="page prev disabled">#{pagy_t('pagy.nav.prev')}</span> )
-              end
+      html = +%(<nav#{p_id} class="pagy pagy-nav pagination" #{nav_aria_label_attr(pagy, nav_aria_label, nav_i18n_key)}>)
+      html << 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 %(<span class="page">#{link.call item}</span> )
-                when String  then %(<span class="page active">#{pagy.label_for(item)}</span> )
-                when :gap    then %(<span class="page gap">#{pagy_t('pagy.nav.gap')}</span> )
-                else raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
+                when Integer
+                  %(<span class="page">#{link.call(item)}</span>)
+                when String
+                  %(<span class="page active">) +
+                  %(<a role="link" aria-disabled="true" aria-current="page">#{pagy.label_for(item)}</a></span>)
+                when :gap
+                  %(<span class="page gap">#{pagy_t('pagy.gap')}</span>)
+                else
+                  raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
                 end
       end
-      html << if p_next
-                %(<span class="page next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</span>)
-              else
-                %(<span class="page next disabled">#{pagy_t('pagy.nav.next')}</span>)
-              end
-      html << %(</nav>)
+      html << %(#{next_html(pagy, link)}</nav>)
     end
 
     # Return examples: "Displaying items 41-60 of 324 in total" or "Displaying Products 41-60 of 324 in total"
-    def pagy_info(pagy, pagy_id: nil, item_name: nil, i18n_key: nil)
+    def pagy_info(pagy, pagy_id: nil, item_name: nil, item_i18n_key: nil)
       p_id    = %( id="#{pagy_id}") if pagy_id
       p_count = pagy.count
       key     = if    p_count.zero?   then 'pagy.info.no_items'
@@ -53,22 +48,25 @@ class Pagy
                 end
 
       %(<span#{p_id} class="pagy-info">#{
-          pagy_t key, item_name: item_name || pagy_t(i18n_key || pagy.vars[:i18n_key], count: p_count),
+          pagy_t key, item_name: item_name || pagy_t(item_i18n_key || pagy.vars[:item_i18n_key], count: p_count),
                       count: p_count, from: pagy.from, to: pagy.to
         }</span>)
     end
 
-    # Return a performance optimized proc to generate the HTML links
+    # Return a performance optimized lambda to generate the HTML links
     # Benchmarked on a 20 link nav: it is ~22x faster and uses ~18x less memory than rails' link_to
     def pagy_link_proc(pagy, link_extra: '')
       p_prev      = pagy.prev
       p_next      = pagy.next
-      left, right = %(<a href="#{pagy_url_for(pagy, PAGE_PLACEHOLDER, html_escaped: true)}" #{
-                        pagy.vars[:link_extra]} #{link_extra}).split(PAGE_PLACEHOLDER, 2)
+      p_page      = pagy.page.to_s
+      left, right = %(<a href="#{pagy_url_for(pagy, PAGE_TOKEN)}" #{
+                        pagy.vars[:link_extra]} #{link_extra}).split(PAGE_TOKEN, 2)
+      # lambda used by all the helpers
       lambda do |page, text = pagy.label_for(page), extra_attrs = ''|
         %(#{left}#{page}#{right}#{ case page
                                    when p_prev then ' rel="prev"'
                                    when p_next then ' rel="next"'
+                                   when p_page then ' aria-disabled="true" aria-current="page"'
                                    else             ''
                                    end } #{extra_attrs}>#{text}</a>)
       end
@@ -79,5 +77,38 @@ class Pagy
     def pagy_t(key, opts = {})
       Pagy::I18n.translate(@pagy_locale ||= nil, key, opts)
     end
+
+    private
+
+    def nav_aria_label_attr(pagy, nav_aria_label, nav_i18n_key, count: pagy.pages)
+      nav_aria_label ||= pagy_t(nav_i18n_key || pagy.vars[:nav_i18n_key], count:)
+      %(aria-label="#{nav_aria_label}")
+    end
+
+    def prev_aria_label_attr
+      %(aria-label="#{pagy_t('pagy.aria_label.prev')}")
+    end
+
+    def next_aria_label_attr
+      %(aria-label="#{pagy_t('pagy.aria_label.next')}")
+    end
+
+    def prev_html(pagy, link, text: pagy_t('pagy.prev'))
+      if (p_prev = pagy.prev)
+        %(<span class="page prev">#{link.call(p_prev, text, prev_aria_label_attr)}</span>)
+      else
+        %(<span class="page prev disabled"><a role="link" aria-disabled="true" #{
+             prev_aria_label_attr}>#{text}</a></span>)
+      end
+    end
+
+    def next_html(pagy, link, text: pagy_t('pagy.next'))
+      if (p_next = pagy.next)
+        %(<span class="page next">#{link.call(p_next, text, next_aria_label_attr)}</span>)
+      else
+        %(<span class="page next disabled"><a role="link" aria-disabled="true" #{
+            next_aria_label_attr}>#{text}</a></span>)
+      end
+    end
   end
 end

data/lib/pagy/i18n.rb

@@ -107,8 +107,6 @@ class Pagy
                  hash['pl']    = RULE[:polish]
                  hash['ru']    = RULE[:east_slavic]
                  hash['sr']    = RULE[:east_slavic]
-                 hash['sv']    = RULE[:one_two_other]
-                 hash['sv-SE'] = RULE[:one_two_other]
                  hash['tr']    = RULE[:other]
                  hash['uk']    = RULE[:east_slavic]
                  hash['vi']    = RULE[:other]

data/lib/pagy/url_helpers.rb

@@ -6,7 +6,7 @@ class Pagy
     # Return the URL for the page, relying on the params method and Rack by default.
     # It supports all Rack-based frameworks (Sinatra, Padrino, Rails, ...).
     # For non-rack environments you can use the standalone extra
-    def pagy_url_for(pagy, page, absolute: false, html_escaped: false, **_)
+    def pagy_url_for(pagy, page, absolute: false, **_)
       vars         = pagy.vars
       request_path = vars[:request_path].to_s.empty? ? request.path : vars[:request_path]
       pagy_params  = pagy.params.is_a?(Hash) ? pagy.params.transform_keys(&:to_s) : {}
@@ -14,7 +14,6 @@ class Pagy
       pagy_set_query_params(page, vars, params)
       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
 

data/lib/pagy.rb

@@ -5,7 +5,7 @@ require 'pathname'
 
 # Core class
 class Pagy
-  VERSION = '6.5.0'
+  VERSION = '7.0.9'
 
   # Root pathname to get the path of Pagy files like templates or dictionaries
   def self.root
@@ -13,17 +13,19 @@ class Pagy
   end
 
   # Default core vars: constant for easy access, but mutable for customizable defaults
-  DEFAULT = { page:         1, # rubocop:disable Style/MutableConstant
-              items:        20,
-              outset:       0,
-              size:         [1, 4, 4, 1],
-              page_param:   :page,
-              params:       {},
-              fragment:     '',
-              link_extra:   '',
-              i18n_key:     'pagy.item_name',
-              cycle:        false,
-              request_path: '' }
+  DEFAULT = { page:          1, # rubocop:disable Style/MutableConstant
+              items:         20,
+              outset:        0,
+              size:          7,
+              page_param:    :page,
+              params:        {},
+              fragment:      '',
+              link_extra:    '',
+              item_i18n_key: 'pagy.item_name',
+              nav_i18n_key: 'pagy.aria_label.nav',
+              cycle:         false,
+              request_path:  '',
+              count_args:    [:all] } # AR friendly
 
   attr_reader :count, :page, :items, :vars, :pages, :last, :offset, :in, :from, :to, :prev, :next, :params, :request_path
 
@@ -87,12 +89,12 @@ class Pagy
     series
   end
 
-  # Allow the customization of the output (overridden by the calendar extra)
+  # Label for any page. Allow the customization of the output (overridden by the calendar extra)
   def label_for(page)
     page.to_s
   end
 
-  # Allow the customization of the output (overridden by the calendar extra)
+  # Label for the current page. Allow the customization of the output (overridden by the calendar extra)
   def label
     @page.to_s
   end