Merge pull request #140 from buildrtech/support-pagy-v43

Support pagy v43

Author: davidcelis

Gemfile

@@ -7,7 +7,7 @@ gemspec
 # Without these, Bundler may override gemspec constraints and install incompatible versions
 gem "kaminari", "~> 1.2", ">= 1.2.1", require: false
 gem "will_paginate", "~> 3.3", ">= 3.3.1", require: false
-gem "pagy", ">= 9.4.0", "< 10.0.0", require: false
+gem "pagy", "~> 43.0", require: false
 
 gem "sqlite3", require: false
 gem "sequel", "~> 5.49", require: false

api-pagination.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = "> 2.7"
 
   s.add_development_dependency "kaminari", "~> 1.2", ">= 1.2.1"
-  s.add_development_dependency "pagy", ">= 9.4.0", "< 10.0.0"
+  s.add_development_dependency "pagy", "~> 43.0"
   s.add_development_dependency "will_paginate", "~> 3.3", ">= 3.3.1"
 
   s.add_development_dependency "rspec", "~> 3.10"

lib/api-pagination.rb

@@ -47,10 +47,10 @@ def total_from(collection)
     private
 
     def paginate_with_pagy(collection, options)
-      if Pagy::DEFAULT[:max_per_page] && options[:per_page] > Pagy::DEFAULT[:max_per_page]
-        options[:per_page] = Pagy::DEFAULT[:max_per_page]
+      if Pagy.options[:max_per_page] && options[:per_page] > Pagy.options[:max_per_page]
+        options[:per_page] = Pagy.options[:max_per_page]
       elsif options[:per_page] <= 0
-        options[:per_page] = Pagy::DEFAULT[:limit]
+        options[:per_page] = Pagy.options[:limit]
       end
 
       pagy = pagy_from(collection, options)
@@ -73,14 +73,14 @@ def pagy_from(collection, options)
       # Pagy 9.x requires keyword arguments
       # Use explicit keyword argument syntax to avoid Ruby version quirks
       pagy_options = {count: count, limit: options[:per_page], page: options[:page]}
-      Pagy.new(**pagy_options)
+      Pagy::Offset.new(**pagy_options)
     end
 
     def pagy_pages_from(pagy)
       {}.tap do |pages|
         unless pagy.page == 1
           pages[:first] = 1
-          pages[:prev] = pagy.prev
+          pages[:prev] = pagy.previous
         end
 
         unless pagy.page == pagy.pages

spec/rails_spec.rb

@@ -285,7 +285,7 @@ class << Integer
 
           expect(response.header["Per-Page"]).to eq(
             case ApiPagination.config.paginator
-            when :pagy then Pagy::DEFAULT[:limit].to_s
+            when :pagy then Pagy.options[:limit].to_s
             when :kaminari then Kaminari.config.default_per_page.to_s
             when :will_paginate then WillPaginate.per_page.to_s
             end
@@ -300,7 +300,7 @@ class << Integer
 
         expect(response.header["Per-Page"]).to eq(
           case ApiPagination.config.paginator
-          when :pagy then Pagy::DEFAULT[:limit].to_s
+          when :pagy then Pagy.options[:limit].to_s
           when :kaminari then Kaminari.config.default_per_page.to_s
           when :will_paginate then WillPaginate.per_page.to_s
           end