Update to iD v1.7.3

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

diff --git a/lib/classic_pagination/pagination.rb b/lib/classic_pagination/pagination.rb
index 3fa1109f06b3f583c4490ddc00db838fe0199645..b48844000135381a83960bddc68dc0d0cd905763 100644 (file)
--- a/lib/classic_pagination/pagination.rb
+++ b/lib/classic_pagination/pagination.rb
@@ -77,7 +77,7 @@ module ActionController
         :include    => nil,
         :select     => nil,
         :group      => nil,
-        :parameter  => 'page'
+        :parameter  => "page"
       }
     end
 
@@ -98,7 +98,7 @@ module ActionController
               unknown_option_keys.empty?
 
       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
@@ -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
+        fail 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
+          fail ArgumentError, "Page/Paginator mismatch" unless
             page.paginator == self
         end
         page = page.to_i
@@ -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