kotovalexarian-likes-github/kaminari--kaminari
1
0
Fork 0
mirror of https://github.com/kaminari/kaminari.git synced 2022-11-09 13:44:37 -05:00
Code Releases Activity

Add ability to inspect current value of per_page

Browse source
This commit is contained in:
Brad Lindsay 2017-03-14 12:42:37 -04:00
parent 1c9ec3603d
commit 609478e17d
2 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
kaminari-core/lib/kaminari/models/page_scope_methods.rb
View file

@ -19,7 +19,7 @@ module Kaminari
def max_paginates_per(new_max_per_page)
@_max_per_page = new_max_per_page
per ((defined?(@_per) && @_per) || default_per_page), max_per_page: new_max_per_page
per current_per_page, max_per_page: new_max_per_page
end
def padding(num)
@ -52,6 +52,11 @@ module Kaminari
raise ZeroPerPageOperation, "Current page was incalculable. Perhaps you called .per(0)?"
end
# Current per-page number
def current_per_page
(defined?(@_per) && @_per) || default_per_page
end
# Next page number in the collection
def next_page
current_page + 1 unless last_page? || out_of_range?

14
kaminari-core/test/models/active_record/scopes_test.rb
View file

@ -293,6 +293,20 @@ if defined? ActiveRecord
end
end
sub_test_case '#current_per_page' do
test 'per 0' do
assert_equal 0, model_class.page.per(0).current_per_page
end
test 'no per specified' do
assert_equal model_class.default_per_page, model_class.page.current_per_page
end
test 'per specified as 42' do
assert_equal 42, model_class.page.per(42).current_per_page
end
end
sub_test_case '#next_page' do
test 'page 1' do
assert_equal 2, model_class.page.next_page