pagy 4.10.2 → 5.1.0

data/lib/pagy/extras/bulma.rb

@@ -4,8 +4,9 @@
 require 'pagy/extras/shared'
 
 class Pagy
-  module Frontend
-
+  # 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: '')
       p_id = %( id="#{pagy_id}") if pagy_id
@@ -16,67 +17,77 @@ class Pagy
       html << %(<ul class="pagination-list">)
       pagy.series.each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
         html << case item
-                when Integer then %(<li>#{link.call item, item, %(class="pagination-link" aria-label="goto page #{item}") }</li>)                           # page link
-                when String  then %(<li>#{link.call item, item, %(class="pagination-link is-current" aria-label="page #{item}" aria-current="page")}</li>)  # active page
-                when :gap    then %(<li><span class="pagination-ellipsis">#{pagy_t 'pagy.nav.gap'}</span></li>)                                            # page gap
+                when Integer
+                  %(<li>#{link.call item, item, %(class="pagination-link" aria-label="goto page #{item}")}</li>)
+                when String
+                  %(<li>#{link.call item, item,
+                                    %(class="pagination-link is-current" aria-label="page #{item}" aria-current="page")}</li>)
+                when :gap
+                  %(<li><span class="pagination-ellipsis">#{pagy_t 'pagy.nav.gap'}</span></li>)
+                else raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
                 end
       end
       html << %(</ul></nav>)
     end
 
-    def pagy_bulma_nav_js(pagy, deprecated_id=nil, pagy_id: nil, link_extra: '', steps: nil)
-      pagy_id = Pagy.deprecated_arg(:id, deprecated_id, :pagy_id, pagy_id) if deprecated_id
+    def pagy_bulma_nav_js(pagy, pagy_id: nil, link_extra: '', steps: nil)
       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, PAGE_PLACEHOLDER, %(class="pagination-link" aria-label="goto page #{PAGE_PLACEHOLDER}")}</li>),
-               'active' => %(<li>#{link.call PAGE_PLACEHOLDER, PAGE_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'   => %(<li>#{link.call PAGE_PLACEHOLDER, PAGE_PLACEHOLDER,
+                                             %(class="pagination-link" aria-label="goto page #{PAGE_PLACEHOLDER}")}</li>),
+               'active' => %(<li>#{link.call PAGE_PLACEHOLDER, PAGE_PLACEHOLDER,
+                                             %(class="pagination-link is-current" aria-current="page" aria-label="page #{
+                                                 PAGE_PLACEHOLDER}")}</li>),
+               'gap'    => %(<li><span class="pagination-ellipsis">#{pagy_t 'pagy.nav.gap'}</span></li>),
                'after'  => '</ul>' }
 
-      %(<nav#{p_id} class="pagy-njs pagy-bulma-nav-js pagination is-centered" aria-label="pagination" #{pagy_json_attr(pagy, :nav, tags, pagy.sequels(steps))}></nav>)
+      %(<nav#{p_id} class="pagy-njs pagy-bulma-nav-js pagination is-centered" aria-label="pagination" #{pagy_json_attr(
+        pagy, :nav, tags, pagy.sequels(steps)
+      )}></nav>)
     end
 
     # Javascript combo pagination for Bulma: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
-    def pagy_bulma_combo_nav_js(pagy, deprecated_id=nil, pagy_id: nil, link_extra: '')
-      pagy_id = Pagy.deprecated_arg(:id, deprecated_id, :pagy_id, pagy_id) if deprecated_id
+    def pagy_bulma_combo_nav_js(pagy, pagy_id: nil, link_extra: '')
       p_id    = %( id="#{pagy_id}") if pagy_id
       link    = pagy_link_proc(pagy, link_extra: link_extra)
       p_page  = pagy.page
       p_pages = pagy.pages
-      input   = %(<input class="input" type="number" min="1" max="#{p_pages}" value="#{p_page}" style="padding: 0; text-align: center; width: #{p_pages.to_s.length+1}rem; margin:0 0.3rem;">)
+      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;">)
 
-      %(<nav#{p_id} class="pagy-bulma-combo-nav-js" aria-label="pagination"><div class="field is-grouped is-grouped-centered" role="group" #{
-         pagy_json_attr pagy, :combo_nav, p_page, pagy_marked_link(link)
-      }>#{
+      html = %(<nav#{p_id} class="pagy-bulma-combo-nav-js" aria-label="pagination">)
+      %(#{html}<div class="field is-grouped is-grouped-centered" role="group" #{
+          pagy_json_attr pagy, :combo_nav, p_page, pagy_marked_link(link)}>#{
           if (p_prev  = pagy.prev)
             %(<p class="control">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'class="button" aria-label="previous page"'}</p>)
           else
             %(<p class="control"><a class="button" disabled>#{pagy_t 'pagy.nav.prev'}</a></p>)
           end
-      }<div class="pagy-combo-input control level is-mobile">#{pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages}</div>#{
+        }<div class="pagy-combo-input control level is-mobile">#{
+          pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages}</div>#{
           if (p_next  = pagy.next)
             %(<p class="control">#{link.call p_next, pagy_t('pagy.nav.next'), 'class="button" aria-label="next page"'}</p>)
           else
             %(<p class="control"><a class="button" disabled>#{pagy_t 'pagy.nav.next'}</a></p>)
           end
-      }</div></nav>)
+        }</div></nav>)
     end
 
     private
 
