pagy 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f42ebff94cf9faa8dadd414d3fd056bcf57da0a2e4930f1a9850d64eca08adf4
-  data.tar.gz: 60133804f52c4c687647d2c8b48f2b7344a558fa163063857f24bc0387d41834
+  metadata.gz: 3a66c2944b27ed7d4ce4f4ab521cd8bc45fc675196ca79bcc352f65e5cb8584e
+  data.tar.gz: 6a2aee40334e9b80291b74b840776ed4f9697afaa4ce4701c61ade1fa8b35349
 SHA512:
-  metadata.gz: b6dbcbc1041dceb8ff23832f687083e701d3eb187fabddd1051bf3672c1e93efbe4b680c534dd531d506c173f7766cba96473ac8bc5464da8db25206a9c9ee9b
-  data.tar.gz: 256e4e8eb88d53c71fe035804e6ad99af606f93fc673d7173150e4ac13e396c084eda16686d52c144ea3d5af7cca29797ddca5d0be21aac87406cc7654757171
+  metadata.gz: a6bfadbdf1ff037faf2e1bc29e01c4f3fe488983c3c0eb2da2cfb474b3cd38025704773d38ad903c436f97a2e810e99537134e6ab6660257311df5133d3d176c
+  data.tar.gz: 1a9949404e19dddb77f790147f3cf732ccbfbaf1d20083b963a164344f4154aacf40d4f2f0632284109c17830c20d99c92767a473f649a502a2f0771dcbca509

data/lib/pagy.rb

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

data/lib/pagy/backend.rb

@@ -16,9 +16,10 @@ 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: collection.count(:all),        # works with AR, but may not work with other ORMs
-        page:  params[vars[:page_param]||VARS[:page_param]] }.merge!(vars)
+      { count: count, page: params[vars[:page_param]||VARS[:page_param]] }.merge!(vars)
     end
 
     # Sub-method called only by #pagy: here for easy customization of record-extraction by overriding

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-21 00:00:00.000000000 Z
+date: 2018-06-23 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,