data_table 0.1.6 → 0.1.7

data/Gemfile

@@ -1,5 +1,3 @@
 source "http://rubygems.org"
 
-gem "will_paginate"
-
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    data_table (0.1.2)
+    data_table (0.1.6)
       rails (~> 3.0.0)
       will_paginate (~> 3.0.pre2)
 

data/TODO

@@ -0,0 +1 @@
+- repackage as a Rails 3 responder

data/lib/data_table/active_record.rb

@@ -4,7 +4,7 @@ module DataTable
       def _find_objects params, fields, search_fields
         self.where(_where_conditions params[:sSearch], search_fields).
              order(_order_fields params, fields).
-             paginate :page => _page(params), :per_page => params[:iDisplayLength]
+             paginate :page => _page(params), :per_page => _per_page(params)
       end
 
       def _where_conditions query, search_fields

data/lib/data_table/base.rb

@@ -37,6 +37,14 @@ module DataTable
     def _page params
       params[:iDisplayStart].to_i / params[:iDisplayLength].to_i + 1
     end
+
+    def _per_page params
+      case (display_length = params[:iDisplayLength].to_i)
+        when -1 then self.count
+        when  0 then 25
+        else         display_length
+      end
+    end
   end
 
 end

data/lib/data_table/mongoid.rb

@@ -4,7 +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).
-             paginate :page => _page(params), :per_page => params[:iDisplayLength]
+             paginate :page => _page(params), :per_page => _per_page(params)
       end
 
       def _where_conditions raw_query, search_fields

data/lib/data_table/version.rb

@@ -1,3 +1,3 @@
 module DataTable
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/spec/active_record_data_table_spec.rb

@@ -12,8 +12,9 @@ describe DataTable do
       mock(self)._where_conditions("answer", %w(foo bar)) { "where clause" }
       mock(self)._order_fields(params, %w(foo bar baz)) { "order" }
 
-      mock(self).where("where clause") { mock!.order("order") { mock!.paginate({:page => :page, :per_page => 10}) { :answer } } }
+      mock(self).where("where clause") { mock!.order("order") { mock!.paginate({:page => :page, :per_page => :per_page}) { :answer } } }
       mock(self)._page(params) { :page }
+      mock(self)._per_page(params) { :per_page }
 
       _find_objects(params, %w(foo bar baz), %w(foo bar)).should == :answer
     end

data/spec/data_table_spec.rb

@@ -63,4 +63,21 @@ describe DataTable do
 
   end
 
+  context "#_per_page" do
+
+    it "should return 10 given an iDisplayLength of 10" do
+      send(:_per_page, {:iDisplayLength => "10"}).should == 10
+    end
+
+    it "should return a default of 25 given an invalid iDisplayLength" do
+      send(:_per_page, {:iDisplayLength => "foobar"}).should == 25
+    end
+
+    it "should return self.count given an iDisplayLength of -1" do
+      mock(self).count { :all }
+      send(:_per_page, {:iDisplayLength => "-1"}).should == :all
+    end
+
+  end
+
 end

data/spec/mongoid_data_table_spec.rb

@@ -11,8 +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 => 10}) { :answer } } }
+      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 }
 
       _find_objects(params, %w(foo bar baz), %w(foo bar)).should == :answer
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: data_table
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Jason Dew
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-25 00:00:00 -04:00
+date: 2010-12-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -114,6 +114,7 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
+- TODO
 - data_table.gemspec
 - lib/data_table.rb
 - lib/data_table/active_record.rb