pagy 4.11.0 → 6.0.0

data/lib/pagy/extras/semantic.rb

@@ -1,80 +1,82 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/semantic
 # frozen_string_literal: true
 
-require 'pagy/extras/shared'
-
-class Pagy
-  module Frontend
+require 'pagy/extras/frontend_helpers'
 
+class Pagy # :nodoc:
+  # Frontend modules are specially optimized for performance.
+  # 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: '')
+    def pagy_semantic_nav(pagy, pagy_id: nil, link_extra: '', **vars)
       p_id = %( id="#{pagy_id}") if pagy_id
       link = pagy_link_proc(pagy, link_extra: %(class="item" #{link_extra}))
 
       html = +%(<div#{p_id} class="pagy-semantic-nav ui pagination menu">)
       html << pagy_semantic_prev_html(pagy, link)
-      pagy.series.each do |item|  # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
+      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                                                 # page link
-                when String  then %(<a class="item active">#{item}</a>)                          # current page
-                when :gap    then %(<div class="disabled item">#{pagy_t 'pagy.nav.gap'}</div>)   # page gap
+                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}"
                 end
       end
       html << pagy_semantic_next_html(pagy, link)
       html << %(</div>)
     end
 
-    # Javascript pagination for semantic: it returns a nav and a JSON tag used by the Pagy.nav javascript
-    def pagy_semantic_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
+    # 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)
+      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),
-               'active' => %(<a class="item active">#{pagy.page}</a>),
+               '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) }
 
-      %(<div#{p_id} class="pagy-njs pagy-semantic-nav-js ui pagination menu" role="navigation" #{pagy_json_attr(pagy, :nav, tags, pagy.sequels(steps))}></div>)
+      %(<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>)
     end
 
-    # Combo pagination for semantic: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
-    def pagy_semantic_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
+    # 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: '')
       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">)
+      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">)
 
       %(<div#{p_id} class="pagy-semantic-combo-nav-js ui compact menu" role="navigation" #{
-          pagy_json_attr pagy, :combo_nav, p_page, pagy_marked_link(link)
-      }>#{
-         pagy_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
-      }</div>)
+          pagy_data(pagy, :combo, pagy_marked_link(link))}>#{
+          pagy_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
+        }</div>)
     end
 
     private
 
-      def pagy_semantic_prev_html(pagy, link)
-        if (p_prev = pagy.prev)
-          link.call p_prev, '<i class="left small chevron icon"></i>', 'aria-label="previous"'
-        else
-          +%(<div class="item disabled"><i class="left small chevron icon"></i></div>)
-        end
+    def pagy_semantic_prev_html(pagy, link)
+      if (p_prev = pagy.prev)
+        link.call p_prev, '<i class="left small chevron icon"></i>', 'aria-label="previous"'
+      else
+        +%(<div class="item disabled"><i class="left small chevron icon"></i></div>)
       end
+    end
 
-      def pagy_semantic_next_html(pagy, link)
-        if (p_next = pagy.next)
-          link.call p_next, '<i class="right small chevron icon"></i>', 'aria-label="next"'
-        else
-          +%(<div class="item disabled"><i class="right small chevron icon"></i></div>)
-        end
+    def pagy_semantic_next_html(pagy, link)
+      if (p_next = pagy.next)
+        link.call p_next, '<i class="right small chevron icon"></i>', 'aria-label="next"'
+      else
+        +%(<div class="item disabled"><i class="right small chevron icon"></i></div>)
       end
-
+    end
   end
+  Frontend.prepend SemanticExtra
 end

data/lib/pagy/extras/standalone.rb

@@ -2,61 +2,65 @@
 # frozen_string_literal: true
 
 require 'uri'
-class Pagy
 
