WIP: Minor adjustments

gem/apps/demo.ru

@@ -282,8 +282,8 @@ class PagyDemo < Sinatra::Base
 
       <h2>pagy<%= prefix %>_nav_js <span class="notes">Responsive nav <code>steps: {...}</code> (Resize the window to see)</span></h2>
       <%= html = send(:"pagy#{prefix}_nav_js", @pagy, id: 'nav-js-responsive',
-           aria_label: 'Pages nav_js_responsive',
-           steps: { 0 => 5, 500 => 7, 750 => 9, 1000 => 11 }) %>
+                                                      aria_label: 'Pages nav_js_responsive',
+                                                      steps: { 0 => 5, 500 => 7, 750 => 9, 1000 => 11 }) %>
       <%= highlight(html) %>
 
       <h2>pagy<%= prefix %>_combo_nav_js</h2>

gem/apps/keynav.ru

@@ -146,8 +146,8 @@ class PagyKeynav < Sinatra::Base
           <h3>pagy_nav_js (responsive)</h3>
         <p>
           <%= pagy_nav_js(@pagy, id: 'nav-js-responsive',
-          aria_label: 'Pages (nav_js_responsive)',
-          steps: { 0 => 5, 500 => 7, 750 => 9, 1000 => 11 }) %>
+                                 aria_label: 'Pages (nav_js_responsive)',
+                                 steps: { 0 => 5, 500 => 7, 750 => 9, 1000 => 11 }) %>
         </p>
           <h3>pagy_combo_nav_js</h3>
         <p>

gem/lib/pagy/calendar/unit.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-require_relative '../core/assignable'
+require_relative '../core/shiftable'
 require_relative '../core/rangeable'
-require_relative '../core/navable'
+require_relative '../core/seriable'
 
 class Pagy
   class Calendar
     # Base class for time units subclasses (Year, Quarter, Month, Week, Day)
     class Unit < Pagy
-      include Core::Assignable
-      include Core::Navable
       include Core::Rangeable
+      include Core::Seriable
+      include Core::Shiftable
 
       DEFAULT = { page: 1 }.freeze
 
@@ -74,12 +74,12 @@ def page_at(time, **opts)
       def assign_unit_vars
         raise OptionError.new(self, :format, 'to be a strftime format', @opts[:format]) unless @opts[:format].is_a?(String)
         raise OptionError.new(self, :order, 'to be in [:asc, :desc]', @order) \
-        unless %i[asc desc].include?(@order = @opts[:order])
+              unless %i[asc desc].include?(@order = @opts[:order])
 
         @starting, @ending = @opts[:period]
         raise OptionError.new(self, :period, 'to be a an Array of min and max TimeWithZone instances', @opts[:period]) \
-        unless @starting.is_a?(ActiveSupport::TimeWithZone) \
-        && @ending.is_a?(ActiveSupport::TimeWithZone) && @starting <= @ending
+              unless @starting.is_a?(ActiveSupport::TimeWithZone) \
+                  && @ending.is_a?(ActiveSupport::TimeWithZone) && @starting <= @ending
       end
 
       # Apply the strftime format to the time.

gem/lib/pagy/core/navable.rb → gem/lib/pagy/core/seriable.rb

@@ -3,7 +3,7 @@
 class Pagy
   module Core
     # Add methods enabling frontend navigation
-    module Navable
+    module Seriable
       # Label for any page. Allow the customization of the output (overridden by the calendar)
       def label(page: @page, **) = page.to_s
 

gem/lib/pagy/core/assignable.rb → gem/lib/pagy/core/shiftable.rb

@@ -3,7 +3,7 @@
 class Pagy
   module Core
     # Add a few assign_* methods
-    module Assignable
+    module Shiftable
       # Assign @prev and @next
       def assign_prev_and_next
         @prev = (@page - 1 unless @page == 1)

gem/lib/pagy/keyset.rb

@@ -3,6 +3,8 @@
 require 'json'
 require_relative 'modules/b64'
 
+puts 'I am a keyset file'
+
 class Pagy
   # Implement wicked-fast keyset pagination for big data
   class Keyset < Pagy
