pagy 4.11.0 → 6.0.0

data/lib/pagy/i18n.rb

@@ -0,0 +1,164 @@
+# See Pagy::I18n API documentation https://ddnexus.github.io/pagy/api/i18n
+# frozen_string_literal: true
+
+require 'yaml'
+
+class Pagy
+  # Pagy i18n implementation, compatible with the I18n gem, just a lot faster and lighter
+  module I18n
+    extend self
+
+    # Pluralization rules
+    module P11n
+      # Pluralization variables
+      from0to1   = (0..1).to_a.freeze
+      from2to4   = (2..4).to_a.freeze
+      from3to10  = (3..10).to_a.freeze
+      from5to9   = (5..9).to_a.freeze
+      from11to14 = (11..14).to_a.freeze
+      from11to99 = (11..99).to_a.freeze
+      from12to14 = (12..14).to_a.freeze
+
+      from0to1_from5to9 = from0to1 + from5to9
+
+      # Store the proc defining each pluralization RULE
+      # Logic adapted from https://github.com/svenfuchs/rails-i18n
+      RULE = {
+        arabic:
+          lambda do |n = 0|
+            mod100 = n % 100
+            case
+            when n == 0                      then 'zero' # rubocop:disable Style/NumericPredicate
+            when n == 1                      then 'one'
+            when n == 2                      then 'two'
+            when from3to10.include?(mod100)  then 'few'
+            when from11to99.include?(mod100) then 'many'
+            else                                  'other'
+            end
+          end,
+
+        east_slavic:
+          lambda do |n = 0|
+            mod10  = n % 10
+            mod100 = n % 100
+            case
+            when mod10 == 1 && mod100 != 11                                            then 'one'
+            when from2to4.include?(mod10) && !from12to14.include?(mod100)              then 'few'
+            when mod10 == 0 || from5to9.include?(mod10) || from11to14.include?(mod100) then 'many' # rubocop:disable Style/NumericPredicate
+            else                                                                            'other'
+            end
+          end,
+
+        one_other:
+          ->(n) { n == 1 ? 'one' : 'other' }, # default RULE
+
+        one_two_other:
+          lambda do |n|
+            case n
+            when 1 then 'one'
+            when 2 then 'two'
+            else        'other'
+            end
+          end,
+
+        one_upto_two_other:
+          ->(n) { n && n >= 0 && n < 2 ? 'one' : 'other' },
+
+        other:
+          ->(*) { 'other' },
+
+        polish:
+          lambda do |n = 0|
+            mod10  = n % 10
+            mod100 = n % 100
+            case
+            when n == 1                                                           then 'one'
+            when from2to4.include?(mod10) && !from12to14.include?(mod100)         then 'few'
+            when from0to1_from5to9.include?(mod10) || from12to14.include?(mod100) then 'many'
+            else                                                                       'other'
+            end
+          end,
+
+        west_slavic:
+          lambda do |n|
+            case n
+            when 1         then 'one'
+            when *from2to4 then 'few'
+            else                'other'
+            end
+          end
+
+      }.freeze
+
+      # Store the RULE to apply to each LOCALE
+      # the :one_other RULE is the default for locales missing from this list
+      LOCALE = Hash.new(RULE[:one_other]).tap do |hash|
+                 hash['ar']    = RULE[:arabic]
+                 hash['bs']    = RULE[:east_slavic]
+                 hash['cs']    = RULE[:west_slavic]
+                 hash['id']    = RULE[:other]
+                 hash['fr']    = RULE[:one_upto_two_other]
+                 hash['hr']    = RULE[:east_slavic]
+                 hash['ja']    = RULE[:other]
+                 hash['km']    = RULE[:other]
+                 hash['ko']    = RULE[:other]
+                 hash['pl']    = RULE[:polish]
+                 hash['ru']    = RULE[:east_slavic]
+                 hash['sr']    = RULE[:east_slavic]
+                 hash['sv']    = RULE[:one_two_other]
+                 hash['sv-SE'] = RULE[:one_two_other]
+                 hash['tr']    = RULE[:other]
+                 hash['uk']    = RULE[:east_slavic]
+                 hash['zh-CN'] = RULE[:other]
+                 hash['zh-HK'] = RULE[:other]
+                 hash['zh-TW'] = RULE[:other]
+               end.freeze
+    end
+
+    # Stores the i18n DATA structure for each loaded locale
+    # default on the first locale DATA
+    DATA = Hash.new { |hash, _| hash.first[1] }
+
+    private
+
+    # Create a flat hash with dotted notation keys
+    def flatten(initial, prefix = '')
+      initial.each.reduce({}) do |hash, (key, value)|
+        hash.merge!(value.is_a?(Hash) ? flatten(value, "#{prefix}#{key}.") : { "#{prefix}#{key}" => value })
+      end
+    end
+
+    # Build the DATA hash out of the passed locales
+    def build(*locales)
+      locales.each do |locale|
+        locale[:filepath]  ||= Pagy.root.join('locales', "#{locale[:locale]}.yml")
+        locale[:pluralize] ||= P11n::LOCALE[locale[:locale]]
+        dictionary = YAML.safe_load(File.read(locale[:filepath], encoding: 'UTF-8'))
+        raise I18nError, %(expected :locale "#{locale[:locale]}" not found in :filepath "#{locale[:filepath].inspect}") \
+              unless dictionary.key?(locale[:locale])
+
+        DATA[locale[:locale]] = [flatten(dictionary[locale[:locale]]), locale[:pluralize]]
+      end
+    end
+    # Build the default at require time
+    build(locale: 'en')
+
+    public
+
+    # Public method to configure the locales: overrides the default, build the DATA and freezes it
+    def load(*locales)
+      DATA.clear
+      build(*locales)
+      DATA.freeze
+    end
+
+    # Translate and pluralize the key with the locale DATA
+    def translate(locale, key, opts = {})
+      data, pluralize = DATA[locale]
+      translation = data[key] || (opts[:count] && data[key += ".#{pluralize.call(opts[:count])}"]) \
+                      or return %([translation missing: "#{key}"])
+      translation.gsub(/%{[^}]+?}/) { |match| opts[:"#{match[2..-2]}"] || match }
+    end
+    alias t translate
+  end
+end

