Skip to content

Commit 34879e8

Browse files
author
Mason McLead
committed
moving to Grape 0.10 with refactored settings - BREAKING CHANGE
1 parent 2a546ed commit 34879e8

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
.bundle
44
.config
55
.yardoc
6+
.ruby-version
67
Gemfile.lock
78
InstalledFiles
89
_yardoc

api-pagination.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
1717
s.require_paths = ['lib']
1818

1919
s.add_development_dependency 'rspec', '~> 3.0'
20-
s.add_development_dependency 'grape'
20+
s.add_development_dependency 'grape', '>= 0.10.0'
2121
s.add_development_dependency 'railties', '>= 3.0.0'
2222
s.add_development_dependency 'actionpack', '>= 3.0.0'
2323
s.add_development_dependency 'sequel', '>= 4.9.0'

lib/grape/pagination.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ def self.included(base)
55
def paginate(collection)
66
options = {
77
:page => params[:page],
8-
:per_page => (params[:per_page] || settings[:per_page])
8+
:per_page => (params[:per_page] || route_setting(:per_page))
99
}
1010
collection = ApiPagination.paginate(collection, options)
1111

@@ -28,7 +28,7 @@ def paginate(collection)
2828

2929
base.class_eval do
3030
def self.paginate(options = {})
31-
set :per_page, (options[:per_page] || 25)
31+
route_setting :per_page, (options[:per_page] || 25)
3232
params do
3333
optional :page, :type => Integer, :default => 1,
3434
:desc => 'Page of results to fetch.'

0 commit comments

Comments
 (0)