-  # extracted from Rack::Utils and reformatted for rubocop
-  module QueryUtils
-    module_function
-    def escape(str)
-      URI.encode_www_form_component(str)
-    end
-    def build_nested_query(value, prefix = nil)
-      case value
-      when Array
-        value.map { |v| build_nested_query(v, "#{prefix}[]") }.join('&')
-      when Hash
-        value.map { |k, v| build_nested_query(v, prefix ? "#{prefix}[#{escape(k)}]" : escape(k)) }.delete_if(&:empty?).join('&')
-      when nil
-        prefix
-      else
-        raise ArgumentError, 'value must be a Hash' if prefix.nil?
-        "#{prefix}=#{escape(value)}"
+class Pagy # :nodoc:
+  # Use pagy without any request object, nor Rack environment/gem, nor any defined params method,
+  # even in the irb/rails console without any app or config.
+  module StandaloneExtra
+    # Extracted from Rack::Utils and reformatted for rubocop
+    # :nocov:
+    module QueryUtils
+      module_function
+
+      def escape(str)
+        URI.encode_www_form_component(str)
       end
-    end
-  end
 
-  module UseStandaloneExtra
-    # without any :url var it works exactly as the regular #pagy_url_for;
-    # with a defined :url variable it does not use rack/request
-    def pagy_url_for(pagy, page, deprecated_url=nil, absolute: nil)
-      absolute = Pagy.deprecated_arg(:url, deprecated_url, :absolute, absolute) if deprecated_url
-      pagy, page = Pagy.deprecated_order(pagy, page) if page.is_a?(Pagy)
-      p_vars = pagy.vars
-      if p_vars[:url]
-        url_string = p_vars[:url]
-        params     = {}
-      else
-        url_string = "#{request.base_url if absolute}#{request.path}"
-        params     = request.GET
+      def build_nested_query(value, prefix = nil)
+        case value
+        when Array
+          value.map { |v| build_nested_query(v, "#{prefix}[]") }.join('&')
+        when Hash
+          value.map do |k, v|
+            build_nested_query(v, prefix ? "#{prefix}[#{escape(k)}]" : escape(k))
+          end.delete_if(&:empty?).join('&')
+        when nil
+          prefix
+        else
+          raise ArgumentError, 'value must be a Hash' if prefix.nil?
+
+          "#{prefix}=#{escape(value)}"
+        end
       end
-      params = params.merge(p_vars[:params])
-      params[p_vars[:page_param].to_s]  = page
-      params[p_vars[:items_param].to_s] = p_vars[:items] if defined?(UseItemsExtra)
-      query_string = "?#{QueryUtils.build_nested_query(pagy_get_params(params))}" unless params.empty?
-      "#{url_string}#{query_string}#{p_vars[:fragment]}"
     end
-  end
+    # :nocov:
 
-  #  single line in order to avoid complicating simplecov already tested with other GitHub Actions
-  Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0') \
-      && Helpers.prepend(UseStandaloneExtra) \
-      || ( Frontend.prepend(UseStandaloneExtra); Backend.prepend(UseStandaloneExtra) if defined?(Pagy::Backend::METADATA) ) # rubocop:disable Style/Semicolon
+    # 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)
+      return super unless pagy.vars[:url]
 
-  # defines a dummy #params method if not already defined in the including module
+      vars                = pagy.vars
+      page_param          = vars[:page_param].to_s
+      items_param         = vars[:items_param].to_s
+      params              = pagy.params.is_a?(Hash) ? pagy.params.clone : {}  # safe when it gets reused
+      params[page_param]  = page
+      params[items_param] = vars[:items] if vars[:items_extra]
+      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
+      "#{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
+
+  # Define a dummy params method if it's not already defined in the including module
   module Backend
     def self.included(controller)
-      controller.define_method(:params){{}} unless controller.method_defined?(:params)
+      controller.define_method(:params) { {} } unless controller.method_defined?(:params)
     end
   end
-
 end

data/lib/pagy/extras/support.rb

@@ -1,46 +1,54 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/support
 # frozen_string_literal: true
 
-class Pagy
-
-  module Frontend
-
+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
     end
 
