pagy 5.3.0 → 5.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b456869f0028668579c9839d1083b7baf7693d593fcbed24f371bc52dfff4467
-  data.tar.gz: ec4f4b71da52860950262812d2bfbbe9190b1f0a1c3836cbc8f316e0c04ecd0b
+  metadata.gz: e23922e820d30e39dee31d0b1931e79da25f9fd6fa4ee4c5f75a25f383ca99bc
+  data.tar.gz: 863360e18514c2250c2746d7fdfac4b11e65e0b04488150bee078466877a8b33
 SHA512:
-  metadata.gz: e16ea640c3cc34b506c02d585c48fa8365b1a5e67d3b487d69669aa9d700a1f930929844e92759929f3963e78f2d72c53b4ef2d4caefeb2adbbff262ff0dd54d
-  data.tar.gz: 3086cf995b60b71212b64b42d7998e2f2831883abf41d22f9952b0632143936871a4c50d16da6b1849e805ce90de190be555e96ba893b5ee28c01b8650af7e03
+  metadata.gz: 27819f1864544b94b0c916cca3d4d43a7bfd051c41a7a202b30818e9b5730fd754c2034247c912d48bb046d90ce46f95f4a18a636b2b75e8ed6b06203f1ddc81
+  data.tar.gz: '031559fa58448415d4555613c76cb16f3e5f1b1262400d6ea928c0817dd45a6902a28014052860aa1ac74f6da59d2313d142226635fd6d351578f12477e34439'

data/lib/config/pagy.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Pagy initializer file (5.3.0)
+# Pagy initializer file (5.5.1)
 # Customize only what you really need and notice that 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
 
@@ -40,17 +40,30 @@
 # See https://ddnexus.github.io/pagy/extras/array
 # require 'pagy/extras/array'
 
-# Calendar extra: Paginate a collection by calendar Time unit (year, month, week or day)
+# Calendar extra: Add pagination filtering by calendar time unit (Year, Month, Week Day)
 # See https://ddnexus.github.io/pagy/extras/calendar
 # require 'pagy/extras/calendar'
-# Pagy::DEFAULT[:local_minmax] = []          # Min and max local Time period must be set by the user (better not not as default)
-# Pagy::DEFAULT[:unit]         = :month      # Time unit allowed %i[year month week day]
-# Pagy::DEFAULT[:week_offset]  = 0           # Day offset from Sunday (0: Sunday; 1: Monday;... 6: Saturday)
-# Pagy::DEFAULT[:order]         = :asc        # Time direction of pagination
-# Pagy::DEFAULT[:year_format]  = '%Y'        # strftime format for :year unit
-# Pagy::DEFAULT[:month_format] = '%Y-%m'     # strftime format for :month unit
-# Pagy::DEFAULT[:week_format]  = '%Y-%W'     # strftime format for :week unit
-# Pagy::DEFAULT[:day_format]   = '%Y-%m-%d'  # strftime format for :day unit
+# Default for each unit
+# 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::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::Day::DEFAULT[:order]    = :asc        # Time direction of pagination
+# Pagy::Calendar::Day::DEFAULT[:format]   = '%Y-%m-%d'  # strftime format
+#
+# Uncomment the following block, if you need calendar localization without using the I18n extra
+# module LocalizePagyCalendar
+#   def localize(time, opts)
+#     ::I18n.l(time, **opts)
+#   end
+# end
+# Pagy::Calendar.prepend LocalizePagyCalendar
 
 # Countless extra: Paginate without any count, saving one query per rendering
 # See https://ddnexus.github.io/pagy/extras/countless
@@ -219,6 +232,5 @@
 # Pagy::DEFAULT[:i18n_key] = 'pagy.item_name'   # default
 
 
-# When you are done setting your own defaults freeze it,
-# so it will not changed accidentally
+# When you are done setting your own default freeze it, so it will not get changed accidentally
 Pagy::DEFAULT.freeze

data/lib/javascripts/pagy.js

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

data/lib/pagy/calendar/day.rb

