data_table 0.2.4 → 0.2.5

data/lib/data_table/mongoid.rb

@@ -4,6 +4,7 @@ module DataTable
       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
 

data/lib/data_table/version.rb

@@ -1,3 +1,3 @@
 module DataTable
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/spec/mongoid_data_table_spec.rb

@@ -11,9 +11,9 @@ describe DataTable do
       mock(self)._where_conditions("answer", %w(foo bar)) { "where clause" }
       mock(self)._order_by_fields(params, %w(foo bar baz)) { "order by" }
 
-      mock(self).where("where clause") { mock!.order_by("order by") { mock!.paginate({:page => :page, :per_page => :per_page}) { :answer } } }
       mock(self)._page(params) { :page }
-      mock(self)._per_page(params) { :per_page }
+      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

metadata

@@ -2,7 +2,7 @@
 name: data_table
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Jason Dew