data/lib/pagy/url_helpers.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class Pagy
+  # Provide the helpers to handle the url in frontend and backend
+  module UrlHelpers
+    # Return the URL for the page, relying on the params method and Rack by default.
+    # It supports all Rack-based frameworks (Sinatra, Padrino, Rails, ...).
+    # For non-rack environments you can use the standalone extra
+    def pagy_url_for(pagy, page, absolute: false, html_escaped: false)
+      vars                = pagy.vars
+      request_path        = vars[:request_path].to_s.empty? ? request.path : vars[:request_path]
+      page_param          = vars[:page_param].to_s
+      items_param         = vars[:items_param].to_s
+      params              = pagy.params.is_a?(Hash) ? pagy.params.transform_keys(&:to_s) : {}
+      params              = request.GET.merge(params)
+      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
+      "#{request.base_url if absolute}#{request_path}#{query_string}#{vars[:fragment]}"
+    end
+  end
+end

data/lib/pagy.rb

@@ -3,64 +3,69 @@
 
 require 'pathname'
 
-# main class
+# Core class
 class Pagy
-  VERSION = '4.11.0'
+  VERSION = '6.0.0'
 
   # Root pathname to get the path of Pagy files like templates or dictionaries
   def self.root
     @root ||= Pathname.new(__dir__).freeze
   end
 
-  # default vars
-  VARS = { page: 1, items: 20, outset: 0, size: [1, 4, 4, 1], page_param: :page,              # rubocop:disable Style/MutableConstant
-           params: {}, fragment: '', link_extra: '', i18n_key: 'pagy.item_name', cycle: false }
+  # Default core vars: constant for easy access, but mutable for customizable defaults
+  DEFAULT = { page:       1, # rubocop:disable Style/MutableConstant
+              items:      20,
+              outset:     0,
+              size:       [1, 4, 4, 1],
+              page_param: :page,
+              params:     {},
+              fragment:   '',
+              link_extra: '',
+              i18n_key:   'pagy.item_name',
+              cycle:      false,
+              request_path: '' }
 