@@ -0,0 +1,29 @@
+# See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/api/calendar
+# frozen_string_literal: true
+
+class Pagy # :nodoc:
+  class Calendar # :nodoc:
+    # Calendar day subclass
+    class Day < Calendar
+      DEFAULT = { order:  :asc,      # rubocop:disable Style/MutableConstant
+                  format: '%Y-%m-%d' }
+
+      protected
+
+      # Setup the calendar variables
+      def setup_unit_vars
+        super
+        @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)
+        @to      = @from + DAY
+      end
+
+      # Time for the page
+      def start_for(page)
+        @initial + (snap(page) * DAY)
+      end
+    end
+  end
+end

data/lib/pagy/calendar/month.rb

@@ -0,0 +1,44 @@
+# See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/api/calendar
+# frozen_string_literal: true
+
+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
+    end
+  end
+end

data/lib/pagy/calendar/week.rb

@@ -0,0 +1,39 @@
+# See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/api/calendar
+# frozen_string_literal: true
+
+class Pagy # :nodoc:
+  class Calendar # :nodoc:
+    # Calendar week subclass
+    class Week < Calendar
+      DEFAULT = { order:  :asc,      # rubocop:disable Style/MutableConstant
+                  format: '%Y-%W',
+                  offset: 0 }
+
+      protected
+
+      # Setup the calendar variables
+      def setup_unit_vars
+        setup_vars(offset: 0)
+        super
+        @initial = week_start(@starting)
+        @final   = week_start(@ending) + WEEK
+        @pages   = @last = (@final - @initial).to_i / WEEK
+        @from    = start_for(@page)
+        @to      = @from + WEEK
+      end
+
+      # Time for the page
+      def start_for(page)
+        @initial + (snap(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)
+      end
+    end
+  end
+end

data/lib/pagy/calendar/year.rb

@@ -0,0 +1,29 @@
+# See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/api/calendar
+# frozen_string_literal: true
+
+class Pagy # :nodoc:
+  class Calendar # :nodoc:
+    # Calendar year subclass
+    class Year < Calendar
+      DEFAULT = { order:  :asc,      # rubocop:disable Style/MutableConstant
+                  format: '%Y' }
+
+      protected
+
+      # Setup the calendar variables
+      def setup_unit_vars
+        super
+        @initial = new_time(@starting.year)
+        @final   = new_time(@ending.year + 1)
+        @pages   = @last = @final.year - @initial.year
+        @from    = start_for(@page)
+        @to      = new_time(@from.year + 1)
+      end
+
+      # Time for the page
+      def start_for(page)
+        new_time(@initial.year + snap(page))
+      end
+    end
+  end
+end

data/lib/pagy/calendar.rb

@@ -2,27 +2,22 @@
 # frozen_string_literal: true
 
 require 'pagy'
-require 'date'
 
 class Pagy # :nodoc:
-  DEFAULT[:local_minmax] = []          # Min and max Time period must be set by the user
-  DEFAULT[:unit]         = :month      # Time unit allowed %i[year month week day]
-  DEFAULT[:week_offset]  = 0           # Day offset from Sunday (0: Sunday; 1: Monday;... 6: Saturday)
-  DEFAULT[:order]        = :asc        # Time direction of pagination
-  DEFAULT[:year_format]  = '%Y'        # strftime format for :year unit
-  DEFAULT[:month_format] = '%Y-%m'     # strftime format for :month unit
-  DEFAULT[:week_format]  = '%Y-%W'     # strftime format for :week unit
-  DEFAULT[:day_format]   = '%Y-%m-%d'  # strftime format for :day unit
-
-  # Paginate a Time period by units (year, month, week or day)
+  # Base class for time units subclasses (Year, Month, Week, Day)
   class Calendar < Pagy
-    attr_reader :utc_from, :utc_to, :unit, :week_offset, :order
-    attr_writer :count, :in
+    DAY  = 60 * 60 * 24
+    WEEK = DAY * 7
+
+    attr_reader :order
 
     # Merge and validate the options, do some simple arithmetic and set a few instance variables
     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)
