pagy 1.3.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b68e52cc18266e62b2156ebfafb24479c052e019128a5228c42203d516a17fd6
-  data.tar.gz: 86065e2c0d2bfdc27330a941e165d33068eaae67cd4ef8521c8e0d18b6ef2fda
+  metadata.gz: 984f87dd6d805faf04c9c980bc8b5e2da6d90963beae920805ece77a627ed6f0
+  data.tar.gz: '095f11ccb37ee8c4a64e714f0d3384f4c7f6cdddbafc4c4f34b9a3d2efd4c2de'
 SHA512:
-  metadata.gz: 66c438b46a53076f3780da6f0c51c92b5571bdb3c6c627805695d0868cc25ea8edcb6122d457e59ca79f6e84e10e435e7d0f30a201bfcc6fd8130b5a2d235410
-  data.tar.gz: 32aa96c1331ea6a0913b6889b445e0b05fa12c1fdf6e3232bb55a93ea990a38417f89cb809f76c6b854aecd6c564ba7886a789fba0107e704bc4c0985758ef04
+  metadata.gz: 9ade0c565e6f30f118ee30884456c1185c3f7dde0723aa6688734ac974dfc41fb0e16979a78d25042ee469178afe02244594a8366bb3e9f2057b031a378a062c
+  data.tar.gz: 7087679d2675ac589627085522871b53f59f27be60298fadb4e64752a12e21f3c23fcc13cd72b22ebe7c25a0bcd5c7a3064c4383aad5995e115b10fed1a4be0d

data/lib/config/pagy.rb

@@ -1,5 +1,8 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 # Pagy initializer file
-# Customize only what you really need but notice that Pagy works also without any of the following lines.
+# Customize only what you really need and notice that Pagy works also without any of the following lines.
 
 
 # Extras
@@ -111,15 +114,34 @@
 
 # I18n
 
-# I18n faster internal pagy implementation (does not use the I18n gem)
-# Use only for single language apps that don't need dynamic translation between multiple languages
+# Pagy internal I18n: ~18x faster using ~10x less memory than the i18n gem
 # See https://ddnexus.github.io/pagy/api/frontend#i18n
-# Notice: Do not use any of the following lines if you use the i18n extra below
-# Pagy::Frontend::I18N.load(file: Pagy.root.join('locale', 'es.yml'), language:'es') # load 'es' pagy language file
-# Pagy::Frontend::I18N.load(file:'path/to/dictionary.yml', language:'en')            # load a custom 'en' file
-# Pagy::Frontend::I18N[:plural] = -> (count) {(['zero', 'one'][count] || 'other')}   # default
-
-# I18n extra: Use the `I18n` gem instead of the pagy implementation
-# (slower but allows dynamic translation between multiple languages)
+# Notice: No need to use any of the following lines if you use the i18n extra below
+#
+# Examples:
+# load the "de" built-in locale:
+# Pagy::I18n.load(locale: 'de')
+#
+# load the "de" locale defined in the custom file at :filepath:
+# Pagy::I18n.load(locale: 'de', filepath: 'path/to/pagy-de.yml')
+#
+# load the "de", "en" and "es" built-in locales:
+# (the first passed :locale will be used also as the default_locale)
+# Pagy::I18n.load({locale: 'de'},
+#                 {locale: 'en'},
+#                 {locale: 'es'})
+#
+# load the "en" built-in locale, a custom "es" locale,
+# and a totally custom locale complete with the :pluralize proc:
+# (the first passed :locale will be used also as the default_locale)
+# Pagy::I18n.load({locale: 'en'},
+#                 {locale: 'es', filepath: 'path/to/pagy-es.yml'},
+#                 {locale: 'xyz',  # not built-in
+#                  filepath: 'path/to/pagy-xyz.yml',
+#                  pluralize: lambda{|count| ... } )
+
+
+# I18n extra: uses the standard i18n gem which is ~18x slower using ~10x more memory
+# than the default pagy internal i18n (see above)
 # See https://ddnexus.github.io/pagy/extras/i18n
 # require 'pagy/extras/i18n'

data/lib/javascripts/pagy.js

@@ -84,13 +84,6 @@ Pagy.init = function(arg){
                 var args = JSON.parse(jsonTags[i].innerHTML);
                 Pagy[args.shift()].apply(null, args);
               }
-              // Support for legacy overridden helpers. It will be removed in 2.0
-              ['compact', 'items', 'responsive'].forEach(function(name){
-                var json = document.getElementsByClassName("pagy-"+name+"-json");
-                for (var i = 0, len = json.length; i < len; i++) {
-                  Pagy[name].apply(null, JSON.parse(json[i].innerHTML))
-                }
-              })
             };
 
 // namespace for custom init functions

data/lib/locales/utils/i18n.rb

@@ -0,0 +1,18 @@
+# See https://ddnexus.github.io/pagy/api/frontend#i18n
+# encoding: utf-8
+# frozen_string_literal: true
+
+# this file returns the I18n hash used as default alternative to the i18n gem
+
+Hash.new{|h,_| h.first[1]}.tap do |i18n|   # first loaded locale used as default
+  i18n.define_singleton_method(:load) do |*args|
+    # eval: we don't need to keep the loader proc in memory
+    eval(Pagy.root.join('locales', 'utils', 'loader.rb').read).call(i18n, *args)   #rubocop:disable Security/Eval
+  end
+  i18n.define_singleton_method(:t) do |locale, path, vars={}|
+    data, pluralize = self[locale]
+    translate = data[path] || vars[:count] && data[path+=".#{pluralize.call(vars[:count])}"] or return %([translation missing: "#{path}"])
+    translate.call(vars)
+  end
+  i18n.load(locale: 'en')
+end

data/lib/locales/utils/loader.rb

