Revert "reverting limit optimization"

This reverts commit c5936e5.
nickgal · Sep 5, 2011 · 0d8805c · 0d8805c
1 parent bc93905
commit 0d8805c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/data_table/mongoid.rb b/lib/data_table/mongoid.rb
@@ -4,6 +4,7 @@ module ClassMethods
       def _find_objects params, fields, search_fields
         self.where(_where_conditions params[:sSearch], search_fields).
              order_by(_order_by_fields params, fields).
+             limit(_per_page params).
              paginate :page => _page(params), :per_page => _per_page(params)
       end
 

diff --git a/spec/mongoid_data_table_spec.rb b/spec/mongoid_data_table_spec.rb
@@ -12,8 +12,8 @@
       mock(self)._order_by_fields(params, %w(foo bar baz)) { "order by" }
 
       mock(self)._page(params) { :page }
-      mock(self)._per_page(params) { :per_page }
-      mock(self).where("where clause") { mock!.order_by("order by") { mock!.paginate({:page => :page, :per_page => :per_page}) { :answer } } }
+      mock(self)._per_page(params) { :per_page }.twice
+      mock(self).where("where clause") { mock!.order_by("order by") { mock!.limit(:per_page) { mock!.paginate({:page => :page, :per_page => :per_page}) { :answer } } } }
 
       _find_objects(params, %w(foo bar baz), %w(foo bar)).should == :answer
     end