-      setup_vars(page: 1, week_offset: 0)
+      @vars = self.class::DEFAULT.merge(@vars)
+      setup_vars(page: 1)
       setup_unit_vars
       setup_params_var
       raise OverflowError.new(self, :page, "in 1..#{@last}", @page) if @page > @last
@@ -31,103 +26,43 @@ class Pagy # :nodoc:
       @next = @page == @last ? (1 if @vars[:cycle]) : @page + 1
     end
 
-    # Generate a label for each page, with the specific `Time` period it refers to
-    # It can pass along the I18n gem opts when it's used with the i18n extra
-    def label_for(page, **opts)
-      snap = snap(page.to_i)
-      time = case @unit
-             when :year  then new_time(@initial.year + snap)
-             when :month then bump_month(@initial, snap)
-             when :week  then @initial + (snap * WEEK)
-             when :day   then @initial + (snap * DAY)
-             else raise InternalError, "expected @unit to be in [:year, :month, :week, :day]; got #{@unit.inspect}"
-             end
-      opts[:format] ||= @vars[:"#{@unit}_format"]
-      strftime(time, **opts)
-    end
-
-    # The label for the current page
-    # It can pass along the I18n gem opts when it's used with the i18n extra
+    # 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)
     end
 
-    DAY  = 60 * 60 * 24
-    WEEK = DAY * 7
+    # 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)
+      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
+    end
 
     protected
 
+    # Base class method for the setup of the unit variables
     def setup_unit_vars
-      (units = %i[year month week day]).each do |unit|
-        raise VariableError.new(self, :format, 'to be a strftime format', @vars[:"#{unit}_format"]) \
-              unless @vars[:"#{unit}_format"].is_a?(String)
-      end
-      raise VariableError.new(self, :unit, "to be in #{units.inspect}", @unit) \
-            unless units.include?(@unit = @vars[:unit])
+      raise VariableError.new(self, :format, 'to be a strftime format', @vars[:format]) unless @vars[:format].is_a?(String)
       raise VariableError.new(self, :order, 'to be in [:asc, :desc]', @order) \
             unless %i[asc desc].include?(@order = @vars[:order])
 
-      min, max = @vars[:local_minmax]
-      raise VariableError.new(self, :local_minmax, 'to be a an Array of min and max local Time instances', @vars[:local_minmax]) \
-            unless min.is_a?(Time) && max.is_a?(Time) && !min.utc? && !min.utc? && min <= max \
-                   && (@utc_offset = min.utc_offset) == max.utc_offset
-
-      send :"setup_#{@unit}_vars", min, max
+      @starting, @ending = @vars[:period]
+      raise VariableError.new(self, :period, 'to be a an Array of min and max local Time instances', @vars[:period]) \
+            unless @starting.is_a?(Time) && @ending.is_a?(Time) && !@starting.utc? && !@ending.utc? && @starting <= @ending \
+                   && (@utc_offset = @starting.utc_offset) == @ending.utc_offset
     end
 
-    # IMPORTANT: all the Time objects created and passed as arguments MUST be local!
-
-    # @initial:  beginning of the first day of the period that encloses the min local time
-    # @final:    beginning of the first day of the NEXT period AFTER the period that encloses the max local time
-    # @utc_from: beginning of the first day of the period of the current page as UTC time
-    # @utc_to:   beginning of the first day of the NEXT period AFTER the current page as UTC time
-
-    # Setup the calendar vars when the unit is :year
-    def setup_year_vars(min, max)
-      @initial  = new_time(min.year)
-      @final    = new_time(max.year + 1)
-      @pages    = @last = @final.year - @initial.year
-      @utc_from = new_time(@initial.year + snap).utc
-      @utc_to   = new_time(@initial.year + snap + 1).utc
-    end
-
-    # Setup the calendar vars when the unit is :month
-    def setup_month_vars(min, max)
-      @initial  = new_time(min.year, min.month)
-      @final    = bump_month(max)
-      @pages    = @last = months(@final) - months(@initial)
-      @utc_from = bump_month(@initial, snap).utc
-      @utc_to   = bump_month(@initial, snap + 1).utc
-    end
-
-    # Setup the calendar vars when the unit is :week
-    def setup_week_vars(min, max)
-      @initial  = week_start(min)
-      @final    = week_start(max) + WEEK
-      @pages    = @last = (@final - @initial).to_i / WEEK
-      @utc_from = (@initial + (snap * WEEK)).utc
-      @utc_to   = @utc_from + WEEK
-    end
-
-    # Setup the calendar vars when the unit is :day
-    def setup_day_vars(min, max)
-      @initial  = new_time(min.year, min.month, min.day)
-      @final    = new_time(max.year, max.month, max.day) + DAY
-      @pages    = @last = (@final - @initial).to_i / DAY
-      @utc_from = (@initial + (snap * DAY)).utc
-      @utc_to   = @utc_from + DAY
-    end
-
-    # The last method in the labelling chain: it is overridden by the I18n when localization is required.
-    def strftime(time, **opts)
+    # Apply the strftime format to the time (overridden by the i18n extra when localization is required)
+    def localize(time, opts)
       time.strftime(opts[:format])
     end
 