@@ -13,18 +15,19 @@ class Keyset < Pagy
     class TypeError < ::TypeError; end
 
     # Allow to run Keyset.new or Keyset::ActiveRecord.new
-    def self.new(set, **opts)
-      # Run the initializer if is an adapter instance (e.g. *::ActiveRecord instance)
-      return allocate.tap { |instance| instance.send(:initialize, set, **opts) } if /::(?:ActiveRecord|Sequel)$/.match?(name)
-
-      # Pick the right adapter-class and run new again on the adapter class
-      if defined?(::ActiveRecord) && set.is_a?(::ActiveRecord::Relation)
-        self::ActiveRecord
-      elsif defined?(::Sequel) && set.is_a?(::Sequel::Dataset)
-        self::Sequel
-      else
-        raise TypeError, "expected set to be an instance of ActiveRecord::Relation or Sequel::Dataset; got #{set.class}"
-      end.new(set, **opts)
+    def self.new(set, **)
+      # Run the initializer if it's a subclass instance (check without triggering autoload)
+      return allocate.tap { |instance| instance.send(:initialize, set, **) } \
+             if /::(?:ActiveRecord|Sequel)$/.match?(name)
+
+      subclass = if defined?(::ActiveRecord) && set.is_a?(::ActiveRecord::Relation)
+                   self::ActiveRecord
+                 elsif defined?(::Sequel) && set.is_a?(::Sequel::Dataset)
+                   self::Sequel
+                 else
+                   raise TypeError, "expected set to be an instance of ActiveRecord::Relation or Sequel::Dataset; got #{set.class}"
+                 end
+      subclass.new(set, **)
     end
 
     def initialize(set, **opts) # rubocop:disable Lint/MissingSuper

gem/lib/pagy/keyset/keynav.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../core/navable'
+require_relative '../core/seriable'
 
 class Pagy
   class Keyset
@@ -9,7 +9,7 @@ class Keynav < Keyset
       autoload :ActiveRecord, PAGY_PATH.join('keyset/keynav/active_record')
       autoload :Sequel,       PAGY_PATH.join('keyset/keynav/sequel')
 
-      include Core::Navable
+      include Core::Seriable
 
       # Avoid filter args conflicts in composite SQL fragments
       CUTOFF_PREFIX = 'cutoff_'

gem/lib/pagy/offset.rb

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
-require_relative 'core/assignable'
-require_relative 'core/navable'
+require_relative 'core/shiftable'
+require_relative 'core/seriable'
 require_relative 'core/rangeable'
 
 class Pagy
   # Implements Offset Pagination
   class Offset < Pagy
     autoload :Countless, PAGY_PATH.join('offset/countless')
 
-    DEFAULT = { page: 1, size: 7 }.freeze
-
-    include Core::Assignable
-    include Core::Navable
     include Core::Rangeable
+    include Core::Seriable
+    include Core::Shiftable
+
+    DEFAULT = { page: 1, size: 7 }.freeze
 
     attr_reader :offset, :from, :to
 

test/test_helper.rb

@@ -1,22 +1,21 @@
 # frozen_string_literal: true
 
 require 'simplecov'
+require_relative '../gem/lib/pagy'
 
+require 'minitest/autorun'
 unless ENV['RM_INFO']   # RubyMine safe
   require "minitest/reporters"
   Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
 end
 
-require_relative '../gem/lib/pagy'
-require 'minitest/autorun'
-
 # /usr/local/lib/ruby/gems/3.4.0/gems/minitest-5.25.4/lib/minitest.rb
 module Minitest
   class UnexpectedError
     module AvoidBacktraceMangling
       def message # :nodoc:
         bt = Minitest.filter_backtrace(backtrace)
-                     .map { |p| p.sub(%r{^#{Dir.pwd}/}, "") } # <-- ^ sub inside map and not gsub on string
+                     .map { |p| p.sub(%r{^#{Dir.pwd}/}, '') } # <-- ^ sub inside map and not gsub on string
                      .join("\n    ")
         "#{error.class}: #{error.message}\n    #{bt}"
       end