pagy 8.0.0 → 9.0.0

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,37 +1,38 @@
 # See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/docs/api/countless
 # frozen_string_literal: true
 
-require '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
-    def initialize(vars = {}) # rubocop:disable Lint/MissingSuper
-      normalize_vars(vars)
-      setup_vars(page: 1, outset: 0)
-      setup_items_var
-      setup_offset_var
-      setup_params_var
+    def initialize(**vars) # rubocop:disable Lint/MissingSuper
+      assign_vars(DEFAULT, vars)
+      assign_and_check(page: 1, outset: 0)
+      assign_limit
+      assign_offset
     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 > @limit ? @page + 1 : @page
+      @last = @vars[:max_pages] if @vars[:max_pages] && @last > @vars[:max_pages]
+      check_overflow
+      @in   = [fetched_size, @limit].min
+      @from = @in.zero? ? 0 : @offset - @outset + 1
+      @to   = @offset - @outset + @in
+      assign_prev_and_next
       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

@@ -7,19 +7,11 @@ class Pagy # :nodoc:
     private
 
     # Return Pagy object and paginated collection/results
-    def pagy_arel(collection, vars = {})
-      pagy = Pagy.new(pagy_arel_get_vars(collection, vars))
+    def pagy_arel(collection, **vars)
+      pagy = Pagy.new(**pagy_arel_get_vars(collection, vars))
       [pagy, pagy_get_items(collection, pagy)]
     end
 
-    # Sub-method called only by #pagy_arel: here for easy customization of variables by overriding
-    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
-    end
-
     # Count using Arel when grouping
     def pagy_arel_count(collection)
       if collection.group_values.empty?
@@ -31,6 +23,12 @@ class Pagy # :nodoc:
         collection.unscope(:order).limit(1).pluck(sql).first.to_i
       end
     end
+
+    # Sub-method called only by #pagy_arel: here for easy customization of variables by overriding
+    def pagy_arel_get_vars(collection, vars)
+      vars[:count] ||= pagy_arel_count(collection)
+      pagy_get_vars(collection, vars)
+    end
   end
   Backend.prepend ArelExtra
 end

data/lib/pagy/extras/array.rb

@@ -7,17 +7,15 @@ class Pagy # :nodoc:
     private
 
     # Return Pagy object and paginated items
-    def pagy_array(array, vars = {})
-      pagy = Pagy.new(pagy_array_get_vars(array, vars))
-      [pagy, array[pagy.offset, pagy.items]]
+    def pagy_array(array, **vars)
+      pagy = Pagy.new(**pagy_array_get_vars(array, vars))
+      [pagy, array[pagy.offset, pagy.limit]]
     end
 
     # Sub-method called only by #pagy_array: here for easy customization of variables by overriding
     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
+      pagy_get_vars(array, vars)
     end
   end
   Backend.prepend ArrayExtra

data/lib/pagy/extras/bootstrap.rb

@@ -1,7 +1,7 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/bootstrap
 # frozen_string_literal: true
 
-require 'pagy/extras/js_tools'
+require_relative 'js_tools'
 
 class Pagy # :nodoc:
   # Frontend modules are specially optimized for performance.
@@ -10,7 +10,7 @@ class Pagy # :nodoc:
     # Pagination for bootstrap: it returns the html with the series of links to the pages
     def pagy_bootstrap_nav(pagy, id: nil, classes: 'pagination', aria_label: nil, **vars)
       id = %( id="#{id}") if id
-      a  = pagy_anchor(pagy)
+      a  = pagy_anchor(pagy, **vars)
 
       html = %(<nav#{id} class="pagy-bootstrap nav" #{nav_aria_label(pagy, aria_label:)}><ul class="#{classes}">#{
                  bootstrap_prev_html(pagy, a)})
@@ -34,7 +34,7 @@ class Pagy # :nodoc:
     def pagy_bootstrap_nav_js(pagy, id: nil, classes: 'pagination', aria_label: nil, **vars)
       sequels = pagy.sequels(**vars)
       id      = %( id="#{id}") if id
