Merge branch 'dev'

ddnexus · ddnexus · commit 3e8f5779a24b · 2025-11-28T04:25:12.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.6
+        - label: I upgraded to pagy version 43.1.7
           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,8 +1,12 @@
-### Changes in 43.1.6
+### Changes in 43.1.7
 
 <!-- changes_start -->
-- Ensure the request GET and POST merge into a proper params Hash
-- Simplify code efficiency and readability
+- Fix and improve search paginators:
+  - Add support for elasticsearch_rails v8
+  - Prioritize elasticsearch_rails response over raw_response in
+  total_count (causing multiple query executions)
+  - Fix the ignored :search_method paginator option
+  - Close #837, close #838, close #839.
 <!-- 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.6)
+    pagy (43.1.7)
       json
       yaml
 
@@ -82,21 +82,21 @@ GEM
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    addressable (2.8.8)
+      public_suffix (>= 2.0.2, < 8.0)
     ansi (1.5.0)
     ast (2.4.3)
     base64 (0.3.0)
     bigdecimal (3.3.1)
     builder (3.3.0)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.4)
+    connection_pool (2.5.5)
     crass (1.0.6)
     date (3.5.0)
     docile (1.4.1)
     domain_name (0.6.20240107)
     drb (2.2.3)
-    erb (5.1.3)
+    erb (6.0.0)
     erubi (1.13.1)
     ffi (1.17.2-x86_64-linux-gnu)
     ffi-compiler (1.3.2)
@@ -142,7 +142,7 @@ GEM
       net-smtp
     marcel (1.1.0)
     mini_mime (1.1.5)
-    minitest (5.26.1)
+    minitest (5.26.2)
     minitest-reporters (1.7.1)
       ansi
       builder
@@ -179,7 +179,7 @@ GEM
     psych (5.2.6)
       date
       stringio
-    public_suffix (6.0.2)
+    public_suffix (7.0.0)
     puma (7.1.0)
       nio4r (~> 2.0)
     racc (1.8.1)
@@ -216,7 +216,7 @@ GEM
     rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    rails-i18n (8.0.2)
+    rails-i18n (8.1.0)
       i18n (>= 0.7, < 2)
       railties (>= 8.0.0, < 9)
     railties (8.1.1)
@@ -233,7 +233,7 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rdoc (6.15.1)
+    rdoc (6.16.0)
       erb
       psych (>= 4.0.0)
       tsort
diff --git a/README.md b/README.md
diff --git a/bun.lockb b/bun.lockb
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -45,6 +45,15 @@ If you upgrade from version `< 9.0.0` see the following:
 
 <hr>
 
+## Version 43.1.7
+
+- Fix and improve search paginators:
+  - Add support for elasticsearch_rails v8
+  - Prioritize elasticsearch_rails response over raw_response in
+  total_count (causing multiple query executions)
+  - Fix the ignored :search_method paginator option
+  - Close #837, close #838, close #839.
+
 ## Version 43.1.6
 
 - Ensure the request GET and POST merge into a proper params Hash
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.6
+  label: 43.1.7
   colors:
     label:
       text: "#ffffff"
diff --git a/e2e/snapshots.js b/e2e/snapshots.js
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.6'
+VERSION = '43.1.7'
 
 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.6'
+VERSION = '43.1.7'
 
 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.6'
+VERSION = '43.1.7'
 
 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.6'
+VERSION = '43.1.7'
 
 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.6'
+VERSION = '43.1.7'
 
 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.6'
+VERSION = '43.1.7'
 
 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.6'
+VERSION = '43.1.7'
 
 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.6'
+VERSION = '43.1.7'
 
 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.6'
+VERSION = '43.1.7'
 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.6)
+# Pagy initializer file (43.1.7)
 # 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.6",
+    version: "43.1.7",
     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.6'
+  VERSION     = '43.1.7'
   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/offset/search.rb b/gem/lib/pagy/classes/offset/search.rb
@@ -22,13 +22,7 @@ class SearchBase < Offset
     def search? = true
   end
 
-  class ElasticsearchRails < SearchBase
-    # Get the count from different versions of ElasticsearchRails
-    def self.total_count(results)
-      total = results.instance_eval { respond_to?(:raw_response) ? raw_response['hits']['total'] : response['hits']['total'] }
-      total.is_a?(Hash) ? total['value'] : total
-    end
-  end
+  class ElasticsearchRails < SearchBase; end
 
   class Meilisearch < SearchBase
     DEFAULT = { search_method: :ms_search }.freeze
diff --git a/gem/lib/pagy/toolbox/paginators/elasticsearch_rails.rb b/gem/lib/pagy/toolbox/paginators/elasticsearch_rails.rb
@@ -14,17 +14,37 @@ def paginate(search, options)
           model, query_or_payload, search_options = search
           search_options[:size] = options[:limit]
           search_options[:from] = options[:limit] * ((options[:page] || 1) - 1)
