Merge branch 'master' into messages

[rails.git] / lib / classic_pagination / pagination.rb

diff --git a/lib/classic_pagination/pagination.rb b/lib/classic_pagination/pagination.rb
index f12ff095f7ebd3ee0f657879ba9349d133faf22f..811d09239d0fe5a325e3aca04204d86470434af5 100644 (file)
--- a/lib/classic_pagination/pagination.rb
+++ b/lib/classic_pagination/pagination.rb
@@ -136,7 +136,7 @@ module ActionController
 
     # These methods become class methods on any controller
     module ClassMethods
-      # Creates a +before_filter+ which automatically paginates an Active
+      # Creates a +before_action+ which automatically paginates an Active
       # Record model for all actions in a controller (or certain actions if
       # specified with the <tt>:actions</tt> option).
       #
@@ -147,13 +147,15 @@ module ActionController
       def paginate(collection_id, options = {})
         Pagination.validate_options!(collection_id, options, false)
         module_eval do
-          before_filter :create_paginators_and_retrieve_collections
+          before_action :create_paginators_and_retrieve_collections
           OPTIONS[self] ||= {}
           OPTIONS[self][collection_id] = options
         end
       end
     end
 
+    protected
+
     def create_paginators_and_retrieve_collections #:nodoc:
       Pagination::OPTIONS[self.class].each do |collection_id, options|
         next if options[:actions] && !options[:actions].include?(action_name)
@@ -200,9 +202,7 @@ module ActionController
       collection.offset(paginator.current.offset).limit(options[:per_page])
     end
 
-    protected :create_paginators_and_retrieve_collections,
-              :count_collection_for_pagination,
-              :find_collection_for_pagination
+    private
 
     def paginator_and_collection_for(_collection_id, options) #:nodoc:
       klass = options[:class_name].constantize
@@ -214,8 +214,6 @@ module ActionController
       [paginator, collection]
     end
 
-    private :paginator_and_collection_for
-
     # A class representing a paginator for an Active Record collection.
     class Paginator
       include Enumerable
@@ -318,6 +316,7 @@ module ActionController
         # same page number).
         def ==(other)
           return false if other.nil?
+
           @paginator == other.paginator &&
             @number == other.number
         end
@@ -328,6 +327,7 @@ module ActionController
         # if the pages do not belong to the same Paginator object.
         def <=>(other)
           raise ArgumentError unless @paginator == other.paginator
+
           @number <=> other.number
         end
 
@@ -398,7 +398,7 @@ module ActionController
         # Sets the window's padding (the number of pages on either side of the
         # window page).
         def padding=(padding)
-          @padding = padding < 0 ? 0 : padding
+          @padding = padding.negative? ? 0 : padding
           # Find the beginning and end pages of the window
           @first = if @paginator.has_page_number?(@page.number - @padding)
                      @paginator[@page.number - @padding]