kotovalexarian-likes-github
/
kaminari--kaminari
mirror of https://github.com/kaminari/kaminari.git
1
0
Fork 0
Code Releases Activity

Reduce Ruby ⚠️s

This commit is contained in:
Akira Matsuda 2013-04-23 22:20:21 +09:00
parent 853ab980a0
commit d23564457c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/kaminari/models/configuration_methods.rb
View File

@ -13,7 +13,7 @@ module Kaminari
# This model's default +per_page+ value
# returns +default_per_page+ value unless explicitly overridden via <tt>paginates_per</tt>
def default_per_page
@_default_per_page || Kaminari.config.default_per_page
(defined?(@_default_per_page) && @_default_per_page) || Kaminari.config.default_per_page
end
# Overrides the max +per_page+ value per model
@ -27,7 +27,7 @@ module Kaminari
# This model's max +per_page+ value
# returns +max_per_page+ value unless explicitly overridden via <tt>max_paginates_per</tt>
def max_per_page
@_max_per_page || Kaminari.config.max_per_page
(defined?(@_max_per_page) && @_max_per_page) || Kaminari.config.max_per_page
end
# Overrides the max_pages value per model
@ -41,7 +41,7 @@ module Kaminari
# This model's max_pages value
# returns max_pages value unless explicitly overridden via <tt>max_pages_per</tt>
def max_pages
@_max_pages || Kaminari.config.max_pages
(defined?(@_max_pages) && @_max_pages) || Kaminari.config.max_pages
end
end
end

4
lib/kaminari/models/page_scope_methods.rb
View File

@ -24,7 +24,7 @@ module Kaminari
return 1 if limit_value.nil?
count_without_padding = total_count
count_without_padding -= @_padding if @_padding
count_without_padding -= @_padding if defined?(@_padding) && @_padding
count_without_padding = 0 if count_without_padding < 0
total_pages_count = (count_without_padding.to_f / limit_value).ceil
@ -42,7 +42,7 @@ module Kaminari
return 1 if limit_value.nil?
offset_without_padding = offset_value
offset_without_padding -= @_padding if @_padding
offset_without_padding -= @_padding if defined?(@_padding) && @_padding
offset_without_padding = 0 if offset_without_padding < 0
(offset_without_padding / limit_value) + 1