pagy 8.6.3 → 9.3.4

data/lib/pagy/calendar/unit.rb

@@ -13,18 +13,15 @@ class Pagy # :nodoc:
       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
+      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
+        assign_vars({ **Pagy::DEFAULT, **self.class::DEFAULT }, vars)
+        assign_and_check(page: 1)
+        assign_unit_vars
+        check_overflow
+        assign_prev_and_next
       end
 
       # The label for the current page (it can pass along the I18n gem opts when it's used with the i18n extra)
@@ -63,7 +60,7 @@ class Pagy # :nodoc:
       end
 
       # Base class method for the setup of the unit variables (subclasses must implement it and call super)
-      def setup_unit_vars
+      def assign_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])

data/lib/pagy/calendar/week.rb

@@ -10,8 +10,8 @@ class Pagy # :nodoc:
 
       protected
 
-      # Setup the calendar variables
-      def setup_unit_vars
+      # Set up the calendar variables
+      def assign_unit_vars
         super
         @initial = @starting.beginning_of_week
         @final   = @ending.next_week.beginning_of_week

data/lib/pagy/calendar/year.rb

@@ -12,8 +12,8 @@ class Pagy # :nodoc:
 
       protected
 
-      # Setup the calendar variables
-      def setup_unit_vars
+      # Set up the calendar variables
+      def assign_unit_vars
         super
         @initial = @starting.beginning_of_year
         @final   = @ending.next_year.beginning_of_year

data/lib/pagy/calendar.rb

@@ -17,17 +17,17 @@ class Pagy # :nodoc:
       private
 
       # Create a unit subclass instance by using the unit name (internal use)
-      def create(unit, vars)
+      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)
+        Object.const_get("Pagy::Calendar::#{name}").new(**vars)
       end
 
       # Return calendar, from, to
-      def init(conf, period, params)
-        new.send(:init, conf, period, params)
+      def init(...)
+        new.send(:init, ...)
       end
     end
 
@@ -47,18 +47,20 @@ class Pagy # :nodoc:
       @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
+      # set all the :page_param vars for later deletion
+      @units.each { |unit| conf[unit][:page_param] = :"#{unit}_#{@page_param}" }
       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][:params] = ->(up) { up.except(*params_to_delete.map(&:to_s)) }
         conf[unit][:period] = object&.send(:active_period) || @period
-        calendar[unit]      = object = Calendar.send(:create, unit, conf[unit])
+        conf[unit][:page]   = @params[:"#{unit}_#{@page_param}"] # requested page
+        # :nocov:
+        conf[unit][:counts] = yield(unit, conf[unit][:period]) if block_given?  # nocov doesn't need to fail block_given?
+        # :nocov:
+        calendar[unit]      = object \
+                            = Calendar.send(:create, unit, **conf[unit])
       end
       [replace(calendar), object.from, object.to]
     end
@@ -70,10 +72,10 @@ class Pagy # :nodoc:
       @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)
+                            = 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])
+        Calendar.send(:create, unit, **conf[unit])
       end
     end
   end

data/lib/pagy/countless.rb

@@ -1,32 +1,28 @@
 # See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/docs/api/countless
 # frozen_string_literal: true
 
-require_relative '../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
+    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
 
-      @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
+      @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
-      @prev = (@page - 1 unless @page == 1)
-      @next = @page == @last ? (1 if @vars[:cycle]) : @page + 1
+      assign_prev_and_next
       self
     end
   end

data/lib/pagy/extras/arel.rb

@@ -7,17 +7,9 @@ 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))
-      [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)
+    def pagy_arel(collection, **vars)
       vars[:count] ||= pagy_arel_count(collection)
-      vars[:page]  ||= pagy_get_page(vars)
-      vars
+      pagy(collection, **vars)
     end
 
     # Count using Arel when grouping
@@ -28,7 +20,7 @@ class Pagy # :nodoc:
       else
         # COUNT(*) OVER ()
         sql = Arel.star.count.over(Arel::Nodes::Grouping.new([]))
-        collection.unscope(:order).limit(1).pluck(sql).first.to_i
+        collection.unscope(:order).pick(sql).to_i
       end
     end
   end

data/lib/pagy/extras/array.rb