+    # Return the next page URL string or nil
     def pagy_next_url(pagy)
       pagy_url_for(pagy, pagy.next) if pagy.next
     end
 
-    def pagy_prev_link(pagy, deprecated_text=nil, deprecated_link_extra=nil, text: pagy_t('pagy.nav.prev'), link_extra: '')
-      text       = Pagy.deprecated_arg(:text, deprecated_text, :text, text) if deprecated_text
-      link_extra = Pagy.deprecated_arg(:link_extra, deprecated_link_extra, :link_extra, link_extra) if deprecated_link_extra
+    # 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)}" rel="prev" aria-label="previous" #{pagy.vars[:link_extra]} #{link_extra}>#{text}</a></span>)
+        %(<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
     end
 
-    def pagy_next_link(pagy, deprecated_text=nil, deprecated_link_extra=nil, text: pagy_t('pagy.nav.next'), link_extra: '')
-      text       = Pagy.deprecated_arg(:text, deprecated_text, :text, text) if deprecated_text
-      link_extra = Pagy.deprecated_arg(:link_extra, deprecated_link_extra, :link_extra, link_extra) if deprecated_link_extra
+    # 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)}" rel="next" aria-label="next" #{pagy.vars[:link_extra]} #{link_extra}>#{text}</a></span>)
+        %(<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
     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)}" rel="prev"/>) if pagy.prev
+      %(<link href="#{pagy_url_for(pagy, pagy.prev, html_escaped: true)}" 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)}" rel="next"/>) if pagy.next
+      %(<link href="#{pagy_url_for(pagy, pagy.next, html_escaped: true)}" rel="next"/>) if pagy.next
     end
-
   end
-
+  Frontend.prepend SupportExtra
 end

data/lib/pagy/extras/trim.rb

@@ -1,28 +1,29 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/trim
 # frozen_string_literal: true
 
-class Pagy
+class Pagy # :nodoc:
+  DEFAULT[:trim_extra] = true   # extra enabled by default
 
-  VARS[:enable_trim_extra] = true
+  # Remove the page=1 param from the first page link
+  module TrimExtra
+    # 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)
+      return link_proc unless pagy.vars[:trim_extra]
 
-  module UseTrimExtra
+      lambda do |page, text = pagy.label_for(page), extra = ''|
+        link = +link_proc.call(page, text, extra)
+        return link unless page == 1
 
-    def pagy_link_proc(pagy, deprecated_link_extra=nil, link_extra: '')
-      link_extra = Pagy.deprecated_arg(:link_extra, deprecated_link_extra, :link_extra, link_extra) if deprecated_link_extra
-      link_proc = super(pagy, link_extra: link_extra)
-      return link_proc unless pagy.vars[:enable_trim_extra]
-      lambda do |num, text=num, extra=''|
-        link = +link_proc.call(num, text, extra)
-        return link unless num == 1
         pagy_trim(pagy, link)
       end
     end
 
+    # 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 UseTrimExtra
-
+  Frontend.prepend TrimExtra
 end

data/lib/pagy/extras/uikit.rb

@@ -1,81 +1,84 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/uikit
 # frozen_string_literal: true
 
-require 'pagy/extras/shared'
-
-class Pagy
-  module Frontend
+require 'pagy/extras/frontend_helpers'
 