-    private
-
-    # Simple trick to snap the page into its ordered position,
-    # without actually reordering anything in the internal structure
-    def snap(page = @page)
+    # Simple trick to snap the page to its ordered start, without actually reordering anything in the internal structure.
+    def snap(page)
       @order == :asc ? page - 1 : @pages - page
     end
 
@@ -135,24 +70,20 @@ 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'
 
-    # Months in local time
-    def months(time)
-      (time.year * 12) + time.month
-    end
+  class Calendar # :nodoc:
+    UNITS = { year: Year, month: Month, week: Week, day: Day }.freeze
 
-    # 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
+    # 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)
 
-    # Return the start of the week for local time
-    def week_start(time)
-      start = time - (((time.wday - @week_offset) * DAY) % WEEK)
-      new_time(start.year, start.month, start.day)
+      UNITS[unit].new(vars)
     end
   end
 end

data/lib/pagy/countless.rb

@@ -30,7 +30,7 @@ class Pagy
 
     # Override the original series.
     # Return nil if :countless_minimal is enabled
-    def series(_size = @vars[:size])
+    def series(*)
       super unless @vars[:countless_minimal]
     end
   end

data/lib/pagy/extras/bootstrap.rb

@@ -8,13 +8,13 @@ class Pagy # :nodoc:
   # The resulting code may not look very elegant, but produces the best benchmarks
   module BootstrapExtra
     # Pagination for bootstrap: it returns the html with the series of links to the pages