@@ -7,17 +7,12 @@ 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]]
-    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
+    def pagy_array(array, **vars)
+      vars[:limit] ||= pagy_get_limit(vars)
       vars[:page]  ||= pagy_get_page(vars)
-      vars
+      vars[:count] ||= array.size
+      pagy = Pagy.new(**vars)
+      [pagy, array[pagy.offset, pagy.limit]]
     end
   end
   Backend.prepend ArrayExtra

data/lib/pagy/extras/bootstrap.rb

@@ -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,9 +50,9 @@ 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" ) <<
@@ -61,7 +61,7 @@ class Pagy # :nodoc:
 
       %(<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

@@ -8,9 +8,10 @@ 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, 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,9 +51,10 @@ 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") <<
@@ -61,7 +64,7 @@ class Pagy # :nodoc:
 
       %(<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

@@ -19,15 +19,12 @@ class Pagy # :nodoc:
 
         conf[:pagy] ||= {}
         unless conf.key?(:active) && !conf[:active]
-          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
+          calendar, from, to = Calendar.send(:init, conf, pagy_calendar_period(collection), params) do |unit, period|
+                                 pagy_calendar_counts(collection, unit, *period) if respond_to?(:pagy_calendar_counts)
+                               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
 
@@ -46,23 +43,22 @@ class Pagy # :nodoc:
 
     # Override the pagy_anchor
     module FrontendOverride
-      # Consider the vars[:count]
-      def pagy_anchor(pagy)
+      # Consider the vars[:counts]
+      def pagy_anchor(pagy, anchor_string: nil)
         return super unless (counts = pagy.vars[:counts])
 
-        a_string    = pagy.vars[:anchor_string]
-        a_string    = %( #{a_string}) if a_string
-        left, right = %(<a#{a_string} href="#{pagy_url_for(pagy, PAGE_TOKEN)}").split(PAGE_TOKEN, 2)
+        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:)
+          count = counts[page - 1]
           if count.zero?
-            classes = "#{classes && (classes + ' ')}empty-page"
-            title   = %( title="#{pagy_t('pagy.info.no_items', item_name:, count:)}")
+            classes  = "#{classes && (classes + ' ')}empty-page"
+            info_key = 'pagy.info.no_items'
           else
-            title   = %( title="#{pagy_t('pagy.info.single_page', item_name:, count:)}")
+            info_key = 'pagy.info.single_page'
           end
+          title      = %( title="#{pagy_t(info_key, item_name: pagy_t('pagy.item_name', count:), count:)}")
           classes    = %( class="#{classes}") if classes
           aria_label = %( aria-label="#{aria_label}") if aria_label
           %(#{left}#{page}#{right}#{title}#{classes}#{aria_label}>#{text}</a>)

data/lib/pagy/extras/countless.rb

@@ -10,27 +10,22 @@ 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)
+      vars[:limit] ||= pagy_get_limit(vars)
+      vars[:page]  ||= pagy_get_page(vars)
+      pagy = Countless.new(**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] ||= pagy_get_page(vars)
-      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,32 +48,23 @@ class Pagy # :nodoc:
     module BackendAddOn
       private
 
-      # Return Pagy object and items
-      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)
-        response         = model.send(DEFAULT[:elasticsearch_rails_search], query_or_payload, **options)
-        vars[:count]     = ElasticsearchRailsExtra.total_count(response)
+      # Return Pagy object and records
+      def pagy_elasticsearch_rails(pagy_search_args, **vars)
+        vars[:page]  ||= pagy_get_page(vars)
+        vars[:limit] ||= pagy_get_limit(vars)
+        model, query_or_payload, options, *called = pagy_search_args
+        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)]
       end
-
-      # 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
-      end
     end
     Backend.prepend BackendAddOn
   end

data/lib/pagy/extras/gearbox.rb

@@ -3,27 +3,27 @@
 
 class Pagy # :nodoc:
   DEFAULT[:gearbox_extra] = true # extra enabled by default
-  DEFAULT[:gearbox_items] = [15, 30, 60, 100]
+  DEFAULT[:gearbox_limit] = [15, 30, 60, 100]
 
-  # Automatically change the number of items per page depending on the page number
-  # accepts an array as the :gearbox_items variable, that will determine the items for the first pages
+  # Automatically change the limit depending on the page number
+  # accepts an array as the :gearbox_limit variable, that will determine the limit for the first pages
   module GearboxExtra
