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

Fix a bug that PaginatableArray#total_pages returns the wrong value

Browse source 
closes #416
This commit is contained in:
Yuki Nishijima 2013-07-02 22:20:53 +09:00
parent 9be421d916
commit ed4e6f042b
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/kaminari/models/array_extension.rb
View file

@ -11,7 +11,7 @@ module Kaminari
# * <tt>:offset</tt> - offset # * <tt>:offset</tt> - offset
# * <tt>:total_count</tt> - total_count # * <tt>:total_count</tt> - total_count
def initialize(original_array = [], options = {}) def initialize(original_array = [], options = {})
@_original_array, @_limit_value, @_offset_value, @_total_count = original_array, (options[:limit] || default_per_page).to_i, options[:offset].to_i, options[:total_count] @_original_array, @_limit_value, @_offset_value, @_total_count, @_padding = original_array, (options[:limit] || default_per_page).to_i, options[:offset].to_i, options[:total_count], options[:padding].to_i
if options[:limit] && options[:offset] if options[:limit] && options[:offset]
extend Kaminari::PageScopeMethods extend Kaminari::PageScopeMethods
@ -33,7 +33,7 @@ module Kaminari
# returns another chunk of the original array # returns another chunk of the original array
def limit(num) def limit(num)
self.class.new @_original_array, :limit => num, :offset => @_offset_value, :total_count => @_total_count self.class.new @_original_array, :limit => num, :offset => @_offset_value, :total_count => @_total_count, :padding => @_padding
end end
# total item numbers of the original array # total item numbers of the original array
@ -43,7 +43,7 @@ module Kaminari
# returns another chunk of the original array # returns another chunk of the original array
def offset(num) def offset(num)
self.class.new @_original_array, :limit => @_limit_value, :offset => num, :total_count => @_total_count self.class.new @_original_array, :limit => @_limit_value, :offset => num, :total_count => @_total_count, :padding => @_padding
end end
end end

5
spec/models/array_spec.rb
View file

@ -86,6 +86,11 @@ describe Kaminari::PaginatableArray do
subject { array.page(5).per('aho') } subject { array.page(5).per('aho') }
its(:total_pages) { should == 4 } its(:total_pages) { should == 4 }
end end
context 'per 25, padding 25' do
subject { array.page(1).padding(25) }
its(:total_pages) { should == 3 }
end
end end
describe '#current_page' do describe '#current_page' do