+class Pagy # :nodoc:
+  # Frontend modules are specially optimized for performance.
+  # 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: '')
+    def pagy_uikit_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)
 
       html = +%(<ul#{p_id} class="pagy-uikit-nav uk-pagination uk-flex-center">#{pagy_uikit_prev_html pagy, link})
-      pagy.series.each do |item|
-        html << case    item
+      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>#{item}</span></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}"
                 end
       end
       html << pagy_uikit_next_html(pagy, link)
       html << %(</ul>)
     end
 
-    # Javascript pagination for uikit: it returns a nav and a JSON tag used by the Pagy.nav javascript
-    def pagy_uikit_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
+    # 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)
+      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)}</li>),
-               'active' => %(<li class="uk-active"><span>#{PAGE_PLACEHOLDER}</span></li>),
+               '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) }
 
-      %(<ul#{p_id} class="pagy-njs pagy-uikit-nav-js uk-pagination uk-flex-center" #{pagy_json_attr(pagy, :nav, tags, pagy.sequels(steps))}></ul>)
+      %(<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>)
     end
 
-    # Javascript combo pagination for uikit: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
-    def pagy_uikit_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
+    # 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: '')
       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 type="number" min="1" max="#{p_pages}" value="#{p_page}" style="text-align: center; width: #{p_pages.to_s.length+1}rem;">)
+      input   = %(<input type="number" min="1" max="#{p_pages}" value="#{
+                    p_page}" style="text-align: center; width: #{p_pages.to_s.length + 1}rem;">)
 
       %(<ul#{p_id} class="pagy-uikit-combo-nav-js uk-button-group uk-pagination uk-flex-center" #{
-          pagy_json_attr pagy, :combo_nav, p_page, pagy_marked_link(link)
-      }>#{
+          pagy_data(pagy, :combo, pagy_marked_link(link))
+        }>#{
           pagy_uikit_prev_html pagy, link
-      }<li>#{
+        }<li>#{
           pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages
-      }</li>#{
+        }</li>#{
           pagy_uikit_next_html pagy, link
-      }</ul>)
+        }</ul>)
     end
 
     private
 
