X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b70da7b8ea15ab48bb2f34155567cea6dffc8fc9..c23d8bfa6ac9c344b0875449109ab52caa84aa12:/lib/classic_pagination/pagination.rb?ds=inline diff --git a/lib/classic_pagination/pagination.rb b/lib/classic_pagination/pagination.rb index c59c1a901..c7022e0b0 100644 --- a/lib/classic_pagination/pagination.rb +++ b/lib/classic_pagination/pagination.rb @@ -81,12 +81,12 @@ module ActionController }.freeze end - def self.included(base) #:nodoc: + def self.included(base) # :nodoc: super base.extend(ClassMethods) end - def self.validate_options!(collection_id, options, in_action) #:nodoc: + def self.validate_options!(collection_id, options, in_action) # :nodoc: options.merge!(DEFAULT_OPTIONS) { |_key, old, _new| old } valid_options = DEFAULT_OPTIONS.keys @@ -156,7 +156,7 @@ module ActionController protected - def create_paginators_and_retrieve_collections #:nodoc: + def create_paginators_and_retrieve_collections # :nodoc: Pagination::OPTIONS[self.class].each do |collection_id, options| next if options[:actions]&.exclude?(action_name) @@ -204,7 +204,7 @@ module ActionController private - def paginator_and_collection_for(_collection_id, options) #:nodoc: + def paginator_and_collection_for(_collection_id, options) # :nodoc: klass = options[:class_name].constantize page = params[options[:parameter]] count = count_collection_for_pagination(klass, options) @@ -243,7 +243,7 @@ module ActionController raise ArgumentError, "Page/Paginator mismatch" if page.is_a?(Page) && page.paginator != self page = page.to_i - @current_page_number = has_page_number?(page) ? page : 1 + @current_page_number = contains_page?(page) ? page : 1 end # Returns a Page object representing this paginator's current page. @@ -277,7 +277,7 @@ module ActionController alias length page_count # Returns true if this paginator contains the page of index +number+. - def has_page_number?(number) + def contains_page?(number) number >= 1 && number <= page_count end @@ -304,7 +304,7 @@ module ActionController def initialize(paginator, number) @paginator = paginator @number = number.to_i - @number = 1 unless @paginator.has_page_number? @number + @number = 1 unless @paginator.contains_page? @number end attr_reader :paginator, :number @@ -378,7 +378,7 @@ module ActionController [@paginator.items_per_page, offset] end - def to_param #:nodoc: + def to_param # :nodoc: @number.to_s end end @@ -399,12 +399,12 @@ module ActionController def padding=(padding) @padding = padding.negative? ? 0 : padding # Find the beginning and end pages of the window - @first = if @paginator.has_page_number?(@page.number - @padding) + @first = if @paginator.contains_page?(@page.number - @padding) @paginator[@page.number - @padding] else @paginator.first end - @last = if @paginator.has_page_number?(@page.number + @padding) + @last = if @paginator.contains_page?(@page.number + @padding) @paginator[@page.number + @padding] else @paginator.last