pagy 43.2.3 → 43.2.5

data/lib/pagy/toolbox/paginators/offset.rb

@@ -11,8 +11,15 @@ class Pagy
       options[:page]  ||= options[:request].resolve_page
       options[:limit]   = options[:request].resolve_limit
       options[:count] ||= Countable.get_count(collection, options)
-      pagy = Offset.new(**options)
-      [pagy, collection.instance_of?(Array) ? collection[pagy.offset, pagy.limit] : pagy.records(collection)]
+
+      pagy    = Offset.new(**options)
+      records = if collection.instance_of?(Array)
+                  collection[pagy.offset, pagy.limit]
+                else
+                  pagy.records(collection)
+                end
+
+      [pagy, records]
     end
   end
 end

data/lib/pagy/toolbox/paginators/searchkick.rb

@@ -8,22 +8,25 @@ class Pagy
 
     # Paginate from the search object
     def paginate(search, options)
-      if search.is_a?(Search::Arguments)
-        # The search is the array of pagy_search arguments
+      if search.is_a?(Search::Arguments) # Active mode
+
         Searcher.wrap(search, options) do
           model, term, search_options, block = search
-          search_options[:per_page] = options[:limit]
-          search_options[:page]     = options[:page]
-          results                   = model.send(options[:search_method] || Searchkick::DEFAULT[:search_method],
-                                                 term || '*', **search_options, &block)
-          options[:count]           = results.total_count
+          search_options[:per_page]          = options[:limit]
+          search_options[:page]              = options[:page]
+
+          method          = options[:search_method] || Searchkick::DEFAULT[:search_method]
+          results         = model.send(method, term || '*', **search_options, &block)
+          options[:count] = results.total_count
+
           [Searchkick.new(**options), results]
         end
-      else
-        # The search is a searchkick results object
+
+      else # Passive mode
         options[:limit] = search.respond_to?(:options) ? search.options[:per_page] : search.per_page
         options[:page]  = search.respond_to?(:options) ? search.options[:page]     : search.current_page
         options[:count] = search.total_count
+
         Searchkick.new(**options)
       end
     end

data/lib/pagy.rb

@@ -8,7 +8,7 @@ require_relative 'pagy/toolbox/helpers/loader'
 
 # Top superclass: it defines only what's common to all the subclasses
 class Pagy
-  VERSION     = '43.2.3'
+  VERSION     = '43.2.5'
   ROOT        = Pathname.new(__dir__).parent.freeze
   DEFAULT     = { limit: 20, limit_key: 'limit', page_key: 'page' }.freeze
   PAGE_TOKEN  = EscapedValue.new('P ')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 43.2.3
+  version: 43.2.5
 platform: ruby
 authors:
 - Domizio Demichelis