-      def pagy_uikit_prev_html(pagy, link)
-        previous_span = %(<span uk-pagination-previous>#{pagy_t 'pagy.nav.prev'}</span>)
-        if (p_prev = pagy.prev)
-          %(<li>#{link.call p_prev, previous_span}</li>)
-        else
-          %(<li class="uk-disabled"><a href="#">#{previous_span}</a></li>)
-        end
+    def pagy_uikit_prev_html(pagy, link)
+      previous_span = %(<span uk-pagination-previous>#{pagy_t 'pagy.nav.prev'}</span>)
+      if (p_prev = pagy.prev)
+        %(<li>#{link.call p_prev, previous_span}</li>)
+      else
+        %(<li class="uk-disabled"><a href="#">#{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>)
-        if (p_next = pagy.next)
-          %(<li>#{link.call p_next, next_span}</li>)
-        else
-          %(<li class="uk-disabled"><a href="#">#{next_span}</a></li>)
-        end
+    def pagy_uikit_next_html(pagy, link)
+      next_span = %(<span uk-pagination-next>#{pagy_t 'pagy.nav.next'}</span>)
+      if (p_next = pagy.next)
+        %(<li>#{link.call p_next, next_span}</li>)
+      else
+        %(<li class="uk-disabled"><a href="#">#{next_span}</a></li>)
       end
-
+    end
   end
+  Frontend.include UikitExtra
 end

data/lib/pagy/frontend.rb

@@ -1,59 +1,38 @@
 # See Pagy::Frontend API documentation: https://ddnexus.github.io/pagy/api/frontend
 # frozen_string_literal: true
 
-require 'yaml'
+require 'pagy/url_helpers'
+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_PLACEHOLDER = '__pagy_page__'  # string used for search and replace, hardcoded also in the pagy.js file
-
-  # I18n static hash loaded at startup, used as default alternative to the i18n gem.
-  # see https://ddnexus.github.io/pagy/api/frontend#i18n
-  I18n = eval Pagy.root.join('locales', 'utils', 'i18n.rb').read #rubocop:disable Security/Eval
-
-  module Helpers
-    # This works with all Rack-based frameworks (Sinatra, Padrino, Rails, ...)
-    def pagy_url_for(pagy, page, deprecated_url=nil, absolute: nil)
-      absolute = Pagy.deprecated_arg(:url, deprecated_url, :absolute, absolute) if deprecated_url
-      pagy, page = Pagy.deprecated_order(pagy, page) if page.is_a?(Pagy)
-      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] if defined?(UseItemsExtra)
-      query_string = "?#{Rack::Utils.build_nested_query(pagy_get_params(params))}" unless params.empty?
-      "#{request.base_url if absolute}#{request.path}#{query_string}#{p_vars[:fragment]}"
-    end
-
-    # Sub-method called only by #pagy_url_for: here for easy customization of params by overriding
-    def pagy_get_params(params)
-      params
-    end
-  end
-
-  # All the code here has been optimized for performance: it may not look very pretty
-  # (as most code dealing with many long strings), but its performance makes it very sexy! ;)
+  # Frontend modules are specially optimized for performance.
+  # The resulting code may not look very elegant, but produces the best benchmarks
   module Frontend
-
-    include Helpers
+    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: '')
+    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
 
-      html  = +%(<nav#{p_id} class="pagy-nav pagination" aria-label="pager">)
+      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
-      pagy.series.each do |item|  # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
+      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> )               # page link
-                when String  then %(<span class="page active">#{item}</span> )                  # current page
-                when :gap    then %(<span class="page gap">#{pagy_t('pagy.nav.gap')}</span> )   # page gap
+                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}"
                 end
       end
       html << if p_next
@@ -64,43 +43,41 @@ class Pagy
       html << %(</nav>)
     end
 
-    # Return examples: "Displaying items 41-60 of 324 in total" of "Displaying Products 41-60 of 324 in total"
-    def pagy_info(pagy, deprecated_item_name=nil, pagy_id: nil, item_name: nil, i18n_key: nil)
-      p_id      = %( id="#{pagy_id}") if pagy_id
-      item_name = Pagy.deprecated_arg(:item_name, deprecated_item_name, :item_name, item_name) if deprecated_item_name
+    # 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)
+      p_id    = %( id="#{pagy_id}") if pagy_id
       p_count = pagy.count
       key     = if    p_count.zero?   then 'pagy.info.no_items'
                 elsif pagy.pages == 1 then 'pagy.info.single_page'
-                else                       'pagy.info.multiple_pages'
+                else                       'pagy.info.multiple_pages' # rubocop:disable Lint/ElseLayout
                 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),
-                  count: p_count, from: pagy.from, to: pagy.to
-      }</span>)
+          pagy_t key, item_name: item_name || pagy_t(i18n_key || pagy.vars[:i18n_key], count: p_count),
+                      count: p_count, from: pagy.from, to: pagy.to
+        }</span>)
     end
 
-    # Returns a performance optimized proc to generate the HTML links
+    # Return a performance optimized proc 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, deprecated_link_extra=nil, link_extra: '')
-      link_extra = Pagy.deprecated_arg(:link_extra, deprecated_link_extra, :link_extra, link_extra) if deprecated_link_extra
-      p_prev = pagy.prev
-      p_next = pagy.next
-      left, right = %(<a href="#{pagy_url_for pagy, PAGE_PLACEHOLDER}" #{pagy.vars[:link_extra]} #{link_extra}).split(PAGE_PLACEHOLDER, 2)
-      lambda do |num, text=num, extra_attrs=''|
-        %(#{left}#{num}#{right}#{ case num
-                                  when p_prev then ' rel="prev"'
-                                  when p_next then ' rel="next"'
-                                  else             ''
-                                  end } #{extra_attrs}>#{text}</a>)
+    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)
+      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"'
+                                   else             ''
+                                   end } #{extra_attrs}>#{text}</a>)
       end
     end
 
     # Similar to I18n.t: just ~18x faster using ~10x less memory
     # (@pagy_locale explicitly initialized in order to avoid warning)
-    def pagy_t(key, **opts)
-      Pagy::I18n.t @pagy_locale||=nil, key, **opts
+    def pagy_t(key, opts = {})
+      Pagy::I18n.translate(@pagy_locale ||= nil, key, opts)
     end
-
   end
 end