-    def pagy_bootstrap_nav(pagy, pagy_id: nil, link_extra: '')
+    def pagy_bootstrap_nav(pagy, pagy_id: nil, link_extra: '', **vars)
       p_id = %( id="#{pagy_id}") if pagy_id
       link = pagy_link_proc(pagy, link_extra: %(class="page-link" #{link_extra}))
 
       html = +%(<nav#{p_id} class="pagy-bootstrap-nav" aria-label="pager"><ul class="pagination">)
       html << pagy_bootstrap_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
                   %(<li class="page-item">#{link.call item}</li>)
@@ -30,7 +30,7 @@ class Pagy # :nodoc:
     end
 
     # Javascript pagination for bootstrap: it returns a nav and a JSON tag used by the Pagy.nav javascript
-    def pagy_bootstrap_nav_js(pagy, pagy_id: nil, link_extra: '', steps: nil)
+    def pagy_bootstrap_nav_js(pagy, pagy_id: nil, link_extra: '', **vars)
       p_id = %( id="#{pagy_id}") if pagy_id
       link = pagy_link_proc(pagy, link_extra: %(class="page-link" #{link_extra}))
       tags = { 'before' => %(<ul class="pagination">#{pagy_bootstrap_prev_html pagy, link}),
@@ -40,7 +40,7 @@ class Pagy # :nodoc:
                'after'  => %(#{pagy_bootstrap_next_html pagy, link}</ul>) }
 
       %(<nav#{p_id} class="pagy-njs pagy-bootstrap-nav-js" aria-label="pager" #{
-        pagy_json_attr(pagy, :nav, tags, (sequels = pagy.sequels(steps)), pagy.label_sequels(sequels))}></nav>)
+        pagy_json_attr(pagy, :nav, tags, (sequels = pagy.sequels(**vars)), pagy.label_sequels(sequels))}></nav>)
     end
 
     # Javascript combo pagination for bootstrap: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript

data/lib/pagy/extras/bulma.rb

@@ -8,14 +8,14 @@ class Pagy # :nodoc:
   # The resulting code may not look very elegant, but produces the best benchmarks
   module BulmaExtra
     # Pagination for Bulma: it returns the html with the series of links to the pages
-    def pagy_bulma_nav(pagy, pagy_id: nil, link_extra: '')
+    def pagy_bulma_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 = +%(<nav#{p_id} class="pagy-bulma-nav pagination is-centered" aria-label="pagination">)
       html << pagy_bulma_prev_next_html(pagy, link)
       html << %(<ul class="pagination-list">)
-      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
                   %(<li>#{link.call item, pagy.label_for(item), %(class="pagination-link" aria-label="goto page #{item}")}</li>)
@@ -30,7 +30,7 @@ class Pagy # :nodoc:
       html << %(</ul></nav>)
     end
 
-    def pagy_bulma_nav_js(pagy, pagy_id: nil, link_extra: '', steps: nil)
+    def pagy_bulma_nav_js(pagy, pagy_id: nil, link_extra: '', **vars)
       p_id = %( id="#{pagy_id}") if pagy_id
       link = pagy_link_proc(pagy, link_extra: link_extra)
       tags = { 'before' => %(#{pagy_bulma_prev_next_html(pagy, link)}<ul class="pagination-list">),
@@ -43,7 +43,7 @@ class Pagy # :nodoc:
                'after'  => '</ul>' }
 
       %(<nav#{p_id} class="pagy-njs pagy-bulma-nav-js pagination is-centered" aria-label="pagination" #{
-        pagy_json_attr(pagy, :nav, tags, (sequels = pagy.sequels(steps)), pagy.label_sequels(sequels))}></nav>)
+        pagy_json_attr(pagy, :nav, tags, (sequels = pagy.sequels(**vars)), pagy.label_sequels(sequels))}></nav>)
     end
 
     # Javascript combo pagination for Bulma: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript

data/lib/pagy/extras/calendar.rb

@@ -4,32 +4,71 @@
 require 'pagy/calendar'
 
 class Pagy # :nodoc:
-  # Paginate based on calendar periods (year month week day)
+  # Paginate based on calendar periods (year month week day) plus the regular pagination
   module CalendarExtra
     # Additions for the Backend module
     module Backend
+      CONF_KEYS = %i[year month week day pagy active].freeze
+
       private
 
-      # Return Pagy object and items
-      def pagy_calendar(collection, vars = {})
-        pagy = Calendar.new(pagy_calendar_get_vars(collection, vars))
-        [pagy, pagy_calendar_get_items(collection, pagy)]
+      # 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
+      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}"
+        end
+
+        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]
+      end
+
+      # Setup and return the calendar objects and the filtered collection
+      def pagy_setup_calendar(collection, conf)
+        units      = Calendar::UNITS.keys & conf.keys
+        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}"
+          conf[unit][:page_param] = unit_page_param
+          conf[unit][:page]       = params[unit_page_param]
+        end
+        calendar = {}
+        period   = pagy_calendar_period(collection)
+        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
+                                end
+          conf[unit][:period] = period
+          calendar[unit]      = Calendar.create(unit, conf[unit])
+          period              = calendar[unit].active_period # set the period for the next unit
+        end
+        [calendar, pagy_calendar_filter(collection, calendar[units.last].from, calendar[units.last].to)]
       end
 
-      # Sub-method called only by #pagy_calendar: here for easy customization of variables by overriding.
-      # You may want to override it in order to implement the dynamic set of the :minmax variable.
-      def pagy_calendar_get_vars(_collection, vars)
-        # vars[:minmax] ||= your_own_method_to_get_the_period_from(collection)
-        vars[:page] ||= params[vars[:page_param] || DEFAULT[:page_param]]
-        vars
+      # This method must be implemented by the application.
+      # It must return the the starting and ending local Time objects defining the calendar :period
+      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'
       end
 
-      # This method should be implemented in the application and should return the records
-      # for the unit by selecting the records with DateTime from pagy.from to pagy.to
-      def pagy_calendar_get_items(_collection, _pagy)
-        # collection.your_own_method_to_get_the_items_with(pagy.from, pagy.to)
-        raise NoMethodError, 'The pagy_calendar_get_items method must be implemented in the application and must return ' \
-                             'the items for the unit by selecting the records with Time from pagy.from to pagy.to'
+      # 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}
+      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}'
       end
     end
   end

data/lib/pagy/extras/foundation.rb

@@ -8,13 +8,13 @@ class Pagy # :nodoc:
   # The resulting code may not look very elegant, but produces the best benchmarks
   module FoundationExtra
     # Pagination for Foundation: it returns the html with the series of links to the pages
-    def pagy_foundation_nav(pagy, pagy_id: nil, link_extra: '')
+    def pagy_foundation_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 = +%(<nav#{p_id} class="pagy-foundation-nav" aria-label="Pagination"><ul class="pagination">)
       html << pagy_foundation_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 %(<li>#{link.call item}</li>)                        # page link
                 when String  then %(<li class="current">#{pagy.label_for(item)}</li>)                  # active page
@@ -27,7 +27,7 @@ class Pagy # :nodoc:
     end
 
     # Javascript pagination for foundation: it returns a nav and a JSON tag used by the Pagy.nav javascript
-    def pagy_foundation_nav_js(pagy, pagy_id: nil, link_extra: '', steps: nil)
+    def pagy_foundation_nav_js(pagy, pagy_id: nil, link_extra: '', **vars)
       p_id = %( id="#{pagy_id}") if pagy_id
       link = pagy_link_proc(pagy, link_extra: link_extra)
       tags = { 'before' => %(<ul class="pagination">#{pagy_foundation_prev_html pagy, link}),
@@ -37,7 +37,7 @@ class Pagy # :nodoc:
                'after'  => %(#{pagy_foundation_next_html pagy, link}</ul>) }
 
       %(<nav#{p_id} class="pagy-njs pagy-foundation-nav-js" aria-label="Pagination" #{
-        pagy_json_attr(pagy, :nav, tags, (sequels = pagy.sequels(steps)), pagy.label_sequels(sequels))}></nav>)
+        pagy_json_attr(pagy, :nav, tags, (sequels = pagy.sequels(**vars)), pagy.label_sequels(sequels))}></nav>)
     end
 
     # Javascript combo pagination for Foundation: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript

data/lib/pagy/extras/frontend_helpers.rb

@@ -18,12 +18,11 @@ class Pagy # :nodoc:
       #       "350" => [1, 2, :gap, 17, 18, 19, "20", 21, 22, 23, :gap, 49, 50],
       #       "550" => [1, 2, 3, :gap, 16, 17, 18, 19, "20", 21, 22, 23, 24, :gap, 48, 49, 50] }
       # Notice: if :steps is false it will use the single {0 => @vars[:size]} size
-      def sequels(steps = nil)
-        steps ||= @vars[:steps] || { 0 => @vars[:size] }
+      def sequels(steps: @vars[:steps] || { 0 => @vars[:size] })
         raise VariableError.new(self, :steps, 'to define the 0 width', steps) unless steps.key?(0)
 
         {}.tap do |sequels|
-          steps.each { |width, size| sequels[width.to_s] = series(size) }
+          steps.each { |width, step_size| sequels[width.to_s] = series(size: step_size) }
         end
       end
 

data/lib/pagy/extras/i18n.rb

@@ -13,7 +13,7 @@ class Pagy # :nodoc:
 
     # Calendar overriding
     module Calendar
-      def strftime(time, **opts)
+      def localize(time, opts)
         ::I18n.l(time, **opts)
       end
     end

data/lib/pagy/extras/materialize.rb

@@ -8,13 +8,13 @@ class Pagy # :nodoc:
   # The resulting code may not look very elegant, but produces the best benchmarks
   module MaterializeExtra
     # Pagination for materialize: it returns the html with the series of links to the pages
-    def pagy_materialize_nav(pagy, pagy_id: nil, link_extra: '')
+    def pagy_materialize_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 = +%(<div#{p_id} 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]
+      pagy.series(**vars).each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
         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
@@ -27,7 +27,7 @@ class Pagy # :nodoc:
     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, pagy_id: nil, link_extra: '', steps: nil)
+    def pagy_materialize_nav_js(pagy, pagy_id: nil, link_extra: '', **vars)
       p_id = %( id="#{pagy_id}") if pagy_id
       link = pagy_link_proc(pagy, link_extra: link_extra)
 
@@ -38,7 +38,7 @@ class Pagy # :nodoc:
                'after'  => %(#{pagy_materialize_next_html pagy, link}</ul>) }
 
       %(<div#{p_id} class="pagy-njs pagy-materialize-nav-js" role="navigation" aria-label="pager" #{
-        pagy_json_attr(pagy, :nav, tags, (sequels = pagy.sequels(steps)), pagy.label_sequels(sequels))}></div>)
+        pagy_json_attr(pagy, :nav, tags, (sequels = pagy.sequels(**vars)), pagy.label_sequels(sequels))}></div>)
     end
 
     # Javascript combo pagination for materialize: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript

data/lib/pagy/extras/navs.rb

@@ -8,7 +8,7 @@ class Pagy # :nodoc:
   # The resulting code may not look very elegant, but produces the best benchmarks
   module NavsExtra
     # Javascript pagination: it returns a nav and a JSON tag used by the Pagy.nav javascript
-    def pagy_nav_js(pagy, pagy_id: nil, link_extra: '', steps: nil)
+    def pagy_nav_js(pagy, pagy_id: nil, link_extra: '', **vars)
       p_id = %( id="#{pagy_id}") if pagy_id
       link = pagy_link_proc(pagy, link_extra: link_extra)
       tags = { 'before' => pagy_nav_prev_html(pagy, link),
@@ -18,7 +18,7 @@ class Pagy # :nodoc:
                'after'  => pagy_nav_next_html(pagy, link) }
 
       %(<nav#{p_id} class="pagy-njs pagy-nav-js pagination" aria-label="pager" #{
-        pagy_json_attr(pagy, :nav, tags, (sequels = pagy.sequels(steps)), pagy.label_sequels(sequels))}></nav>)
+        pagy_json_attr(pagy, :nav, tags, (sequels = pagy.sequels(**vars)), pagy.label_sequels(sequels))}></nav>)
     end
 
     # Javascript combo pagination: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript

data/lib/pagy/extras/overflow.rb

@@ -29,8 +29,8 @@ class Pagy # :nodoc:
         when :empty_page
           @offset = @items = @from = @to = 0           # vars relative to the actual page
           if defined?(Calendar) && is_a?(Calendar)     # only for Calendar instances
-            edge = @order == :asc ? @final : @initial  # get the edge of the overflow side (neat, but it would work with any time)
-            @utc_from = @utc_to = edge.getutc          # set both to the edge utc time (a query with >= && < will get no record)
+            edge = @order == :asc ? @final : @initial  # get the edge of the overflow side (neat, but any time would do)
+            @from = @to = edge                         # set both to the edge utc time (a >=&&< query will get no records)
           end
           @prev = @last                                # prev relative to the actual page
           extend Series                                # special series for :empty_page
@@ -41,9 +41,9 @@ class Pagy # :nodoc:
 
       # Special series for empty page
       module Series
-        def series(size = @vars[:size])
+        def series(*)
           @page = @last                                # series for last page
-          super(size).tap do |s|                       # call original series
+          super.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
@@ -63,7 +63,7 @@ class Pagy # :nodoc:
         when :exception
           raise                                        # same as without the extra
         when :empty_page
-          @offset = @items = @from = @to = 0            # vars relative to the actual page
+          @offset = @items = @from = @to = 0           # vars relative to the actual page
           @vars[:size] = []                            # no page in the series
           self
         else

