File tree Expand file tree Collapse file tree 3 files changed +4
-3
lines changed Expand file tree Collapse file tree 3 files changed +4
-3
lines changed Original file line number Diff line number Diff line change 3
3
.bundle
4
4
.config
5
5
.yardoc
6
+ .ruby-version
6
7
Gemfile.lock
7
8
InstalledFiles
8
9
_yardoc
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ Gem::Specification.new do |s|
17
17
s . require_paths = [ 'lib' ]
18
18
19
19
s . add_development_dependency 'rspec' , '~> 3.0'
20
- s . add_development_dependency 'grape'
20
+ s . add_development_dependency 'grape' , '>= 0.10.1'
21
21
s . add_development_dependency 'railties' , '>= 3.0.0'
22
22
s . add_development_dependency 'actionpack' , '>= 3.0.0'
23
23
s . add_development_dependency 'sequel' , '>= 4.9.0'
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ def self.included(base)
5
5
def paginate ( collection )
6
6
options = {
7
7
:page => params [ :page ] ,
8
- :per_page => ( params [ :per_page ] || settings [ :per_page ] )
8
+ :per_page => ( params [ :per_page ] || route_setting ( :per_page ) )
9
9
}
10
10
collection = ApiPagination . paginate ( collection , options )
11
11
@@ -28,7 +28,7 @@ def paginate(collection)
28
28
29
29
base . class_eval do
30
30
def self . paginate ( options = { } )
31
- set :per_page , ( options [ :per_page ] || 25 )
31
+ route_setting :per_page , ( options [ :per_page ] || 25 )
32
32
params do
33
33
optional :page , :type => Integer , :default => 1 ,
34
34
:desc => 'Page of results to fetch.'
You can’t perform that action at this time.
0 commit comments