-      a       = pagy_anchor(pagy)
+      a       = pagy_anchor(pagy, **vars)
       tokens  = { 'before'  => %(<ul class="#{classes}">#{bootstrap_prev_html(pagy, a)}),
                   'a'       => %(<li class="page-item">#{a.(PAGE_TOKEN, LABEL_TOKEN, classes: 'page-link')}</li>),
                   'current' => %(<li class="page-item active"><a role="link" class="page-link" ) +
@@ -50,18 +50,18 @@ class Pagy # :nodoc:
     end
 
     # Javascript combo pagination for bootstrap: it returns a nav with a data-pagy attribute used by the pagy.js file
-    def pagy_bootstrap_combo_nav_js(pagy, id: nil, classes: 'pagination', aria_label: nil)
+    def pagy_bootstrap_combo_nav_js(pagy, id: nil, classes: 'pagination', aria_label: nil, **vars)
       id    = %( id="#{id}") if id
-      a     = pagy_anchor(pagy)
+      a     = pagy_anchor(pagy, **vars)
       pages = pagy.pages
 
       page_input = %(<input name="page" type="number" min="1" max="#{pages}" value="#{pagy.page}" aria-current="page" ) <<
                    %(style="text-align: center; width: #{pages.to_s.length + 1}rem; padding: 0; ) <<
-                   %(border: none; display: inline-block;" class="page-link active">)
+                   %(border: none; display: inline-block;" class="page-link active">#{JSTools::A_TAG})
 
       %(<nav#{id} class="pagy-bootstrap combo-nav-js" #{
           nav_aria_label(pagy, aria_label:)} #{
-          pagy_data(pagy, :combo, pagy_url_for(pagy, PAGE_TOKEN))
+          pagy_data(pagy, :combo, pagy_url_for(pagy, PAGE_TOKEN, **vars))
         }><ul class="#{classes}">#{
           bootstrap_prev_html(pagy, a)
         }<li class="page-item pagy-bootstrap"><label class="page-link">#{

data/lib/pagy/extras/bulma.rb

@@ -1,16 +1,17 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/bulma
 # frozen_string_literal: true
 
-require 'pagy/extras/js_tools'
+require_relative 'js_tools'
 
 class Pagy # :nodoc:
   # Frontend modules are specially optimized for performance.
   # 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, id: nil, classes: 'pagy-bulma nav pagination is-centered', aria_label: nil, **vars)
+    def pagy_bulma_nav(pagy, id: nil, classes: 'pagy-bulma nav pagination is-centered',
+                       aria_label: nil, **vars)
       id = %( id="#{id}") if id
-      a  = pagy_anchor(pagy)
+      a  = pagy_anchor(pagy, **vars)
 
       html = %(<nav#{id} class="#{classes}" #{nav_aria_label(pagy, aria_label:)}>)
       html << bulma_prev_next_html(pagy, a)
@@ -31,10 +32,11 @@ class Pagy # :nodoc:
     end
 
     # Javascript pagination for bulma: it returns a nav with a data-pagy attribute used by the Pagy.nav javascript
-    def pagy_bulma_nav_js(pagy, id: nil, classes: 'pagy-bulma nav-js pagination is-centered', aria_label: nil, **vars)
+    def pagy_bulma_nav_js(pagy, id: nil, classes: 'pagy-bulma nav-js pagination is-centered',
+                          aria_label: nil, **vars)
       sequels = pagy.sequels(**vars)
       id      = %( id="#{id}") if id
-      a       = pagy_anchor(pagy)
+      a       = pagy_anchor(pagy, **vars)
       tokens = { 'before'  => %(#{bulma_prev_next_html(pagy, a)}<ul class="pagination-list">),
                  'a'       => %(<li>#{a.(PAGE_TOKEN, LABEL_TOKEN, classes: 'pagination-link')}</li>),
                  'current' => %(<li><a role="link" class="pagination-link is-current" aria-current="page" aria-disabled="true">#{
@@ -49,18 +51,20 @@ class Pagy # :nodoc:
     end
 
     # Javascript combo pagination for bulma: it returns a nav with a data-pagy attribute used by the pagy.js file
-    def pagy_bulma_combo_nav_js(pagy, id: nil, classes: 'pagy-bulma combo-nav-js pagination is-centered', aria_label: nil)
+    def pagy_bulma_combo_nav_js(pagy, id: nil, classes: 'pagy-bulma combo-nav-js pagination is-centered',
+                                aria_label: nil, **vars)
       id    = %( id="#{id}") if id
-      a     = pagy_anchor(pagy)
+      a     = pagy_anchor(pagy, **vars)
       pages = pagy.pages
 
       page_input = %(<input name="page" type="number" min="1" max="#{pages}" value="#{pagy.page}" aria-current="page") <<
                    %(style="text-align: center; width: #{pages.to_s.length + 1}rem; height: 1.7rem; margin:0 0.3rem; ) <<
-                   %(border: none; border-radius: 4px; padding: 0; font-size: 1.1rem; color: white; background-color: #485fc7;">)
+                   %(border: none; border-radius: 4px; padding: 0; font-size: 1.1rem; color: white; ) <<
+                   %(background-color: #485fc7;">#{JSTools::A_TAG})
 
       %(<nav#{id} class="#{classes}" #{
           nav_aria_label(pagy, aria_label:)} #{
-          pagy_data(pagy, :combo, pagy_url_for(pagy, PAGE_TOKEN))
+          pagy_data(pagy, :combo, pagy_url_for(pagy, PAGE_TOKEN, **vars))
         }>#{
           bulma_prev_next_html(pagy, a)
         }<ul class="pagination-list"><li class="pagination-link"><label>#{

data/lib/pagy/extras/calendar.rb

@@ -1,8 +1,7 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/calendar
 # frozen_string_literal: true
 
-require 'pagy/calendar'
-require 'pagy/calendar/helper'
+require_relative '../calendar'
 
 class Pagy # :nodoc:
   # Add pagination filtering by calendar unit (:year, :quarter, :month, :week, :day) to the regular pagination
@@ -20,10 +19,15 @@ class Pagy # :nodoc:
 
         conf[:pagy] ||= {}
         unless conf.key?(:active) && !conf[:active]
-          calendar, from, to = Calendar::Helper.send(:init, conf, pagy_calendar_period(collection), params)
-          collection         = pagy_calendar_filter(collection, from, to)
+          calendar, from, to = Calendar.send(:init, conf, pagy_calendar_period(collection), params)
+          if respond_to?(:pagy_calendar_counts)
+            calendar.each_key do |unit|
+              calendar[unit].vars[:counts] = pagy_calendar_counts(collection, unit, *calendar[unit].vars[:period])
+            end
+          end
+          collection = pagy_calendar_filter(collection, from, to)
         end
-        pagy, results = send(conf[:pagy][:backend] || :pagy, collection, conf[:pagy])  # use backend: :pagy when omitted
+        pagy, results = send(conf[:pagy][:backend] || :pagy, collection, **conf[:pagy])  # use backend: :pagy when omitted
         [calendar, pagy, results]
       end
 
@@ -40,6 +44,31 @@ class Pagy # :nodoc:
       end
     end
 
+    # Override the pagy_anchor
+    module FrontendOverride
+      # Consider the vars[:count]
+      def pagy_anchor(pagy, anchor_string: nil)
+        return super unless (counts = pagy.vars[:counts])
+
+        anchor_string &&= %( #{anchor_string})
+        left, right = %(<a#{anchor_string} href="#{pagy_url_for(pagy, PAGE_TOKEN)}").split(PAGE_TOKEN, 2)
+        # lambda used by all the helpers
+        lambda do |page, text = pagy.label_for(page), classes: nil, aria_label: nil|
+          count     = counts[page - 1]
+          item_name = pagy_t('pagy.item_name', count:)
+          if count.zero?
+            classes = "#{classes && (classes + ' ')}empty-page"
+            title   = %( title="#{pagy_t('pagy.info.no_items', item_name:, count:)}")
+          else
+            title   = %( title="#{pagy_t('pagy.info.single_page', item_name:, count:)}")
+          end
+          classes    = %( class="#{classes}") if classes
+          aria_label = %( aria-label="#{aria_label}") if aria_label
+          %(#{left}#{page}#{right}#{title}#{classes}#{aria_label}>#{text}</a>)
+        end
+      end
+    end
+
     # Additions for the Frontend module
     module UrlHelperAddOn
       # Return the url for the calendar page at time
@@ -49,5 +78,5 @@ class Pagy # :nodoc:
     end
   end
   Backend.prepend CalendarExtra::BackendAddOn, CalendarExtra::UrlHelperAddOn
-  Frontend.prepend CalendarExtra::UrlHelperAddOn
+  Frontend.prepend CalendarExtra::UrlHelperAddOn, CalendarExtra::FrontendOverride
 end

data/lib/pagy/extras/countless.rb

@@ -1,7 +1,7 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/countless
 # frozen_string_literal: true
 
-require 'pagy/countless'
+require_relative '../countless'
 
 class Pagy # :nodoc:
   DEFAULT[:countless_minimal] = false
@@ -10,27 +10,20 @@ class Pagy # :nodoc:
   module CountlessExtra
     private
 
-    # Return Pagy object and items
-    def pagy_countless(collection, vars = {})
-      pagy = Countless.new(pagy_countless_get_vars(collection, vars))
+    # Return Pagy object and records
+    def pagy_countless(collection, **vars)
+      pagy = Countless.new(**pagy_get_vars(collection, vars))
       [pagy, pagy_countless_get_items(collection, pagy)]
     end
 
-    # Sub-method called only by #pagy_countless: here for easy customization of variables by overriding
-    def pagy_countless_get_vars(_collection, vars)
-      pagy_set_items_from_params(vars) if defined?(ItemsExtra)
-      vars[:page] ||= params[vars[:page_param] || DEFAULT[:page_param]]
-      vars
-    end
-
     # Sub-method called only by #pagy_countless: here for easy customization of record-extraction by overriding
     # You may need to override this method for collections without offset|limit
     def pagy_countless_get_items(collection, pagy)
-      return collection.offset(pagy.offset).limit(pagy.items) if pagy.vars[:countless_minimal]
+      return collection.offset(pagy.offset).limit(pagy.limit) if pagy.vars[:countless_minimal]
 
-      fetched = collection.offset(pagy.offset).limit(pagy.items + 1).to_a # eager load items + 1
+      fetched = collection.offset(pagy.offset).limit(pagy.limit + 1).to_a # eager load limit + 1
       pagy.finalize(fetched.size)                                         # finalize the pagy object
-      fetched[0, pagy.items]                                              # ignore eventual extra item
+      fetched[0, pagy.limit]                                              # ignore eventual extra item
     end
   end
   Backend.prepend CountlessExtra

data/lib/pagy/extras/elasticsearch_rails.rb

@@ -28,18 +28,18 @@ class Pagy # :nodoc:
           args.define_singleton_method(:method_missing) { |*a| args += a }
         end
       end
-      alias_method Pagy::DEFAULT[:elasticsearch_rails_pagy_search], :pagy_elasticsearch_rails
+      alias_method DEFAULT[:elasticsearch_rails_pagy_search], :pagy_elasticsearch_rails
     end
     Pagy::ElasticsearchRails = ModelExtension
 
     # Additions for the Pagy class
     module PagyAddOn
       # Create a Pagy object from an Elasticsearch::Model::Response::Response object
-      def new_from_elasticsearch_rails(response, vars = {})
-        vars[:items] = response.search.options[:size] || 10
-        vars[:page]  = ((response.search.options[:from] || 0) / vars[:items]) + 1
+      def new_from_elasticsearch_rails(response, **vars)
+        vars[:limit] = response.search.options[:size] || 10
+        vars[:page]  = ((response.search.options[:from] || 0) / vars[:limit]) + 1
         vars[:count] = ElasticsearchRailsExtra.total_count(response)
-        new(vars)
+        Pagy.new(**vars)
       end
     end
     Pagy.extend PagyAddOn
@@ -48,19 +48,19 @@ class Pagy # :nodoc:
     module BackendAddOn
       private
 
-      # Return Pagy object and items
-      def pagy_elasticsearch_rails(pagy_search_args, vars = {})
+      # Return Pagy object and records
+      def pagy_elasticsearch_rails(pagy_search_args, **vars)
         model, query_or_payload,
         options, *called = pagy_search_args
         vars             = pagy_elasticsearch_rails_get_vars(nil, vars)
-        options[:size]   = vars[:items]
-        options[:from]   = vars[:items] * (vars[:page] - 1)
+        options[:size]   = vars[:limit]
+        options[:from]   = vars[:limit] * ((vars[:page] || 1) - 1)
         response         = model.send(DEFAULT[:elasticsearch_rails_search], query_or_payload, **options)
         vars[:count]     = ElasticsearchRailsExtra.total_count(response)
 
-        pagy = ::Pagy.new(vars)
+        pagy = ::Pagy.new(**vars)
         # with :last_page overflow we need to re-run the method in order to get the hits
-        return pagy_elasticsearch_rails(pagy_search_args, vars.merge(page: pagy.page)) \
+        return pagy_elasticsearch_rails(pagy_search_args, **vars, page: pagy.page) \
                if defined?(::Pagy::OverflowExtra) && pagy.overflow? && pagy.vars[:overflow] == :last_page
 
         [pagy, called.empty? ? response : response.send(*called)]
@@ -69,10 +69,10 @@ class Pagy # :nodoc:
       # Sub-method called only by #pagy_elasticsearch_rails: here for easy customization of variables by overriding
       # the _collection argument is not available when the method is called
       def pagy_elasticsearch_rails_get_vars(_collection, vars)
-        pagy_set_items_from_params(vars) if defined?(ItemsExtra)
-        vars[:items] ||= DEFAULT[:items]
-        vars[:page]  ||= pagy_get_page(vars)
-        vars
+        vars.tap do |v|
+          v[:page]  ||= pagy_get_page(v)
+          v[:limit] ||= pagy_get_limit(v) || DEFAULT[:limit]
+        end
       end
     end
     Backend.prepend BackendAddOn