Merge remote-tracking branch 'upstream/pull/2189'

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

diff --git a/lib/classic_pagination/pagination.rb b/lib/classic_pagination/pagination.rb
index 36653ee02435af468ffa47f4b661f5e7328ef6d2..dbeaf5a408e66dfd757b6d63fb5ea639a49c44bc 100644 (file)
--- a/lib/classic_pagination/pagination.rb
+++ b/lib/classic_pagination/pagination.rb
@@ -67,17 +67,17 @@ module ActionController
       DEFAULT_OPTIONS = {
         :class_name => nil,
         :singular_name => nil,
       DEFAULT_OPTIONS = {
         :class_name => nil,
         :singular_name => nil,

-        :per_page   => 10,
+        :per_page => 10,

         :conditions => nil,
         :conditions => nil,

-        :order_by   => nil,
-        :order      => nil,
-        :join       => nil,
-        :joins      => nil,
-        :count      => nil,
-        :include    => nil,
-        :select     => nil,
-        :group      => nil,
-        :parameter  => "page"
+        :order_by => nil,
+        :order => nil,
+        :join => nil,
+        :joins => nil,
+        :count => nil,
+        :include => nil,
+        :select => nil,
+        :group => nil,
+        :parameter => "page"

       }.freeze
     end
 
       }.freeze
     end
 


@@ -93,9 +93,10 @@ module ActionController
       valid_options << :actions unless in_action
 
       unknown_option_keys = options.keys - valid_options
       valid_options << :actions unless in_action
 
       unknown_option_keys = options.keys - valid_options

-      raise ActionController::ActionControllerError,
-            "Unknown options: #{unknown_option_keys.join(', ')}" unless
-              unknown_option_keys.empty?
+      unless unknown_option_keys.empty?
+        raise ActionController::ActionControllerError,
+              "Unknown options: #{unknown_option_keys.join(', ')}"
+      end

 
       options[:singular_name] ||= ActiveSupport::Inflector.singularize(collection_id.to_s)
       options[:class_name] ||= ActiveSupport::Inflector.camelize(options[:singular_name])
 
       options[:singular_name] ||= ActiveSupport::Inflector.singularize(collection_id.to_s)
       options[:class_name] ||= ActiveSupport::Inflector.camelize(options[:singular_name])


@@ -135,7 +136,7 @@ module ActionController
 
     # These methods become class methods on any controller
     module ClassMethods
 
     # 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).
       #
       # Record model for all actions in a controller (or certain actions if
       # specified with the <tt>:actions</tt> option).
       #


@@ -146,13 +147,15 @@ module ActionController
       def paginate(collection_id, options = {})
         Pagination.validate_options!(collection_id, options, false)
         module_eval do
       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
 
           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)
     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)


@@ -199,9 +202,7 @@ module ActionController
       collection.offset(paginator.current.offset).limit(options[:per_page])
     end
 
       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
 
     def paginator_and_collection_for(_collection_id, options) #:nodoc:
       klass = options[:class_name].constantize


@@ -213,8 +214,6 @@ module ActionController
       [paginator, collection]
     end
 
       [paginator, collection]
     end
 

-    private :paginator_and_collection_for
-

     # A class representing a paginator for an Active Record collection.
     class Paginator
       include Enumerable
     # A class representing a paginator for an Active Record collection.
     class Paginator
       include Enumerable


@@ -317,6 +316,7 @@ module ActionController
         # same page number).
         def ==(other)
           return false if other.nil?
         # same page number).
         def ==(other)
           return false if other.nil?

+

           @paginator == other.paginator &&
             @number == other.number
         end
           @paginator == other.paginator &&
             @number == other.number
         end


@@ -327,6 +327,7 @@ module ActionController
         # if the pages do not belong to the same Paginator object.
         def <=>(other)
           raise ArgumentError unless @paginator == other.paginator
         # if the pages do not belong to the same Paginator object.
         def <=>(other)
           raise ArgumentError unless @paginator == other.paginator

+

           @number <=> other.number
         end
 
           @number <=> other.number
         end
 


@@ -397,7 +398,7 @@ module ActionController
         # Sets the window's padding (the number of pages on either side of the
         # window page).
         def padding=(padding)
         # 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]
           # Find the beginning and end pages of the window
           @first = if @paginator.has_page_number?(@page.number - @padding)
                      @paginator[@page.number - @padding]