Merge pull request #24 from mmclead/master

support for Grape 0.10 with refactored settings

Author: davidcelis

.gitignore

@@ -3,6 +3,7 @@
 .bundle
 .config
 .yardoc
+.ruby-version
 Gemfile.lock
 InstalledFiles
 _yardoc

api-pagination.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_development_dependency 'rspec', '~> 3.0'
-  s.add_development_dependency 'grape'
+  s.add_development_dependency 'grape', '>= 0.10.0'
   s.add_development_dependency 'railties', '>= 3.0.0'
   s.add_development_dependency 'actionpack', '>= 3.0.0'
   s.add_development_dependency 'sequel', '>= 4.9.0'

lib/grape/pagination.rb

@@ -5,7 +5,7 @@ def self.included(base)
         def paginate(collection)
           options = {
             :page     => params[:page],
-            :per_page => (params[:per_page] || settings[:per_page])
+            :per_page => (params[:per_page] || route_setting(:per_page))
           }
           collection = ApiPagination.paginate(collection, options)
 
@@ -28,7 +28,7 @@ def paginate(collection)
 
       base.class_eval do
         def self.paginate(options = {})
-          set :per_page, (options[:per_page] || 25)
+          route_setting :per_page, (options[:per_page] || 25)
           params do
             optional :page,     :type => Integer, :default => 1,
                                 :desc => 'Page of results to fetch.'