activeset 0.6.1 → 0.6.2

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: aee5f35b2eba91b7f28431bb7b023de8a1a1e47a
4
- data.tar.gz: e58182617ed601e1bf5b553d9364caccbca89924
3
+ metadata.gz: b5b7a0fb4bee14702c5860357142fabb13d05b56
4
+ data.tar.gz: 5b4abfbf57c42b7ea378b3524211370f4871ead7
5
5
  SHA512:
6
- metadata.gz: 6b90c61856131638982ac21dde343e3b2b09d7115886760c744de2f1dbed0c24331ee45fd996846b45a2ba37d408d52bf28dab098b72781891e9356578efd9c1
7
- data.tar.gz: af694c42227c3871e7ea187cd7674e09ef842cdcbaaaa39303a0261e647e36b76822d9641de56a8ced052bfa8213d0542220fba0b8b3a5c140893a080b320d02
6
+ metadata.gz: ddeb4273ae651f05ed155ed0f511989b08757a2b284f226750a7fd4c63669e790ced91bb817fe5f8e621092d9d3d69dc8c98181cb4499eb50128d490de9b6614
7
+ data.tar.gz: c6d4b300588d604c70cc2878c728086ec2fcd0d3bd746bab91fe6ab0c7531ce5f831ca56ea4b8be7be1aaf57b2e3ad650fab1744c56f8ceec96b6b57ce7a9dd1
data/CHANGELOG CHANGED
@@ -1,3 +1,5 @@
1
+ v 0.6.2
2
+ - ensure that the default paginate instructions are saved into the ActiveSet#instructions attr
1
3
  v 0.6.1
2
4
  - fix bug with ActiveSet#method_missing blowing up when the delegated method properly returned a false Boolean
3
5
  v 0.6.0
data/lib/active_set.rb CHANGED
@@ -2,6 +2,7 @@
2
2
 
3
3
  require 'active_set/version'
4
4
 
5
+ require 'active_support/core_ext/hash/reverse_merge'
5
6
  require 'active_set/processor_filter'
6
7
  require 'active_set/processor_sort'
7
8
  require 'active_set/processor_paginate'
@@ -49,7 +50,9 @@ class ActiveSet
49
50
 
50
51
  def paginate(instructions)
51
52
  paginater = Processor::Paginate.new(@view, instructions)
52
- reinitialize(paginater.process, :paginate, instructions)
53
+ full_instructions = instructions.reverse_merge(page: paginater.instructions.get(:page),
54
+ size: paginater.instructions.get(:size))
55
+ reinitialize(paginater.process, :paginate, full_instructions)
53
56
  end
54
57
 
55
58
  def transform(instructions)
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  class ActiveSet
4
- VERSION = '0.6.1'
4
+ VERSION = '0.6.2'
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: activeset
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.1
4
+ version: 0.6.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Stephen Margheim
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2018-08-17 00:00:00.000000000 Z
11
+ date: 2018-08-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport