pagy 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 231b1787febd199766fff19ee9e1f8a25b9ba94e92491f9899ea91b98cad82c3
-  data.tar.gz: 94c21814452385052d0a1ed3085074e1cc69c60534a9525d66946e3f556d32a7
+  metadata.gz: 2226375f9b2e7c4789d60aa45d08ba7f5842fc00caa3980586e0f1cf51a611ee
+  data.tar.gz: 76aedcccf63588b2dd27e83e5b616485b36a768383e424df7048c863433e9f80
 SHA512:
-  metadata.gz: 206e2c4afb1398260ab713f2d85b6628c1594af65a857455b491c27788367b2a90f1f9eb9b943a2f4fcf6355f928d4228f36e76229e77cd75b9611c80a93c81a
-  data.tar.gz: d2690104a7de7e789600837504bed1f7f8d227d395d8a57c39cd51b3fc0ad3ed44522d0ee4211c29da1bc04603f36ce2116312e87afefe327b49dd75eec16d63
+  metadata.gz: 4992b2396dc45b7226ae0de2d6cde8bacd93716152ef8a0f6b5fb643387451527db0d3f2bc5f830e361ea0e3fb789e4a3d343b4f16a828f9764912ad2531213e
+  data.tar.gz: 459cb889d1c9ee9b653a0db42cb54923fa3755d42260482c66aa077244d1cd54a15323e769b8683a371dab6186c93eaf20c74214c15660de37d3139a9e31be98

data/lib/config/pagy.rb

@@ -60,8 +60,8 @@
 
 # Breakpoints var used by the responsive nav helpers
 # See https://ddnexus.github.io/pagy/extras/plain#breakpoints
-# Pagy::VARS[:breakpoints] = { 0 => [1,2,2,1], 350 => [2,3,3,2], 550 => [3,4,4,3] }    # example of width/size pairs
-
+# width/size pairs: example for bootstrap4 sm-md-lg internal container widths
+# Pagy::VARS[:breakpoints] = { 0 => [1,0,0,1], 540 => [2,3,3,2], 720 => [3,4,4,3] }
 
 # Feature Extras
 

data/lib/pagy.rb

@@ -4,7 +4,7 @@
 
 require 'pathname'
 
-class Pagy ; VERSION = '2.1.0'
+class Pagy ; VERSION = '2.1.1'
 
   class OverflowError < StandardError; attr_reader :pagy; def initialize(pagy) @pagy = pagy end; end
 

data/lib/pagy/frontend.rb

@@ -13,10 +13,12 @@ class Pagy
   module Helpers
     # This works with all Rack-based frameworks (Sinatra, Padrino, Rails, ...)
     def pagy_url_for(page, pagy, path_or_url=:path)
-      p_vars = pagy.vars; params = request.GET; params[p_vars[:page_param].to_s] = page; params.merge!(p_vars[:params])
+      p_vars = pagy.vars; params = request.GET.merge(p_vars[:params]); params[p_vars[:page_param].to_s] = page
       "#{request.send(path_or_url)}?#{Rack::Utils.build_nested_query(pagy_get_params(params))}#{p_vars[:anchor]}"
     end
 
+
+
     # Sub-method called only by #pagy_url_for: here for easy customization of params by overriding
     def pagy_get_params(params) params end
   end

metadata

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