pagy 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c340603d318a1982f676209661b8357a2c386c93e6144c0f950dbad19645a23
-  data.tar.gz: 13bd39e2660aff66151c245801a8502320392cd0e62faf82f6042caf45e59603
+  metadata.gz: 660aa79dcf4de07d2377f7f7706897a14e637eae0f8ddff1799094361da5e76c
+  data.tar.gz: eef332aa68f610aa89df84822d91c99274facf0c84162268c5a7d0c97a28163e
 SHA512:
-  metadata.gz: f2562e79aa12b299e2e4594d595255d3de4e401ef406c0b2a6228ab2924226905cd4531fbf9c0f563c3680f8e56ef0d13229b3a25be26e6c590cbc1073f9b944
-  data.tar.gz: 302da621bcf61a0a2ae97e4ed96d0e7477abec46d50bf3128ed850ff1edf1b5f88e6bcc3f79161907051f4015cf158e37a6bbcfd001609557decbd7569b979a1
+  metadata.gz: cff58fe6379393d1156aafa83a85fdc0d3ebfa6e8d193215e42f7d40c59fb3f476420325ae1cce84624d8b11dddf670f874cb1fbf69c40f7a7b32f6cf6db3752
+  data.tar.gz: 718f1a9dd1f829488228e9e4620938f48ea471b40b89ccabf610ff76b73811b57b25a5c9729ca7147ae8bbefce8b82f73d37fe76a95d9fb037c6571fe6078ee7

data/lib/config/pagy.rb

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

@@ -98,6 +98,6 @@ Pagy.addInputEventListeners = function(input, handler){
                               };
 
 Pagy.trim = function(html, param){
-              var re = new RegExp('[?&]' + param + '=1(?![&])|(?<=[?&])' + 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.2.0'
+class Pagy ; VERSION = '3.2.1'
 
   class OverflowError < StandardError; attr_reader :pagy; def initialize(pagy) @pagy = pagy end; end
 

data/lib/pagy/extras/i18n.rb

@@ -10,9 +10,9 @@ class Pagy
 
     Pagy::I18n.clear.instance_eval { undef :load; undef :t } # unload the pagy default constant for efficiency
 
-    alias :pagy_without_i18n :pagy_t
+    alias_method :pagy_without_i18n, :pagy_t
     def pagy_t_with_i18n(*args) ::I18n.t(*args) end
-    alias :pagy_t :pagy_t_with_i18n
+    alias_method :pagy_t, :pagy_t_with_i18n
 
   end
 end

data/lib/pagy/extras/overflow.rb

@@ -10,7 +10,7 @@ class Pagy
 
   def overflow?; @overflow end
 
-  alias :initialize_without_overflow :initialize
+  alias_method :initialize_without_overflow, :initialize
   def initialize_with_overflow(vars)
     @overflow ||= false                         # don't override if :last_page re-run the method after an overflow
     initialize_without_overflow(vars)
@@ -31,7 +31,7 @@ class Pagy
       raise ArgumentError, "expected :overflow variable in [:last_page, :empty_page, :exception]; got #{@vars[:overflow].inspect}"
     end
   end
-  alias :initialize :initialize_with_overflow
+  alias_method :initialize, :initialize_with_overflow
 
   module Series
     def series(size=@vars[:size])
@@ -48,7 +48,7 @@ class Pagy
   if defined?(Pagy::Countless)
     class Countless
 
-      alias :finalize_without_overflow :finalize
+      alias_method :finalize_without_overflow, :finalize
       def finalize_with_overflow(items)
         @overflow = false
         finalize_without_overflow(items)
@@ -65,7 +65,7 @@ class Pagy
           raise ArgumentError, "expected :overflow variable in [:empty_page, :exception]; got #{@vars[:overflow].inspect}"
         end
       end
-      alias :finalize :finalize_with_overflow
+      alias_method :finalize, :finalize_with_overflow
 
     end
   end

data/lib/pagy/extras/trim.rb

@@ -10,11 +10,11 @@ class Pagy
 
     alias_method :pagy_link_proc_without_trim, :pagy_link_proc
     def pagy_link_proc_with_trim(pagy, link_extra='')
-      link_proc  = pagy_link_proc_without_trim(pagy, link_extra)
-      page_param = pagy.vars[:page_param]
+      link_proc = pagy_link_proc_without_trim(pagy, link_extra)
+      re = /[?&]#{pagy.vars[:page_param]}=1\b(?!&)|\b#{pagy.vars[:page_param]}=1&/
       lambda do |n, text=n, extra=''|
         link = link_proc.call(n, text, extra)
-        n == 1 ? link.sub(/[?&]#{page_param}=1(?![&])|\b(?<=[?&])#{page_param}=1&/, '') : link
+        n == 1 ? link.sub(re, '') : link
       end
     end
     alias_method :pagy_link_proc, :pagy_link_proc_with_trim

metadata

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