-  attr_reader :count, :page, :items, :vars, :pages, :last, :offset, :from, :to, :prev, :next
-
-  INSTANCE_VARS_MIN = { count: 0, items: 1, page: 1, outset: 0 }.freeze
+  attr_reader :count, :page, :items, :vars, :pages, :last, :offset, :in, :from, :to, :prev, :next, :params, :request_path
 
   # Merge and validate the options, do some simple arithmetic and set the instance variables
   def initialize(vars)
-    @vars = VARS.merge( vars.delete_if{|k,v| VARS.key?(k) && (v.nil? || v == '') } )
-    @vars[:fragment] = Pagy.deprecated_var(:anchor, @vars[:anchor], :fragment, @vars[:fragment]) if @vars[:anchor]
-
-    INSTANCE_VARS_MIN.each do |name,min|
-      raise VariableError.new(self), "expected :#{name} >= #{min}; got #{@vars[name].inspect}" \
-            unless @vars[name] && instance_variable_set(:"@#{name}", @vars[name].to_i) >= min
-    end
-    @pages = @last = [(@count.to_f / @items).ceil, 1].max
-    raise OverflowError.new(self), "expected :page in 1..#{@last}; got #{@page.inspect}" \
-          if @page > @last
+    normalize_vars(vars)
+    setup_vars(count: 0, page: 1, outset: 0)
+    setup_items_var
+    setup_pages_var
+    setup_offset_var
+    setup_params_var
+    setup_request_path_var
+    raise OverflowError.new(self, :page, "in 1..#{@last}", @page) if @page > @last
 
-    @offset = @items * (@page - 1) + @outset
-    @items  = @count - ((@pages - 1) * @items) if @page == @last && @count.positive?
-    @from   = @count.zero? ? 0 : @offset + 1 - @outset
-    @to     = @count.zero? ? 0 : @offset + @items - @outset
+    @from   = [@offset - @outset + 1, @count].min
+    @to     = [@offset - @outset + @items, @count].min
+    @in     = [@to - @from + 1, @count].min
     @prev   = (@page - 1 unless @page == 1)
     @next   = @page == @last ? (1 if @vars[:cycle]) : @page + 1
   end
 
   # Return the array of page numbers and :gap items e.g. [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
-  def series(size=@vars[:size])
+  def series(size: @vars[:size], **_)
     return [] if size.empty?
-    raise VariableError.new(self), "expected 4 items >= 0 in :size; got #{size.inspect}" \
-          unless size.size == 4 && size.all?{ |num| !num.negative? rescue false }  # rubocop:disable Style/RescueModifier
+    raise VariableError.new(self, :size, 'to contain 4 items >= 0', size) \
+          unless size.is_a?(Array) && size.size == 4 && size.all? { |num| !num.negative? rescue false } # rubocop:disable Style/RescueModifier
+
     # This algorithm is up to ~5x faster and ~2.3x lighter than the previous one (pagy < 4.3)
-    left_gap_start  =     1 + size[0]
+    left_gap_start  =     1 + size[0]   # rubocop:disable Layout/ExtraSpacing, Layout/SpaceAroundOperators
     left_gap_end    = @page - size[1] - 1
     right_gap_start = @page + size[2] + 1
     right_gap_end   = @last - size[3]
     left_gap_end    = right_gap_end  if left_gap_end   > right_gap_end
     right_gap_start = left_gap_start if left_gap_start > right_gap_start
-    series = []
-    start  = 1
+    series          = []
+    start           = 1
     if (left_gap_end - left_gap_start).positive?
-      series.push(*start..(left_gap_start - 1), :gap)
+      series.push(*start...left_gap_start, :gap)
       start = left_gap_end + 1
     end
     if (right_gap_end - right_gap_start).positive?
