pagy 5.1.1 → 5.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5300f9784ba9ab19522910b10e2f100a9823b5b52c91738966e946c91a08702a
-  data.tar.gz: 2dc3599be82ee24dba9e8074c1b84e5443d69550ddec6fd32967f66a316ecedd
+  metadata.gz: 4af6c795ba446552a412f0f45e76a267cf767d8f4dec3564a90096525bb298ea
+  data.tar.gz: 57a3f62877f0ed653ebe68f59963fb865e252e68c55e5c3a91794b9aa3b9584a
 SHA512:
-  metadata.gz: 36b6893409fad1745593238f9a169623841dc4b55172fd2263f0bba09b3436e8c7f4e6f5ff6fc65bd56233b510daef44df60238189249547205f17087ddd69ab
-  data.tar.gz: bddaf3afe21358ed1b9ed73de5585931f4dac9018cc37b30c268aae29cdd7f836ac4f77e4ea419f9268dc4f9f247907996ab2461cd6fc6a44d9e80467b513567
+  metadata.gz: 0520f9933ea293895b8d26b0a78ea0af1a61054b5b89fce3a06c1f8f292d82357f6e105f76ab7bd4665f6ee9765bc69ce284428b8fe61b8f0a6b4768136c8e4a
+  data.tar.gz: '0903950d58220f510b5c2700b42f23f19c5cd267bc73eb5404d918863717b816836609256ef3a340534a9bc74e50260915b8b023b502c9dbe503bb443fab968f'

data/lib/config/pagy.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Pagy initializer file (5.1.1)
+# Pagy initializer file (5.1.2)
 # 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

@@ -3,7 +3,7 @@
 // Container of the whole pagy stuff
 function Pagy(){}
 
-Pagy.version = '5.1.1'
+Pagy.version = '5.1.2'
 
 // Used by the waitForMe function
 Pagy.delay = 100

data/lib/pagy/extras/standalone.rb

@@ -3,6 +3,8 @@
 
 require 'uri'
 class Pagy
+  # Use pagy without any request object, nor Rack environment/gem, nor any defined params method,
+  # even in the irb/rails console without any app or config.
   module StandaloneExtra
     # Extracted from Rack::Utils and reformatted for rubocop
     module QueryUtils
@@ -34,15 +36,15 @@ class Pagy
     # it works exactly as the regular #pagy_url_for, relying on the params method and Rack.
     # If there is a defined pagy.vars[:url] variable it does not need the params method nor Rack.
     def pagy_url_for(pagy, page, absolute: nil)
-      p_vars = pagy.vars
-      return super unless (url = p_vars[:url])
+      vars = pagy.vars
+      return super unless (url = vars[:url])
 
-      params                            = p_vars[:params]
-      params[p_vars[:page_param].to_s]  = page
-      params[p_vars[:items_param].to_s] = p_vars[:items] if defined?(ItemsExtra)
+      params                     = vars[:params].clone  # safe when it gets reused
+      params[vars[:page_param]]  = page
+      params[vars[:items_param]] = vars[:items] if vars[:items_extra]
 
       query_string = "?#{QueryUtils.build_nested_query(pagy_massage_params(params))}"
-      "#{url}#{query_string}#{p_vars[:fragment]}"
+      "#{url}#{query_string}#{vars[:fragment]}"
     end
   end
   # In ruby 3+ `UrlHelpers.prepend StandaloneExtra` would be enough instead of using the next 2 lines

data/lib/pagy/url_helpers.rb

@@ -7,13 +7,13 @@ class Pagy
     # It supports all Rack-based frameworks (Sinatra, Padrino, Rails, ...).
     # For non-rack environments you can use the standalone extra
     def pagy_url_for(pagy, page, absolute: nil)
-      p_vars                            = pagy.vars
-      params                            = request.GET.merge(p_vars[:params])
-      params[p_vars[:page_param].to_s]  = page
-      params[p_vars[:items_param].to_s] = p_vars[:items] if defined?(ItemsExtra)
+      vars                            = pagy.vars
+      params                          = request.params.merge(vars[:params].transform_keys(&:to_s))
+      params[vars[:page_param].to_s]  = page
+      params[vars[:items_param].to_s] = vars[:items] if vars[:items_extra]
 
       query_string = "?#{Rack::Utils.build_nested_query(pagy_massage_params(params))}"
-      "#{request.base_url if absolute}#{request.path}#{query_string}#{p_vars[:fragment]}"
+      "#{request.base_url if absolute}#{request.path}#{query_string}#{vars[:fragment]}"
     end
 
     # Sub-method called only by #pagy_url_for: here for easy customization of params by overriding

data/lib/pagy.rb

@@ -5,7 +5,7 @@ require 'pathname'
 
 # Core class
 class Pagy
-  VERSION = '5.1.1'
+  VERSION = '5.1.2'
 
   # Root pathname to get the path of Pagy files like templates or dictionaries
   def self.root

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.1.2
 platform: ruby
 authors:
 - Domizio Demichelis