Update Potlatch 2 to 2.4-32-gecf1e0b build

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

diff --git a/lib/classic_pagination/pagination.rb b/lib/classic_pagination/pagination.rb
index 00db5d33762dc797a3eac782a16667d14d44bed2..f12ff095f7ebd3ee0f657879ba9349d133faf22f 100644 (file)
--- a/lib/classic_pagination/pagination.rb
+++ b/lib/classic_pagination/pagination.rb
@@ -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

-      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[:singular_name] ||= ActiveSupport::Inflector.singularize(collection_id.to_s)
       options[:class_name] ||= ActiveSupport::Inflector.camelize(options[:singular_name])


@@ -225,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)
       # 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
           items_per_page <= 0
 
         @controller = controller


@@ -242,7 +243,7 @@ module ActionController
       # not belong to this Paginator, an ArgumentError is raised.
       def current_page=(page)
         if page.is_a? Page
       # 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
             page.paginator == self
         end
         page = page.to_i


@@ -273,7 +274,7 @@ module ActionController
                           1
                         else
                           q, r = @item_count.divmod(@items_per_page)
                           1
                         else
                           q, r = @item_count.divmod(@items_per_page)

-                          r == 0 ? q : q + 1
+                          r.zero? ? q : q + 1

                         end
       end
 
                         end
       end
 


@@ -326,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)
         # 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
 
           @number <=> other.number
         end