-      series.push(*start..(right_gap_start - 1), :gap)
+      series.push(*start...right_gap_start, :gap)
       start = right_gap_end + 1
     end
     series.push(*start..@last)
@@ -68,9 +73,63 @@ class Pagy
     series
   end
 
+  # Allow the customization of the output (overridden by the calendar extra)
+  def label_for(page)
+    page.to_s
+  end
+
+  # Allow the customization of the output (overridden by the calendar extra)
+  def label
+    @page.to_s
+  end
+
+  protected
+
+  # Apply defaults, cleanup blanks and set @vars
+  def normalize_vars(vars)
+    @vars = DEFAULT.merge(vars.delete_if { |k, v| DEFAULT.key?(k) && (v.nil? || v == '') })
+  end
+
+  # Setup and validates the passed vars: var must be present and value.to_i must be >= to min
+  def setup_vars(name_min)
+    name_min.each do |name, min|
+      raise VariableError.new(self, name, ">= #{min}", @vars[name]) \
+            unless @vars[name]&.respond_to?(:to_i) && instance_variable_set(:"@#{name}", @vars[name].to_i) >= min
+    end
+  end
+
+  # Setup @items (overridden by the gearbox extra)
+  def setup_items_var
+    setup_vars(items: 1)
+  end
+
+  # Setup @pages and @last (overridden by the gearbox extra)
+  def setup_pages_var
+    @pages = @last = [(@count.to_f / @items).ceil, 1].max
+  end
+
+  # Setup @offset based on the :gearbox_items variable
+  def setup_offset_var
+    @offset = (@items * (@page - 1)) + @outset  # may be already set from gear_box
+  end
+
+  # Setup and validate @params
+  def setup_params_var
+    raise VariableError.new(self, :params, 'must be a Hash or a Proc', @params) \
+          unless (@params = @vars[:params]).is_a?(Hash) || @params.is_a?(Proc)
+  end
+
+  def setup_request_path_var
+    request_path = @vars[:request_path]
+    return if request_path.to_s.empty?
+
+    raise VariableError.new(self, :request_path, 'must be a bare path like "/foo"', request_path) \
+          if !request_path.start_with?('/') || request_path.include?('?')
+
+    @request_path = request_path
+  end
 end
 
-require 'pagy/deprecation'
 require 'pagy/backend'
 require 'pagy/frontend'
 require 'pagy/exceptions'

data/lib/templates/bootstrap_nav.html.erb

@@ -5,8 +5,8 @@
   The link variable is set to a proc that returns the link tag.
   Usage: link.call( page_number [, text [, extra_attributes_string ]])
 -%>
-<% link = pagy_link_proc(pagy, 'class="page-link"') -%>
-<%#                            -%><nav aria-label="pager"  class="pagy-bootstrap-nav" role="navigation">
+<% link = pagy_link_proc(pagy, link_extra: 'class="page-link"') -%>
+<%#                            -%><nav class="pagy-bootstrap-nav" role="navigation">
 <%#                            -%>  <ul class="pagination">
 <% if pagy.prev                -%>    <li class="page-item prev"><%== link.call(pagy.prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"') %></li>
 <% else                        -%>    <li class="page-item prev disabled"><a href="#" class="page-link"><%== pagy_t('pagy.nav.prev') %></a></li>

data/lib/templates/bootstrap_nav.html.haml

@@ -4,9 +4,9 @@
 -# The link variable is set to a proc that returns the link tag.
 -# Usage: link.call( page_number [, text [, extra_attributes_string ]])
 
-- link = pagy_link_proc(pagy, 'class="page-link"')
+- link = pagy_link_proc(pagy, link_extra: 'class="page-link"')
 
-%nav.pagy-bootstrap-nav{"aria-label" => "pager", :role => "navigation"}
+%nav.pagy-bootstrap-nav{:role => "navigation"}
 
   %ul.pagination
 

data/lib/templates/bootstrap_nav.html.slim

@@ -4,9 +4,9 @@
 / The link variable is set to a proc that returns the link tag.
 / Usage: link.call( page_number [, text [, extra_attributes_string ]])
 
-- link = pagy_link_proc(pagy, 'class="page-link"')
+- link = pagy_link_proc(pagy, link_extra: 'class="page-link"')
 
-nav.pagy-bootstrap-nav role="navigation" aria-label="pager"
+nav.pagy-bootstrap-nav role="navigation"
 
   ul.pagination
 

data/lib/templates/foundation_nav.html.erb

@@ -13,7 +13,7 @@
 <% end                         -%>
 <% pagy.series.each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36] -%>
 <%   if    item.is_a?(Integer) -%>    <li><%== link.call(item) %></li>