-          results               = model.send(ElasticsearchRails::DEFAULT[:search_method], query_or_payload, **search_options)
-          options[:count]       = ElasticsearchRails.total_count(results)
+          results               = model.send(options[:search_method] || ElasticsearchRails::DEFAULT[:search_method],
+                                             query_or_payload, **search_options)
+          options[:count]       = get_total_count(results)
           [ElasticsearchRails.new(**options), results]
         end
       else
-        # The search is an elasticsearch_rails response
-        options[:limit] = search.search.options[:size] || 10
-        options[:page]  = ((search.search.options[:from] || 0) / options[:limit]) + 1
-        options[:count] = ElasticsearchRails.total_count(search)
+        size, from      = get_es_params(search)
+        options[:limit] = size
+        options[:page]  = ((from || 0) / options[:limit]) + 1
+        options[:count] = get_total_count(search)
         ElasticsearchRails.new(**options)
       end
     end
+
+    # Get the :size and :from params from different versions of ElasticsearchRails
+    def get_es_params(response)
+      raw_def    = response.search.definition
+      definition = raw_def.respond_to?(:to_hash) ? raw_def.to_hash : raw_def
+      container  = (definition.is_a?(Hash) && (definition[:body] || definition)) || response.search.options
+      size       = (container[:size] || container['size']).to_i
+      from       = (container[:from] || container['from']).to_i
+      size       = 10 if size.zero?
+      [size, from]
+    end
+
+    # Get the count from different versions of ElasticsearchRails
+    def get_total_count(response)
+      total = response.instance_eval do
+                respond_to?(:response) ? response['hits']['total'] : raw_response['hits']['total']
+              end
+      total.is_a?(Hash) ? total['value'] : total
+    end
   end
 end
diff --git a/gem/lib/pagy/toolbox/paginators/meilisearch.rb b/gem/lib/pagy/toolbox/paginators/meilisearch.rb
@@ -14,7 +14,8 @@ def paginate(search, options)
           model, term, search_options    = search
           search_options[:hits_per_page] = options[:limit]
           search_options[:page]          = options[:page]
-          results                        = model.send(Meilisearch::DEFAULT[:search_method], term, search_options)
+          results                        = model.send(options[:search_method] || Meilisearch::DEFAULT[:search_method],
+                                                      term, search_options)
           options[:count]                = results.raw_answer['totalHits']
           [Meilisearch.new(**options), results]
         end
diff --git a/gem/lib/pagy/toolbox/paginators/searchkick.rb b/gem/lib/pagy/toolbox/paginators/searchkick.rb
@@ -14,7 +14,8 @@ def paginate(search, options)
           model, term, search_options, block = search
           search_options[:per_page] = options[:limit]
           search_options[:page]     = options[:page]
-          results                   = model.send(Searchkick::DEFAULT[:search_method], term || '*', **search_options, &block)
+          results                   = model.send(options[:search_method] || Searchkick::DEFAULT[:search_method],
+                                                 term || '*', **search_options, &block)
           options[:count]           = results.total_count
           [Searchkick.new(**options), results]
         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.6'
+  s.version     = '43.1.7'
   s.authors     = ['Domizio Demichelis']
   s.email       = ['dd.nexus@gmail.com']
   s.summary     = 'Pagy 🐸 The Leaping Gem!'
diff --git a/package.json b/package.json
@@ -8,18 +8,18 @@
     "@eslint/js": "9.39.1",
     "@types/eslint__js": "9.14.0",
     "@types/node": "24.10.1",
-    "cypress": "15.6.0",
+    "cypress": "15.7.0",
     "cypress-html-validate": "8.1.0",
     "eslint": "9.39.1",
     "eslint-plugin-align-assignments": "^1.1.2",
     "eslint-plugin-cypress": "5.2.0",
     "eslint-plugin-promise": "7.2.1",
-    "html-validate": "10.3.1",
-    "puppeteer": "24.29.1",
+    "html-validate": "10.4.0",
+    "puppeteer": "24.31.0",
     "retypeapp-linux-x64": "3.11.0",
-    "start-server-and-test": "2.1.2",
+    "start-server-and-test": "2.1.3",
     "typescript": "5.9.3",
-    "typescript-eslint": "8.46.4"
+    "typescript-eslint": "8.48.0"
   },
   "scripts": {
     "e2e-lint": "eslint ./e2e",
diff --git a/src/pagy.ts b/src/pagy.ts
@@ -198,7 +198,7 @@ const Pagy = (() => {
 
   // Public interface
   return {
-    version: "43.1.6",
+    version: "43.1.7",
 
     // Scan for elements with a "data-pagy" attribute and call their init functions with the decoded args
     init(arg?:HTMLElement) {
diff --git a/test/mock_helpers/elasticsearch_rails.rb b/test/mock_helpers/elasticsearch_rails.rb
diff --git a/test/pagy/toolbox/paginators/search/elasticsearch_rails_test.rb b/test/pagy/toolbox/paginators/search/elasticsearch_rails_test.rb
diff --git a/test/pagy/toolbox/paginators/search/elasticsearch_rails_test.rb.yaml b/test/pagy/toolbox/paginators/search/elasticsearch_rails_test.rb.yaml