-      def pagy_bulma_prev_next_html(pagy, link)
-        html  = +if (p_prev = pagy.prev)
-                  link.call p_prev, pagy_t('pagy.nav.prev'), 'class="pagination-previous" aria-label="previous page"'
-                else
-                  %(<a class="pagination-previous" disabled>#{pagy_t 'pagy.nav.prev'}</a>)
-                end
-        html << if (p_next = pagy.next)
-                  link.call p_next, pagy_t('pagy.nav.next'), 'class="pagination-next" aria-label="next page"'
-                else
-                  %(<a class="pagination-next" disabled>#{pagy_t 'pagy.nav.next' }</a>)
-                end
-      end
-
+    def pagy_bulma_prev_next_html(pagy, link)
+      html = +if (p_prev = pagy.prev)
+                link.call p_prev, pagy_t('pagy.nav.prev'), 'class="pagination-previous" aria-label="previous page"'
+              else
+                %(<a class="pagination-previous" disabled>#{pagy_t 'pagy.nav.prev'}</a>)
+              end
+      html << if (p_next = pagy.next)
+                link.call p_next, pagy_t('pagy.nav.next'), 'class="pagination-next" aria-label="next page"'
+              else
+                %(<a class="pagination-next" disabled>#{pagy_t 'pagy.nav.next'}</a>)
+              end
+    end
   end
+  Frontend.prepend BulmaExtra
 end

data/lib/pagy/extras/countless.rb

@@ -4,33 +4,33 @@
 require 'pagy/countless'
 
 class Pagy
+  DEFAULT[:countless_minimal] = false
 
-  module Backend
-    private         # the whole module is private so no problem with including it in a controller
+  module CountlessExtra
+    private
 
     # Return Pagy object and items
-    def pagy_countless(collection, vars={})
+    def pagy_countless(collection, vars = {})
       pagy = Pagy::Countless.new(pagy_countless_get_vars(collection, vars))
-      [ pagy, pagy_countless_get_items(collection, pagy) ]
+      [pagy, pagy_countless_get_items(collection, pagy)]
     end
 
     # Sub-method called only by #pagy_countless: here for easy customization of variables by overriding
     def pagy_countless_get_vars(_collection, vars)
-      pagy_set_items_from_params(vars) if defined?(UseItemsExtra)
-      vars[:page]  ||= params[ vars[:page_param] || VARS[:page_param] ]
+      pagy_set_items_from_params(vars) if defined?(ItemsExtra)
+      vars[:page] ||= params[vars[:page_param] || DEFAULT[:page_param]]
       vars
     end
 
     # Sub-method called only by #pagy_countless: here for easy customization of record-extraction by overriding
+    # You may need to override this method for collections without offset|limit
     def pagy_countless_get_items(collection, pagy)
-      # This should work with ActiveRecord, Sequel, Mongoid...
-      items      = collection.offset(pagy.offset).limit(pagy.items + 1).to_a
-      items_size = items.size
-      items.pop if items_size == pagy.items + 1
-      # finalize may adjust pagy.items, so must be used after checking the size
-      pagy.finalize(items_size)
-      items
-    end
+      return collection.offset(pagy.offset).limit(pagy.items) if pagy.vars[:countless_minimal]
 
+      fetched = collection.offset(pagy.offset).limit(pagy.items + 1).to_a # eager load items + 1
+      pagy.finalize(fetched.size)                                         # finalize the pagy object
+      fetched[0, pagy.items]                                              # ignore eventual extra item
+    end
   end
+  Backend.prepend CountlessExtra
 end

data/lib/pagy/extras/elasticsearch_rails.rb

@@ -2,60 +2,77 @@
 # frozen_string_literal: true
 
 class Pagy
+  DEFAULT[:elasticsearch_rails_search_method] ||= :pagy_search
 
-  VARS[:elasticsearch_rails_search_method] ||= :pagy_search
+  module ElasticsearchRailsExtra
+    module_function
 
-  module ElasticsearchRails
-    # returns 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 eventually called method
-    def pagy_elasticsearch_rails(query_or_payload, **options)
-      [self, query_or_payload, options].tap do |args|
-        args.define_singleton_method(:method_missing){|*a| args += a}
-      end
+    # Get the count from different version of ElasticsearchRails
+    def total_count(response)
+      total = if response.respond_to?(:raw_response)
+                response.raw_response['hits']['total']
+              else
+                response.response['hits']['total']
+              end
+      total.is_a?(Hash) ? total['value'] : total
     end
-    alias_method VARS[:elasticsearch_rails_search_method], :pagy_elasticsearch_rails
-  end
-
-  # create a Pagy object from an Elasticsearch::Model::Response::Response object
-  def self.new_from_elasticsearch_rails(response, vars={})
-    vars[:items] = response.search.options[:size] || 10
-    vars[:page]  = (response.search.options[:from] || 0) / vars[:items] + 1
-    total        = response.respond_to?(:raw_response) ? response.raw_response['hits']['total'] : response.response['hits']['total']
-    vars[:count] = total.is_a?(Hash) ? total['value'] : total
-    new(vars)
-  end
 
-  # Add specialized backend methods to paginate ElasticsearchRails searches
-  module Backend
-    private
-
-    # Return Pagy object and items
-    def pagy_elasticsearch_rails(pagy_search_args, vars={})
-      model, query_or_payload, options, *called = pagy_search_args
-      vars           = pagy_elasticsearch_rails_get_vars(nil, vars)
-      options[:size] = vars[:items]
-      options[:from] = vars[:items] * (vars[:page] - 1)
-      response       = model.search(query_or_payload, **options)
-      total          = response.respond_to?(:raw_response) ? response.raw_response['hits']['total'] : response.response['hits']['total']
-      vars[:count]   = total.is_a?(Hash) ? total['value'] : total
-
-      pagy = Pagy.new(vars)
-      # with :last_page overflow we need to re-run the method in order to get the hits
-      return pagy_elasticsearch_rails(pagy_search_args, vars.merge(page: pagy.page)) \
-             if defined?(Pagy::UseOverflowExtra) && pagy.overflow? && pagy.vars[:overflow] == :last_page
-
-      [ pagy, called.empty? ? response : response.send(*called) ]
+    module ElasticsearchRails
+      # 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.
+      def pagy_elasticsearch_rails(query_or_payload, **options)
+        [self, query_or_payload, options].tap do |args|
+          args.define_singleton_method(:method_missing) { |*a| args += a }
+        end
+      end
+      alias_method Pagy::DEFAULT[:elasticsearch_rails_search_method], :pagy_elasticsearch_rails
     end
 
-    # Sub-method called only by #pagy_elasticsearch_rails: here for easy customization of variables by overriding
-    # the _collection argument is not available when the method is called
-    def pagy_elasticsearch_rails_get_vars(_collection, vars)
-      pagy_set_items_from_params(vars) if defined?(UseItemsExtra)
-      vars[:items] ||= VARS[:items]
-      vars[:page]  ||= (params[ vars[:page_param] || VARS[:page_param] ] || 1).to_i
-      vars
+    # Additions for the Pagy class
+    module Pagy
+      # 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
+        vars[:page]  = ((response.search.options[:from] || 0) / vars[:items]) + 1
+        vars[:count] = ElasticsearchRailsExtra.total_count(response)
+        new(vars)
+      end
     end
 
+    # Add specialized backend methods to paginate ElasticsearchRails searches
+    module Backend
+      private
+
+      # Return Pagy object and items
+      def pagy_elasticsearch_rails(pagy_search_args, vars = {})
+        model, query_or_payload,
+        options, *called = pagy_search_args
+        vars             = pagy_elasticsearch_rails_get_vars(nil, vars)
+        options[:size]   = vars[:items]
+        options[:from]   = vars[:items] * (vars[:page] - 1)
+        response         = model.search(query_or_payload, **options)
+        vars[:count]     = ElasticsearchRailsExtra.total_count(response)
+
+        pagy = ::Pagy.new(vars)
+        # with :last_page overflow we need to re-run the method in order to get the hits
+        return pagy_elasticsearch_rails(pagy_search_args, vars.merge(page: pagy.page)) \
+               if defined?(::Pagy::OverflowExtra) && pagy.overflow? && pagy.vars[:overflow] == :last_page
+
+        [pagy, called.empty? ? response : response.send(*called)]
+      end
+
+      # Sub-method called only by #pagy_elasticsearch_rails: here for easy customization of variables by overriding
+      # the _collection argument is not available when the method is called
+      def pagy_elasticsearch_rails_get_vars(_collection, vars)
+        pagy_set_items_from_params(vars) if defined?(ItemsExtra)
+        vars[:items] ||= DEFAULT[:items]
+        vars[:page]  ||= (params[vars[:page_param] || DEFAULT[:page_param]] || 1).to_i
+        vars
+      end
+    end
   end
+  ElasticsearchRails = ElasticsearchRailsExtra::ElasticsearchRails
+  extend ElasticsearchRailsExtra::Pagy
+  Backend.prepend ElasticsearchRailsExtra::Backend
 end

data/lib/pagy/extras/foundation.rb

@@ -4,8 +4,9 @@
 require 'pagy/extras/shared'
 
 class Pagy
-  module Frontend
-
+  # Frontend modules are specially optimized for performance.
+  # 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: '')
       p_id = %( id="#{pagy_id}") if pagy_id
@@ -18,6 +19,7 @@ class Pagy
                 when Integer then %(<li>#{link.call item}</li>)                        # page link
                 when String  then %(<li class="current">#{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}"
                 end
       end
       html << pagy_foundation_next_html(pagy, link)
@@ -25,8 +27,7 @@ class Pagy
     end
 
     # Javascript pagination for foundation: it returns a nav and a JSON tag used by the Pagy.nav javascript
-    def pagy_foundation_nav_js(pagy, deprecated_id=nil, pagy_id: nil, link_extra: '', steps: nil)
-      pagy_id = Pagy.deprecated_arg(:id, deprecated_id, :pagy_id, pagy_id) if deprecated_id
+    def pagy_foundation_nav_js(pagy, pagy_id: nil, link_extra: '', steps: nil)
       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}),
@@ -35,52 +36,54 @@ class Pagy
                'gap'    => %(<li class="ellipsis gap" aria-hidden="true"></li>),
                'after'  => %(#{pagy_foundation_next_html pagy, link}</ul>) }
 
-      %(<nav#{p_id} class="pagy-njs pagy-foundation-nav-js" aria-label="Pagination" #{pagy_json_attr(pagy, :nav, tags, pagy.sequels(steps))}></nav>)
+      %(<nav#{p_id} class="pagy-njs pagy-foundation-nav-js" aria-label="Pagination" #{
+          pagy_json_attr(pagy, :nav, tags, pagy.sequels(steps))}></nav>)
     end
 
     # Javascript combo pagination for Foundation: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
-    def pagy_foundation_combo_nav_js(pagy, deprecated_id=nil, pagy_id: nil, link_extra: '')
-      pagy_id = Pagy.deprecated_arg(:id, deprecated_id, :pagy_id, pagy_id) if deprecated_id
+    def pagy_foundation_combo_nav_js(pagy, pagy_id: nil, link_extra: '')
       p_id    = %( id="#{pagy_id}") if pagy_id
       link    = pagy_link_proc(pagy, link_extra: link_extra)
       p_page  = pagy.page
       p_pages = pagy.pages
-      input   = %(<input class="input-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;">)
+      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;">)
 
       %(<nav#{p_id} class="pagy-foundation-combo-nav-js" aria-label="Pagination"><div class="input-group" #{
-          pagy_json_attr pagy, :combo_nav, p_page, pagy_marked_link(link)
-      }>#{
+          pagy_json_attr pagy, :combo_nav, p_page, 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"'
+            link.call p_prev, pagy_t('pagy.nav.prev'),
+                      'style="margin-bottom: 0" aria-label="previous" class="prev button primary"'
           else
             %(<a style="margin-bottom: 0" class="prev button primary disabled" href="#">#{pagy_t 'pagy.nav.prev'}</a>)
           end
-      }<span class="input-group-label">#{pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages}</span>#{
+        }<span class="input-group-label">#{pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages}</span>#{
           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"'
           else
             %(<a style="margin-bottom: 0" class="next button primary disabled" href="#">#{pagy_t 'pagy.nav.next'}</a>)
           end
-      }</div></nav>)
+        }</div></nav>)
     end
 
     private
 
-      def pagy_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>)
-        else
-          %(<li class="prev disabled">#{pagy_t 'pagy.nav.prev' }</li>)
-        end
+    def pagy_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>)
+      else
+        %(<li class="prev disabled">#{pagy_t 'pagy.nav.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>)
-        else
-          %(<li class="next disabled">#{pagy_t 'pagy.nav.next'}</li>)
-        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>)
+      else
+        %(<li class="next disabled">#{pagy_t 'pagy.nav.next'}</li>)
       end
-
+    end
   end
+  Frontend.prepend FoundationExtra
 end

data/lib/pagy/extras/gearbox.rb

@@ -0,0 +1,42 @@
+# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/gearbox
+# frozen_string_literal: true
+
+class Pagy
+  DEFAULT[:gearbox_extra] = true # extra enabled by default
+  DEFAULT[:gearbox_items] = [15, 30, 60, 100]
+
+  # Automatically change the number of items per page depending on the page number
+  # accepts an array as the :gearbox_items variable, that will determine the items for the first pages
+  module GearboxExtra
+    # Setup @items based on the :items variable
+    def setup_items_var
+      return super if !@vars[:gearbox_extra] || @vars[:items_extra]
+
+      gearbox_items = @vars[:gearbox_items]
+      raise VariableError.new(self, :gearbox_items, 'to be an Array of positives', gearbox_items) \
+            unless gearbox_items.is_a?(Array) && gearbox_items.all? { |num| num.positive? rescue false } # rubocop:disable Style/RescueModifier
+
+      @items = gearbox_items[@page - 1] || gearbox_items.last
+    end
+
+    # Setup @pages and @last based on the :items variable
+    def setup_pages_var
+      return super if !@vars[:gearbox_extra] || @vars[:items_extra]
+
+      gearbox_items = @vars[:gearbox_items]
+      # This algorithm is thousands of times faster than the one in the geared_pagination gem
+      @pages = @last = (if @count > (sum = gearbox_items.sum)
+                          [((@count - sum).to_f / gearbox_items.last).ceil, 1].max + gearbox_items.count
+                        else
+                          pages    = 0
+                          reminder = @count
+                          while reminder.positive?
+                            pages    += 1
+                            reminder -= gearbox_items[pages - 1]
+                          end
+                          [pages, 1].max
+                        end)
+    end
+  end
+  prepend GearboxExtra
+end

data/lib/pagy/extras/headers.rb

@@ -1,35 +1,43 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/headers
 # frozen_string_literal: true
 
+require 'pagy/url_helpers'
+
 class Pagy
+  DEFAULT[:headers] = { page:  'Current-Page',
+                        items: 'Page-Items',
+                        count: 'Total-Count',
+                        pages: 'Total-Pages' }
   # Add specialized backend methods to add pagination response headers
-  module Backend
-    private
-
-    VARS[:headers] = { page: 'Current-Page', items: 'Page-Items', count: 'Total-Count', pages: 'Total-Pages' }
+  module HeadersExtra
+    include UrlHelpers
 
-    include Helpers
+    private
 
+    # Merge the pagy headers into the response.headers
     def pagy_headers_merge(pagy)
       response.headers.merge!(pagy_headers(pagy))
     end
 
+    # 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
 
+    # Generates a hash structure of the headers
     def pagy_headers_hash(pagy)
-      countless = defined?(Pagy::Countless) && pagy.is_a?(Pagy::Countless)
-      rels = { 'first' => 1, 'prev' => pagy.prev, 'next' => pagy.next }
-      rels['last'] = pagy.last unless countless
-      url_str = pagy_url_for(pagy, PAGE_PLACEHOLDER, absolute: true)
-      hash    = { 'Link' => rels.map do |rel, num| # filter_map if ruby >=2.7
-                              next unless num
-                              [ rel, url_str.sub(PAGE_PLACEHOLDER, num.to_s) ]
-                            end.compact.to_h }
-      headers = pagy.vars[:headers]
+      countless             = defined?(Pagy::Countless) && pagy.is_a?(Pagy::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
+                                next unless num # rubocop:disable Layout/EmptyLineAfterGuardClause
+                                [r, url_str.sub(PAGE_PLACEHOLDER, num.to_s)]
+                              end.compact.to_h
+      hash                  = { 'Link' => link }
+      headers               = pagy.vars[:headers]
       hash[headers[:page]]  = pagy.page.to_s         if headers[:page]
       hash[headers[:items]] = pagy.vars[:items].to_s if headers[:items]
       unless countless
@@ -38,6 +46,6 @@ class Pagy
       end
       hash
     end
-
   end
+  Backend.prepend HeadersExtra
 end

data/lib/pagy/extras/i18n.rb

@@ -3,22 +3,13 @@
 
 class Pagy
   # Use ::I18n gem
-  module Frontend
-
-    ::I18n.load_path += Dir[Pagy.root.join('locales', '*.yml')]
-
-    # unload the pagy default constant for efficiency
-    Pagy::I18n.clear.instance_eval do
-      undef :load
-      undef :t
-    end
-
-    module UseI18nGem
-      def pagy_t(key, **opts)
-        ::I18n.t(key, **opts)
-      end
+  module I18nExtra
+    def pagy_t(key, **opts)
+      ::I18n.t(key, **opts)
     end
-    prepend UseI18nGem
-
   end
+  Frontend.prepend I18nExtra
+
+  # Add the pagy locales to the I18n.load_path
+  ::I18n.load_path += Dir[Pagy.root.join('locales', '*.yml')]
 end

data/lib/pagy/extras/items.rb

@@ -3,50 +3,49 @@
 
 require 'pagy/extras/shared'
 
-class Pagy
+class Pagy  # Default variables for this extra
+  DEFAULT[:items_param] = :items
+  DEFAULT[:max_items]   = 100
+  DEFAULT[:items_extra] = true   # extra enabled by default
 
-  # Default variables for this extra
-  VARS[:items_param] = :items
-  VARS[:max_items]   = 100
-
-  VARS[:enable_items_extra] = true
-
-  ITEMS_PLACEHOLDER = '__pagy_items__'
-
-  module UseItemsExtra; end
-
-  module Backend
-    private
+  module ItemsExtra
+    module Backend
+      private
 
+      # Set the items variable considering the params and other pagy variables
       def pagy_set_items_from_params(vars)
-        return if vars[:items]
-        return unless vars.key?(:enable_item_extra) ? vars[:enable_item_extra] : VARS[:enable_items_extra]
-        return unless (items = params[vars[:items_param] || VARS[:items_param]])                               # :items from :items_param
-        vars[:items] = [items.to_i, vars.key?(:max_items) ? vars[:max_items] : VARS[:max_items]].compact.min   # :items capped to :max_items
-      end
+        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
 
-  end
-
-  module Frontend
-
-    # Return the items selector HTML. For example "Show [20] items per page"
-    def pagy_items_selector_js(pagy, deprecated_id=nil, pagy_id: nil, item_name: nil, i18n_key: nil, link_extra: '')
-      return '' unless pagy.vars[:enable_items_extra]
-      pagy_id        = Pagy.deprecated_arg(:id, deprecated_id, :pagy_id, pagy_id) if deprecated_id
-      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))
-      p_vars[:items] = p_items # restore the items
-
-      html  = +%(<span#{p_id} class="pagy-items-selector-js" #{pagy_json_attr pagy, :items_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 << %(</span>)
+        vars[:items] = [items.to_i, vars.key?(:max_items) ? vars[:max_items] : DEFAULT[:max_items]].compact.min
+      end
     end
 
+    module Frontend
+      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: '')
+        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))
+        p_vars[:items] = p_items # restore the items
+
+        html  = +%(<span#{p_id} class="pagy-items-selector-js" #{pagy_json_attr pagy, :items_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 << %(</span>)
+      end
+    end
   end
+  Backend.prepend ItemsExtra::Backend
+  Frontend.prepend ItemsExtra::Frontend
 end