-<%   elsif item.is_a?(String)  -%>    <li class="current"><%= item %></li>
+<%   elsif item.is_a?(String)  -%>    <li class="current"><%= pagy.label_for(item) %></li>
 <%   elsif item == :gap        -%>    <li class="ellipsis gap" aria-hidden="true"></li>
 <%   end                       -%>
 <% end                         -%>

data/lib/templates/foundation_nav.html.haml

@@ -22,7 +22,7 @@
 
       - elsif item.is_a?(String)                      # current page
         %li.current
-          = item
+          = pagy.label_for(item)
 
       - elsif item == :gap                            # page gap
         %li.ellipsis.gap{"aria-hidden" => true}

data/lib/templates/foundation_nav.html.slim

@@ -22,7 +22,7 @@ nav.pagy-foundation-nav role="navigation" aria-label="Pagination"
 
       - elsif item.is_a?(String)                 # current page
         li.current
-          = item
+          = pagy.label_for(item)
 
       - elsif item == :gap                       # page gap
         li.ellipsis.gap aria-hidden="true"

data/lib/templates/nav.html.erb

@@ -6,7 +6,7 @@
   Usage: link.call( page_number [, text [, extra_attributes_string ]])
 -%>
 <% link = pagy_link_proc(pagy) -%>
-<%#                            -%><nav aria-label="pager" class="pagy_nav pagination" role="navigation">
+<%#                            -%><nav class="pagy_nav pagination" role="navigation">
 <% if pagy.prev                -%>  <span class="page prev"><%== link.call(pagy.prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"') %></span>
 <% else                        -%>  <span class="page prev disabled"><%== pagy_t('pagy.nav.prev') %></span>
 <% end                         -%>

data/lib/templates/nav.html.haml

@@ -6,7 +6,7 @@
 
 - link = pagy_link_proc(pagy)
 
-%nav.pagy_nav.pagination{"aria-label" => "pager", :role => "navigation"}
+%nav.pagy_nav.pagination{:role => "navigation"}
 
   - if pagy.prev
     %span.page.prev!= link.call(pagy.prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"')

data/lib/templates/nav.html.slim

@@ -6,7 +6,7 @@
 
 - link = pagy_link_proc(pagy)
 
-nav.pagy_nav.pagination role="navigation" aria-label="pager"
+nav.pagy_nav.pagination role="navigation"
 
   - if pagy.prev
     span.page.prev ==> link.call(pagy.prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"')

data/lib/templates/uikit_nav.html.erb

@@ -5,11 +5,11 @@
 <% end                         -%>
 <% pagy.series.each do |item|  -%>
 <%   if    item.is_a?(Integer) -%>   <li><%== link.call(item) %></li>
-<%   elsif item.is_a?(String)  -%>   <li class="uk-active"><span><%== item %></span></li>
+<%   elsif item.is_a?(String)  -%>   <li class="uk-active"><span><%== pagy.label_for(item) %></span></li>
 <%   elsif item == :gap        -%>   <li class="uk-disabled"><span><%== pagy_t('pagy.nav.gap') %></span></li>
 <%   end                       -%>
 <% end                         -%>
-<% if pagy.next                -%>   <li><%== link.call(p_next, "<span uk-pagination-next>#{pagy_t('pagy.nav.next')}</span>") %></li>
+<% if pagy.next                -%>   <li><%== link.call(pagy.next, "<span uk-pagination-next>#{pagy_t('pagy.nav.next')}</span>") %></li>
 <% else                        -%>   <li class="uk-disabled"><a href="#"><span uk-pagination-next><%== pagy_t('pagy.nav.next') %></span></a></li>
 <% end                         -%>
 <%#                            -%> </ul>

data/lib/templates/uikit_nav.html.haml

@@ -14,7 +14,7 @@
 
     - elsif item.is_a?(String)
       %li.uk-active
-        %span!= item
+        %span!= pagy.label_for(item)
 
     - elsif item == :gap
       %li.uk-disabled

data/lib/templates/uikit_nav.html.slim

@@ -14,14 +14,14 @@ ul.uk-pagination.uk-flex-center
 
     - elsif item.is_a?(String)
       li.uk-active
-        span== item
+        span== pagy.label_for(item)
 
     - elsif item == :gap
       li.uk-disabled
         span== pagy_t('pagy.nav.gap')
 
   - if pagy.next
-    li== link.call(p_next, "<span uk-pagination-next>#{pagy_t('pagy.nav.next')}</span>")
+    li== link.call(pagy.next, "<span uk-pagination-next>#{pagy_t('pagy.nav.next')}</span>")
   - else
     li.uk-disabled
       a href="#"

metadata

@@ -1,18 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 4.11.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-20 00:00:00.000000000 Z
+date: 2022-12-22 00:00:00.000000000 Z
 dependencies: []
-description: 'Agnostic pagination in plain ruby: it works with any framework, ORM
-  and DB type, with all kinds of collections, even pre-paginated, scopes, Arrays,
-  JSON data... Easy, powerful, fast and light.'
+description: Agnostic pagination in plain ruby. It does it all. Better.
 email:
 - dd.nexus@gmail.com
 executables: []
@@ -21,6 +19,9 @@ extra_rdoc_files: []
 files:
 - LICENSE.txt
 - lib/config/pagy.rb
+- lib/javascripts/pagy-dev.js
+- lib/javascripts/pagy-module.d.ts
+- lib/javascripts/pagy-module.js
 - lib/javascripts/pagy.js
 - lib/locales/ar.yml
 - lib/locales/bg.yml
@@ -40,6 +41,7 @@ files:
 - lib/locales/ko.yml
 - lib/locales/nb.yml
 - lib/locales/nl.yml
+- lib/locales/nn.yml
 - lib/locales/pl.yml
 - lib/locales/pt-BR.yml
 - lib/locales/pt.yml
@@ -48,27 +50,34 @@ files:
 - lib/locales/sv-SE.yml
 - lib/locales/sv.yml
 - lib/locales/sw.yml
+- lib/locales/ta.yml
 - lib/locales/tr.yml
 - lib/locales/uk.yml
-- lib/locales/utils/i18n.rb
-- lib/locales/utils/loader.rb
-- lib/locales/utils/p11n.rb
 - lib/locales/zh-CN.yml
 - lib/locales/zh-HK.yml
 - lib/locales/zh-TW.yml
 - lib/pagy.rb
 - lib/pagy/backend.rb
+- lib/pagy/calendar.rb
+- lib/pagy/calendar/day.rb
+- lib/pagy/calendar/helper.rb
+- lib/pagy/calendar/month.rb
+- lib/pagy/calendar/quarter.rb
+- lib/pagy/calendar/week.rb
+- lib/pagy/calendar/year.rb
 - lib/pagy/console.rb
 - lib/pagy/countless.rb
-- lib/pagy/deprecation.rb
 - lib/pagy/exceptions.rb
 - lib/pagy/extras/arel.rb
 - lib/pagy/extras/array.rb
 - lib/pagy/extras/bootstrap.rb
 - lib/pagy/extras/bulma.rb
+- lib/pagy/extras/calendar.rb
 - lib/pagy/extras/countless.rb
 - lib/pagy/extras/elasticsearch_rails.rb
 - lib/pagy/extras/foundation.rb
+- lib/pagy/extras/frontend_helpers.rb
+- lib/pagy/extras/gearbox.rb
 - lib/pagy/extras/headers.rb
 - lib/pagy/extras/i18n.rb
 - lib/pagy/extras/items.rb
@@ -79,12 +88,13 @@ files:
 - lib/pagy/extras/overflow.rb
 - lib/pagy/extras/searchkick.rb
 - lib/pagy/extras/semantic.rb
-- lib/pagy/extras/shared.rb
 - lib/pagy/extras/standalone.rb
 - lib/pagy/extras/support.rb
 - lib/pagy/extras/trim.rb
 - lib/pagy/extras/uikit.rb
 - lib/pagy/frontend.rb
+- lib/pagy/i18n.rb
+- lib/pagy/url_helpers.rb
 - lib/templates/bootstrap_nav.html.erb
 - lib/templates/bootstrap_nav.html.haml
 - lib/templates/bootstrap_nav.html.slim
@@ -103,7 +113,13 @@ files:
 homepage: https://github.com/ddnexus/pagy
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
+  homepage_uri: https://github.com/ddnexus/pagy
+  documentation_uri: https://ddnexus.github.io/pagy
+  bug_tracker_uri: https://github.com/ddnexus/pagy/issues
+  changelog_uri: https://github.com/ddnexus/pagy/blob/master/CHANGELOG.md
+  support: https://github.com/ddnexus/pagy/discussions/categories/q-a
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -119,8 +135,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
-summary: The Ultimate Pagination Ruby Gem
+summary: The kick-ass pagination ruby gem
 test_files: []

data/lib/locales/utils/i18n.rb

@@ -1,17 +0,0 @@
-# See https://ddnexus.github.io/pagy/api/frontend#i18n
-# frozen_string_literal: true
-
-# this file returns the I18n hash used as default alternative to the i18n gem
-
-Hash.new{|h,_| h.first[1]}.tap do |i18n_hash|   # first loaded locale used as default
-  i18n_hash.define_singleton_method(:load) do |*load_args|
-    # eval: we don't need to keep the loader proc in memory
-    eval(Pagy.root.join('locales', 'utils', 'loader.rb').read).call(i18n_hash, *load_args)   #rubocop:disable Security/Eval
-  end
-  i18n_hash.define_singleton_method(:t) do |locale, key, **opts|
-    data, pluralize = self[locale]
-    translate = data[key] || opts[:count] && data[key+=".#{pluralize.call(opts[:count])}"] or return %([translation missing: "#{key}"])
-    translate.call(opts)
-  end
-  i18n_hash.load(locale: 'en')
-end

data/lib/locales/utils/loader.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-# the whole file will be eval'ed/executed and gc-collected after returning/executing the loader proc
-
-# eval: no need for the whole file in memory
-plurals, = eval Pagy.root.join('locales', 'utils', 'p11n.rb').read   # rubocop:disable Security/Eval
-
-# flatten the dictionary file nested keys
-# convert each value to a simple ruby interpolation proc
-flatten = lambda do |hash, key=''|
-            hash.each.reduce({}) do |h, (k, v)|
-              if v.is_a?(Hash)
-                h.merge! flatten.call(v, "#{key}#{k}.")
-              else
-                code = %({"#{key}#{k}" => lambda{|vars|"#{v.gsub(/%{[^}]+?}/){|m| "\#{vars[:#{m[2..-2]}]||'#{m}'}" }}"}})
-                h.merge! eval(code) # rubocop:disable Security/Eval
-              end
-            end
-          end
-
-# loader proc
-lambda do |i18n, *args|
-  i18n.clear
-  args.each do |arg|
-    arg[:filepath]  ||= Pagy.root.join('locales', "#{arg[:locale]}.yml")
-    arg[:pluralize] ||= plurals[arg[:locale]]
-    hash = YAML.load(File.read(arg[:filepath], encoding: 'UTF-8')) #rubocop:disable Security/YAMLLoad
-    hash.key?(arg[:locale]) or raise VariableError, %(expected :locale "#{arg[:locale]}" not found in :filepath "#{arg[:filepath].inspect}")
-    i18n[arg[:locale]] = [flatten.call(hash[arg[:locale]]), arg[:pluralize]]
-  end
-end