pagy 3.5.0 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1cd0c46c7653c9ca234cdc26c4582ba9aed45de1e9041aad2fd5f7bf19c6b0f
-  data.tar.gz: 4c8527dd62f9a5f6e32e660a78df65e92ab72a26c97e148149927eea0043b8fb
+  metadata.gz: 5d5bc9d035a9a4d9f5f807a6e95cdad150a705ab17df7fc964ea3103614a7a7d
+  data.tar.gz: 6cee7bf4ccb841d55b1d38619f4cac613f765f8040fbe2162e2cf1ec99e84655
 SHA512:
-  metadata.gz: 450fb7112761bee9bcceb85dfcdd38c03e7914e29c8ea7f6816e8bebbbd7c742a39f77e9eec698b420bd481dbbaced929d023437e8991482fa087184c1664b9c
-  data.tar.gz: f2d32c23c141e7d440715550856876152153c47d1fb98954ef4451e1ad483b6b81939c8cb9e1c559c14332ca42b4a014f751ab169f50d3ab3908bc299154c780
+  metadata.gz: 883c2262141419d5f1e1270ef6a443bfce351c54fa1a893a477dc8dfd00ab0af1b75c7f8670e26a1a73a406723006a1ac23667a2ba9b652390eab5b46e5964d9
+  data.tar.gz: cdb1bd1461caf095f22407eab5de315d306dbdfb1f2cc2a733f811c92f5fdef475f1995264317e32ec8d775a019e46757b801426b8f4f7c160ff4eb9bbad799e

data/lib/config/pagy.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
-# Pagy initializer file (3.5.0)
+# Pagy initializer file (3.5.1)
 # Customize only what you really need and notice that Pagy works also without any of the following lines.
 # Should you just cherry pick part of this file, please maintain the require-order of the extras
 
@@ -89,7 +89,7 @@
 # require 'pagy/extras/overflow'
 # Pagy::VARS[:overflow] = :empty_page    # default  (other options: :last_page and :exception)
 
-# Metadata extra: Provides the pagination metadata to Javascrtipt frameworks like Vue.js, react.js, etc.
+# Metadata extra: Provides the pagination metadata to Javascript frameworks like Vue.js, react.js, etc.
 # See https://ddnexus.github.io/pagy/extras/metadata
 # you must require the shared internal extra (BEFORE the metadata extra) ONLY if you need also the :sequels
 # require 'pagy/extras/shared'

data/lib/javascripts/pagy.js

@@ -2,7 +2,7 @@
 
 function Pagy(){}
 
-Pagy.version = '3.5.0';
+Pagy.version = '3.5.1';
 
 Pagy.init = function(arg){
               var target   = arg instanceof Event || arg === undefined ? document : arg,

data/lib/pagy.rb

@@ -4,7 +4,7 @@
 
 require 'pathname'
 
-class Pagy ; VERSION = '3.5.0'
+class Pagy ; VERSION = '3.5.1'
 
   # Root pathname to get the path of Pagy files like templates or dictionaries
   def self.root; @root ||= Pathname.new(__FILE__).dirname.freeze end

data/lib/pagy/extras/elasticsearch_rails.rb

@@ -13,7 +13,8 @@ class Pagy
   def self.new_from_elasticsearch_rails(response, vars={})
     vars[:items] = response.search.options[:size] || 10
     vars[:page]  = (response.search.options[:from] || 0) / vars[:items] + 1
-    vars[:count] = response.raw_response['hits']['total']
+    total        = response.raw_response['hits']['total']
+    vars[:count] = total.is_a?(Hash) ? total['value'] : total
     new(vars)
   end
 
@@ -27,7 +28,8 @@ class Pagy
       search_args[-1][:size] = vars[:items]
       search_args[-1][:from] = vars[:items] * (vars[:page] - 1)
       response               = model.search(*search_args)
-      vars[:count]           = response.raw_response['hits']['total']
+      total                  = response.raw_response['hits']['total']
+      vars[:count]           = total.is_a?(Hash) ? total['value'] : total
       pagy = Pagy.new(vars)
       # with :last_page overflow we need to re-run the method in order to get the hits
       if defined?(OVERFLOW) && pagy.overflow? && pagy.vars[:overflow] == :last_page

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.5.1
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-20 00:00:00.000000000 Z
+date: 2019-08-31 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,