pagy 5.5.1 → 5.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e23922e820d30e39dee31d0b1931e79da25f9fd6fa4ee4c5f75a25f383ca99bc
-  data.tar.gz: 863360e18514c2250c2746d7fdfac4b11e65e0b04488150bee078466877a8b33
+  metadata.gz: f567ea14d1f7bf5697ca416cf0cf1bc200986b804099f31aba5fd1ae6a946fa4
+  data.tar.gz: 8b09e574678ab6673c4e9d8fdc48eaf611657354d457da4856a70173d7194732
 SHA512:
-  metadata.gz: 27819f1864544b94b0c916cca3d4d43a7bfd051c41a7a202b30818e9b5730fd754c2034247c912d48bb046d90ce46f95f4a18a636b2b75e8ed6b06203f1ddc81
-  data.tar.gz: '031559fa58448415d4555613c76cb16f3e5f1b1262400d6ea928c0817dd45a6902a28014052860aa1ac74f6da59d2313d142226635fd6d351578f12477e34439'
+  metadata.gz: 2cf7845ce5b8d668cfa0de512bb6fb7ed676e3586167a9b95fdfd6eebb8b9f7bfd5cb688ab523ef1e7e512ce5f5bb379e305beb4531dd00c609e755620bd0004
+  data.tar.gz: f79e860f496368e67bf328b3359f5860162801600452482cf4b1c0b06439b20f9fb296d5593159410c1817fff4576c4e03ef526f265dbb5f9aa4d8877e9c558b

data/lib/config/pagy.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-# Pagy initializer file (5.5.1)
-# Customize only what you really need and notice that Pagy works also without any of the following lines.
+# Pagy initializer file (5.6.3)
+# Customize only what you really need and notice that the core Pagy works also without any of the following lines.
 # Should you just cherry pick part of this file, please maintain the require-order of the extras
 
 
 # Pagy DEFAULT Variables
 # See https://ddnexus.github.io/pagy/api/pagy#variables
-# All the Pagy::DEFAULT are set for all the Pagy instances but can be overridden per instance
-# by just passing them to Pagy.new|Pagy::Countless.new|Pagy::Calendar.new or the #pagy controller method
+# All the Pagy::DEFAULT are set for all the Pagy instances but can be overridden per instance by just passing them to
+# Pagy.new|Pagy::Countless.new|Pagy::Calendar::*.new or any of the #pagy* controller methods
 
 
 # Instance variables
@@ -40,24 +40,27 @@
 # See https://ddnexus.github.io/pagy/extras/array
 # require 'pagy/extras/array'
 
-# Calendar extra: Add pagination filtering by calendar time unit (Year, Month, Week Day)
+# Calendar extra: Add pagination filtering by calendar time unit (year, quarter, month, week, day)
 # See https://ddnexus.github.io/pagy/extras/calendar
 # require 'pagy/extras/calendar'
 # Default for each unit
-# Pagy::Calendar::Year::DEFAULT[:order]   = :asc        # Time direction of pagination
-# Pagy::Calendar::Year::DEFAULT[:format]  = '%Y'        # strftime format
+# Pagy::Calendar::Year::DEFAULT[:order]     = :asc        # Time direction of pagination
+# Pagy::Calendar::Year::DEFAULT[:format]    = '%Y'        # strftime format
 #
-# Pagy::Calendar::Month::DEFAULT[:order]  = :asc        # Time direction of pagination
-# Pagy::Calendar::Month::DEFAULT[:format] = '%Y-%m'     # strftime format
+# Pagy::Calendar::Quarter::DEFAULT[:order]  = :asc        # Time direction of pagination
+# Pagy::Calendar::Quarter::DEFAULT[:format] = '%Y-Q%q'    # strftime format
 #
-# Pagy::Calendar::Week::DEFAULT[:order]   = :asc        # Time direction of pagination
-# Pagy::Calendar::Week::DEFAULT[:format]  = '%Y-%W'     # strftime format
-# Pagy::Calendar::Week::DEFAULT[:offset]  = 0           # Day offset from Sunday (0: Sunday; 1: Monday;... 6: Saturday)
+# Pagy::Calendar::Month::DEFAULT[:order]    = :asc        # Time direction of pagination
+# Pagy::Calendar::Month::DEFAULT[:format]   = '%Y-%m'     # strftime format
 #
