pagy 7.0.11 → 8.6.3

data/lib/pagy/backend.rb

@@ -18,16 +18,21 @@ class Pagy
     # You may need to override the count call for non AR collections
     def pagy_get_vars(collection, vars)
       pagy_set_items_from_params(vars) if defined?(ItemsExtra)
-      count_args = vars[:count_args] || DEFAULT[:count_args]
-      vars[:count] ||= (count = collection.count(*count_args)).is_a?(Hash) ? count.size : count
+      vars[:count] ||= pagy_get_count(collection, vars)
       vars[:page]  ||= pagy_get_page(vars)
       vars
     end
 
+    # Get the count from the collection
+    def pagy_get_count(collection, vars)
+      count_args = vars[:count_args] || DEFAULT[:count_args]
+      (count     = collection.count(*count_args)).is_a?(Hash) ? count.size : count
+    end
+
     # Get the page integer from the params
     # Overridable by the jsonapi extra
     def pagy_get_page(vars)
-      (params[vars[:page_param] || DEFAULT[:page_param]] || 1).to_i
+      [params[vars[:page_param] || DEFAULT[:page_param]].to_i, 1].max
     end
 
     # Sub-method called only by #pagy: here for easy customization of record-extraction by overriding

data/lib/pagy/calendar/day.rb

@@ -3,9 +3,10 @@
 
 class Pagy # :nodoc:
   class Calendar # :nodoc:
-    # Calendar day subclass
-    class Day < Calendar
+    # Day unit subclass
+    class Day < Unit
       DEFAULT = { size:   31,   # rubocop:disable Style/MutableConstant
+                  ends: false,
                   order:  :asc,
                   format: '%d' }
 
@@ -16,7 +17,7 @@ class Pagy # :nodoc:
         super
         @initial = @starting.beginning_of_day
         @final   = @ending.tomorrow.beginning_of_day
-        @pages   = @last = page_offset(@initial, @final)
+        @last    = page_offset(@initial, @final)
         @from    = starting_time_for(@page)
         @to      = @from.tomorrow
       end

data/lib/pagy/calendar/month.rb

@@ -3,9 +3,10 @@
 
 class Pagy # :nodoc:
   class Calendar # :nodoc:
-    # Calendar month subclass
-    class Month < Calendar
+    # Month unit subclass
+    class Month < Unit
       DEFAULT = { size: 12,   # rubocop:disable Style/MutableConstant
+                  ends: false,
                   order: :asc,
                   format: '%b' }
 
@@ -16,7 +17,7 @@ class Pagy # :nodoc:
         super
         @initial = @starting.beginning_of_month
         @final   = @ending.next_month.beginning_of_month
-        @pages   = @last = (months_in(@final) - months_in(@initial))
+        @last    = (months_in(@final) - months_in(@initial))
         @from    = starting_time_for(@page)
         @to      = @from.next_month
       end

data/lib/pagy/calendar/quarter.rb

@@ -3,9 +3,10 @@
 
 class Pagy # :nodoc:
   class Calendar # :nodoc:
-    # Calendar quarter subclass
-    class Quarter < Calendar
+    # Quarter unit subclass
+    class Quarter < Unit
       DEFAULT = { size:   4,      # rubocop:disable Style/MutableConstant
+                  ends: false,
                   order:  :asc,
                   format: 'Q%q' } # '%q' token
 
@@ -23,7 +24,7 @@ class Pagy # :nodoc:
         super
         @initial = @starting.beginning_of_quarter
         @final   = @ending.next_quarter.beginning_of_quarter
-        @pages   = @last = (months_in(@final) - months_in(@initial)) / 3
+        @last    = (months_in(@final) - months_in(@initial)) / 3
         @from    = starting_time_for(@page)
         @to      = @from.next_quarter
       end

data/lib/pagy/calendar/unit.rb

