pagy 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 388922f4fd6c86c42945097ef08078bfe351e8b61a380ef68c58c583509ee4ae
-  data.tar.gz: 775b71455d808039150ac6285a15c8fd9574609df2a43399f465d71fed853cff
+  metadata.gz: 404671150cf9cb3580df7ec51a52715dbec0ea879140f16b0f41d67714a9760e
+  data.tar.gz: 9074cfed85d9465b2484222b6063e3b282e4c910fc01388bd5155ce4348181e3
 SHA512:
-  metadata.gz: a98e301538f52ebd068f137ff5bf7850ab713a28e8636b399753b8a70022d076885e3ac93216c7da255fb3d4269f8bd3c48990243e27db31ccc08f841af750b2
-  data.tar.gz: d22e17a6910d0e1dbc31f184a69a9dae63a25932c7d29d2f9dc1d291d9ed5fe58c641bba96ae9feea2e312cd06e478643705688916d8b26c3395937a7fe0442c
+  metadata.gz: bbba1646133377c9dc118fdb184d694dd5b137d780cdd55009f61b7190f276e737e46cf0dd0ebd63957b4f8fb7a67cbc1ed409c0ac3a0055ab6a58db0eadece6
+  data.tar.gz: e7ef0461dc55852c9f6d1baa594cb495256d7cefdd6a230c36b139fcf9adfc16684d4e9b3e65a075c93891a2f315912c1e3f33e3c6bef5d909aa5f21f77e7303

data/lib/pagy.rb

@@ -3,7 +3,7 @@
 
 require 'pathname'
 
-class Pagy ; VERSION = '1.2.0'
+class Pagy ; VERSION = '1.2.1'
 
   class OverflowError < StandardError; attr_reader :pagy; def initialize(pagy) @pagy = pagy end; end
 

data/lib/pagy/backend.rb

@@ -16,10 +16,9 @@ class Pagy
 
     # Sub-method called only by #pagy: here for easy customization of variables by overriding
     def pagy_get_vars(collection, vars)
-      count = collection.count(:all)                # work with AR collections: other ORMs may need to change this
-      count = count.count if count.is_a?(Hash)      # fix for the AR grouping count inconsistency (Hash instead of Integer)
-      # Return the merged variables to initialize the Pagy object
-      { count: count, page: params[vars[:page_param]||VARS[:page_param]] }.merge!(vars)
+      vars[:count] ||= (c = collection.count(:all)).is_a?(Hash) ? c.size : c
+      vars[:page]  ||= params[ vars[:page_param] || VARS[:page_param] ]
+      vars
     end
 
     # Sub-method called only by #pagy: here for easy customization of record-extraction by overriding

data/lib/pagy/extras/array.rb

@@ -10,10 +10,11 @@ class Pagy
       return pagy, array[pagy.offset, pagy.items]
     end
 
+    # Sub-method called only by #pagy_array: here for easy customization of variables by overriding
     def pagy_array_get_vars(array, vars)
-      # Return the merged variables to initialize the Pagy object
-      { count: array.count,
-        page:  params[vars[:page_param]||VARS[:page_param]] }.merge!(vars)
+      vars[:count] ||= array.size
+      vars[:page]  ||= params[ vars[:page_param] || VARS[:page_param] ]
+      vars
     end
 
   end

data/lib/pagy/extras/countless.rb

@@ -17,8 +17,8 @@ class Pagy
 
     # Sub-method called only by #pagy_countless: here for easy customization of variables by overriding
     def pagy_countless_get_vars(_collection, vars)
-      # Return the merged variables to initialize the Pagy object
-      { page: params[vars[:page_param]||VARS[:page_param]] }.merge!(vars)
+      vars[:page] ||= params[ vars[:page_param] || VARS[:page_param] ]
+      vars
     end
 
     # Sub-method called only by #pagy_countless: here for easy customization of record-extraction by overriding

data/lib/pagy/extras/elasticsearch_rails.rb

@@ -9,10 +9,11 @@ class Pagy
       return pagy, results.offset(pagy.offset).limit(pagy.items)
     end
 
+    # Sub-method called only by #pagy_elasticsearch_rails: here for easy customization of variables by overriding
     def pagy_elasticsearch_rails_get_vars(results, vars)
-      # Return the merged variables to initialize the Pagy object
-      { count: results.total,
-        page: (params[:page] || 1)}.merge!(vars)
+      vars[:count] ||= results.total
+      vars[:page]  ||= params[:page] || 1
+      vars
     end
   end
 end

data/lib/pagy/extras/searchkick.rb

@@ -9,11 +9,12 @@ class Pagy
       return pagy, results
     end
 
+    # Sub-method called only by #pagy_searchkick: here for easy customization of variables by overriding
     def pagy_searchkick_get_vars(results, vars)
-      # Return the merged variables to initialize the Pagy object
-      { count: results.total_count,
-        page:  results.options[:page],
-        items: results.options[:per_page] }.merge!(vars)
+      vars[:count] ||= results.total_count
+      vars[:page]  ||= results.options[:page]
+      vars[:items] ||= results.options[:per_page]
+      vars
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-03 00:00:00.000000000 Z
+date: 2018-12-10 00:00:00.000000000 Z
 dependencies: []
 description: 'Agnostic pagination in plain ruby: it works with any framework, ORM
   and DB type, with all kinds of collections, even pre-paginated, scopes, Arrays,