-# Pagy::Calendar::Day::DEFAULT[:order]    = :asc        # Time direction of pagination
-# Pagy::Calendar::Day::DEFAULT[:format]   = '%Y-%m-%d'  # strftime format
+# Pagy::Calendar::Week::DEFAULT[:order]     = :asc        # Time direction of pagination
+# Pagy::Calendar::Week::DEFAULT[:format]    = '%Y-%W'     # strftime format
+# Pagy::Calendar::Week::DEFAULT[:offset]    = 0           # Day offset from Sunday (0: Sunday; 1: Monday;... 6: Saturday)
 #
-# Uncomment the following block, if you need calendar localization without using the I18n extra
+# Pagy::Calendar::Day::DEFAULT[:order]      = :asc        # Time direction of pagination
+# Pagy::Calendar::Day::DEFAULT[:format]     = '%Y-%m-%d'  # strftime format
+#
+# Uncomment the following lines, if you need calendar localization without using the I18n extra
 # module LocalizePagyCalendar
 #   def localize(time, opts)
 #     ::I18n.l(time, **opts)
@@ -97,8 +100,8 @@
 # you must require the shared internal extra (BEFORE the metadata extra) ONLY if you need also the :sequels
 # require 'pagy/extras/shared'
 # require 'pagy/extras/metadata'
-# For performance reason, you should explicitly set ONLY the metadata you use in the frontend
-# Pagy::DEFAULT[:metadata] = %i[scaffold_url count page prev next last]   # example
+# For performance reasons, you should explicitly set ONLY the metadata you use in the frontend
+# Pagy::DEFAULT[:metadata] = %i[scaffold_url page prev next last]   # example
 
 # Searchkick extra: Paginate `Searchkick::Results` objects
 # See https://ddnexus.github.io/pagy/extras/searchkick
@@ -209,18 +212,18 @@
 #
 # load the "de", "en" and "es" built-in locales:
 # (the first passed :locale will be used also as the default_locale)
-# Pagy::I18n.load({locale: 'de'},
-#                 {locale: 'en'},
-#                 {locale: 'es'})
+# Pagy::I18n.load({ locale: 'de' },
+#                 { locale: 'en' },
+#                 { locale: 'es' })
 #
 # load the "en" built-in locale, a custom "es" locale,
 # and a totally custom locale complete with a custom :pluralize proc:
 # (the first passed :locale will be used also as the default_locale)
-# Pagy::I18n.load({locale: 'en'},
-#                 {locale: 'es', filepath: 'path/to/pagy-es.yml'},
-#                 {locale: 'xyz',  # not built-in
-#                  filepath: 'path/to/pagy-xyz.yml',
-#                  pluralize: lambda{ |count| ... } )
+# Pagy::I18n.load({ locale: 'en' },
+#                 { locale: 'es', filepath: 'path/to/pagy-es.yml' },
+#                 { locale: 'xyz',  # not built-in
+#                   filepath: 'path/to/pagy-xyz.yml',
+#                   pluralize: lambda{ |count| ... } )
 
 
 # I18n extra: uses the standard i18n gem which is ~18x slower using ~10x more memory

data/lib/javascripts/pagy.js

@@ -5,7 +5,7 @@
 // Container of the whole pagy stuff
 function Pagy(){}
 
-Pagy.version = '5.5.1'
+Pagy.version = '5.6.3'
 
 // Used by the waitForMe function
 Pagy.delay = 100

data/lib/locales/ta.yml

@@ -0,0 +1,22 @@
+# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/locales/utils/p11n.rb)
+
+ta:
+  pagy:
+
+    item_name:
+      one: "பதிவு"
+      other: "பதிவுகள்"
+
+    nav:
+      prev: "‹ முந்தையது"
+      next: "அடுத்தது ›"
+      gap: "…"
+
+    info:
+      no_items: "%{item_name} கிடைக்கவில்லை"
+      single_page: "<b>%{count}</b> %{item_name} காட்டப்படுகின்றது"
+      multiple_pages: "மொத்தம் <b>%{count}</b> %{item_name}, காட்டப்படுபவை <b>%{from}-%{to}</b>"
+
+    combo_nav_js: "<label>%{pages}-இல் %{page_input}-வது பக்கம்</label>"
+
+    items_selector_js: "<label>ஒரு பக்கத்திற்கு %{items_input} %{item_name} காட்டு</label>"

data/lib/pagy/calendar/day.rb

@@ -16,13 +16,13 @@ class Pagy # :nodoc:
         @initial = new_time(@starting.year, @starting.month, @starting.day)
         @final   = new_time(@ending.year, @ending.month, @ending.day) + DAY
         @pages   = @last = (@final - @initial).to_i / DAY
