pagy 3.11.0 → 4.3.0

data/lib/pagy/extras/headers.rb

@@ -1,10 +1,10 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/headers
-# encoding: utf-8
 # frozen_string_literal: true
 
 class Pagy
   # Add specialized backend methods to add pagination response headers
-  module Backend ; private
+  module Backend
+    private
 
     VARS[:headers] = { page: 'Current-Page', items: 'Page-Items', count: 'Total-Count', pages: 'Total-Pages' }
 
@@ -15,17 +15,21 @@ class Pagy
     end
 
     def pagy_headers(pagy)
-      hash = pagy_headers_hash(pagy)
-      hash['Link'] = hash['Link'].map{|rel, link| %(<#{link}>; rel="#{rel}")}.join(', ')
-      hash
+      pagy_headers_hash(pagy).tap do |hash|
+        hash['Link'] = hash['Link'].map{|rel, link| %(<#{link}>; rel="#{rel}")}.join(', ')
+      end
     end
 
     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(PAGE_PLACEHOLDER, pagy, :url)
-      hash      = { 'Link' => Hash[rels.map{|rel, n|[rel, url_str.sub(PAGE_PLACEHOLDER, n.to_s)] if n}.compact] }
-      headers   = pagy.vars[:headers]
+      rels = { 'first' => 1, 'prev' => pagy.prev, 'next' => pagy.next }
+      rels['last'] = pagy.last unless countless
+      url_str = pagy_url_for(PAGE_PLACEHOLDER, pagy, :url)
+      hash    = { 'Link' => rels.map do |rel, num|
+                              next unless num
+                              [ rel, url_str.sub(PAGE_PLACEHOLDER, num.to_s) ]
+                            end.compact.to_h }
+      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

data/lib/pagy/extras/i18n.rb

@@ -1,5 +1,4 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/i18n
-# encoding: utf-8
 # frozen_string_literal: true
 
 class Pagy
@@ -8,18 +7,16 @@ class Pagy
 
     ::I18n.load_path += Dir[Pagy.root.join('locales', '*.yml')]
 
-    Pagy::I18n.clear.instance_eval { undef :load; undef :t } # unload the pagy default constant for efficiency
+    # unload the pagy default constant for efficiency
+    Pagy::I18n.clear.instance_eval do
+      undef :load
+      undef :t
+    end
 
-    alias_method :pagy_without_i18n, :pagy_t
-    if Gem::Version.new(::I18n::VERSION) < Gem::Version.new('1.6.0')
-      def pagy_t_with_i18n(*args) ::I18n.t(*args) end
-    else
-      # keep 1.9 compatibility by hiding 2.0+ syntax in string
-      module_eval <<-RUBY
-        def pagy_t_with_i18n(key, **opts) ::I18n.t(key, **opts) end
-      RUBY
+    module UseI18nGem
+      def pagy_t(key, **opts) = ::I18n.t(key, **opts)
     end
-    alias_method :pagy_t, :pagy_t_with_i18n
+    prepend UseI18nGem
 
   end
 end

data/lib/pagy/extras/items.rb

@@ -1,5 +1,4 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/items
-# encoding: utf-8
 # frozen_string_literal: true
 
 require 'pagy/extras/shared'
@@ -12,40 +11,42 @@ class Pagy
 
   ITEMS_PLACEHOLDER = '__pagy_items__'
 
-  # Handle a custom number of :items from params
-  module Backend ; private
+  module UseItemsExtra
+    private
 
-    def pagy_with_items(vars)
-      vars[:items] ||= (items = params[vars[:items_param] || VARS[:items_param]]) &&                           # :items from :items_param
-                       [items.to_i, vars.key?(:max_items) ? vars[:max_items] : VARS[:max_items]].compact.min   # :items capped to :max_items
-    end
+    %i[ pagy_get_vars
+        pagy_countless_get_vars
+        pagy_elasticsearch_rails_get_vars
+        pagy_searchkick_get_vars
+    ].each do |meth|
+      next unless Backend.private_method_defined?(meth, true)
 
-    # add the pagy*_get_vars alias-chained methods for frontend, and defined/required extras
-    [nil, 'countless', 'elasticsearch_rails', 'searchkick'].each do |name|
-      prefix, if_start, if_end = "_#{name}", "if defined?(Pagy::#{name.upcase})", "end" if name
-      module_eval <<-RUBY
-        #{if_start}
-          alias_method :pagy#{prefix}_get_vars_without_items, :pagy#{prefix}_get_vars
-          def pagy#{prefix}_get_vars_with_items(collection, vars)
-            pagy_with_items(vars)
-            pagy#{prefix}_get_vars_without_items(collection, vars)
-          end
-          alias_method :pagy#{prefix}_get_vars, :pagy#{prefix}_get_vars_with_items  
-        #{if_end}
-      RUBY
+      define_method(meth) do |collection, vars|
+        vars[:items] ||= if (items = params[vars[:items_param] || VARS[:items_param]])                             # :items from :items_param
+                           [items.to_i, vars.key?(:max_items) ? vars[:max_items] : VARS[:max_items]].compact.min   # :items capped to :max_items
+                         end
+        super collection, vars
+      end
     end
 
   end
+  Backend.prepend UseItemsExtra
+
 
   module Frontend
 
-    alias_method :pagy_url_for_without_items, :pagy_url_for
-    def pagy_url_for_with_items(page, pagy, url=false)
-      p_vars = pagy.vars; params = request.GET.merge(p_vars[:params]); params[p_vars[:page_param].to_s] = page
-      params[p_vars[:items_param].to_s] = p_vars[:items]
-      "#{request.base_url if url}#{request.path}?#{Rack::Utils.build_nested_query(pagy_get_params(params))}#{p_vars[:anchor]}"
+    module UseItemsExtra
+
+      def pagy_url_for(page, pagy, url=nil)
+        p_vars = pagy.vars
+        params = request.GET.merge(p_vars[:params])
+        params[p_vars[:page_param].to_s]  = page
+        params[p_vars[:items_param].to_s] = p_vars[:items]
+        "#{request.base_url if url}#{request.path}?#{Rack::Utils.build_nested_query(pagy_get_params(params))}#{p_vars[:anchor]}"
+      end
+
     end
-    alias_method :pagy_url_for, :pagy_url_for_with_items
+    prepend UseItemsExtra
 
     # Return the items selector HTML. For example "Show [20] items per page"
     def pagy_items_selector_js(pagy, id=pagy_id)
@@ -55,10 +56,12 @@ class Pagy
       link           = pagy_marked_link(pagy_link_proc(pagy))
       p_vars[:items] = p_items # restore the items
 
-      html = EMPTY + %(<span id="#{id}">)
+      html  = %(<span id="#{id}">)
       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: pagy_t(p_vars[:i18n_key], count: p_items), items_input: input, count: p_items)})
-      html << %(</span>#{pagy_json_tag(:items_selector, id, pagy.from, link, defined?(TRIM) && p_vars[:page_param])})
+      html << pagy_t('pagy.items_selector_js', item_name:   pagy_t(p_vars[:i18n_key], count: p_items),
+                                               items_input: input,
+                                               count:       p_items)
+      html << %(</span>#{pagy_json_tag(pagy, :items_selector, id, pagy.from, link)})
     end
 
   end

data/lib/pagy/extras/materialize.rb

@@ -1,5 +1,4 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/materialize
-# encoding: utf-8
 # frozen_string_literal: true
 
 require 'pagy/extras/shared'
@@ -9,51 +8,70 @@ class Pagy
 
     # Pagination for materialize: it returns the html with the series of links to the pages
     def pagy_materialize_nav(pagy)
-      link, p_prev, p_next = pagy_link_proc(pagy), pagy.prev, pagy.next
-      html = EMPTY + (p_prev ? %(<li class="waves-effect prev">#{link.call p_prev, '<i class="material-icons">chevron_left</i>', 'aria-label="previous"'}</li>)
-                             : %(<li class="prev disabled"><a href="#"><i class="material-icons">chevron_left</i></a></li>))
+      link = pagy_link_proc(pagy)
+
+      html = +%(<div class="pagy-materialize-nav pagination" role="navigation" aria-label="pager"><ul class="pagination">)
+      html << pagy_materialize_prev_html(pagy, link)
       pagy.series.each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
-        html << if    item.is_a?(Integer); %(<li class="waves-effect">#{link.call item}</li>)                                             # page link
-                elsif item.is_a?(String) ; %(<li class="active">#{link.call item}</li>)                                                   # active page
-                elsif item == :gap       ; %(<li class="gap disabled"><a href="#">#{pagy_t('pagy.nav.gap')}</a></li>)   # page gap
+        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
                 end
       end
-      html << (p_next ? %(<li class="waves-effect next">#{link.call p_next, '<i class="material-icons">chevron_right</i>', 'aria-label="next"'}</li>)
-                      : %(<li class="next disabled"><a href="#"><i class="material-icons">chevron_right</i></a></li>))
-      %(<div class="pagy-materialize-nav pagination" role="navigation" aria-label="pager"><ul class="pagination">#{html}</ul></div>)
+      html << pagy_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.nav javascript
     def pagy_materialize_nav_js(pagy, id=pagy_id)
-      link, p_prev, p_next = pagy_link_proc(pagy), pagy.prev, pagy.next
-      tags = { 'before' => ( '<ul class="pagination">' \
-                           + (p_prev  ? %(<li class="waves-effect prev">#{link.call(p_prev, '<i class="material-icons">chevron_left</i>', 'aria-label="previous"')}</li>)
-                                      : %(<li class="prev disabled"><a href="#"><i class="material-icons">chevron_left</i></a></li>)) ),
+      link = pagy_link_proc(pagy)
+      tags = { 'before' => %(<ul class="pagination">#{pagy_materialize_prev_html pagy, link}),
                'link'   => %(<li class="waves-effect">#{mark = link.call(PAGE_PLACEHOLDER)}</li>),
                'active' => %(<li class="active">#{mark}</li>),
-               'gap'    => %(<li class="gap disabled"><a href="#">#{pagy_t('pagy.nav.gap')}</a></li>),
-               'after'  => ( (p_next ? %(<li class="waves-effect next">#{link.call(p_next, '<i class="material-icons">chevron_right</i>', 'aria-label="next"')}</li>)
-                                     : %(<li class="next disabled"><a href="#"><i class="material-icons">chevron_right</i></a></li>)) \
-                           + '</ul>' ) }
-      %(<div id="#{id}" class="pagy-materialize-nav-js" role="navigation" aria-label="pager"></div>#{pagy_json_tag(:nav, id, tags, pagy.sequels, defined?(TRIM) && pagy.vars[:page_param])})
+               'gap'    => %(<li class="gap disabled"><a href="#">#{pagy_t 'pagy.nav.gap'}</a></li>),
+               'after'  => %(#{pagy_materialize_next_html pagy, link}</ul>) }
+
+      html = %(<div id="#{id}" class="pagy-materialize-nav-js" role="navigation" aria-label="pager"></div>)
+      html << pagy_json_tag(pagy, :nav, id, tags, pagy.sequels)
     end
 
     # Javascript combo pagination for materialize: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
     def pagy_materialize_combo_nav_js(pagy, id=pagy_id)
-      link, p_prev, p_next, p_page, p_pages = pagy_link_proc(pagy), pagy.prev, pagy.next, pagy.page, pagy.pages
-
-      html = %(<div id="#{id}" class="pagy-materialize-combo-nav-js pagination" role="navigation" aria-label="pager">) \
-           + %(<div class="pagy-compact-chip role="group" style="height: 35px; border-radius: 18px; background: #e4e4e4; display: inline-block;">)
-      html << '<ul class="pagination" style="margin: 0px;">'
-      li_style = 'style="vertical-align: middle;"'
-      html << (p_prev ? %(<li class="waves-effect prev" #{li_style}>#{link.call p_prev, '<i class="material-icons">chevron_left</i>', 'aria-label="previous"'}</li>)
-                      : %(<li class="prev disabled" #{li_style}><a href="#"><i class="material-icons">chevron_left</i></a></li>))
-      input = %(<input type="number" class="browser-default" min="1" max="#{p_pages}" value="#{p_page}" style="padding: 2px; border: none; border-radius: 2px; text-align: center; width: #{p_pages.to_s.length+1}rem;">)
-      html << %(<div class="pagy-combo-input btn-flat" style="cursor: default; padding: 0px">#{pagy_t('pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages)}</div>)
-      html << (p_next ? %(<li class="waves-effect next" #{li_style}>#{link.call p_next, '<i class="material-icons">chevron_right</i>', 'aria-label="next"'}</li>)
-                      : %(<li class="next disabled" #{li_style}><a href="#"><i class="material-icons">chevron_right</i></a></li>))
-      html << %(</ul></div>#{pagy_json_tag(:combo_nav, id, p_page, pagy_marked_link(link), defined?(TRIM) && pagy.vars[:page_param])})
+      link    = pagy_link_proc(pagy)
+      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="padding: 2px; border: none; border-radius: 2px; text-align: center; width: #{p_pages.to_s.length+1}rem;">)
+
+      %(<div id="#{id}" class="pagy-materialize-combo-nav-js pagination" role="navigation" aria-label="pager"><div class="pagy-compact-chip role="group" style="height: 35px; border-radius: 18px; background: #e4e4e4; display: inline-block;"><ul class="pagination" style="margin: 0px;">#{
+          pagy_materialize_prev_html pagy, link, style
+      }<div class="pagy-combo-input btn-flat" style="cursor: default; padding: 0px">#{
+          pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages
+      }</div>#{
+          pagy_materialize_next_html pagy, link, style
+      }</ul></div>#{
+          pagy_json_tag pagy, :combo_nav, id, p_page, pagy_marked_link(link)
+      })
     end
 
+    private
+
+      def pagy_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>)
+        else
+          %(<li class="prev disabled"#{style}><a href="#"><i class="material-icons">chevron_left</i></a></li>)
+        end
+      end
+
+      def pagy_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>)
+        else
+          %(<li class="next disabled"#{style}><a href="#"><i class="material-icons">chevron_right</i></a></li>)
+        end
+      end
+
   end
 end

data/lib/pagy/extras/metadata.rb

@@ -1,36 +1,41 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/metadata
-# encoding: utf-8
 # frozen_string_literal: true
 
 class Pagy
   # Add a specialized backend method for pagination metadata
-  module Backend ; private
+  module Backend
+  private
 
-    METADATA = [ :scaffold_url, :first_url, :prev_url, :page_url, :next_url, :last_url,
-                 :count, :page, :items, :vars, :pages, :last, :from, :to, :prev, :next, :series ]
-    METADATA << :sequels if VARS.key?(:steps)  # :steps gets defined along with the #sequels method
+    METADATA = %i[ scaffold_url first_url prev_url page_url next_url last_url
+                   count page items vars pages last from to prev next series
+               ].tap do |metadata|
+                 metadata << :sequels if VARS.key?(:steps)  # :steps gets defined along with the #sequels method
+               end.freeze
 
     VARS[:metadata] = METADATA.dup
 
     include Helpers
 
-    def pagy_metadata(pagy, url=false)
-      names = pagy.vars[:metadata]
-      (unknown = names - METADATA).empty? or raise(VariableError.new(pagy), "unknown metadata #{unknown.inspect}")
+    def pagy_metadata(pagy, url=nil)
+      names   = pagy.vars[:metadata]
+      unknown = names - METADATA
+      raise VariableError.new(pagy), "unknown metadata #{unknown.inspect}" \
+            unless unknown.empty?
+
       scaffold_url = pagy_url_for(PAGE_PLACEHOLDER, pagy, url)
-      metadata = {}
-      names.each do |key|
-        metadata[key] = case key
-                        when :scaffold_url ; scaffold_url
-                        when :first_url    ; scaffold_url.sub(PAGE_PLACEHOLDER, 1.to_s)
-                        when :prev_url     ; scaffold_url.sub(PAGE_PLACEHOLDER, pagy.prev.to_s)
-                        when :page_url     ; scaffold_url.sub(PAGE_PLACEHOLDER, pagy.page.to_s)
-                        when :next_url     ; scaffold_url.sub(PAGE_PLACEHOLDER, pagy.next.to_s)
-                        when :last_url     ; scaffold_url.sub(PAGE_PLACEHOLDER, pagy.last.to_s)
-                        else pagy.send(key)
-                        end
+      {}.tap do |metadata|
+        names.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)
+                          else pagy.send(key)
+                          end
+        end
       end
-      metadata
     end
 
   end

data/lib/pagy/extras/navs.rb

@@ -1,5 +1,4 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/navs
-# encoding: utf-8
 # frozen_string_literal: true
 
 require 'pagy/extras/shared'
@@ -9,30 +8,52 @@ class Pagy
 
     # Javascript pagination: it returns a nav and a JSON tag used by the Pagy.nav javascript
     def pagy_nav_js(pagy, id=pagy_id)
-      link, p_prev, p_next = pagy_link_proc(pagy), pagy.prev, pagy.next
-      tags = { 'before' => p_prev ? %(<span class="page prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</span> )
-                                  : %(<span class="page prev disabled">#{pagy_t('pagy.nav.prev')}</span> ),
+      link = pagy_link_proc(pagy)
+      tags = { 'before' => pagy_nav_prev_html(pagy, link),
                'link'   => %(<span class="page">#{link.call(PAGE_PLACEHOLDER)}</span> ),
                'active' => %(<span class="page active">#{pagy.page}</span> ),
-               'gap'    => %(<span class="page gap">#{pagy_t('pagy.nav.gap')}</span> ),
-               'after'  => p_next ? %(<span class="page next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</span>)
-                                  : %(<span class="page next disabled">#{pagy_t('pagy.nav.next')}</span>) }
-      %(<nav id="#{id}" class="pagy-nav-js pagination" role="navigation" aria-label="pager"></nav>#{pagy_json_tag(:nav, id, tags, pagy.sequels, defined?(TRIM) && pagy.vars[:page_param])})
+               'gap'    => %(<span class="page gap">#{pagy_t 'pagy.nav.gap'}</span> ),
+               'after'  => pagy_nav_next_html(pagy, link) }
+
+      html = %(<nav id="#{id}" class="pagy-nav-js pagination" role="navigation" aria-label="pager"></nav>)
+      html << pagy_json_tag(pagy, :nav, id, tags, pagy.sequels)
     end
 
     # Javascript combo pagination: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
     def pagy_combo_nav_js(pagy, id=pagy_id)
-      link, p_prev, p_next, p_page, p_pages = pagy_link_proc(pagy), pagy.prev, pagy.next, pagy.page, pagy.pages
-
-      html = EMPTY + %(<nav id="#{id}" class="pagy-combo-nav-js pagination" role="navigation" aria-label="pager">)
-      html << (p_prev ? %(<span class="page prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</span> )
-                      : %(<span class="page prev disabled">#{pagy_t('pagy.nav.prev')}</span> ))
-      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;">)
-      html << %(<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> )
-      html << (p_next ? %(<span class="page next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</span>)
-                      : %(<span class="page next disabled">#{pagy_t('pagy.nav.next')}</span>))
-      html << %(</nav>#{pagy_json_tag(:combo_nav, id, p_page, pagy_marked_link(link), defined?(TRIM) && pagy.vars[:page_param])})
+      link    = pagy_link_proc(pagy)
+      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;">)
+
+      %(<nav id="#{id}" class="pagy-combo-nav-js pagination" role="navigation" aria-label="pager">#{
+          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
+      }</nav>#{
+          pagy_json_tag pagy, :combo_nav, id, p_page, pagy_marked_link(link)
+      })
     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
 end

data/lib/pagy/extras/overflow.rb

@@ -1,71 +1,73 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/overflow
-# encoding: utf-8
 # frozen_string_literal: true
 
 class Pagy
 
-  OVERFLOW = true
+  module UseOverflowExtra
+    VARS[:overflow] = :empty_page
 
-  VARS[:overflow] = :empty_page
+    def overflow? = @overflow
 
-  def overflow?; @overflow end
-
-  alias_method :initialize_without_overflow, :initialize
-  def initialize_with_overflow(vars)
-    @overflow ||= false                         # don't override if :last_page re-run the method after an overflow
-    initialize_without_overflow(vars)
-  rescue OverflowError
-    @overflow = true                            # add the overflow flag
-    case @vars[:overflow]
-    when :exception
-      raise                                     # same as without the extra
-    when :last_page
-      initial_page = @vars[:page]               # save the very initial page (even after re-run)
-      initialize(vars.merge!(page: @last))      # re-run with the last page
-      @vars[:page] = initial_page               # restore the inital page
-    when :empty_page
-      @offset = @items = @from = @to = 0        # vars relative to the actual page
-      @prev = @last                             # prev relative to the actual page
-      extend(Series)                            # special series for :empty_page
-    else
-      raise VariableError.new(self), "expected :overflow variable in [:last_page, :empty_page, :exception]; got #{@vars[:overflow].inspect}"
+    def initialize(vars)
+      @overflow ||= false                         # don't override if :last_page re-run the method after an overflow
+      super
+    rescue OverflowError
+      @overflow = true                            # add the overflow flag
+      case @vars[:overflow]
+      when :exception
+        raise                                     # same as without the extra
+      when :last_page
+        initial_page = @vars[:page]               # save the very initial page (even after re-run)
+        initialize vars.merge!(page: @last)       # re-run with the last page
+        @vars[:page] = initial_page               # restore the inital page
+      when :empty_page
+        @offset = @items = @from = @to = 0        # vars relative to the actual page
+        @prev = @last                             # prev relative to the actual page
+        extend Series                             # special series for :empty_page
+      else
+        raise VariableError.new(self), "expected :overflow variable in [:last_page, :empty_page, :exception]; got #{@vars[:overflow].inspect}"
+      end
     end
-  end
-  alias_method :initialize, :initialize_with_overflow
 
-  module Series
-    def series(size=@vars[:size])
-      @page = @last                               # series for last page
-      super(size).tap do |s|                      # call original series
-        s[s.index(@page.to_s)] = @page            # string to integer (i.e. no current page)
-        @page = @vars[:page]                      # restore the actual page
+    module Series
+      def series(size=@vars[:size])
+        @page = @last                             # series for last page
+        super(size).tap do |s|                    # call original series
+          s[s.index(@page.to_s)] = @page          # string to integer (i.e. no current page)
+          @page = @vars[:page]                    # restore the actual page
+        end
       end
     end
+
   end
+  prepend UseOverflowExtra
 
 
   # support for Pagy::Countless
   if defined?(Pagy::Countless)
     class Countless
 
-      alias_method :finalize_without_overflow, :finalize
-      def finalize_with_overflow(items)
-        @overflow = false
-        finalize_without_overflow(items)
-      rescue OverflowError
-        @overflow = true                            # add the overflow flag
-        case @vars[:overflow]
-        when :exception
-          raise                                     # same as without the extra
-        when :empty_page
-          @offset = @items = @from = @to = 0        # vars relative to the actual page
-          @vars[:size] = []                         # no page in the series
-          self
-        else
-          raise VariableError.new(self), "expected :overflow variable in [:empty_page, :exception]; got #{@vars[:overflow].inspect}"
+      module UseOverflowExtra
+
+        def finalize(items)
+          @overflow = false
+          super
+        rescue OverflowError
+          @overflow = true                        # add the overflow flag
+          case @vars[:overflow]
+          when :exception
+            raise                                 # same as without the extra
+          when :empty_page
+            @offset = @items = @from = @to = 0    # vars relative to the actual page
+            @vars[:size] = []                     # no page in the series
+            self
+          else
+            raise VariableError.new(self), "expected :overflow variable in [:empty_page, :exception]; got #{@vars[:overflow].inspect}"
+          end
         end
+
       end
-      alias_method :finalize, :finalize_with_overflow
+      prepend UseOverflowExtra
 
     end
   end