actionset 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70f401497fe08e53f4cc6f71fd85dc666c231472
-  data.tar.gz: 12ddc413392c8b1890e9618dd5ccd8aa02b983e2
+  metadata.gz: da75dd84d025051634c3e55fb959c3df91bd074e
+  data.tar.gz: cf129f9777e7d21cefdb14ed8f55009647f7d4fc
 SHA512:
-  metadata.gz: aa4a4706d1145a0437d67f6cc1a8acff5b7eb1a38c0e3613c3845f11c48b1162079558293f988ecd62b1da8c45546e0b03d0b05bd597a3ea1794f3b74de0b4d2
-  data.tar.gz: 95c4204b4d5a8cd7f302792eb159226243f41dfbc6968163de327440449db92190e890032870a42306f0e857ba994a51d66d7695b71619cefe0f560f777087bb
+  metadata.gz: 068760c30b9ed5a55cfc5caac4459af2efa7d3723e80e2be2d7dfb8fa5f1451d069abde323cf76fac1a416371d86b03b744a649e3136e65fea1f5877feac5b38
+  data.tar.gz: d47d46fa425c52a18ff2495c66cd87b144d81297c4f75356f12baea66f907a14acfd536d54739c2728c59f53c8079b40b92eb99d7280e51787053b0244ddc917

data/CHANGELOG

@@ -1,3 +1,5 @@
+v 0.3.3
+  - Ensure the page link url uses a deep merge to retain any previously set paginate params
 v 0.3.2
   - Ensure that we always call ActiveSet#paginate so that even default pagination instructions are inserted into the ActiveSet instace
 v 0.3.1

data/lib/action_set/helpers/paginator.rb

@@ -50,11 +50,11 @@ module ActionSet
 
       def page_link_url(page_number)
         request.query_parameters
-               .merge(controller: controller.controller_path,
-                      action: controller.action_name,
-                      paginate: {
-                        page: page_number
-                      })
+               .deep_merge(controller: controller.controller_path,
+                           action: controller.action_name,
+                           paginate: {
+                             page: page_number
+                           })
       end
 
       def link_to_prev_gap

data/lib/action_set/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActionSet
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionset
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Stephen Margheim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-27 00:00:00.000000000 Z
+date: 2017-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeset