Formatting...

mongomapper · Apr 23, 2011 · 42016ac · 42016ac
1 parent 3696d54
commit 42016ac
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/lib/plucky/query.rb b/lib/plucky/query.rb
@@ -40,14 +40,11 @@ def per_page(limit=nil)
     end
 
     def paginate(opts={})
-      page          = opts.delete(:page)
+      page      = opts.delete(:page)
-      limit         = opts.delete(:per_page) || per_page
+      limit     = opts.delete(:per_page) || per_page
-      query         = clone.amend(opts)
+      query     = clone.amend(opts)
-      total         = query.count
+      paginator = Pagination::Paginator.new(query.count, page, limit)
-      paginator     = Pagination::Paginator.new(total, page, limit)
+      query.amend(:limit => paginator.limit, :skip => paginator.skip).all.tap do |docs|
-      query[:limit] = paginator.limit
-      query[:skip]  = paginator.skip
-      query.all.tap do |docs|
         docs.extend(Pagination::Decorator)
         docs.paginator(paginator)
       end