hal_api-rails 0.3.1 → 0.3.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: 7b318397223e77cc82d2ab9164f9f9ec2dd9b127
4
- data.tar.gz: 1a89f74d2c6685d025ddad7932957c591d7fda22
3
+ metadata.gz: d8029fa25346fb276a6bc2c06d866a7a6e89c8ad
4
+ data.tar.gz: 61d932fd883eda182f9a249676e82003589befd3
5
5
  SHA512:
6
- metadata.gz: bf12d6755045f0ba05b7620474d9d32e82aa0d85200a6ec42bede5e85bfeac03369b0f18c908ad1862f6dc29d061fba8821f87d7cc8ec233499f507ffe2ec09f
7
- data.tar.gz: 6908296c63f9eda39063e3cc014718e25cdb16bad6bf5e72060714ebcbd621d13323f06513f6a5f48861dc3e58f6d431b8facc438ef770dbe35c6d4eb5d7f462
6
+ metadata.gz: 0db583727abe49cd38cdd1903ea16fccc8594cbc23064eaab2e3cb57ec76ef4b316ffd8ce22aa39757e23955adee778b1c551a4d4c5f8266c02d50e630805ec1
7
+ data.tar.gz: d9d0e09088b887833bd1aa39a2d809fa332f66f0d3bed8a178e1af8917f538fba6a9495ac644c9cfd0058c6ed5d1a4ead55c7abf696e6ee46bce81e66240acea
@@ -1,5 +1,5 @@
1
1
  module HalApi
2
2
  module Rails
3
- VERSION = "0.3.1"
3
+ VERSION = "0.3.2"
4
4
  end
5
5
  end
@@ -75,8 +75,14 @@ module HalApi::Representer::Embeds
75
75
  }
76
76
  getter_per = options.delete(:per) || Kaminari.config.default_per_page
77
77
  options[:getter] ||= ->(*) do
78
- per = getter_per == :all ? send(name).count : getter_per
79
- HalApi::PagedCollection.new(send(name).page(1).per(per), nil, opts.merge(parent: self))
78
+ cnt = send(name).count
79
+ per = getter_per == :all ? cnt : getter_per
80
+ if cnt <= per
81
+ items = Kaminari.paginate_array(send(name)).page(1).per(per)
82
+ else
83
+ items = send(name).page(1).per(per)
84
+ end
85
+ HalApi::PagedCollection.new(items, nil, opts.merge(parent: self))
80
86
  end
81
87
  options[:decorator] = HalApi::PagedCollection.representer
82
88
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: hal_api-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.1
4
+ version: 0.3.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Chris Rhoden
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: exe
11
11
  cert_chain: []
12
- date: 2017-10-27 00:00:00.000000000 Z
12
+ date: 2017-10-30 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: activemodel