actionset 0.3.2 → 0.3.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG +2 -0
  3. data/lib/action_set/helpers/paginator.rb +5 -5
  4. data/lib/action_set/version.rb +1 -1
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 70f401497fe08e53f4cc6f71fd85dc666c231472
4
- data.tar.gz: 12ddc413392c8b1890e9618dd5ccd8aa02b983e2
3
+ metadata.gz: da75dd84d025051634c3e55fb959c3df91bd074e
4
+ data.tar.gz: cf129f9777e7d21cefdb14ed8f55009647f7d4fc
5
5
  SHA512:
6
- metadata.gz: aa4a4706d1145a0437d67f6cc1a8acff5b7eb1a38c0e3613c3845f11c48b1162079558293f988ecd62b1da8c45546e0b03d0b05bd597a3ea1794f3b74de0b4d2
7
- data.tar.gz: 95c4204b4d5a8cd7f302792eb159226243f41dfbc6968163de327440449db92190e890032870a42306f0e857ba994a51d66d7695b71619cefe0f560f777087bb
6
+ metadata.gz: 068760c30b9ed5a55cfc5caac4459af2efa7d3723e80e2be2d7dfb8fa5f1451d069abde323cf76fac1a416371d86b03b744a649e3136e65fea1f5877feac5b38
7
+ data.tar.gz: d47d46fa425c52a18ff2495c66cd87b144d81297c4f75356f12baea66f907a14acfd536d54739c2728c59f53c8079b40b92eb99d7280e51787053b0244ddc917
data/CHANGELOG CHANGED
@@ -1,3 +1,5 @@
1
+ v 0.3.3
2
+ - Ensure the page link url uses a deep merge to retain any previously set paginate params
1
3
  v 0.3.2
2
4
  - Ensure that we always call ActiveSet#paginate so that even default pagination instructions are inserted into the ActiveSet instace
3
5
  v 0.3.1
data/lib/action_set/helpers/paginator.rb CHANGED
@@ -50,11 +50,11 @@ module ActionSet
50
50
 
51
51
  def page_link_url(page_number)
52
52
  request.query_parameters
53
- .merge(controller: controller.controller_path,
54
- action: controller.action_name,
55
- paginate: {
56
- page: page_number
57
- })
53
+ .deep_merge(controller: controller.controller_path,
54
+ action: controller.action_name,
55
+ paginate: {
56
+ page: page_number
57
+ })
58
58
  end
59
59
 
60
60
  def link_to_prev_gap
data/lib/action_set/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module ActionSet
4
- VERSION = '0.3.2'
4
+ VERSION = '0.3.3'
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: actionset
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.2
4
+ version: 0.3.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Stephen Margheim
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2017-10-27 00:00:00.000000000 Z
11
+ date: 2017-10-31 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activeset