pagy 3.4.0 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a00174d5d8af0760d883355ba8e77f9f9118954a7c6dec7e5e6e7ab503dcfde9
-  data.tar.gz: 64a379d944f3b013e6b17ec8f899661346ac837780c028295e1916e796a1930e
+  metadata.gz: 6623351e17c1612e6a27f72491dc2dc3402550295f1d58b41f222de35195577a
+  data.tar.gz: 51127de303671a68cc3c219f4fa4423ae461a5281eca74e4aec71fa78aa53d3e
 SHA512:
-  metadata.gz: 4d2d2d25d9df71c80de2786165ed678b82744ba617bad804beb8a56eb41011a239ad3d7ce96abfef80a4e6313f483edab43e9f9d331a161a4fead6f07675013d
-  data.tar.gz: e4dba23f4e9fd2ccc1d77c1f8e0bcb00c3a3ba7b770126afd57eb7247a51168e0bcb2ba4ec4ebfb30e34eac97913099e79e2409225ddbcd72ba618f77fa20597
+  metadata.gz: 8385841d14b773eba91ee9bff068765698fa6b09736dc1dfdbfbd5bb8b6c022db58d495c8e0d7fc423ca5837f2543f9672c2594a7d8f271eb0fa4bbcfa6400aa
+  data.tar.gz: 7889d3d82b6928ed58c4a095e540d5c227619a0ab102eff77afb0ac93f481af25fe5513cba0d1cd54beda7a23cceb97ab83a17792f9610800edb53605cda7c70

data/lib/config/pagy.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
-# Pagy initializer file (3.4.0)
+# Pagy initializer file (3.4.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
 

data/lib/javascripts/pagy.js

@@ -2,6 +2,8 @@
 
 function Pagy(){}
 
+Pagy.version = '3.4.1';
+
 Pagy.init = function(arg){
               var target   = arg instanceof Event || arg === undefined ? document : arg,
                   jsonTags = target.getElementsByClassName('pagy-json');

data/lib/pagy.rb

@@ -4,7 +4,7 @@
 
 require 'pathname'
 
-class Pagy ; VERSION = '3.4.0'
+class Pagy ; VERSION = '3.4.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

@@ -21,17 +21,17 @@ class Pagy
   module Backend ; private
 
     # Return Pagy object and items
-    def pagy_elasticsearch_rails(search_args, vars={})
-      model, query_or_payload, options, _block, *called = search_args
-      vars           = pagy_elasticsearch_rails_get_vars(nil, vars)
-      options[:size] = vars[:items]
-      options[:from] = vars[:items] * (vars[:page] - 1)
-      response       = model.search(query_or_payload, options)
-      vars[:count]   = response.raw_response['hits']['total']
+    def pagy_elasticsearch_rails(pagy_search_args, vars={})
+      model, search_args, _block, *called = pagy_search_args
+      vars                   = pagy_elasticsearch_rails_get_vars(nil, vars)
+      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']
       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
-        return pagy_elasticsearch_rails(search_args, vars.merge(page: pagy.page))
+        return pagy_elasticsearch_rails(pagy_search_args, vars.merge(page: pagy.page))
       end
       return pagy, called.empty? ? response : response.send(*called)
     end

data/lib/pagy/extras/pagy_search.rb

@@ -7,8 +7,10 @@ class Pagy
     # returns an array used to delay the call of #search
     # after the pagination variables are merged to the options
     # it also pushes to the same array an eventually called method and arguments
-    def pagy_search(arg, options={}, &block)
-      [self, arg, options, block].tap do |args|
+    # the last search argument must be a hash option
+    def pagy_search(*search_args, &block)
+      search_args << {} unless search_args[-1].is_a?(Hash)
+      [self, search_args, block].tap do |args|
         args.define_singleton_method(:method_missing){|*a| args += a}
       end
     end

data/lib/pagy/extras/searchkick.rb

@@ -21,17 +21,17 @@ class Pagy
   module Backend ; private
 
     # Return Pagy object and results
-    def pagy_searchkick(search_args, vars={})
-      model, term, options, block, *called = search_args
-      vars               = pagy_searchkick_get_vars(nil, vars)
-      options[:per_page] = vars[:items]
-      options[:page]     = vars[:page]
-      results            = model.search(term, options, &block)
-      vars[:count]       = results.total_count
+    def pagy_searchkick(pagy_search_args, vars={})
+      model, search_args, block, *called = pagy_search_args
+      vars                       = pagy_searchkick_get_vars(nil, vars)
+      search_args[-1][:per_page] = vars[:items]
+      search_args[-1][:page]     = vars[:page]
+      results                    = model.search(*search_args, &block)
+      vars[:count]               = results.total_count
       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
-        return pagy_searchkick(search_args, vars.merge(page: pagy.page))
+        return pagy_searchkick(pagy_search_args, vars.merge(page: pagy.page))
       end
       return pagy, called.empty? ? results : results.send(*called)
     end

metadata

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