pagy 3.8.0 → 3.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a3ba0f375dbf0278f8701c8cd68b628c207543556da9779c195a441c8c92896
-  data.tar.gz: 40656e0eaeb6b8bfe45126100242e6b89edd588e6723b98c1a120787e2ff77cb
+  metadata.gz: 7ea52feecd4bb597b050def40adc283602005ff5e92b4df578228e05d747f9ef
+  data.tar.gz: 808775763c37c92e3457214284fffcfc1075a7c8fbde1da39286b35c06923424
 SHA512:
-  metadata.gz: d2e5fe320e18656b1c9e7fb0d36597ee6a4ad8fcb55579b269ea8f394b390975e7f7e1138484b158ee5099bccfa6ee16e6c780513c68866d0b08367aa77c8919
-  data.tar.gz: 5b3c2c1deeb0f4131044e8b5830394080c31e5ddd49cb6c07e9124da5a14d5d15dfcf9c69e34775b7f9249193e6d6064c52316ce7703e9b53319b3c235b08adc
+  metadata.gz: 80015e89122214f8e8054e2c8e8490b407f4fb9513a4336458eeedd2b5bc986e27abf339830157392afd9cd8f901d61fcd0403480fe7acb093da27d68f9d800b
+  data.tar.gz: ec2ab4d61e3763c580d011565811a55595b15f1f7498b9879dd20f6986f5b470f155f1f4ff5c74286892836c5a2f133e0f2d17e32f82d2b0e1e737a876b89155

data/lib/config/pagy.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
-# Pagy initializer file (3.8.0)
+# Pagy initializer file (3.8.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,7 +2,7 @@
 
 function Pagy(){}
 
-Pagy.version = '3.8.0';
+Pagy.version = '3.8.1';
 
 Pagy.init = function(arg){
               var target   = arg instanceof Event || arg === undefined ? document : arg,
@@ -101,6 +101,6 @@ Pagy.addInputEventListeners = function(input, handler){
                               };
 
 Pagy.trim = function(html, param){
-              var re = new RegExp('[?&]' + param + '=1\b(?!&)|\b' + param + '=1&');
+              var re = new RegExp('[?&]' + param + '=1\\b(?!&)|\\b' + param + '=1&');
               return html.replace(re, '');
             };

data/lib/pagy.rb

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

@@ -28,7 +28,7 @@ class Pagy
       search_args[-1][:size] = vars[:items]
       search_args[-1][:from] = vars[:items] * (vars[:page] - 1)
       response               = model.search(*search_args)
-      total                  = response.raw_response['hits']['total']
+      total                  = response.respond_to?(:raw_response) ? response.raw_response['hits']['total'] : response.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

data/lib/pagy/extras/i18n.rb

@@ -11,7 +11,14 @@ class Pagy
     Pagy::I18n.clear.instance_eval { undef :load; undef :t } # unload the pagy default constant for efficiency
 
     alias_method :pagy_without_i18n, :pagy_t
-    def pagy_t_with_i18n(*args) ::I18n.t(*args) end
+    if Gem::Version.new(::I18n::VERSION) < Gem::Version.new('1.6.0')
+      def pagy_t_with_i18n(*args) ::I18n.t(*args) end
+    else
+      # keep 1.9 compatibility by hiding 2.0+ syntax in string
+      module_eval <<-RUBY
+        def pagy_t_with_i18n(key, **opts) ::I18n.t(key, **opts) end
+      RUBY
+    end
     alias_method :pagy_t, :pagy_t_with_i18n
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 3.8.0
+  version: 3.8.1
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-23 00:00:00.000000000 Z
+date: 2020-05-08 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,
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: The Ultimate Pagination Ruby Gem