-        @from    = start_for(@page)
+        @from    = starting_time_for(@page)
         @to      = @from + DAY
       end
 
-      # Time for the page
-      def start_for(page)
-        @initial + (snap(page) * DAY)
+      # Starting time for the page
+      def starting_time_for(page)
+        @initial + (offset_units_for(page) * DAY)
       end
     end
   end

data/lib/pagy/calendar/month.rb

@@ -1,44 +1,16 @@
 # See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/api/calendar
 # frozen_string_literal: true
 
+require_relative 'month_mixin'
+
 class Pagy # :nodoc:
   class Calendar # :nodoc:
     # Calendar month subclass
     class Month < Calendar
       DEFAULT = { order:  :asc,      # rubocop:disable Style/MutableConstant
                   format: '%Y-%m' }
-
-      protected
-
-      # Setup the calendar variables
-      def setup_unit_vars
-        super
-        @initial = new_time(@starting.year, @starting.month)
-        @final   = bump_month(@ending)
-        @pages   = @last = months(@final) - months(@initial)
-        @from    = start_for(@page)
-        @to      = bump_month(@from)
-      end
-
-      # Time for the page
-      def start_for(page)
-        bump_month(@initial, snap(page))
-      end
-
-      private
-
-      # Months in local time
-      def months(time)
-        (time.year * 12) + time.month
-      end
-
-      # Add 1 or more months to local time
-      def bump_month(time, months = 1)
-        months += months(time)
-        year  = months / 12
-        month = months % 12
-        month.zero? ? new_time(year - 1, 12) : new_time(year, month)
-      end
+      MONTHS  = 1  # number of months in the unit
+      include MonthMixin
     end
   end
 end

data/lib/pagy/calendar/month_mixin.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+class Pagy
+  class Calendar
+    # Mixin for month based unit periods
+    # It is used for month and quarter, but you could use it to implement less common unit of 6, 4, 2 months
+    # (see the https://ddnexus.github.io/pagy/api/calendar#custom-units sections for details).
+    # The including class must set the MONTHS duration for the unit and the usual DEFAULT.
+    module MonthMixin
+      protected
+
+      # Setup the calendar variables
+      def setup_unit_vars
+        super
+        @months  = self.class::MONTHS  # number of months in the unit
+        @initial = unit_starting_time_for(@starting)
+        @final   = add_months_to(unit_starting_time_for(@ending), @months)
+        @pages   = @last = (months_in(@final) - months_in(@initial)) / @months
+        @from    = starting_time_for(@page)
+        @to      = add_months_to(@from, @months)
+      end
+
+      # Starting time for the page
+      def starting_time_for(page)
+        add_months_to(@initial, offset_units_for(page) * @months)
+      end
+
+      private
+
+      # Unit starting time for time
+      def unit_starting_time_for(time)
+        # remove 1 month for 0-11 calculations and add it back for 1-12 conversion
+        starting_month = (@months * ((time.month - 1) / @months)) + 1
+        new_time(time.year, starting_month)
+      end
+
+      # Number of months in time
+      def months_in(time)
+        (time.year * 12) + time.month
+      end
+
+      # Add months to time
+      def add_months_to(time, months)
+        months += months_in(time) - 1             # remove 1 month for 0-11 calculations
+        new_time(months / 12, (months % 12) + 1)  # add 1 month back for 1-12 conversion
+      end
+    end
+  end
+end

data/lib/pagy/calendar/quarter.rb

@@ -0,0 +1,23 @@
+# See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/api/calendar
+# frozen_string_literal: true
+
+require_relative 'month_mixin'
+
+class Pagy # :nodoc:
+  class Calendar # :nodoc:
+    # Calendar quarter subclass
+    class Quarter < Calendar
+      DEFAULT = { order:  :asc,      # rubocop:disable Style/MutableConstant
+                  format: '%Y-Q%q' } # '%q' token
+      MONTHS  = 3  # number of months of the unit
+      include MonthMixin
+
+      # The label for any page, with the substitution of the '%q' token
+      def label_for(page, opts = {})
+        starting_time = starting_time_for(page.to_i)  # page could be a string
+        opts[:format] = (opts[:format] || @vars[:format]).gsub('%q') { (starting_time.month / 4) + 1 }
+        localize(starting_time, opts)
+      end
+    end
+  end
+end

data/lib/pagy/calendar/week.rb

@@ -15,24 +15,24 @@ class Pagy # :nodoc:
       def setup_unit_vars
         setup_vars(offset: 0)
         super
