Replace kaminari with pagy

Removes the need for PaginatedDecorator.
Pagy returns two objects instead of mixing them together

Gemfile

@@ -5,10 +5,10 @@ source "https://rubygems.org"
 gem "addressable"
 gem "good_job"
 gem "httparty"
-gem "kaminari"
 gem "listen"
 gem "nokogiri"
 gem "open3"
+gem "pagy"
 gem "pg", "~> 1.1"
 gem "puma"
 gem "rails", "~> 7.0"

Gemfile.lock

@@ -117,18 +117,6 @@ GEM
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.6)
     json (2.6.3)
-    kaminari (1.2.2)
-      activesupport (>= 4.1.0)
-      kaminari-actionview (= 1.2.2)
-      kaminari-activerecord (= 1.2.2)
-      kaminari-core (= 1.2.2)
-    kaminari-actionview (1.2.2)
-      actionview
-      kaminari-core (= 1.2.2)
-    kaminari-activerecord (1.2.2)
-      activerecord
-      kaminari-core (= 1.2.2)
-    kaminari-core (1.2.2)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
@@ -175,6 +163,7 @@ GEM
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     open3 (0.1.2)
+    pagy (6.0.4)
     parallel (1.23.0)
     parser (3.2.2.3)
       ast (~> 2.4.1)
@@ -316,13 +305,13 @@ DEPENDENCIES
   factory_bot_rails
   good_job
   httparty
-  kaminari
   listen
   minitest-rails
   minitest-reporters
   mocha
   nokogiri
   open3
+  pagy
   pg (~> 1.1)
   puma
   rails (~> 7.0)

app/controllers/artists_controller.rb

@@ -4,13 +4,13 @@ class ArtistsController < ApplicationController
   respond_to :html
 
   def index
-    @artists = Artist.includes(:artist_urls).search(index_search_params).page params[:page]
+    @pagy, @artists = Artist.includes(:artist_urls).search(index_search_params).pagy(params)
   end
 
   def show
     @artist = Artist.includes(:artist_urls).find(params[:id])
     @search_params = instance_search_params.merge(artist_id: @artist.id)
-    @submission_files = SubmissionFile.search(@search_params).with_everything.page params[:page]
+    @pagy, @submission_files = SubmissionFile.search(@search_params).with_everything.pagy(params)
     respond_with(@artist)
   end
 

app/controllers/log_events_controller.rb

@@ -2,7 +2,7 @@
 
 class LogEventsController < ApplicationController
   def index
-    @log_events = LogEvent.search(search_params).page(params[:page]).decorate
+    @pagy, @log_events = LogEvent.search(search_params).pagy_and_decorate(params)
   end
 
   def show

app/controllers/submission_files_controller.rb

@@ -5,7 +5,7 @@ class SubmissionFilesController < ApplicationController
 
   def index
     @search_params = search_params
-    @submission_files = SubmissionFile.search(@search_params).with_everything.page(params[:page])
+    @pagy, @submission_files = SubmissionFile.search(@search_params).with_everything.pagy(params)
   end
 
   def show
@@ -38,18 +38,18 @@ def update_matching_e6_posts
 
   def backlog
     @search_params = search_params.merge(in_backlog: true)
-    @submission_files = SubmissionFile.search(@search_params)
+    @pagy, @submission_files = SubmissionFile.search(@search_params)
       .with_everything
       .reorder(added_to_backlog_at: :desc)
-      .page params[:page]
+      .pagy(params)
   end
 
   def hidden
     @search_params = search_params.merge(hidden_from_search: true)
-    @submission_files = SubmissionFile.search(@search_params)
+    @pagy, @submission_files = SubmissionFile.search(@search_params)
       .with_everything
       .reorder(hidden_from_search_at: :desc)
-      .page params[:page]
+      .pagy(params)
   end
 
   def hide_many

app/helpers/application_helper.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 module ApplicationHelper
+  include Pagy::Frontend
+
   def error_messages_for(value)
     value.errors.full_messagess.join(",")
   end
@@ -52,10 +54,6 @@ def hideable_search(path, &)
     tag.div(search)
   end
 
-  def paginated(values)
-    content_for(:paginator) { paginate values }
-  end
-
   def job_stats
     @job_stats ||= JobStats.new
   end

app/models/application_record.rb

@@ -115,7 +115,7 @@ def join_hash(input)
     end
   end
 
-  concerning :Decoration do
+  concerning :ControllerMethods do
     def decorate
       self.class.decorator_class.new(self)
     end
@@ -125,8 +125,16 @@ def decorator_class
         "#{model_name}Decorator".constantize
       end
 
-      def decorate
-        PaginatedDecorator.new(all)
+      def pagy(params)
+        page = [params[:page].to_i, 1].max
+        limit = params[:limit].to_i <= 0 ? nil : params[:limit]
+        pagy = Pagy.new(page: page, items: limit, count: count)
+        [pagy, offset(pagy.offset).limit(pagy.items)]
+      end
+
+      def pagy_and_decorate(params)
+        pagy, elements = pagy(params)
+        [pagy, elements.map(&:decorate)]
       end
     end
   end

app/views/artists/index.html.erb

@@ -35,6 +35,4 @@
   </tbody>
 </table>
 
-<%= paginated @artists %>
-
 <% page_title "Artists" %>

app/views/layouts/application.html.erb

@@ -20,7 +20,7 @@
         <% end %>
           <%= yield %>
       </div>
-      <%= content_for(:paginator) if content_for? :paginator %>
+      <%= pagy_nav(@pagy).html_safe if instance_variable_defined?(:@pagy) && @pagy.pages > 1 %>
     </div>
     <div class="footer-padding"></div>
     <%= render "application/footer" %>

app/views/log_events/index.html.erb

@@ -29,6 +29,4 @@
   </tbody>
 </table>
 
-<%= paginated @log_events %>
-
 <% page_title "Logs" %>

app/views/submission_files/_list_with_search.html.erb

@@ -4,4 +4,3 @@
 <% submission_files.each do |file| %>
   <%= render "submission_files/sample", submission_file: file %>
 <% end %>
-<%= paginated submission_files %>

app/views/submission_files/index.html.erb

@@ -7,6 +7,5 @@
 <% @submission_files.each do |file| %>
   <%= render "submission_files/sample", submission_file: file %>
 <% end %>
-<%= paginated @submission_files %>
 
 <% page_title "Submission Files" %>

config/initializers/pagy.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+require "pagy/extras/overflow"
+
+Pagy::DEFAULT[:items] = 25