X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dc2a2c8ebd1a11e4a64555fda22c6859a51defff..f227804093a5a82eaf724f9b028b25aa7cbf41a1:/lib/classic_pagination/pagination.rb?ds=sidebyside

diff --git a/lib/classic_pagination/pagination.rb b/lib/classic_pagination/pagination.rb
index 990a53d8b..bd495cef1 100644
--- a/lib/classic_pagination/pagination.rb
+++ b/lib/classic_pagination/pagination.rb
@@ -61,7 +61,7 @@ module ActionController
       DEFAULT_OPTIONS[:group] = nil
     else
       # A hash holding options for controllers using macro-style pagination
-      OPTIONS = {}
+      OPTIONS = {}.freeze
 
       # The default options for pagination
       DEFAULT_OPTIONS = {
@@ -78,7 +78,7 @@ module ActionController
         :select     => nil,
         :group      => nil,
         :parameter  => "page"
-      }
+      }.freeze
     end
 
     def self.included(base) #:nodoc:
@@ -93,12 +93,13 @@ module ActionController
       valid_options << :actions unless in_action
 
       unknown_option_keys = options.keys - valid_options
-      fail 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[:class_name] ||= ActiveSupport::Inflector.camelize(options[:singular_name])
     end
 
     # Returns a paginator and a collection of Active Record model instances
@@ -135,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).
       #
@@ -146,7 +147,7 @@ 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
@@ -155,8 +156,7 @@ module ActionController
 
     def create_paginators_and_retrieve_collections #:nodoc:
       Pagination::OPTIONS[self.class].each do |collection_id, options|
-        next unless options[:actions].include? action_name if
-          options[:actions]
+        next if options[:actions] && !options[:actions].include?(action_name)
 
         paginator, collection =
           paginator_and_collection_for(collection_id, options)
@@ -226,7 +226,7 @@ module ActionController
       # than or equal to zero). The page CGI parameter for links defaults to
       # "page" and can be overridden with +page_parameter+.
       def initialize(controller, item_count, items_per_page, current_page = 1)
-        fail ArgumentError, "must have at least one item per page" if
+        raise ArgumentError, "must have at least one item per page" if
           items_per_page <= 0
 
         @controller = controller
@@ -243,7 +243,7 @@ module ActionController
       # not belong to this Paginator, an ArgumentError is raised.
       def current_page=(page)
         if page.is_a? Page
-          fail ArgumentError, "Page/Paginator mismatch" unless
+          raise ArgumentError, "Page/Paginator mismatch" unless
             page.paginator == self
         end
         page = page.to_i
@@ -254,19 +254,19 @@ module ActionController
       def current_page
         @current_page ||= self[@current_page_number]
       end
-      alias_method :current, :current_page
+      alias current current_page
 
       # Returns a new Page representing the first page in this paginator.
       def first_page
         @first_page ||= self[1]
       end
-      alias_method :first, :first_page
+      alias first first_page
 
       # Returns a new Page representing the last page in this paginator.
       def last_page
         @last_page ||= self[page_count]
       end
-      alias_method :last, :last_page
+      alias last last_page
 
       # Returns the number of pages in this paginator.
       def page_count
@@ -274,11 +274,11 @@ module ActionController
                           1
                         else
                           q, r = @item_count.divmod(@items_per_page)
-                          r == 0 ? q : q + 1
+                          r.zero? ? q : q + 1
                         end
       end
 
-      alias_method :length, :page_count
+      alias length page_count
 
       # Returns true if this paginator contains the page of index +number+.
       def has_page_number?(number)
@@ -311,7 +311,7 @@ module ActionController
           @number = 1 unless @paginator.has_page_number? @number
         end
         attr_reader :paginator, :number
-        alias_method :to_i, :number
+        alias to_i number
 
         # Compares two Page objects and returns true when they represent the
         # same page (i.e., their paginators are the same and they have the
@@ -327,7 +327,7 @@ module ActionController
         # left-hand page comes after the right-hand page. Raises ArgumentError
         # if the pages do not belong to the same Paginator object.
         def <=>(other)
-          fail ArgumentError unless @paginator == other.paginator
+          raise ArgumentError unless @paginator == other.paginator
           @number <=> other.number
         end
 
@@ -359,13 +359,13 @@ module ActionController
         # Returns a new Page object representing the page just before this
         # page, or nil if this is the first page.
         def previous
-          if first? then nil else @paginator[@number - 1] end
+          first? ? nil : @paginator[@number - 1]
         end
 
         # Returns a new Page object representing the page just after this
         # page, or nil if this is the last page.
         def next
-          if last? then nil else @paginator[@number + 1] end
+          last? ? nil : @paginator[@number + 1]
         end
 
         # Returns a new Window object for this page with the specified
@@ -417,7 +417,7 @@ module ActionController
         def pages
           (@first.number..@last.number).to_a.collect! { |n| @paginator[n] }
         end
-        alias_method :to_a, :pages
+        alias to_a pages
       end
     end
   end