-        @initial = week_start(@starting)
-        @final   = week_start(@ending) + WEEK
+        @initial = unit_starting_time_for(@starting)
+        @final   = unit_starting_time_for(@ending) + WEEK
         @pages   = @last = (@final - @initial).to_i / WEEK
-        @from    = start_for(@page)
+        @from    = starting_time_for(@page)
         @to      = @from + WEEK
       end
 
-      # Time for the page
-      def start_for(page)
-        @initial + (snap(page) * WEEK)
+      # Starting time for the page
+      def starting_time_for(page)
+        @initial + (offset_units_for(page) * WEEK)
       end
 
       private
 
-      # Return the start of the week for local time
-      def week_start(time)
-        start = time - (((time.wday - @offset) * DAY) % WEEK)
-        new_time(start.year, start.month, start.day)
+      # Unit starting time for time
+      def unit_starting_time_for(time)
+        starting_time = time - (((time.wday - @offset) * DAY) % WEEK)
+        new_time(starting_time.year, starting_time.month, starting_time.day)
       end
     end
   end

data/lib/pagy/calendar/year.rb

@@ -16,13 +16,13 @@ class Pagy # :nodoc:
         @initial = new_time(@starting.year)
         @final   = new_time(@ending.year + 1)
         @pages   = @last = @final.year - @initial.year
-        @from    = start_for(@page)
+        @from    = starting_time_for(@page)
         @to      = new_time(@from.year + 1)
       end
 
-      # Time for the page
-      def start_for(page)
-        new_time(@initial.year + snap(page))
+      # Starting time for the page
+      def starting_time_for(page)
+        new_time(@initial.year + offset_units_for(page))
       end
     end
   end

data/lib/pagy/calendar.rb

@@ -4,10 +4,12 @@
 require 'pagy'
 
 class Pagy # :nodoc:
-  # Base class for time units subclasses (Year, Month, Week, Day)
+  # Base class for time units subclasses (Year, Quarter, Month, Week, Day)
   class Calendar < Pagy
-    DAY  = 60 * 60 * 24
-    WEEK = DAY * 7
+    # List of units in desc order of duration. It can be used for custom units.
+    UNITS = %i[year quarter month week day]  # rubocop:disable Style/MutableConstant
+    DAY   = 60 * 60 * 24  # One day in seconds
+    WEEK  = DAY * 7       # One week in seconds
 
     attr_reader :order
 
@@ -15,8 +17,8 @@ class Pagy # :nodoc:
     def initialize(vars) # rubocop:disable Lint/MissingSuper
       raise InternalError, 'Pagy::Calendar is a base class; use one of its subclasses' if instance_of?(Pagy::Calendar)
 
-      normalize_vars(vars)
-      @vars = self.class::DEFAULT.merge(@vars)
+      vars = self.class::DEFAULT.merge(vars)  # subclass specific default
+      normalize_vars(vars)                    # general default
       setup_vars(page: 1)
       setup_unit_vars
       setup_params_var
@@ -27,19 +29,14 @@ class Pagy # :nodoc:
     end
 
     # The label for the current page (it can pass along the I18n gem opts when it's used with the i18n extra)
-    def label(**opts)
-      label_for(@page, **opts)
+    def label(opts = {})
+      label_for(@page, opts)
     end
 
     # The label for any page (it can pass along the I18n gem opts when it's used with the i18n extra)
-    def label_for(page, **opts)
+    def label_for(page, opts = {})
       opts[:format] ||= @vars[:format]
-      localize(start_for(page.to_i), **opts)
-    end
-
-    # Period of the active page (used for nested units)
-    def active_period
-      [[@starting, @from].max, [@to - DAY, @ending].min] # include only last unit day
+      localize(starting_time_for(page.to_i), opts)  # page could be a string
     end
 
     protected
@@ -61,8 +58,9 @@ class Pagy # :nodoc:
       time.strftime(opts[:format])
     end
 
-    # Simple trick to snap the page to its ordered start, without actually reordering anything in the internal structure.
-    def snap(page)
+    # Number of units to offset from the @initial time, in order to get the ordered starting time for the page.
+    # Used in starting_time_for(page) with a logic equivalent to: @initial + (offset_units_for(page) * unit_time_length)
+    def offset_units_for(page)
       @order == :asc ? page - 1 : @pages - page
     end
 
@@ -70,20 +68,23 @@ class Pagy # :nodoc:
     def new_time(year, month = 1, day = 1)
       Time.new(year, month, day, 0, 0, 0, @utc_offset)
     end
-  end
-  require 'pagy/calendar/year'
-  require 'pagy/calendar/month'
-  require 'pagy/calendar/week'
-  require 'pagy/calendar/day'
 
-  class Calendar # :nodoc:
-    UNITS = { year: Year, month: Month, week: Week, day: Day }.freeze
+    # Period of the active page (used internally for nested units)
+    def active_period
+      [[@starting, @from].max, [@to - 1, @ending].min] # -1 sec: include only last unit day
+    end
 
-    # Create a subclass instance by unit name (internal use)
-    def self.create(unit, vars)
-      raise InternalError, "unit must be in #{UNITS.keys.inspect}; got #{unit}" unless UNITS.key?(unit)
+    class << self
+      # Create a subclass instance by unit name (internal use)
+      def create(unit, vars)
+        raise InternalError, "unit must be in #{UNITS.inspect}; got #{unit}" unless UNITS.include?(unit)
 
-      UNITS[unit].new(vars)
+        name    = unit.to_s
+        name[0] = name[0].capitalize
+        Object.const_get("Pagy::Calendar::#{name}").new(vars)
+      end
     end
   end
+
+  Calendar::UNITS.each { |unit| require "pagy/calendar/#{unit}" }
 end

data/lib/pagy/extras/calendar.rb

@@ -8,16 +8,11 @@ class Pagy # :nodoc:
   module CalendarExtra
     # Additions for the Backend module
     module Backend
-      CONF_KEYS = %i[year month week day pagy active].freeze
+      CONF_KEYS = (Calendar::UNITS + %i[pagy active]).freeze
 
       private
 
-      # Take a collection and a conf Hash with keys in [:year, :month: week, :day, :pagy: :active];
-      # The calendar is active by default, but it can be explicitly inactivated with `active: false`
-      # Return a hash with 3 items:
-      # 0. Array of pagy calendar unit objects
-      # 1. Pagy object
-      # 2. Array of results
+      # Take a collection and a conf Hash with keys in CONF_KEYS and return an array with 3 items: [calendar, pagy, results]
       def pagy_calendar(collection, conf)
         unless conf.is_a?(Hash) && (conf.keys - CONF_KEYS).empty? && conf.all? { |k, v| v.is_a?(Hash) || k == :active }
           raise ArgumentError, "keys must be in #{CONF_KEYS.inspect} and object values must be Hashes; got #{conf.inspect}"
@@ -25,50 +20,43 @@ class Pagy # :nodoc:
 
         conf[:pagy]          = {} unless conf[:pagy]  # use default Pagy object when omitted
         calendar, collection = pagy_setup_calendar(collection, conf) unless conf.key?(:active) && !conf[:active]
-        pagy, result         = send(conf[:pagy][:backend] || :pagy, collection, conf[:pagy])  # use backend: :pagy when omitted
-        [calendar, pagy, result]
+        pagy, results        = send(conf[:pagy][:backend] || :pagy, collection, conf[:pagy])  # use backend: :pagy when omitted
+        [calendar, pagy, results]
       end
 
       # Setup and return the calendar objects and the filtered collection
       def pagy_setup_calendar(collection, conf)
-        units      = Calendar::UNITS.keys & conf.keys
+        units      = Calendar::UNITS & conf.keys # get the units in time length desc order
         page_param = conf[:pagy][:page_param] || DEFAULT[:page_param]
         units.each do |unit|  # set all the :page_param vars for later deletion
-          unit_page_param = :"#{unit}_#{page_param}"
+          unit_page_param         = :"#{unit}_#{page_param}"
           conf[unit][:page_param] = unit_page_param
           conf[unit][:page]       = params[unit_page_param]
         end
         calendar = {}
-        period   = pagy_calendar_period(collection)
+        last_obj = nil
         units.each_with_index do |unit, index|
           params_to_delete    = units[(index + 1), units.size].map { |sub| conf[sub][:page_param] } + [page_param]
           conf[unit][:params] = lambda do |params|  # delete page_param from the sub-units
-                                  params_to_delete.each { |p| params.delete(p.to_s) } # Hash#except missing from 2.5 baseline
+                                  params_to_delete.each { |p| params.delete(p.to_s) } # Hash#except missing from ruby 2.5 baseline
                                   params
                                 end
