lib/paginate/helper.rb in paginate-2.0.0 vs lib/paginate/helper.rb in paginate-3.0.0

@@ -10,28 +10,41 @@
     #
     # * <tt>:url</tt>: the URL which page numbers will be appended to. Can be proc or string.
     # * <tt>:id</tt>: the HTML id that will identify the pagination block.
     # * <tt>:size</tt>: the page size. When not specified will default to <tt>Paginate::Config.size</tt>.
     # * <tt>:param_name</tt>: the page param name. When not specified will default to <tt>Paginate::Config.param_name</tt>.
+    # * <tt>:renderer</tt>: A class that will be used to render the pagination. When not specified will default to <tt>Paginate::Renderer::List</tt>.
     #
     #   <%= paginate @posts, proc {|page| posts_path(page) }
     #   <%= paginate @posts, :url => proc {|page| posts_path(page) }
     #
     # You don't have to specify the URL; the current requested URI will be used if you don't provide it.
     #
     def paginate(collection, *args)
       options = args.extract_options!
-      param_name = [options[:param_name], Paginate::Config.param_name, :page].compact.first
+
+      param_name = [
+        options[:param_name],
+        Paginate::Config.param_name,
+        :page
+      ].compact.first
+
+      renderer = [
+        options[:renderer],
+        Paginate::Config.renderer,
+        Paginate::Renderer::List
+      ].compact.first
+
       options.merge!({
-        :collection => collection,
-        :page => params[param_name],
-        :param_name => param_name,
-        :fullpath => request.respond_to?(:fullpath) ? request.fullpath : request.request_uri
+        collection: collection,
+        page: params[param_name],
+        param_name: param_name,
+        fullpath: request.fullpath
       })
-      options.merge!(:url => args.first) if args.any?
 
-      Paginate::Renderer.new(options).render
+      options.merge!(url: args.first) if args.any?
+      renderer.new(self, options).render
     end
 
     # Override the original render method, so we can strip the additional
     # item from the collection, without changing your workflow with the
     # iterate "always felt dirty" method.
@@ -47,51 +60,12 @@
       options    = args.extract_options!
       paginated  = options.delete(:paginate)
       size       = options.delete(:size) { Paginate::Config.size }
 
       return super(*[*args, options], &block) unless paginated
-
       collection = options.delete(:collection) { args.shift }
       collection = collection[0, size]
 
       super(collection, *[*args, options], &block)
-    end
-
-    # In order to iterate the correct items you have to skip the last collection's item.
-    # We added this helper to automatically skip the last item only if there's a next page.
-    #
-    #   <% iterate @items do |item| %>
-    #   <% end %>
-    #
-    # If you want to grab the iteration index as well just expect it as a block parameter.
-    #
-    #   <% iterate @items do |item, i|
-    #   <% end %>
-    #
-    # If you set a custom size while fetching items from database, you need to inform it while iterating.
-    #
-    #   @items = Item.paginate(:page => 1, :size => 5)
-    #
-    # Then in your view:
-    #
-    #   <% iterate @items, :size => 5 do |item| %>
-    #   <% end %>
-    #
-    # You can receive the iteration counter by expecting two arguments.
-    #
-    #   <% iterate @items do |item, i| do %>
-    #   <% end %>
-    #
-    def iterate(collection, options = {}, &block)
-      options.reverse_merge!(:size => Paginate::Config.size)
-      yield_index = block.arity == 2
-
-      collection[0, options[:size]].each_with_index do |item, i|
-        if yield_index
-          yield item, i
-        else
-          yield item
-        end
-      end
     end
   end
 end