data/lib/pagy/extras/semantic.rb

@@ -8,13 +8,13 @@ class Pagy # :nodoc:
   # 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
                 when String  then %(<a class="item active">#{pagy.label_for(item)}</a>)
@@ -27,7 +27,7 @@ class Pagy # :nodoc:
     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, pagy_id: nil, link_extra: '', steps: nil)
+    def pagy_semantic_nav_js(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}))
       tags = { 'before' => pagy_semantic_prev_html(pagy, link),
@@ -37,7 +37,7 @@ class Pagy # :nodoc:
                '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, (sequels = pagy.sequels(steps)), pagy.label_sequels(sequels))}></div>)
+        pagy_json_attr(pagy, :nav, tags, (sequels = pagy.sequels(**vars)), 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

data/lib/pagy/extras/uikit.rb

@@ -8,12 +8,12 @@ class Pagy # :nodoc:
   # 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|
+      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>#{pagy.label_for(item)}</span></li>)
@@ -26,7 +26,7 @@ class Pagy # :nodoc:
     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, pagy_id: nil, link_extra: '', steps: nil)
+    def pagy_uikit_nav_js(pagy, pagy_id: nil, link_extra: '', **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),
@@ -36,7 +36,7 @@ class Pagy # :nodoc:
                '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, (sequels = pagy.sequels(steps)), pagy.label_sequels(sequels))}></ul>)
+        pagy_json_attr(pagy, :nav, tags, (sequels = pagy.sequels(**vars)), 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

data/lib/pagy/frontend.rb

@@ -15,7 +15,7 @@ class Pagy
     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
@@ -27,7 +27,7 @@ class Pagy
               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> )
                 when String  then %(<span class="page active">#{pagy.label_for(item)}</span> )

data/lib/pagy/url_helpers.rb

@@ -23,7 +23,7 @@ class Pagy
     private
 
     # Transitional code to handle params deprecations. It will be removed in version 6.0
-    def pagy_deprecated_params(pagy, params)   # remove in 6.0
+    def pagy_deprecated_params(pagy, params)    # remove in 6.0
       if pagy.params.is_a?(Proc)                # new code
         pagy.params.call(params)
       elsif respond_to?(:pagy_massage_params)   # deprecated code

data/lib/pagy.rb

@@ -5,7 +5,7 @@ require 'pathname'
 
 # Core class
 class Pagy
-  VERSION = '5.3.0'
+  VERSION = '5.5.1'
 
   # Root pathname to get the path of Pagy files like templates or dictionaries
   def self.root
@@ -44,7 +44,7 @@ class Pagy
   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, :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

data/lib/templates/bootstrap_nav.html.erb

@@ -5,7 +5,7 @@
   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 aria-label="pager"  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>

data/lib/templates/bootstrap_nav.html.haml

@@ -4,7 +4,7 @@
 -# 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"}
 

data/lib/templates/bootstrap_nav.html.slim

@@ -4,7 +4,7 @@
 / 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"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 5.5.1
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-10 00:00:00.000000000 Z
+date: 2021-11-23 00:00:00.000000000 Z
 dependencies: []
 description: Agnostic pagination in plain ruby. It does it all. Better.
 email:
@@ -54,6 +54,10 @@ files:
 - lib/pagy.rb
 - lib/pagy/backend.rb
 - lib/pagy/calendar.rb
+- lib/pagy/calendar/day.rb
+- lib/pagy/calendar/month.rb
+- lib/pagy/calendar/week.rb
+- lib/pagy/calendar/year.rb
 - lib/pagy/console.rb
 - lib/pagy/countless.rb
 - lib/pagy/exceptions.rb
@@ -102,7 +106,8 @@ files:
 homepage: https://github.com/ddnexus/pagy
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths: