Add paginate_with a la respond_with

Signed-off-by: David Celis <[email protected]>

Author: davidcelis

lib/rails/pagination.rb

@@ -2,30 +2,39 @@ module Rails
   module Pagination
     protected
 
-      def paginate(options)
-        collection = options[:json] || options[:xml]
+    def paginate(options)
+      collection = options[:json] || options[:xml]
 
-        block = Proc.new do |collection|
-          links = (headers['Link'] || "").split(',').map(&:strip)
-          url   = request.original_url.sub(/\?.*$/, '')
-          pages = ApiPagination.pages_from(collection)
+      collection     = _paginate_collection(collection)
+      options[:json] = collection if options[:json]
+      options[:xml]  = collection if options[:xml]
 
-          pages.each do |k, v|
-            new_params = request.query_parameters.merge(:page => v)
-            links << %(<#{url}?#{new_params.to_param}>; rel="#{k}")
-          end
+      render options
+    end
 
-          headers['Link']  = links.join(', ') unless links.empty?
-          headers['Total'] = ApiPagination.total_from(collection)
-        end
+    def paginate_with(collection)
+      respond_with _paginate_collection(collection)
+    end
+
+    private
 
-        collection = ApiPagination.paginate(collection, params, &block)
+    def _paginate_collection(collection)
+      block = Proc.new do |collection|
+        links = (headers['Link'] || "").split(',').map(&:strip)
+        url   = request.original_url.sub(/\?.*$/, '')
+        pages = ApiPagination.pages_from(collection)
 
-        options[:json] = collection if options[:json]
-        options[:xml]  = collection if options[:xml]
+        pages.each do |k, v|
+          new_params = request.query_parameters.merge(:page => v)
+          links << %(<#{url}?#{new_params.to_param}>; rel="#{k}")
+        end
 
-        render options
+        headers['Link']  = links.join(', ') unless links.empty?
+        headers['Total'] = ApiPagination.total_from(collection)
       end
+
+      ApiPagination.paginate(collection, params, &block)
+    end
   end
 end
 

spec/support/numbers_controller.rb

@@ -45,8 +45,6 @@ def teardown(*methods)
 class NumbersController < ActionController::Base
   include Rails.application.routes.url_helpers
 
-  # after_filter :only => [:index] { paginate(:numbers) }
-
   def index
     page = params.fetch(:page, 1).to_i
     total = params.fetch(:count).to_i
@@ -57,8 +55,6 @@ def index
       headers['Link'] = %(<#{numbers_url}?#{query.to_param}>; rel="without")
     end
 
-    numbers = (1..total).to_a
-
-    paginate :json => numbers
+    paginate :json => (1..total).to_a
   end
 end