@@ -0,0 +1,106 @@
+# frozen_string_literal: true
+
+require 'active_support'
+require 'active_support/core_ext/time'
+require 'active_support/core_ext/date_and_time/calculations'
+require 'active_support/core_ext/numeric/time'
+require 'active_support/core_ext/integer/time'
+
+class Pagy # :nodoc:
+  class Calendar < Hash # :nodoc:
+    # Base class for time units subclasses (Year, Quarter, Month, Week, Day)
+    class Unit < Pagy
+      attr_reader :order, :from, :to
+
+      # 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::Unit is a base class; use one of its subclasses' \
+            if instance_of?(Pagy::Calendar::Unit)
+
+        vars = self.class::DEFAULT.merge(vars)  # subclass specific default
+        normalize_vars(vars)                    # general default
+        setup_vars(page: 1)
+        setup_unit_vars
+        raise OverflowError.new(self, :page, "in 1..#{@last}", @page) if @page > @last
+
+        @prev = (@page - 1 unless @page == 1)
+        @next = @page == @last ? (1 if @vars[:cycle]) : @page + 1
+      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)
+      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 = {})
+        opts[:format] ||= @vars[:format]
+        localize(starting_time_for(page.to_i), opts)  # page could be a string
+      end
+
+      protected
+
+      # The page that includes time
+      # In case of out of range time, the :fit_time option avoids the outOfRangeError
+      # and returns the closest page to the passed time argument (first or last page)
+      def page_at(time, **opts)
+        fit_time  = time
+        fit_final = @final - 1
+        unless time.between?(@initial, fit_final)
+          raise OutOfRangeError.new(self, :time, "between #{@initial} and #{fit_final}", time) unless opts[:fit_time]
+
+          if time < @final
+            fit_time = @initial
+            ordinal  = 'first'
+          else
+            fit_time = fit_final
+            ordinal  = 'last'
+          end
+          warn "Pagy::Calendar#page_at: Rescued #{time} out of range by returning the #{ordinal} page."
+        end
+        offset = page_offset_at(fit_time)   # offset starts from 0
+        @order == :asc ? offset + 1 : @last - offset
+      end
+
+      # Base class method for the setup of the unit variables (subclasses must implement it and call super)
+      def setup_unit_vars
+        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])
+
+        @starting, @ending = @vars[:period]
+        raise VariableError.new(self, :period, 'to be a an Array of min and max TimeWithZone instances', @vars[:period]) \
+        unless @starting.is_a?(ActiveSupport::TimeWithZone) \
+        && @ending.is_a?(ActiveSupport::TimeWithZone) && @starting <= @ending
+      end
+
+      # 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
+
+      # Number of time units to offset from the @initial time, in order to get the ordered starting time for the page.
+      # Used in starting_time_for(page) where page starts from 1 (e.g. page to starting_time means subtracting 1)
+      def time_offset_for(page)
+        @order == :asc ? page - 1 : @last - page
+      end
+
+      # 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
+
+      # :nocov:
+      # This method must be implemented by the unit subclass
+      def starting_time_for(*)
+        raise NoMethodError, 'the starting_time_for method must be implemented by the unit subclass'
+      end
+
+      # This method must be implemented by the unit subclass
+      def page_offset_at(*)
+        raise NoMethodError, 'the page_offset_at method must be implemented by the unit subclass'
+      end
+      # :nocov:
+    end
+  end
+end

data/lib/pagy/calendar/week.rb

@@ -3,8 +3,8 @@
 
 class Pagy # :nodoc:
   class Calendar # :nodoc:
-    # Calendar week subclass
-    class Week < Calendar
+    # Week unit subclass
+    class Week < Unit
       DEFAULT  = { order:  :asc,      # rubocop:disable Style/MutableConstant
                    format: '%Y-%W' }
 
@@ -15,7 +15,7 @@ class Pagy # :nodoc:
         super
         @initial = @starting.beginning_of_week
         @final   = @ending.next_week.beginning_of_week
-        @pages   = @last = page_offset(@initial, @final)
+        @last    = page_offset(@initial, @final)
         @from    = starting_time_for(@page)
         @to      = @from.next_week
       end

data/lib/pagy/calendar/year.rb

@@ -3,9 +3,10 @@
 
 class Pagy # :nodoc:
   class Calendar # :nodoc:
-    # Calendar year subclass
-    class Year < Calendar
+    # Year unit subclass
+    class Year < Unit
       DEFAULT = { size:   10,   # rubocop:disable Style/MutableConstant
+                  ends: false,
                   order:  :asc,
                   format: '%Y' }
 
@@ -16,7 +17,7 @@ class Pagy # :nodoc:
         super
         @initial = @starting.beginning_of_year
         @final   = @ending.next_year.beginning_of_year
-        @pages   = @last = @final.year - @initial.year
+        @last    = @final.year - @initial.year
         @from    = starting_time_for(@page)
         @to      = @from.next_year
       end

data/lib/pagy/calendar.rb

@@ -1,123 +1,79 @@
 # See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/docs/api/calendar
 # frozen_string_literal: true
 
