pagy 6.4.3 → 7.0.3

data/lib/locales/zh-CN.yml

@@ -1,20 +1,19 @@
 # :other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
-
 zh-CN:
   pagy:
-
+    aria_label:
+      # please add a comment in the https://github.com/ddnexus/pagy/issues/608
+      # posting the translation of the following  "Page"/"Pages" with the plurals for this locale
+      nav: "Pages"
+      prev: "上一页"
+      next: "下一页"
+    prev: "<"
+    next: ">"
+    gap: "…"
     item_name: ""
-
-    nav:
-      prev: "‹ 上一页"
-      next: "下一页 ›"
-      gap: "…"
-
     info:
       no_items: "项目未找到"
       single_page: "显示<b>%{count}</b> 项%{item_name}"
       multiple_pages: "共 <b>%{count}</b> 项%{item_name}，显示 <b>%{from}-%{to}</b>"
-
     combo_nav_js: "<label>第 %{page_input} / %{pages} 页</label>"
-
     items_selector_js: "<label>每页显示 %{items_input} 条%</label>"

data/lib/locales/zh-HK.yml

@@ -1,20 +1,19 @@
 # :other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
-
 zh-HK:
   pagy:
-
+    aria_label:
+      # please add a comment in the https://github.com/ddnexus/pagy/issues/609
+      # posting the translation of the following  "Page"/"Pages" with the plurals for this locale
+      nav: "Pages"
+      prev: "上一頁"
+      next: "下一頁"
+    prev: "<"
+    next: ">"
+    gap: "…"
     item_name: ""
-
-    nav:
-      prev: "‹ 上一頁"
-      next: "下一頁 ›"
-      gap: "…"
-
     info:
       no_items: "記錄未搵到"
       single_page: "顯示 <b>%{count}</b> %{item_name}"
       multiple_pages: "共 <b>%{count}</b>  %{item_name}，顯示 <b>%{from}-%{to}</b>"
-
     combo_nav_js: "<label>第 %{page_input} / %{pages} 頁</label>"
-
     items_selector_js: "<label>每頁顯示 %{items_input} 記錄</label>"

data/lib/locales/zh-TW.yml

@@ -1,20 +1,19 @@
 # :other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
-
 zh-TW:
   pagy:
-
+    aria_label:
+      # please add a comment in the https://github.com/ddnexus/pagy/issues/610
+      # posting the translation of the following  "Page"/"Pages" with the plurals for this locale
+      nav: "Pages"
+      prev: "上一頁"
+      next: "下一頁"
+    prev: "<"
+    next: ">"
+    gap: "…"
     item_name: ""
-
-    nav:
-      prev: "‹ 上一頁"
-      next: "下一頁 ›"
-      gap: "…"
-
     info:
       no_items: "沒找到項"
       single_page: "顯示 <b>%{count}</b> 項%{item_name}"
       multiple_pages: "共 <b>%{count}</b> 項%{item_name}，顯示 <b>%{from}-%{to}</b>"
-
     combo_nav_js: "<label>第 %{page_input} / %{pages} 頁</label>"
-
     items_selector_js: "<label>每頁顯示 %{items_input} 項%{item_name}</label>"

data/lib/pagy/backend.rb

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 class Pagy
-  # Define a few generic methods to paginate an ORM collection out of the box,
+  # Define a few generic methods to paginate a collection out of the box,
   # or any collection by overriding pagy_get_items and/or pagy_get_vars in your controller
   # See also the extras if you need specialized methods to paginate Arrays or other collections
   module Backend
@@ -18,7 +18,8 @@ class Pagy
     # You may need to override the count call for non AR collections
     def pagy_get_vars(collection, vars)
       pagy_set_items_from_params(vars) if defined?(ItemsExtra)
-      vars[:count] ||= (count = collection.count(:all)).is_a?(Hash) ? count.size : count
+      count_args = vars[:count_args] || DEFAULT[:count_args]
+      vars[:count] ||= (count = collection.count(*count_args)).is_a?(Hash) ? count.size : count
       vars[:page]  ||= pagy_get_page(vars)
       vars
     end

data/lib/pagy/calendar/day.rb

@@ -5,8 +5,9 @@ class Pagy # :nodoc:
   class Calendar # :nodoc:
     # Calendar day subclass
     class Day < Calendar
