Fix

Author: skryukov

.github/workflows/push.yml

@@ -34,16 +34,25 @@ jobs:
       fail-fast: false
       matrix:
         ruby: ['3.0', '3.1', '3.2', '3.3']
-        rails: ['6.1', '7.0', '7.1', '7.2', '8.0']
+        rails: ['6.1', '7.0', '7.1', '7.2', '8.0', '8.1']
+        pagy: ['9.0', '43']
         exclude:
           - ruby: '3.0'
             rails: '8.0'
           - ruby: '3.1'
             rails: '8.0'
+          - ruby: '3.0'
+            rails: '8.1'
+          - ruby: '3.1'
+            rails: '8.1'
           - ruby: '3.0'
             rails: '7.2'
           - ruby: '3.1'
             rails: '7.2'
+          - ruby: '3.0'
+            pagy: '43'
+          - ruby: '3.1'
+            pagy: '43'
 
     runs-on: ubuntu-latest
     name: Test against Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }}
@@ -69,8 +78,10 @@ jobs:
           bundler-cache: true
         env:
           RAILS_VERSION:  ${{ matrix.rails }}
+          PAGY_VERSION:  ${{ matrix.pagy }}
 
       - name: Run tests
         run: bundle exec rspec --tag ~type:generator
         env:
           RAILS_VERSION: ${{ matrix.rails }}
+          PAGY_VERSION:  ${{ matrix.pagy }}

Gemfile

@@ -5,7 +5,8 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in inertia_rails.gemspec
 gemspec
 
-version = ENV['RAILS_VERSION'] || '8.0'
+version = ENV.fetch('RAILS_VERSION', '8.1')
+pagy_version = ENV.fetch('PAGY_VERSION', '43')
 gem 'rails', "~> #{version}.0"
 
 gem 'bundler', '~> 2.0'
@@ -19,4 +20,4 @@ gem 'rubocop', '~> 1.21'
 gem 'sqlite3'
 
 gem 'kaminari'
-gem 'pagy'
+gem 'pagy', "~> #{pagy_version}"

docs/guide/infinite-scroll.md

@@ -14,10 +14,10 @@ To configure your paginated data for infinite scrolling, you should use the `Ine
 
 ```ruby
 class UsersController < ApplicationController
-  include Pagy::Backend
+  include Pagy::Method
 
   def index
-    pagy, records = pagy(User.all)
+    pagy, records = pagy(:countless, User.all)
 
     render inertia: {
       users: InertiaRails.scroll(pagy) { records.as_json(...) }
@@ -1112,11 +1112,11 @@ Sometimes you may need to render multiple infinite scroll components on a single
 
 ```ruby
 class DashboardController < ApplicationController
-  include Pagy::Backend
+  include Pagy::Method
 
   def index
-    pagy_users, users = pagy(User.all, page_param: :users)
-    pagy_orders, orders = pagy(Order.all, page_param: :orders)
+    pagy_users, users = pagy(:countless, User.all, page_param: :users)
+    pagy_orders, orders = pagy(:countless, Order.all, page_param: :orders)
 
     render inertia: {
       users: InertiaRails.scroll(pagy_users) { users.as_json(...) },

docs/guide/merging-props.md

@@ -12,10 +12,10 @@ To merge a prop instead of overwriting it, you may use the `InertiaRails.merge`
 
 ```ruby
 class UsersController < ApplicationController
-  include Pagy::Backend
+  include Pagy::Method
 
   def index
-    _pagy, records = pagy(User.all)
+    _pagy, records = pagy(:offset, User.all)
 
     render inertia: {
       users: InertiaRails.merge { records.as_json(...) },
@@ -133,10 +133,10 @@ You can also combine [deferred props](/guide/deferred-props) with mergeable prop
 
 ```ruby
 class UsersController < ApplicationController
-  include Pagy::Backend
+  include Pagy::Method
 
   def index
-    pagy, records = pagy(User.all)
+    pagy, records = pagy(:offset, User.all)
 
     render inertia: {
       results: InertiaRails.defer(deep_merge: true) { records.as_json(...) },

lib/inertia_rails/scroll_metadata.rb

@@ -46,7 +46,7 @@ def call(metadata, **_options)
         page_name = metadata.respond_to?(:vars) ? metadata.vars.fetch(:page_param) : metadata.options[:page_key]
         {
           page_name: page_name.to_s,
-          previous_page: metadata.previous,
+          previous_page: metadata.try(:prev) || metadata.try(:previous),
           next_page: metadata.next,
           current_page: metadata.page,
         }

spec/dummy/app/controllers/inertia_render_test_controller.rb

@@ -130,9 +130,7 @@ def deferred_props
   end
 
   def scroll_test
-    pagy = Pagy.new(
-      vars: { page_param: 'page' },
-      prev: nil,
+    pagy = (defined?(Pagy::Offset) ? Pagy::Offset : Pagy).new(
       next: 2,
       page: 1,
       count: 100

spec/inertia/scroll_metadata_spec.rb

@@ -59,16 +59,12 @@
     end
 
     context 'with Pagy adapter' do
-      before do
-        stub_const('Pagy', Class.new)
-      end
-
       let(:pagy_metadata) do
-        instance_double('Pagy').tap do |metadata|
+        instance_double('Pagy::Offset').tap do |metadata|
           allow(metadata).to receive(:is_a?).and_return(false)
           allow(metadata).to receive(:is_a?).with(Pagy).and_return(true)
-          allow(metadata).to receive(:vars).and_return({ page_param: :page })
-          allow(metadata).to receive(:prev).and_return(1)
+          allow(metadata).to receive(:options).and_return({ page_key: :page })
+          allow(metadata).to receive(:previous).and_return(1)
           allow(metadata).to receive(:next).and_return(3)
           allow(metadata).to receive(:page).and_return(2)
         end
@@ -85,14 +81,6 @@
         )
       end
 
-      it 'raises error when page_param is missing from vars' do
-        allow(pagy_metadata).to receive(:vars).and_return({})
-
-        expect do
-          described_class.extract(pagy_metadata)
-        end.to raise_error(KeyError)
-      end
-
       it 'allows options to override metadata values' do
         result = described_class.extract(
           pagy_metadata,

spec/inertia/scroll_prop_spec.rb

@@ -6,7 +6,9 @@
   describe '#metadata' do
     it 'resolves metadata from Pagy paginator' do
       collection = Array.new(100) { |i| "item#{i}" }
-      pagy, = Pagy.new(count: collection.size, page: 1, items: 20)
+      pagy, = (defined?(Pagy::Offset) ? Pagy::Offset : Pagy).new(
+        count: collection.size, page: 1, items: 20
+      )
 
       prop = described_class.new(metadata: pagy) { collection }
       metadata = prop.metadata