-    # Setup @items based on the :gearbox_items variable
-    def setup_items_var
-      return super if !@vars[:gearbox_extra] || @vars[:items_extra]
+    # Assign @limit based on the :gearbox_limit variable
+    def assign_limit
+      return super if !@vars[:gearbox_extra] || @vars[:limit_extra]
 
-      gears = @vars[:gearbox_items]
-      raise VariableError.new(self, :gearbox_items, 'to be an Array of positives', gears) \
+      gears = @vars[:gearbox_limit]
+      raise VariableError.new(self, :gearbox_limit, 'to be an Array of positives', gears) \
             unless gears.is_a?(Array) && gears.all? { |num| num.positive? rescue false } # rubocop:disable Style/RescueModifier
 
-      @items = gears[@page - 1] || gears.last
+      @limit = gears[@page - 1] || gears.last
     end
 
-    # Setup @offset based on the :gearbox_items variable
-    def setup_offset_var
-      return super if !@vars[:gearbox_extra] || @vars[:items_extra]
+    # Asgnsi @offset based on the :gearbox_limit variable
+    def assign_offset
+      return super if !@vars[:gearbox_extra] || @vars[:limit_extra]
 
-      gears   = @vars[:gearbox_items]
+      gears   = @vars[:gearbox_limit]
       @offset = if @page <= gears.count
                   gears[0, @page - 1].sum
                 else
@@ -31,11 +31,11 @@ class Pagy # :nodoc:
                 end + @outset
     end
 
-    # Setup Pagy @last based on the :gearbox_items variable and @count
-    def setup_last_var
-      return super if !@vars[:gearbox_extra] || @vars[:items_extra]
+    # Assign @last based on the :gearbox_limit variable and @count
+    def assign_last
+      return super if !@vars[:gearbox_extra] || @vars[:limit_extra]
 
-      gears = @vars[:gearbox_items]
+      gears = @vars[:gearbox_limit]
       # This algorithm is thousands of times faster than the one in the geared_pagination gem
       @last = (if count > (sum = gears.sum)
                  [((count - sum).to_f / gears.last).ceil, 1].max + gears.count
@@ -48,7 +48,7 @@ class Pagy # :nodoc:
                  end
                  [pages, 1].max
                end)
-      @last = vars[:max_pages] if vars[:max_pages] && @last > vars[:max_pages]
+      @last = @vars[:max_pages] if @vars[:max_pages] && @last > @vars[:max_pages]
     end
   end
   prepend GearboxExtra

data/lib/pagy/extras/headers.rb

@@ -5,7 +5,7 @@ require_relative '../url_helpers'
 
 class Pagy # :nodoc:
   DEFAULT[:headers] = { page:  'current-page',
-                        items: 'page-items',
+                        limit: 'page-items',
                         count: 'total-count',
                         pages: 'total-pages' }
   # Add specialized backend methods to add pagination response headers
@@ -21,32 +21,33 @@ class Pagy # :nodoc:
 
     # Generate a hash of RFC-8288 compliant http headers
     def pagy_headers(pagy)