-      DEFAULT = { order:  :asc,      # rubocop:disable Style/MutableConstant
-                  format: '%Y-%m-%d' }
+      DEFAULT = { size:   31,   # rubocop:disable Style/MutableConstant
+                  order:  :asc,
+                  format: '%d' }
 
       protected
 

data/lib/pagy/calendar/helper.rb

@@ -17,13 +17,13 @@ class Pagy # :nodoc:
 
       # Create the calendar
       def init(conf, period, params)
-        @units = Calendar::UNITS & conf.keys # get the units in time length desc order
+        @conf  = Marshal.load(Marshal.dump(conf))  # store a copy
+        @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?
 
         @period     = period
         @params     = params
         @page_param = conf[:pagy][:page_param] || DEFAULT[:page_param]
-        @conf       = Marshal.load(Marshal.dump(conf))  # store a copy
         @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
@@ -33,11 +33,7 @@ class Pagy # :nodoc:
         object   = 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 |unit_params|  # delete page_param from the sub-units
-                                  # Hash#except missing from ruby 2.5 baseline
-                                  params_to_delete.each { |p| unit_params.delete(p.to_s) }
-                                  unit_params
-                                end
+          conf[unit][:params] = lambda { |up| up.except(*params_to_delete.map(&:to_s)) } # rubocop:disable Style/Lambda
           conf[unit][:period] = object&.send(:active_period) || @period
           calendar[unit]      = object = Calendar.send(:create, unit, conf[unit])
         end

data/lib/pagy/calendar/month.rb

@@ -5,8 +5,9 @@ class Pagy # :nodoc:
   class Calendar # :nodoc:
     # Calendar month subclass
     class Month < Calendar
-      DEFAULT = { order: :asc, # rubocop:disable Style/MutableConstant
-                  format: '%Y-%m' }
+      DEFAULT = { size: 12,   # rubocop:disable Style/MutableConstant
+                  order: :asc,
+                  format: '%b' }
 
       protected
 

data/lib/pagy/calendar/quarter.rb

@@ -5,8 +5,9 @@ class Pagy # :nodoc:
   class Calendar # :nodoc:
     # Calendar quarter subclass
     class Quarter < Calendar
-      DEFAULT = { order:  :asc,      # rubocop:disable Style/MutableConstant
-                  format: '%Y-Q%q' } # '%q' token
+      DEFAULT = { size:   4,      # rubocop:disable Style/MutableConstant
+                  order:  :asc,
+                  format: 'Q%q' } # '%q' token
 
       # The label for any page, with the substitution of the '%q' token
       def label_for(page, opts = {})

data/lib/pagy/calendar/year.rb

@@ -5,7 +5,8 @@ class Pagy # :nodoc:
   class Calendar # :nodoc:
     # Calendar year subclass
     class Year < Calendar