-require 'active_support'
-require 'active_support/core_ext/time'
-require 'active_support/core_ext/date_and_time/calculations'
-require 'active_support/core_ext/numeric/time'
-require 'active_support/core_ext/integer/time'
-
-require 'pagy'
+require_relative '../pagy'
+require_relative 'calendar/unit'
 
 class Pagy # :nodoc:
-  # Base class for time units subclasses (Year, Quarter, Month, Week, Day)
-  class Calendar < Pagy
+  # Calendar class
+  class Calendar < Hash
     # Specific out of range error
     class OutOfRangeError < VariableError; end
 
     # 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
 
-    attr_reader :order, :from, :to
-
-    # 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)
-
-      vars = self.class::DEFAULT.merge(vars)  # subclass specific default
-      normalize_vars(vars)                    # general default
-      setup_vars(page: 1)
-      setup_unit_vars
-      setup_params_var
-      raise OverflowError.new(self, :page, "in 1..#{@last}", @page) if @page > @last
-
-      @prev = (@page - 1 unless @page == 1)
-      @next = @page == @last ? (1 if @vars[:cycle]) : @page + 1
-    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)
-    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 = {})
-      opts[:format] ||= @vars[:format]
-      localize(starting_time_for(page.to_i), opts)  # page could be a string
-    end
-
-    protected
+    class << self
+      private
 
-    # The page that includes time
-    # In case of out of range time, the :fit_time option avoids the outOfRangeError
-    # and returns the closest page to the passed time argument (first or last page)
-    def page_at(time, **opts)
-      fit_time  = time
-      fit_final = @final - 1
-      unless time.between?(@initial, fit_final)
-        raise OutOfRangeError.new(self, :time, "between #{@initial} and #{fit_final}", time) unless opts[:fit_time]
+      # Create a unit subclass instance by using the unit name (internal use)
+      def create(unit, vars)
+        raise InternalError, "unit must be in #{UNITS.inspect}; got #{unit}" unless UNITS.include?(unit)
 
-        if time < @final
-          fit_time = @initial
-          ordinal  = 'first'
-        else
-          fit_time = fit_final
-          ordinal  = 'last'
-        end
-        Warning.warn "Pagy::Calendar#page_at: Rescued #{time} out of range by returning the #{ordinal} page."
+        name    = unit.to_s
+        name[0] = name[0].capitalize
+        Object.const_get("Pagy::Calendar::#{name}").new(vars)
       end
-      offset = page_offset_at(fit_time)   # offset starts from 0
-      @order == :asc ? offset + 1 : @pages - offset
-    end
 
-    # Base class method for the setup of the unit variables (subclasses must implement it and call super)
-    def setup_unit_vars
-      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])
-
-      @starting, @ending = @vars[:period]
-      raise VariableError.new(self, :period, 'to be a an Array of min and max TimeWithZone instances', @vars[:period]) \
-            unless @starting.is_a?(ActiveSupport::TimeWithZone) \
-                && @ending.is_a?(ActiveSupport::TimeWithZone) && @starting <= @ending
-    end
-
-    # 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
-
-    # Number of time units to offset from the @initial time, in order to get the ordered starting time for the page.
-    # Used in starting_time_for(page) where page starts from 1 (e.g. page to starting_time means subtracting 1)
-    def time_offset_for(page)
-      @order == :asc ? page - 1 : @pages - page
-    end
-
-    # 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
+      # Return calendar, from, to
+      def init(conf, period, params)
+        new.send(:init, conf, period, params)
+      end
     end
 
-    # :nocov:
-    # This method must be implemented by the unit subclass
-    def starting_time_for(*)
-      raise NoMethodError, 'the starting_time_for method must be implemented by the unit subclass'
+    # Return the current time of the smallest time unit shown
+    def showtime
+      self[@units.last].from
     end
 
-    # This method must be implemented by the unit subclass
-    def page_offset_at(*)
-      raise NoMethodError, 'the page_offset_at method must be implemented by the unit subclass'
+    private
+
+    # Create the calendar
+    def init(conf, period, params)
+      @conf  = Marshal.load(Marshal.dump(conf))  # store a copy
+      @units = Calendar::UNITS & @conf.keys # get the units in time length desc order
+      raise ArgumentError, 'no calendar unit found in pagy_calendar @configuration' if @units.empty?
+
+      @period     = period
+      @params     = params
+      @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 = {}
+      object   = 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 { |up| up.except(*params_to_delete.map(&:to_s)) } # rubocop:disable Style/Lambda
+        conf[unit][:period] = object&.send(:active_period) || @period
+        calendar[unit]      = object = Calendar.send(:create, unit, conf[unit])
+      end
+      [replace(calendar), object.from, object.to]
     end