-          conf[unit][:period] = period
-          calendar[unit]      = Calendar.create(unit, conf[unit])
-          period              = calendar[unit].active_period # set the period for the next unit
+          conf[unit][:period] = last_obj&.send(:active_period) || pagy_calendar_period(collection)
+          calendar[unit]      = last_obj = Calendar.send(:create, unit, conf[unit])
         end
-        [calendar, pagy_calendar_filter(collection, calendar[units.last].from, calendar[units.last].to)]
+        [calendar, pagy_calendar_filter(collection, last_obj.from, last_obj.to)]
       end
 
-      # This method must be implemented by the application.
-      # It must return the the starting and ending local Time objects defining the calendar :period
+      # This method must be implemented by the application
       def pagy_calendar_period(*)
-        # return_period_array_using(collection)
-        raise NoMethodError, 'the pagy_calendar_period method must be implemented by the application and must return ' \
-                             'the starting and ending local Time objects array defining the calendar :period'
+        raise NoMethodError, 'the pagy_calendar_period method must be implemented by the application ' \
+                             '(see https://ddnexus.github.io/pagy/extras/calendar#pagy_calendar_periodcollection)'
       end
 
-      # This method must be implemented by the application.
-      # It receives the main collection and must return a filtered version of it.
-      # The filter logic must be equivalent to {storage_time >= from && storage_time < to}
+      # This method must be implemented by the application
       def pagy_calendar_filter(*)
-        # return_filtered_collection_using(collection, from, to)
-        raise NoMethodError, 'the pagy_calendar_filter method must be implemented by the application and must return the ' \
-                             'collection filtered by a logic equivalent to '\
-                             '{storage_time >= from && storage_time < to}'
+        raise NoMethodError, 'the pagy_calendar_filter method must be implemented by the application ' \
+                             '(see https://ddnexus.github.io/pagy/extras/calendar#pagy_calendar_filtercollection-from-to)'
       end
     end
   end

data/lib/pagy/extras/gearbox.rb

@@ -28,11 +28,11 @@ class Pagy # :nodoc:
       @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]
+                          pages     = 0
+                          remainder = @count
+                          while remainder.positive?
+                            pages     += 1
+                            remainder -= gearbox_items[pages - 1]
                           end
                           [pages, 1].max
                         end)

data/lib/pagy/frontend.rb

@@ -76,8 +76,8 @@ class Pagy
 
     # 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.t(@pagy_locale ||= nil, key, opts)
     end
   end
 end

data/lib/pagy/i18n.rb

@@ -10,12 +10,16 @@ class Pagy
 
     # Pluralization rules
     module P11n
-      # Utility variables
-      from0to1   = [0, 1].freeze
-      from2to4   = [2, 3, 4].freeze
-      from5to9   = [5, 6, 7, 8, 9].freeze
-      from11to14 = [11, 12, 13, 14].freeze
-      from12to14 = [12, 13, 14].freeze
+      # 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
@@ -24,12 +28,12 @@ class Pagy
           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 (3..10).to_a.include?(mod100)  then 'few'
-            when (11..99).to_a.include?(mod100) then 'many'
-            else                                     'other'
+            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,
 
@@ -68,10 +72,10 @@ class Pagy
             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'
+            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,
 
@@ -149,7 +153,7 @@ class Pagy
     end
 
     # Translate and pluralize the key with the locale DATA
-    def t(locale, key, **opts)
+    def t(locale, key, opts = {})
       data, pluralize = DATA[locale]
       translation = data[key] || (opts[:count] && data[key += ".#{pluralize.call(opts[:count])}"]) \
                       or return %([translation missing: "#{key}"])

data/lib/pagy.rb

@@ -5,7 +5,7 @@ require 'pathname'
 
 # Core class
 class Pagy
-  VERSION = '5.5.1'
+  VERSION = '5.6.3'
 
   # Root pathname to get the path of Pagy files like templates or dictionaries
   def self.root

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 5.5.1
+  version: 5.6.3
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-23 00:00:00.000000000 Z
+date: 2021-11-30 00:00:00.000000000 Z
 dependencies: []
 description: Agnostic pagination in plain ruby. It does it all. Better.
 email:
@@ -46,6 +46,7 @@ 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/zh-CN.yml
@@ -56,6 +57,8 @@ files:
 - lib/pagy/calendar.rb
 - lib/pagy/calendar/day.rb
 - lib/pagy/calendar/month.rb
+- lib/pagy/calendar/month_mixin.rb
+- lib/pagy/calendar/quarter.rb
 - lib/pagy/calendar/week.rb
 - lib/pagy/calendar/year.rb
 - lib/pagy/console.rb