-      pagy_headers_hash(pagy).tap do |hash|
-        hash['link'] = hash['link'].map { |rel, link| %(<#{link}>; rel="#{rel}") }.join(', ')
-      end
-    end
+      headers = pagy.vars[:headers]
+      pagy_link_header(pagy).tap do |hash|
+        hash[headers[:page]]  = pagy.page.to_s if pagy.page && headers[:page]
+        hash[headers[:limit]] = pagy.limit.to_s \
+            if headers[:limit] && !(defined?(::Pagy::Calendar) && pagy.is_a?(Calendar::Unit))
+        return hash if (defined?(::Pagy::Countless) && pagy.is_a?(Countless)) || \
+                       (defined?(::Pagy::Keyset) && pagy.is_a?(Keyset))
 
-    # Generates a hash structure of the headers
-    def pagy_headers_hash(pagy)
-      countless             = defined?(Countless) && pagy.is_a?(Countless)
-      rel                   = { 'first' => 1, 'prev' => pagy.prev, 'next' => pagy.next }
-      rel['last']           = pagy.last unless countless
-      url_str               = pagy_url_for(pagy, PAGE_TOKEN, absolute: true)
-      link                  = rel.filter_map do |r, num|
-                                next unless num # rubocop:disable Layout/EmptyLineAfterGuardClause
-                                [r, url_str.sub(PAGE_TOKEN, num.to_s)]
-                              end.compact.to_h
-      hash                  = { 'link' => link }
-      headers               = pagy.vars[:headers]
-      hash[headers[:page]]  = pagy.page.to_s if headers[:page]
-      if headers[:items] && !(defined?(Calendar) && pagy.is_a?(Calendar))  # items is not for Calendar
-        hash[headers[:items]] = pagy.vars[:items].to_s
-      end
-      unless countless
-        hash[headers[:pages]] = pagy.pages.to_s if headers[:pages]
+        hash[headers[:pages]] = pagy.last.to_s if headers[:pages]
         hash[headers[:count]] = pagy.count.to_s if pagy.count && headers[:count] # count may be nil with Calendar
       end
-      hash
+    end
+
+    def pagy_link_header(pagy)
+      { 'link' => [].tap do |link|
+        if defined?(::Pagy::Keyset) && pagy.is_a?(Keyset)
+          link << %(<#{pagy_url_for(pagy, nil, absolute: true)}>; rel="first")
+          link << %(<#{pagy_url_for(pagy, pagy.next, absolute: true)}>; rel="next") if pagy.next
+        else
+          url_str = pagy_url_for(pagy, PAGE_TOKEN, absolute: true)
+          link << %(<#{url_str.sub(PAGE_TOKEN, '1')}>; rel="first")
+          link << %(<#{url_str.sub(PAGE_TOKEN, pagy.prev.to_s)}>; rel="prev") if pagy.prev
+          link << %(<#{url_str.sub(PAGE_TOKEN, pagy.next.to_s)}>; rel="next") if pagy.next
+          link << %(<#{url_str.sub(PAGE_TOKEN, pagy.last.to_s)}>; rel="last") \
+              unless defined?(::Pagy::Countless) && pagy.is_a?(Countless)
+        end
+      end.join(', ') }
     end
   end
   Backend.prepend HeadersExtra

data/lib/pagy/extras/i18n.rb

@@ -19,7 +19,7 @@ class Pagy # :nodoc:
       end
     end
   end
-  Calendar::Unit.prepend I18nExtra::CalendarOverride if defined?(Calendar::Unit)
+  Calendar::Unit.prepend I18nExtra::CalendarOverride if defined?(::Pagy::Calendar::Unit)
 
   # Add the pagy locales to the I18n.load_path
   ::I18n.load_path += Dir[Pagy.root.join('locales', '*.yml')]

data/lib/pagy/extras/js_tools.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative '../b64'
+
 class Pagy # :nodoc:
   DEFAULT[:steps] = false # default false will use {0 => @vars[:size]}
 
@@ -42,17 +44,16 @@ class Pagy # :nodoc:
         end
       end
     end
-    Calendar::Unit.prepend CalendarOverride if defined?(Calendar::Unit)
+    Calendar::Unit.prepend CalendarOverride if defined?(::Pagy::Calendar::Unit)
 
     # Additions for the Frontend
     module FrontendAddOn
-      if defined?(Oj)
+      if defined?(::Oj)
         # Return a data tag with the base64 encoded JSON-serialized args generated with the faster oj gem
         # Base64 encoded JSON is smaller than HTML escaped JSON
         def pagy_data(pagy, *args)
           args << pagy.vars[:page_param] if pagy.vars[:trim_extra]
-          strict_base64_encoded = [Oj.dump(args, mode: :strict)].pack('m0')
-          %(data-pagy="#{strict_base64_encoded}")
+          %(data-pagy="#{B64.encode(Oj.dump(args, mode: :strict))}")
         end
       else
         require 'json'
@@ -60,8 +61,7 @@ class Pagy # :nodoc:
         # Base64 encoded JSON is smaller than HTML escaped JSON
         def pagy_data(pagy, *args)
           args << pagy.vars[:page_param] if pagy.vars[:trim_extra]
-          strict_base64_encoded = [args.to_json].pack('m0')
-          %(data-pagy="#{strict_base64_encoded}")
+          %(data-pagy="#{B64.encode(args.to_json)}")
         end
       end
     end