-    # :nocov:
-
-    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)
 
-        name    = unit.to_s
-        name[0] = name[0].capitalize
-        Object.const_get("Pagy::Calendar::#{name}").new(vars)
+    # Return the calendar object at time
+    def calendar_at(time, **opts)
+      conf        = Marshal.load(Marshal.dump(@conf))
+      page_params = {}
+      @units.inject(nil) do |object, unit|
+        conf[unit][:period] = object&.send(:active_period) || @period
+        conf[unit][:page]   = page_params[:"#{unit}_#{@page_param}"] \
+                            = Calendar.send(:create, unit, conf[unit]).send(:page_at, time, **opts)
+        conf[unit][:params] ||= {}
+        conf[unit][:params].merge!(page_params)
+        Calendar.send(:create, unit, conf[unit])
       end
     end
   end

data/lib/pagy/console.rb

@@ -1,8 +1,8 @@
 # See Pagy::Console API documentation: https://ddnexus.github.io/pagy/docs/api/console
 # frozen_string_literal: true
 
-require 'pagy'  # so you can require just the extra in the console
-require 'pagy/extras/standalone'
+require_relative '../pagy'  # so you can require just the extra in the console
+require_relative 'extras/standalone'
 
 class Pagy
   # Provide a ready to use pagy environment when included in irb/rails console

data/lib/pagy/countless.rb

@@ -1,9 +1,9 @@
 # See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/docs/api/countless
 # frozen_string_literal: true
 
-require 'pagy'
+require_relative '../pagy'
 
-class Pagy
+class Pagy # :nodoc:
   # No need to know the count to paginate
   class Countless < Pagy
     # Merge and validate the options, do some simple arithmetic and set a few instance variables
@@ -12,26 +12,31 @@ class Pagy
       setup_vars(page: 1, outset: 0)
       setup_items_var
       setup_offset_var
-      setup_params_var
     end
 
     # Finalize the instance variables based on the fetched size
     def finalize(fetched_size)
       raise OverflowError.new(self, :page, "to be < #{@page}", @page) if fetched_size.zero? && @page > 1
 
-      @pages = @last = (fetched_size > @items ? @page + 1 : @page)
-      @in    = [fetched_size, @items].min
-      @from  = @in.zero? ? 0 : @offset - @outset + 1
-      @to    = @offset - @outset + @in
-      @prev  = (@page - 1 unless @page == 1)
-      @next  = @page == @last ? (1 if @vars[:cycle]) : @page + 1
+      @last = fetched_size > @items ? @page + 1 : @page
+      @last = vars[:max_pages] if vars[:max_pages] && @last > vars[:max_pages]
+      raise OverflowError.new(self, :page, "in 1..#{@last}", @page) if @page > @last
+
+      @in   = [fetched_size, @items].min
+      @from = @in.zero? ? 0 : @offset - @outset + 1
+      @to   = @offset - @outset + @in
+      @prev = (@page - 1 unless @page == 1)
+      @next = @page == @last ? (1 if @vars[:cycle]) : @page + 1
       self
     end
+  end
 
+  module SeriesOverride # :nodoc:
     # Override the original series.
     # Return nil if :countless_minimal is enabled
-    def series(*, **)
+    def series(**)
       super unless @vars[:countless_minimal]
     end
   end
+  prepend SeriesOverride
 end

data/lib/pagy/extras/arel.rb

@@ -16,7 +16,7 @@ class Pagy # :nodoc:
     def pagy_arel_get_vars(collection, vars)
       pagy_set_items_from_params(vars) if defined?(ItemsExtra)
       vars[:count] ||= pagy_arel_count(collection)
-      vars[:page]  ||= params[vars[:page_param] || DEFAULT[:page_param]]
+      vars[:page]  ||= pagy_get_page(vars)
       vars
     end
 

data/lib/pagy/extras/array.rb

@@ -16,7 +16,7 @@ class Pagy # :nodoc:
     def pagy_array_get_vars(array, vars)
       pagy_set_items_from_params(vars) if defined?(ItemsExtra)
       vars[:count] ||= array.size
-      vars[:page]  ||= params[vars[:page_param] || DEFAULT[:page_param]]
+      vars[:page]  ||= pagy_get_page(vars)
       vars
     end
   end