esse-pagy 0.0.1 → 0.43.0

data/gemfiles/Gemfile.pagy-9.lock

@@ -0,0 +1,138 @@
+PATH
+  remote: ..
+  specs:
+    esse-pagy (0.43.0)
+      esse (>= 0.2.4)
+      pagy (>= 5)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (8.0.3)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    ast (2.4.3)
+    base64 (0.3.0)
+    benchmark (0.4.1)
+    bigdecimal (3.2.3)
+    coderay (1.1.3)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.4)
+    diff-lcs (1.6.2)
+    drb (2.2.3)
+    esse (0.2.6)
+      multi_json
+      thor (>= 0.19)
+    esse-rspec (0.0.6)
+      esse (>= 0.2.4)
+      rspec (>= 3)
+    i18n (1.14.7)
+      concurrent-ruby (~> 1.0)
+    json (2.15.0)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    logger (1.7.0)
+    method_source (1.1.0)
+    minitest (5.25.5)
+    multi_json (1.17.0)
+    pagy (9.4.0)
+    parallel (1.27.0)
+    parser (3.3.9.0)
+      ast (~> 2.4.1)
+      racc
+    prism (1.5.1)
+    pry (0.15.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    racc (1.8.1)
+    rack (3.2.1)
+    rainbow (3.1.1)
+    rake-manifest (0.2.3)
+    regexp_parser (2.11.3)
+    rspec (3.13.1)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.5)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.6)
+    rubocop (1.81.0)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.47.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-performance (1.25.0)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    rubocop-rspec (3.7.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    ruby-progressbar (1.13.0)
+    securerandom (0.4.1)
+    standard (1.35.0.1)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.62)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.3)
+    standard-custom (1.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.50)
+    standard-performance (1.8.0)
+      lint_roller (~> 1.1)
+      rubocop-performance (~> 1.25.0)
+    thor (1.4.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.1.0)
+    uri (1.0.3)
+
+PLATFORMS
+  ruby
+  x86_64-linux
+
+DEPENDENCIES
+  activesupport
+  esse (~> 0.2.4)
+  esse-pagy!
+  esse-rspec (~> 0.0.1)
+  pagy (~> 9.0)
+  pry
+  rack
+  rake-manifest
+  rspec
+  rubocop
+  rubocop-performance
+  rubocop-rspec
+  standard
+
+BUNDLED WITH
+   2.5.23

data/lib/esse/pagy.rb

@@ -3,8 +3,14 @@
 require "esse"
 require "pagy"
 
-::Pagy::DEFAULT[:esse_search] ||= :search
-::Pagy::DEFAULT[:esse_pagy_search] ||= :pagy_search
+# Pagy < 43 ships a mutable DEFAULT and a Backend mixin used by the
+# `pagy_esse`/`pagy_search` controller helpers. Pagy 43 froze DEFAULT, removed
+# the Backend mixin, and split paginators into Pagy::Offset/Keyset/Search.
+# Only register the controller-helper defaults where they apply.
+unless ::Pagy::DEFAULT.frozen?
+  ::Pagy::DEFAULT[:esse_search] ||= :search
+  ::Pagy::DEFAULT[:esse_pagy_search] ||= :pagy_search
+end
 
 # I'll try to move this to the `pagy` gem. But we need to wait for the `pagy` author to accept the PR.
 # @see https://github.com/ddnexus/pagy/blob/master/lib/pagy/extras/elasticsearch_rails.rb
@@ -18,7 +24,7 @@ module Esse
           args.define_singleton_method(:method_missing) { |*a| args += a }
         end
       end
-      alias_method ::Pagy::DEFAULT[:esse_pagy_search], :pagy_esse
+      alias_method :pagy_search, :pagy_esse
     end
 
     module ClusterSearch
@@ -27,19 +33,30 @@ module Esse
           args.define_singleton_method(:method_missing) { |*a| args += a }
         end
       end
-      alias_method ::Pagy::DEFAULT[:esse_pagy_search], :pagy_esse
+      alias_method :pagy_search, :pagy_esse
     end
 
     module ClassMethods
       def new_from_esse(query, vars = {})
         vars[:count] = query.response.total
         vars[:page] = (query.offset_value / query.limit_value.to_f).ceil + 1
-        vars[:items] = query.limit_value
-        ::Pagy.new(vars)
+        vars[:limit] = query.limit_value
+
+        if defined?(::Pagy::Offset)
+          # Pagy 43+: bare Pagy is abstract; offset pagination is Pagy::Offset.
+          ::Pagy::Offset.new(**vars)
+        elsif ::Pagy::VERSION.to_i < 9
+          # Convert :limit back to :items for older Pagy versions
+          vars[:items] = vars.delete(:limit)
+          ::Pagy.new(vars)
+        else
+          ::Pagy.new(**vars)
+        end
       end
     end
 
-    # Add specialized backend methods to paginate Esse::Search::Query
+    # Add specialized backend methods to paginate Esse::Search::Query.
+    # Only relevant on Pagy versions that still ship Pagy::Backend (< 43).
     module Backend
       private
 
@@ -47,12 +64,20 @@ module Esse
       def pagy_esse(pagy_search_args, vars = {})
         cluster, indices, kwargs, block, *called = pagy_search_args
         vars = pagy_esse_get_vars(nil, vars)
+
         query = cluster.send(::Pagy::DEFAULT[:esse_search], *indices, **kwargs, &block)
-          .limit(vars[:items])
-          .offset(vars[:items] * (vars[:page] - 1))
+          .limit(vars[:limit])
+          .offset(vars[:limit] * (vars[:page] - 1))
         vars[:count] = query.response.total
 
-        pagy = ::Pagy.new(vars)
+        # Handle Pagy 9+ API changes
+        if ::Pagy::VERSION.to_i >= 9
+          pagy = ::Pagy.new(**vars)
+        else
+          legacy_vars = vars.dup
+          legacy_vars[:items] = legacy_vars.delete(:limit)
+          pagy = ::Pagy.new(legacy_vars)
+        end
         # with :last_page overflow we need to re-run the method in order to get the hits
         return pagy_esse(pagy_search_args, vars.merge(page: pagy.page)) \
                if defined?(::Pagy::OverflowExtra) && pagy.overflow? && pagy.vars[:overflow] == :last_page
@@ -64,7 +89,15 @@ module Esse
       # the _query argument is not available when the method is called
       def pagy_esse_get_vars(_query, vars)
         pagy_set_items_from_params(vars) if defined?(ItemsExtra)
-        vars[:items] ||= ::Pagy::DEFAULT[:items]
+
+        # Convert :items to :limit for consistency, this is not needed for Pagy 9+
+        vars[:limit] = vars.delete(:items) if vars.key?(:items)
+        if ::Pagy::VERSION.to_i < 9
+          vars[:limit] ||= ::Pagy::DEFAULT[:items]
+        else
+          vars[:limit] ||= ::Pagy::DEFAULT[:limit]
+        end
+
         vars[:page] ||= (params[vars[:page_param] || ::Pagy::DEFAULT[:page_param]] || 1).to_i
         vars
       end
@@ -72,7 +105,13 @@ module Esse
   end
 end
 
-::Pagy::Backend.prepend(Esse::Pagy::Backend)
 ::Pagy.extend(Esse::Pagy::ClassMethods)
 ::Esse::Index.extend(Esse::Pagy::IndexSearch)
 ::Esse::Cluster.prepend(Esse::Pagy::ClusterSearch)
+# Pagy::Backend was removed in Pagy 43; reference it (autoloads on older Pagy)
+# and skip the integration when it is gone.
+begin
+  ::Pagy::Backend.prepend(Esse::Pagy::Backend)
+rescue NameError
+  nil
+end

data/mise.toml

@@ -0,0 +1,2 @@
+[tools]
+ruby = "3.4.8"

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: esse-pagy
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.43.0
 platform: ruby
 authors:
 - Marcos G. Zimmermann
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-15 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: esse
@@ -135,7 +134,23 @@ files:
 - Gemfile.lock
 - LICENSE
 - README.md
+- docs/README.md
+- docs/api.md
+- docs/usage.md
+- gemfiles/Gemfile.pagy-43
+- gemfiles/Gemfile.pagy-43.lock
+- gemfiles/Gemfile.pagy-5
+- gemfiles/Gemfile.pagy-5.lock
+- gemfiles/Gemfile.pagy-6
+- gemfiles/Gemfile.pagy-6.lock
+- gemfiles/Gemfile.pagy-7
+- gemfiles/Gemfile.pagy-7.lock
+- gemfiles/Gemfile.pagy-8
+- gemfiles/Gemfile.pagy-8.lock
+- gemfiles/Gemfile.pagy-9
+- gemfiles/Gemfile.pagy-9.lock
 - lib/esse/pagy.rb
+- mise.toml
 homepage: https://github.com/marcosgz/esse-pagy
 licenses:
 - MIT
@@ -143,7 +158,6 @@ metadata:
   homepage_uri: https://github.com/marcosgz/esse-pagy
   source_code_uri: https://github.com/marcosgz/esse-pagy
   changelog_uri: https://github.com/marcosgz/esse-pagy/blob/main/CHANGELOG.md
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -158,8 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Pagy extensions for Esse
 test_files: []