-      DEFAULT = { order:  :asc,      # rubocop:disable Style/MutableConstant
+      DEFAULT = { size:   10,   # rubocop:disable Style/MutableConstant
+                  order:  :asc,
                   format: '%Y' }
 
       protected

data/lib/pagy/extras/bootstrap.rb

@@ -8,84 +8,97 @@ class Pagy # :nodoc:
   # 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)
+    def pagy_bootstrap_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="page-link" #{link_extra}))
 
-      html = +%(<nav#{p_id} class="pagy-bootstrap-nav"><ul class="pagination">)
-      html << pagy_bootstrap_prev_html(pagy, link)
+      html = +%(<nav#{p_id} class="pagy-bootstrap-nav" #{
+                  nav_aria_label_attr(pagy, nav_aria_label, nav_i18n_key)}><ul class="pagination">)
+      html << bootstrap_prev_html(pagy, link)
       pagy.series(**vars).each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
         html << case item
                 when Integer
-                  %(<li class="page-item">#{link.call item}</li>)
+                  %(<li class="page-item">#{link.call(item)}</li>)
                 when String
-                  %(<li class="page-item active">#{link.call item}</li>)
+                  %(<li class="page-item active">#{link.call(item)}</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 href="#" 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 << bootstrap_next_html(pagy, link)
       html << %(</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)
+    def pagy_bootstrap_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="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>) }
+      tags = { 'before' => %(<ul class="pagination">#{bootstrap_prev_html pagy, link}),
+               'link'   => %(<li class="page-item">#{html = link.call(PAGE_PLACEHOLDER, LABEL_PLACEHOLDER)}</li>),
+               'active' => %(<li class="page-item active">#{html}</li>),
+               'gap'    => %(<li class="page-item gap disabled"><a href="#" class="page-link" aria-disabled="true">#{
+                               pagy_t 'pagy.gap'}</a></li>),
+               'after'  => %(#{bootstrap_next_html pagy, link}</ul>) }
 
       %(<nav#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-bootstrap-nav-js" #{
-        pagy_data(pagy, :nav, tags, sequels, pagy.label_sequels(sequels))}></nav>)
+          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 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: '')
+    def pagy_bootstrap_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; border: none; text-align: center; width: #{
-                    p_pages.to_s.length + 1}rem;">)
+                    p_pages.to_s.length + 1}rem;" aria-current="page">)
 
-      %(<nav#{p_id} class="pagy-bootstrap-combo-nav-js pagination"><div class="btn-group" role="group" #{
+      %(<nav#{p_id} class="pagy-bootstrap-combo-nav-js pagination" #{
+          nav_aria_label_attr(pagy, nav_aria_label, nav_i18n_key)}><div class="btn-group" role="group" #{
           pagy_data(pagy, :combo, pagy_marked_link(link))}>#{
           if (p_prev = pagy.prev)
-            link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous" class="prev btn btn-primary"'
+            link.call(p_prev, pagy_t('pagy.prev'), %(class="prev btn btn-primary" #{prev_aria_label_attr}))
           else
-            %(<a class="prev btn btn-primary disabled" href="#">#{pagy_t('pagy.nav.prev')}</a>)
+            %(<a class="prev btn btn-primary disabled" href="#" aria-disabled="true" #{
+                prev_aria_label_attr}>#{pagy_t('pagy.prev')}</a>)
           end
         }<div class="pagy-combo-input btn btn-secondary" style="white-space: nowrap;">#{
           pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages}</div>#{
-          if (p_next  = pagy.next)
-            link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next" class="next btn btn-primary"'
+          if (p_next = pagy.next)
+            link.call(p_next, pagy_t('pagy.next'), %(class="next btn btn-primary" #{next_aria_label_attr}))
           else
-            %(<a class="next btn btn-primary disabled" href="#">#{pagy_t 'pagy.nav.next'}</a>)
+            %(<a class="next btn btn-primary disabled" href="#" aria-disabled="true" #{
+                next_aria_label_attr}>#{pagy_t 'pagy.next'}</a>)
           end
         }</div></nav>)
     end
 
     private
 
-    def pagy_bootstrap_prev_html(pagy, link)
+    def bootstrap_prev_html(pagy, link)
       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">#{link.call(p_prev, pagy_t('pagy.prev'), prev_aria_label_attr)}</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 href="#" class="page-link" aria-disabled="true" #{
+            prev_aria_label_attr}>#{pagy_t('pagy.prev')}</a></li>)
       end
     end
 
-    def pagy_bootstrap_next_html(pagy, link)
+    def bootstrap_next_html(pagy, link)
       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">#{link.call p_next, pagy_t('pagy.next'), next_aria_label_attr}</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 href="#" class="page-link" aria-disabled="true" #{
+            next_aria_label_attr}>#{pagy_t('pagy.next')}</a></li>)
       end
     end
   end

data/lib/pagy/extras/bulma.rb

@@ -4,26 +4,29 @@
 require 'pagy/extras/frontend_helpers'
 
 class Pagy # :nodoc:
+  DEFAULT[:bulma_nav_classes] = 'is-centered'
+
   # 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)
+    def pagy_bulma_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-bulma-nav pagination is-centered" aria-label="pagination">)
-      html << pagy_bulma_prev_next_html(pagy, link)
+      html = +%(<nav#{p_id} class="pagy-bulma-nav pagination #{DEFAULT[:bulma_nav_classes]}" #{
+                  nav_aria_label_attr(pagy, nav_aria_label, nav_i18n_key)}>)
+      html << bulma_prev_next_html(pagy, link)
       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>#{link.call(item, pagy.label_for(item), %(class="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>#{link.call(item, pagy.label_for(item), %(class="pagination-link is-current"))}</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
@@ -31,62 +34,68 @@ class Pagy # :nodoc:
     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)
+    def pagy_bulma_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_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>),
+      link = pagy_link_proc(pagy, link_extra:)
+      tags = { 'before' => %(#{bulma_prev_next_html(pagy, link)}<ul class="pagination-list">),
+               'link'   => %(<li>#{link.call(PAGE_PLACEHOLDER, LABEL_PLACEHOLDER, %(class="pagination-link"))}</li>),
+               'active' => %(<li>#{link.call(PAGE_PLACEHOLDER, LABEL_PLACEHOLDER, %(class="pagination-link is-current"))}</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" #{
+      %(<nav#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-bulma-nav-js pagination #{DEFAULT[:bulma_nav_classes]}" #{
+        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 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: '')
+    def pagy_bulma_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" 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">)
 
-      html = %(<nav#{p_id} class="pagy-bulma-combo-nav-js" aria-label="pagination">)
+      html = %(<nav#{p_id} class="pagy-bulma-combo-nav-js #{DEFAULT[:bulma_nav_classes]}" #{
+                nav_aria_label_attr(pagy, nav_aria_label, nav_i18n_key)}>)
       %(#{html}<div class="field is-grouped is-grouped-centered" role="group" #{
           pagy_data(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>)
+            %(<p class="control">#{link.call(p_prev, pagy_t('pagy.prev'), %(class="button" #{prev_aria_label_attr}))}</p>)
           else
-            %(<p class="control"><a class="button" disabled>#{pagy_t 'pagy.nav.prev'}</a></p>)
+            %(<p class="control"><a class="button" disabled aria-disabled="true" #{
+                prev_aria_label_attr}>#{pagy_t 'pagy.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>)
+            %(<p class="control">#{link.call(p_next, pagy_t('pagy.next'), %(class="button" #{next_aria_label_attr}))}</p>)
           else
-            %(<p class="control"><a class="button" disabled>#{pagy_t 'pagy.nav.next'}</a></p>)
+            %(<p class="control"><a class="button" disabled aria-disabled="true"#{
+                next_aria_label_attr}>#{pagy_t 'pagy.next'}</a></p>)
           end
         }</div></nav>)
     end
 
     private
 
-    def pagy_bulma_prev_next_html(pagy, link)
+    def 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"'
+                link.call(p_prev, pagy_t('pagy.prev'), %(#{prev_aria_label_attr} class="pagination-previous"))
               else
-                %(<a class="pagination-previous" disabled>#{pagy_t 'pagy.nav.prev'}</a>)
+                %(<a class="pagination-previous" disabled aria-disabled="true" #{
+                    prev_aria_label_attr}>#{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"'
+                link.call(p_next, pagy_t('pagy.next'), %(#{next_aria_label_attr} class="pagination-next"))
               else
-                %(<a class="pagination-next" disabled>#{pagy_t 'pagy.nav.next'}</a>)
+                %(<a class="pagination-next" disabled aria-disabled="true" #{
+                    next_aria_label_attr}>#{pagy_t('pagy.next')}</a>)
               end
     end
   end

data/lib/pagy/extras/calendar.rb

@@ -8,18 +8,17 @@ 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
+        raise ArgumentError, "keys must be in #{CONF_KEYS.inspect}" \
+              unless conf.is_a?(Hash) && (conf.keys - CONF_KEYS).empty?
 
-        conf[:pagy] = {} unless conf[:pagy]  # use default Pagy object when omitted
+        conf[:pagy] ||= {}
         unless conf.key?(:active) && !conf[:active]
           calendar, from, to = Calendar::Helper.send(:init, conf, pagy_calendar_period(collection), params)
           collection         = pagy_calendar_filter(collection, from, to)
@@ -42,13 +41,13 @@ class Pagy # :nodoc:
     end
 
     # Additions for the Frontend module
-    module UrlHelper
+    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, CalendarExtra::UrlHelper
-  Frontend.prepend CalendarExtra::UrlHelper
+  Backend.prepend CalendarExtra::BackendAddOn, CalendarExtra::UrlHelperAddOn
+  Frontend.prepend CalendarExtra::UrlHelperAddOn
 end

data/lib/pagy/extras/elasticsearch_rails.rb

@@ -19,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.
@@ -30,9 +30,10 @@ class Pagy # :nodoc:
       end
       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
@@ -41,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
@@ -73,8 +75,6 @@ class Pagy # :nodoc:
         vars
       end
     end
+    Backend.prepend BackendAddOn
   end
-  ElasticsearchRails = ElasticsearchRailsExtra::ElasticsearchRails
-  extend ElasticsearchRailsExtra::Pagy
-  Backend.prepend ElasticsearchRailsExtra::Backend
 end