@@ -0,0 +1,29 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
+# the whole file will be eval'ed/executed and gc-collected after returning/executing the loader proc
+
+# eval: no need for the whole file in memory
+p11n = eval(Pagy.root.join('locales', 'utils', 'p11n.rb').read)   #rubocop:disable Security/Eval
+
+# flatten the dictionary file nested keys
+# convert each value to a simple ruby interpolation proc
+flatten = lambda do |hash, key=''|
+            hash.each.reduce({}) do |h, (k, v)|
+              v.is_a?(Hash) \
+                ? h.merge!(flatten.call(v, "#{key}#{k}."))
+                : h.merge!(eval %({"#{key}#{k}" => lambda{|vars|"#{v.gsub(/%{[^}]+?}/){|m| "\#{vars[:#{m[2..-2]}]||'#{m}'}" }}"}})) #rubocop:disable Security/Eval
+            end
+          end
+
+# loader proc
+lambda do |i18n, *args|
+  i18n.clear
+  args.each do |arg|
+    arg[:filepath]  ||= Pagy.root.join('locales', "#{arg[:locale]}.yml")
+    arg[:pluralize] ||= p11n[arg[:locale]]
+    hash = YAML.load(File.read(arg[:filepath], encoding: 'UTF-8')) #rubocop:disable Security/YAMLLoad
+    hash.key?(arg[:locale]) or raise ArgumentError, %(Pagy::I18n.load: :locale "#{arg[:locale]}" not found in :filepath "#{arg[:filepath].inspect}")
+    i18n[arg[:locale]] = [flatten.call(hash[arg[:locale]]), arg[:pluralize]]
+  end
+end

data/lib/locales/{plurals.rb → utils/p11n.rb}

@@ -1,7 +1,10 @@
-# This file adds support for multiple built-in plualization types.
-# It defines the pluralization procs and gets eval(ed) at I18N.load time.
+# See https://ddnexus.github.io/pagy/api/frontend#i18n
+# encoding: utf-8
 # frozen_string_literal: true
 
+# This file adds support for multiple built-in plualization types.
+# It defines the pluralization procs and gets eval(ed) and gc-collected at Pagy::I18n.load time.
+
 # utility variables
 zero_one   = ['zero', 'one'].freeze
 from2to4   = (2..4).freeze
@@ -9,13 +12,13 @@ from5to9   = (5..9).freeze
 from11to14 = (11..14).freeze
 from12to14 = (12..14).freeze
 
-# Plurals
-# A plural proc returns a plural type string based on the passed count
-# Each plural proc may apply to one or more languages below
-plurals = {
-  zero_one_other: -> (count) {zero_one[count] || 'other'},
+# Pluralization (p11n)
+# A pluralization proc returns a plural type string based on the passed count
+# Each proc may apply to one or more locales below
+p11n = {
+  zero_one_other: lambda {|count| zero_one[count] || 'other'},
 
-  zero_one_few_many_other: -> (count) do
+  zero_one_few_many_other: lambda do |count|
     mod10, mod100 = count % 10, count % 100
     if count == 0                                                           ; 'zero'
     elsif mod10 == 1 && mod100 != 11                                        ; 'one'
@@ -25,7 +28,7 @@ plurals = {
     end
   end,
 
-  pl: -> (count) do
+  pl: lambda do |count|
     mod10, mod100 = count % 10, count % 100
     if count == 0                                                                       ; 'zero'
     elsif count == 1                                                                    ; 'one'
@@ -36,14 +39,13 @@ plurals = {
   end
 }
 
-# Languages (language/plural pairs)
-# Contain all the entries for all the languages defined in the dictionaries.
-# The default plural for languages not explicitly listed here
-# is the :zero_one_other plural (used for English)
-Hash.new(plurals[:zero_one_other]).tap do |languages|
-  languages['en'] = plurals[:zero_one_other]
-  languages['ru'] = plurals[:zero_one_few_many_other]
-  languages['pl'] = plurals[:pl]
+# Hash of locale/pluralization pairs
+# Contain all the entries for all the locales defined as dictionaries.
+# The default pluralization for locales not explicitly listed here
+# is the :zero_one_other pluralization proc (used for English)
+Hash.new(p11n[:zero_one_other]).tap do |hash|
+  hash['ru'] = p11n[:zero_one_few_many_other]
+  hash['pl'] = p11n[:pl]
 end
 
-# PR for other languages and plurals are very welcome. Thanks!
+# PR for other locales and pluralizations are very welcome. Thanks!

data/lib/pagy.rb

@@ -1,14 +1,15 @@
 # See Pagy API documentation: https://ddnexus.github.io/pagy/api/pagy
+# encoding: utf-8
 # frozen_string_literal: true
 
 require 'pathname'
 
-class Pagy ; VERSION = '1.3.3'
+class Pagy ; VERSION = '2.0.0'
 
   class OverflowError < StandardError; attr_reader :pagy; def initialize(pagy) @pagy = pagy end; end
 
   # Root pathname to get the path of Pagy files like templates or dictionaries
-  def self.root; Pathname.new(__FILE__).dirname end
+  def self.root; @root ||= Pathname.new(__FILE__).dirname.freeze end
 
   # default vars
   VARS = { page:1, items:20, outset:0, size:[1,4,4,1], page_param: :page, params:{}, anchor:'', link_extra:'', item_path:'pagy.info.item_name', cycle: false }

data/lib/pagy/backend.rb

@@ -1,4 +1,6 @@
 # See Pagy::Backend API documentation: https://ddnexus.github.io/pagy/api/backend
+# encoding: utf-8
+# frozen_string_literal: true
 
 class Pagy
   # Defines a few generic methods to paginate an ORM collection out of the box,

data/lib/pagy/countless.rb

@@ -1,3 +1,6 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 require 'pagy'
 
 class Pagy
@@ -6,7 +9,7 @@ class Pagy
 
     # Merge and validate the options, do some simple arithmetic and set a few instance variables
     def initialize(vars={})
-      @vars ||= VARS.merge(vars.delete_if{|_,v| v.nil? || v == '' })    # default vars + cleaned vars (can be overridden)
+      @vars = VARS.merge(vars.delete_if{|_,v| v.nil? || v == '' })      # default vars + cleaned vars (can be overridden)
       { items:1, outset:0, page:1 }.each do |k,min|                     # validate instance variables
         (@vars[k] && instance_variable_set(:"@#{k}", @vars[k].to_i) >= min) \
          or raise(ArgumentError, "expected :#{k} >= #{min}; got #{@vars[k].inspect}")

data/lib/pagy/extras/array.rb

@@ -1,4 +1,6 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/array
+# encoding: utf-8
+# frozen_string_literal: true
 
 class Pagy
   # Add specialized backend methods to paginate array collections

data/lib/pagy/extras/bootstrap.rb

@@ -1,4 +1,5 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/bootstrap
+# encoding: utf-8
 # frozen_string_literal: true
 
 require 'pagy/extras/shared'
@@ -8,10 +9,10 @@ class Pagy
 
     # Pagination for bootstrap: it returns the html with the series of links to the pages
     def pagy_bootstrap_nav(pagy)
-      html, link, p_prev, p_next = +'', pagy_link_proc(pagy, 'class="page-link"'), pagy.prev, pagy.next
+      link, p_prev, p_next = pagy_link_proc(pagy, 'class="page-link"'), pagy.prev, pagy.next
 
-      html << (p_prev ? %(<li class="page-item prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</li>)
-                      : %(<li class="page-item prev disabled"><a href="#" class="page-link">#{pagy_t('pagy.nav.prev')}</a></li>))
+      html = EMPTY + (p_prev ? %(<li class="page-item prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</li>)
+                             : %(<li class="page-item prev disabled"><a href="#" class="page-link">#{pagy_t('pagy.nav.prev')}</a></li>))
       pagy.series.each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
         html << if    item.is_a?(Integer); %(<li class="page-item">#{link.call item}</li>)                                                               # page link
                 elsif item.is_a?(String) ; %(<li class="page-item active">#{link.call item}</li>)                                                        # active page
@@ -20,35 +21,33 @@ class Pagy
       end
       html << (p_next ? %(<li class="page-item next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</li>)
                       : %(<li class="page-item next disabled"><a href="#" class="page-link">#{pagy_t('pagy.nav.next')}</a></li>))
-      %(<nav class="pagy-nav-bootstrap pagy-bootstrap-nav pagination" role="navigation" aria-label="pager"><ul class="pagination">#{html}</ul></nav>)
+      %(<nav class="pagy-bootstrap-nav pagination" role="navigation" aria-label="pager"><ul class="pagination">#{html}</ul></nav>)
     end
-    deprecate :pagy_nav_bootstrap, :pagy_bootstrap_nav
 
     # Compact pagination for bootstrap: it returns the html with the series of links to the pages
     # we use a numeric input tag to set the page and the Pagy.compact javascript to navigate
     def pagy_bootstrap_compact_nav(pagy, id=pagy_id)
-      html, link, p_prev, p_next, p_page, p_pages = +'', pagy_link_proc(pagy), pagy.prev, pagy.next, pagy.page, pagy.pages
+      link, p_prev, p_next, p_page, p_pages = pagy_link_proc(pagy), pagy.prev, pagy.next, pagy.page, pagy.pages
 
-      html << %(<nav id="#{id}" class="pagy-nav-compact-bootstrap pagy-bootstrap-compact-nav pagination" role="navigation" aria-label="pager">)
+      html = EMPTY + %(<nav id="#{id}" class="pagy-bootstrap-compact-nav pagination" role="navigation" aria-label="pager">)
         html << link.call(MARKER, '', %(style="display: none;" ))
         (html << link.call(1, '', %(style="display: none;" ))) if defined?(TRIM)
         html << %(<div class="btn-group" role="group">)
         html << (p_prev ? link.call(p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous" class="prev btn btn-primary"')
                         : %(<a class="prev btn btn-primary disabled" href="#">#{pagy_t('pagy.nav.prev')}</a>))
         input = %(<input type="number" min="1" max="#{p_pages}" value="#{p_page}" class="text-primary" style="padding: 0; border: none; text-align: center; width: #{p_pages.to_s.length+1}rem;">)
-        html << %(<div class="pagy-compact-input btn btn-primary disabled">#{pagy_t('pagy.compact', page_input: input, count: p_page, pages: p_pages)}</div>)
+        html << %(<div class="pagy-compact-input btn btn-primary disabled" style="white-space: nowrap;">#{pagy_t('pagy.compact', page_input: input, count: p_page, pages: p_pages)}</div>)
         html << (p_next ? link.call(p_next, pagy_t('pagy.nav.next'), 'aria-label="next" class="next btn btn-primary"')
                         : %(<a class="next btn btn-primary disabled" href="#">#{pagy_t('pagy.nav.next')}</a>))
       html << %(</div></nav>#{pagy_json_tag(:compact, id, MARKER, p_page, !!defined?(TRIM))})
     end
-    deprecate :pagy_nav_compact_bootstrap, :pagy_bootstrap_compact_nav
 
     # Responsive pagination for bootstrap: it returns the html with the series of links to the pages
     # rendered by the Pagy.responsive javascript
     def pagy_bootstrap_responsive_nav(pagy, id=pagy_id)
       tags, link, p_prev, p_next, responsive = {}, pagy_link_proc(pagy, 'class="page-link"'), pagy.prev, pagy.next, pagy.responsive
 
-      tags['before'] = +'<ul class="pagination">'
+      tags['before'] = EMPTY + '<ul class="pagination">'
       tags['before'] << (p_prev ? %(<li class="page-item prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</li>)
                                 : %(<li class="page-item prev disabled"><a href="#" class="page-link">#{pagy_t('pagy.nav.prev')}</a></li>))
       responsive[:items].each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
@@ -57,13 +56,12 @@ class Pagy
                           elsif item == :gap       ; %(<li class="page-item gap disabled"><a href="#" class="page-link">#{pagy_t('pagy.nav.gap')}</a></li>) # page gap
                           end
       end
-      tags['after'] = +(p_next ? %(<li class="page-item next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</li>)
-                               : %(<li class="page-item next disabled"><a href="#" class="page-link">#{pagy_t('pagy.nav.next')}</a></li>))
+      tags['after'] = EMPTY + (p_next ? %(<li class="page-item next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</li>)
+                                      : %(<li class="page-item next disabled"><a href="#" class="page-link">#{pagy_t('pagy.nav.next')}</a></li>))
       tags['after'] << '</ul>'
       script = pagy_json_tag(:responsive, id, tags,  responsive[:widths], responsive[:series])
-      %(<nav id="#{id}" class="pagy-nav-responsive-bootstrap pagy-bootstrap-responsive-nav pagination" role="navigation" aria-label="pager"></nav>#{script})
+      %(<nav id="#{id}" class="pagy-bootstrap-responsive-nav pagination" role="navigation" aria-label="pager"></nav>#{script})
     end
-    deprecate :pagy_nav_responsive_bootstrap, :pagy_bootstrap_responsive_nav
 
   end
 end

data/lib/pagy/extras/bulma.rb

@@ -1,4 +1,5 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/bulma
+# encoding: utf-8
 # frozen_string_literal: true
 
 require 'pagy/extras/shared'
@@ -8,10 +9,10 @@ class Pagy
 
     # Pagination for Bulma: it returns the html with the series of links to the pages
     def pagy_bulma_nav(pagy)
-      html, link, p_prev, p_next = +'', pagy_link_proc(pagy), pagy.prev, pagy.next
+      link, p_prev, p_next = pagy_link_proc(pagy), pagy.prev, pagy.next
 
-      html << (p_prev ? link.call(p_prev, pagy_t('pagy.nav.prev'), 'class="pagination-previous" aria-label="previous page"')
-                      : %(<a class="pagination-previous" disabled>#{pagy_t('pagy.nav.prev')}</a>))
+      html = EMPTY + (p_prev ? link.call(p_prev, pagy_t('pagy.nav.prev'), 'class="pagination-previous" aria-label="previous page"')
+                             : %(<a class="pagination-previous" disabled>#{pagy_t('pagy.nav.prev')}</a>))
       html << (p_next ? link.call(p_next, pagy_t('pagy.nav.next'), 'class="pagination-next" aria-label="next page"')
                       : %(<a class="pagination-next" disabled>#{pagy_t('pagy.nav.next')}</a>))
       html << '<ul class="pagination-list">'
@@ -22,16 +23,15 @@ class Pagy
                 end
       end
       html << '</ul>'
-      %(<nav class="pagy-nav-bulma pagy-bulma-nav pagination is-centered" role="navigation" aria-label="pagination">#{html}</nav>)
+      %(<nav class="pagy-bulma-nav pagination is-centered" role="navigation" aria-label="pagination">#{html}</nav>)
     end
-    deprecate :pagy_nav_bulma, :pagy_bulma_nav
 
     # Compact pagination for Bulma: it returns the html with the series of links to the pages
     # we use a numeric input tag to set the page and the Pagy.compact javascript to navigate
     def pagy_bulma_compact_nav(pagy, id=pagy_id)
-      html, link, p_prev, p_next, p_page, p_pages = +'', pagy_link_proc(pagy), pagy.prev, pagy.next, pagy.page, pagy.pages
+      link, p_prev, p_next, p_page, p_pages = pagy_link_proc(pagy), pagy.prev, pagy.next, pagy.page, pagy.pages
 
-      html << %(<nav id="#{id}" class="pagy-nav-compact-bulma pagy-bulma-compact-nav" role="navigation" aria-label="pagination">)
+      html = EMPTY + %(<nav id="#{id}" class="pagy-bulma-compact-nav" role="navigation" aria-label="pagination">)
         html << link.call(MARKER, '', 'style="display: none;"')
         (html << link.call(1, '', %(style="display: none;"))) if defined?(TRIM)
         html << %(<div class="field is-grouped is-grouped-centered" role="group">)
@@ -43,15 +43,14 @@ class Pagy
                         : %(<p class="control"><a class="button" disabled>#{pagy_t('pagy.nav.next')}</a></p>))
       html << %(</div></nav>#{pagy_json_tag(:compact, id, MARKER, p_page, !!defined?(TRIM))})
     end
-    deprecate :pagy_nav_compact_bulma, :pagy_bulma_compact_nav
 
     # Responsive pagination for Bulma: it returns the html with the series of links to the pages
     # rendered by the Pagy.responsive javascript
     def pagy_bulma_responsive_nav(pagy, id=pagy_id)
       tags, link, p_prev, p_next, responsive = {}, pagy_link_proc(pagy), pagy.prev, pagy.next, pagy.responsive
 
-      tags['before'] = +(p_prev ? link.call(p_prev, pagy_t('pagy.nav.prev'), 'class="pagination-previous" aria-label="previous page"')
-                                : %(<a class="pagination-previous" disabled>#{pagy_t('pagy.nav.prev')}</a>))
+      tags['before'] = EMPTY + (p_prev ? link.call(p_prev, pagy_t('pagy.nav.prev'), 'class="pagination-previous" aria-label="previous page"')
+                                       : %(<a class="pagination-previous" disabled>#{pagy_t('pagy.nav.prev')}</a>))
       tags['before'] << (p_next ? link.call(p_next, pagy_t('pagy.nav.next'), 'class="pagination-next" aria-label="next page"')
                                 : %(<a class="pagination-next" disabled>#{pagy_t('pagy.nav.next')}</a>))
       tags['before'] << '<ul class="pagination-list">'
@@ -63,9 +62,8 @@ class Pagy
       end
       tags['after'] = '</ul>'
       script = pagy_json_tag(:responsive, id, tags,  responsive[:widths], responsive[:series])
-      %(<nav id="#{id}" class="pagy-nav-responsive-bulma pagy-bulma-responsive-nav pagination is-centered" role="navigation" aria-label="pagination"></nav>#{script})
+      %(<nav id="#{id}" class="pagy-bulma-responsive-nav pagination is-centered" role="navigation" aria-label="pagination"></nav>#{script})
     end
-    deprecate :pagy_nav_responsive_bulma, :pagy_bulma_responsive_nav
 
   end
 end

data/lib/pagy/extras/countless.rb

@@ -1,4 +1,6 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/countless
+# encoding: utf-8
+# frozen_string_literal: true
 
 require 'pagy/countless'
 

data/lib/pagy/extras/elasticsearch_rails.rb

@@ -1,19 +1,43 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/elasticsearch_rails
+# encoding: utf-8
+# frozen_string_literal: true
+
+require 'pagy/extras/pagy_search'
 
 class Pagy
-  # Add specialized backend methods to paginate ElasticsearchRails::Results
+
+  # used by the items extra
+  ELASTICSEARCH_RAILS = true
+
+  # create a Pagy object from an Elasticsearch::Model::Response::Response object
+  def self.new_from_elasticsearch_rails(response, vars={})
+    vars[:items] = response.search.options[:size] || 10
+    vars[:page]  = (response.search.options[:from] || 0) / vars[:items] + 1
+    vars[:count] = response.raw_response['hits']['total']
+    new(vars)
+  end
+
+  # Add specialized backend methods to paginate ElasticsearchRails searches
   module Backend ; private
+
     # Return Pagy object and items
-    def pagy_elasticsearch_rails(results, vars={})
-      pagy = Pagy.new(pagy_elasticsearch_rails_get_vars(results, vars))
-      return pagy, results.offset(pagy.offset).limit(pagy.items)
+    def pagy_elasticsearch_rails(search_args, vars={})
+      model, query_or_payload, options, _block, *called = search_args
+      vars           = pagy_elasticsearch_rails_get_vars(nil, vars)
+      options[:size] = vars[:items]
+      options[:from] = vars[:items] * (vars[:page] - 1)
+      response       = model.search(query_or_payload, options)
+      vars[:count]   = response.raw_response['hits']['total']
+      return Pagy.new(vars), called.empty? ? response : response.send(*called)
     end
 
     # Sub-method called only by #pagy_elasticsearch_rails: here for easy customization of variables by overriding
-    def pagy_elasticsearch_rails_get_vars(results, vars)
-      vars[:count] ||= results.total
-      vars[:page]  ||= params[:page] || 1
+    # the _collection argument is not available when the method is called
+    def pagy_elasticsearch_rails_get_vars(_collection, vars)
+      vars[:items] ||= VARS[:items]
+      vars[:page]  ||= (params[ vars[:page_param] || VARS[:page_param] ] || 1).to_i
       vars
     end
+
   end
 end