Merge branch 'dev'

ddnexus · ddnexus · commit 4fc3280a418d · 2025-11-23T11:19:27.000Z
diff --git a/.github/ISSUE_TEMPLATE/Code.yml b/.github/ISSUE_TEMPLATE/Code.yml
@@ -19,7 +19,7 @@ body:
     attributes:
       label: 👀 Before submitting...
       options:
-        - label: I upgraded to pagy version 43.1.2
+        - label: I upgraded to pagy version 43.1.3
           required: true
         - label: I asked [Pagy AI](https://gurubase.io/g/pagy) (Good starting point for further investigation).
           required: true
diff --git a/.github/latest_release_body.md b/.github/latest_release_body.md
@@ -1,10 +1,14 @@
-### Changes in 43.1.2
+### Changes in 43.1.3
 
 <!-- changes_start -->
-- Support easy countless page param overriding (for legacy param and behavior). See #816
-- Handle legacy page param for :countless paginator. Close #832
-- Improve mock collections
-- Improve code comments
+- Improve the page options handling for countless:
+  - Replace the crippled handling of legacy last-less links params
+  introduced in 43.1.2 by gracefully starting the pagination from
+  the beginning
+  - Remove the compose_page_param method (it would need a deep refactoring
+   for compatibility with the legacy handling)
+  - Improve testing
+- Improve the info message for empty collection in countless paginations
 <!-- changes_end -->
 
 [CHANGELOG](https://ddnexus.github.io/pagy/changelog)
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: gem
   specs:
-    pagy (43.1.2)
+    pagy (43.1.3)
       json
       yaml
 
diff --git a/README.md b/README.md
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -45,6 +45,17 @@ If you upgrade from version `< 9.0.0` see the following:
 
 <hr>
 
+## Version 43.1.3
+
+- Improve the page options handling for countless:
+  - Replace the crippled handling of legacy last-less links params
+  introduced in 43.1.2 by gracefully starting the pagination from
+  the beginning
+  - Remove the compose_page_param method (it would need a deep refactoring
+   for compatibility with the legacy handling)
+  - Improve testing
+- Improve the info message for empty collection in countless paginations
+
 ## Version 43.1.2
 
 - Support easy countless page param overriding (for legacy param and behavior). See #816
diff --git a/docs/retype.yml b/docs/retype.yml
@@ -9,7 +9,7 @@ url: https://ddnexus.github.io/pagy/
 branding:
   title: Pagy
   logo: assets/images/pagy-the-frog.png
-  label: 43.1.2
+  label: 43.1.3
   colors:
     label:
       text: "#ffffff"
diff --git a/gem/apps/calendar.ru b/gem/apps/calendar.ru
@@ -16,7 +16,7 @@
 # URL
 #    http://127.0.0.1:8000
 
-VERSION = '43.1.2'
+VERSION = '43.1.3'
 
 if VERSION != Pagy::VERSION
   Warning.warn("\n>>> WARNING! '#{File.basename(__FILE__)}-#{VERSION}' running with 'pagy-#{Pagy::VERSION}'! <<< \n\n")
diff --git a/gem/apps/demo.ru b/gem/apps/demo.ru
@@ -19,7 +19,7 @@
 # URL
 #    http://127.0.0.1:8000
 
-VERSION = '43.1.2'
+VERSION = '43.1.3'
 
 if VERSION != Pagy::VERSION
   Warning.warn("\n>>> WARNING! '#{File.basename(__FILE__)}-#{VERSION}' running with 'pagy-#{Pagy::VERSION}'! <<< \n\n")
diff --git a/gem/apps/keynav+root_key.ru b/gem/apps/keynav+root_key.ru
@@ -16,7 +16,7 @@
 # URL
 #    http://127.0.0.1:8000
 
-VERSION = '43.1.2'
+VERSION = '43.1.3'
 
 if VERSION != Pagy::VERSION
   Warning.warn("\n>>> WARNING! '#{File.basename(__FILE__)}-#{VERSION}' running with 'pagy-#{Pagy::VERSION}'! <<< \n\n")
diff --git a/gem/apps/keynav.ru b/gem/apps/keynav.ru
@@ -16,7 +16,7 @@
 # URL
 #    http://127.0.0.1:8000
 
-VERSION = '43.1.2'
+VERSION = '43.1.3'
 
 if VERSION != Pagy::VERSION
   Warning.warn("\n>>> WARNING! '#{File.basename(__FILE__)}-#{VERSION}' running with 'pagy-#{Pagy::VERSION}'! <<< \n\n")
diff --git a/gem/apps/keyset.ru b/gem/apps/keyset.ru
@@ -16,7 +16,7 @@
 # URL
 #    http://127.0.0.1:8000
 
-VERSION = '43.1.2'
+VERSION = '43.1.3'
 
 if VERSION != Pagy::VERSION
   Warning.warn("\n>>> WARNING! '#{File.basename(__FILE__)}-#{VERSION}' running with 'pagy-#{Pagy::VERSION}'! <<< \n\n")
diff --git a/gem/apps/keyset_sequel.ru b/gem/apps/keyset_sequel.ru
@@ -16,7 +16,7 @@
 # URL
 #    http://127.0.0.1:8000
 
-VERSION = '43.1.2'
+VERSION = '43.1.3'
 
 if VERSION != Pagy::VERSION
   Warning.warn("\n>>> WARNING! '#{File.basename(__FILE__)}-#{VERSION}' running with 'pagy-#{Pagy::VERSION}'! <<< \n\n")
diff --git a/gem/apps/rails.ru b/gem/apps/rails.ru
@@ -16,7 +16,7 @@
 # URL
 #    http://127.0.0.1:8000
 
-VERSION = '43.1.2'
+VERSION = '43.1.3'
 
 if VERSION != Pagy::VERSION
   Warning.warn("\n>>> WARNING! '#{File.basename(__FILE__)}-#{VERSION}' running with 'pagy-#{Pagy::VERSION}'! <<< \n\n")
diff --git a/gem/apps/repro.ru b/gem/apps/repro.ru
@@ -16,7 +16,7 @@
 # URL
 #    http://127.0.0.1:8000
 
-VERSION = '43.1.2'
+VERSION = '43.1.3'
 
 if VERSION != Pagy::VERSION
   Warning.warn("\n>>> WARNING! '#{File.basename(__FILE__)}-#{VERSION}' running with 'pagy-#{Pagy::VERSION}'! <<< \n\n")
diff --git a/gem/bin/pagy b/gem/bin/pagy
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-VERSION = '43.1.2'
+VERSION = '43.1.3'
 LINUX   = RbConfig::CONFIG['host_os'].include?('linux')
 HOST    = 'localhost'
 PORT    = '8000'
diff --git a/gem/config/pagy.rb b/gem/config/pagy.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Pagy initializer file (43.1.2)
+# Pagy initializer file (43.1.3)
 # See https://ddnexus.github.io/pagy/resources/initializer/
 
 ############ Global Options ################################################################
diff --git a/gem/javascripts/pagy.js b/gem/javascripts/pagy.js
diff --git a/gem/javascripts/pagy.js.map b/gem/javascripts/pagy.js.map
diff --git a/gem/javascripts/pagy.min.js b/gem/javascripts/pagy.min.js
diff --git a/gem/javascripts/pagy.mjs b/gem/javascripts/pagy.mjs
@@ -124,7 +124,7 @@ const Pagy = (() => {
     });
   };
   return {
-    version: "43.1.2",
+    version: "43.1.3",
     init(arg) {
       const target = arg instanceof HTMLElement ? arg : document, elements = target.querySelectorAll("[data-pagy]");
       for (const element of elements) {
diff --git a/gem/lib/pagy.rb b/gem/lib/pagy.rb
@@ -10,7 +10,7 @@
 class Pagy
   class RawQueryValue < String; end
 
-  VERSION     = '43.1.2'
+  VERSION     = '43.1.3'
   ROOT        = Pathname.new(__dir__).parent.freeze
   DEFAULT     = { limit: 20, limit_key: 'limit', page_key: 'page' }.freeze
   PAGE_TOKEN  = RawQueryValue.new('P ')
diff --git a/gem/lib/pagy/classes/keyset/keynav.rb b/gem/lib/pagy/classes/keyset/keynav.rb
@@ -27,6 +27,7 @@ def initialize(set, **)
       # Prepare the @update for the client when it's a new page, and return the next page number
       def next
         records
+        @count = 0 if !@more && @page == 1  # empty records (trigger the right info message for known 0 count)
         return if !@more || (@options[:max_pages] && @page >= @options[:max_pages])
 
         @next ||= begin
diff --git a/gem/lib/pagy/classes/offset/countless.rb b/gem/lib/pagy/classes/offset/countless.rb
@@ -8,8 +8,8 @@ def initialize(**) # rubocop:disable Lint/MissingSuper
         assign_options(**)
         assign_and_check(limit: 1, page: 1)
         @page = upto_max_pages(@page)
+        @last = upto_max_pages(@options[:last]) unless @options[:headless]
         assign_offset
-        assign_last unless @options[:headless]
       end
 
       def records(collection)
@@ -25,23 +25,20 @@ def records(collection)
       def countless? = true
 
       def upto_max_pages(value)
-        return value unless @options[:max_pages]
+        return value unless value && @options[:max_pages]
 
         [value, @options[:max_pages]].min
       end
 
-      def assign_last
-        @last = @options[:last] ? upto_max_pages(@options[:last].to_i) : @page
-      end
-
       # Finalize the instance variables based on the fetched size
       def finalize(fetched_size)
+        @count = 0 if fetched_size.zero? && @page == 1  # empty records (trigger the right info message for known 0 count)
         return self unless in_range? { fetched_size.positive? || @page == 1 }
 
-        if @last && @page < @last # visited page
-          @last = @page unless fetched_size > @limit # set last if last page
-        else
-          @last = upto_max_pages(fetched_size > @limit ? @page + 1 : @page)
+        past = @last && @page < @last     # this page has been past
+        more = fetched_size > @limit      # more pages after this one
+        unless past && more
+          @last = upto_max_pages(more ? @page + 1 : @page)
         end
         @in   = [fetched_size, @limit].min
         @from = @in.zero? ? 0 : @offset + 1
@@ -50,8 +47,17 @@ def finalize(fetched_size)
         self
       end
 
-      # Support easy countless page param overriding (for legacy param and behavior)
-      def compose_page_param(page) = "#{page || 1}+#{@last}"
+      # Called by false in_range?
+      def assign_empty_page_variables
+        @in = @from = @to = 0     # options relative to the actual page
+        if @page > @last
+          # @page     = @last
+          @previous = @last
+        else
+          @last = @page
+          assign_previous_and_next
+        end
+      end
     end
   end
 end
diff --git a/gem/lib/pagy/modules/abilities/linkable.rb b/gem/lib/pagy/modules/abilities/linkable.rb
@@ -43,7 +43,7 @@ def compose_page_url(page, limit_token: nil, **options)
       params = @request.params.clone(freeze: false)
       params.delete(root_key || page_key)
       factors = {}.tap do |h|
-                  h[page_key]  = countless? ? RawQueryValue.new(compose_page_param(page)) : page
+                  h[page_key]  = countless? ? RawQueryValue.new("#{page || 1}+#{@last}") : page
                   h[limit_key] = limit_token || limit if client_max_limit
                 end.compact # No empty params
       params.merge!(root_key ? { root_key => factors } : factors) if factors.size.positive?
diff --git a/gem/lib/pagy/modules/abilities/rangeable.rb b/gem/lib/pagy/modules/abilities/rangeable.rb
@@ -9,7 +9,7 @@ def in_range?
       raise RangeError.new(self, :page, "in 1..#{@last}", @page) if @options[:raise_range_error]
 
       assign_empty_page_variables
-      false
+      @in_range = false
     end
   end
 end
diff --git a/gem/lib/pagy/toolbox/paginators/countless.rb b/gem/lib/pagy/toolbox/paginators/countless.rb
@@ -6,16 +6,19 @@ module CountlessPaginator
 
     # Return the Offset::Countless instance and records
     def paginate(collection, options)
-      if options[:page].nil?
-        page = options[:request].resolve_page(force_integer: false) # accept nil and strings
-        if page.is_a?(String)
-          p, l = page.split(/ /, 2).map(&:to_i) # decoded '+' added by the compose_page_url
-          options[:page] = p if p.positive?
-          options[:last] = l if l&.positive?
+      options[:page] ||= options[:request].resolve_page(force_integer: false) # accept nil and strings
+      if options[:page].is_a?(String)
+        page, last     = options[:page].split(/ /, 2).map(&:to_i) # decoded '+' added by the compose_page_url
+        options[:page] = page
+        if last&.positive?
+          options[:last] = last
+        else
+          # Legacy, last-less page links are handled by starting from the first page
+          options[:page] = nil
         end
       end
       options[:limit] = options[:request].resolve_limit
-      pagy = Offset::Countless.new(**options)
+      pagy            = Offset::Countless.new(**options)
       [pagy, pagy.records(collection)]
     end
   end
diff --git a/gem/pagy.gemspec b/gem/pagy.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'pagy'
-  s.version     = '43.1.2'
+  s.version     = '43.1.3'
   s.authors     = ['Domizio Demichelis']
   s.email       = ['dd.nexus@gmail.com']
   s.summary     = 'Pagy 🐸 The Leaping Gem!'
diff --git a/src/pagy.ts b/src/pagy.ts
@@ -198,7 +198,7 @@ const Pagy = (() => {
 
   // Public interface
   return {
-    version: "43.1.2",
+    version: "43.1.3",
 
     // Scan for elements with a "data-pagy" attribute and call their init functions with the decoded args
     init(arg?:HTMLElement) {
diff --git a/test/pagy/classes/keyset/keynav_test.rb b/test/pagy/classes/keyset/keynav_test.rb
@@ -7,8 +7,23 @@
 describe "Pagy Keynav" do
   [Pet, PetSequel].each do |model|
     describe "Pagy Keynav with #{model}" do
-      describe 'uses optional options' do
-        it 'use the :tuple_comparison' do
+      describe 'uses empty collection' do
+        it 'sets the count to 0' do
+          collection = model == Pet ? model.order(:animal, :name, :id).none :  model.order(:animal, :name, :id).where(false)
+          pagy    = Pagy::Keyset::Keynav.new(collection,
+                                             page:             ['key', 1, 1, ["cat", "Ella", 18], nil],
+                                             limit:            10,
+                                             tuple_comparison: true)
+          records = pagy.records
+
+          _(records.size).must_equal 0
+          _(pagy.instance_variable_get(:@count)).must_equal 0
+          _(pagy.update).must_equal ['key', nil, 'page']
+          _(pagy.info_tag).must_match 'No items found'
+        end
+      end
+      describe 'use optional options' do
+        it 'uses the :tuple_comparison' do
           pagy    = Pagy::Keyset::Keynav.new(model.order(:animal, :name, :id),
                                              page:             ['key', 2, 2, ["cat", "Ella", 18], nil],
                                              limit:            10,
diff --git a/test/pagy/classes/offset/countless_test.rb b/test/pagy/classes/offset/countless_test.rb
diff --git a/test/pagy/toolbox/paginators/countless_test.rb b/test/pagy/toolbox/paginators/countless_test.rb
