api-pagination 3.0.1 → 3.0.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.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/api-pagination/version.rb +1 -1
  3. data/lib/grape/pagination.rb +1 -1
  4. data/lib/rails/pagination.rb +1 -1
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c0a884f079d5228439b05823470d82b27a9fe253
4
- data.tar.gz: b76f421e8921cf19b6ba8418a20058044718e7a3
3
+ metadata.gz: 6af37b20cc366bdb21326a922f7d2fd145178307
4
+ data.tar.gz: adfcf9ea355a22dbeb2c739f69d23af8767000c1
5
5
  SHA512:
6
- metadata.gz: 0890791df230ec465bf397265ab570ef251c28cee3134f6fe05972676bfa0493cd10d6a0cde0b9fc4ce063d4cac2956be11b848275b3b5e110c0497f7b980be4
7
- data.tar.gz: f0b546d497bb139afaf1c09ce17ab7a4ed0423a4d962d0ea649cfdf6bbeb905554efc9679e932a6f9e6afd6e899f3693732a71a97994e8c0707eed4632f611ec
6
+ metadata.gz: 4e0e335c9901191fd8f85202ff25967e09574bc1fb6fdd574a051e0aeb8c0865f17893ec423fee635ab23a3a278025fe82adb5c50a327ff87b288b4ac9aafca5
7
+ data.tar.gz: f230b0babeb25fffcd26542ba373389a2e62188cd8a6fd3c963719e291f963b121f554e19d71f50de77b08459f735d6b8ed272cef15f589be72679b86f7687bf
data/lib/api-pagination/version.rb CHANGED
@@ -2,7 +2,7 @@ module ApiPagination
2
2
  class Version
3
3
  MAJOR = 3
4
4
  MINOR = 0
5
- PATCH = 1
5
+ PATCH = 2
6
6
 
7
7
  def self.to_s
8
8
  [MAJOR, MINOR, PATCH].join('.')
data/lib/grape/pagination.rb CHANGED
@@ -5,7 +5,7 @@ module Grape
5
5
  def paginate(collection)
6
6
  options = {
7
7
  :page => params[:page],
8
- :per_page => (settings[:per_page] || params[:per_page])
8
+ :per_page => (params[:per_page] || settings[:per_page])
9
9
  }
10
10
  collection = ApiPagination.paginate(collection, options)
11
11
 
data/lib/rails/pagination.rb CHANGED
@@ -18,7 +18,7 @@ module Rails
18
18
 
19
19
  private
20
20
 
21
- def _paginate_collection(collection, options)
21
+ def _paginate_collection(collection, options={})
22
22
  options = {
23
23
  :page => params[:page],
24
24
  :per_page => (options.delete(:per_page) || params[:per_page])
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: api-pagination
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.1
4
+ version: 3.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - David Celis
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-05-01 00:00:00.000000000 Z
11
+ date: 2014-05-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rspec