simple_datatables 0.1.6 → 0.1.7

data/README.rdoc

@@ -24,7 +24,7 @@ There are two ways to map awesome Datatables plugin request fields for Rails.
 This gem provides interface for the second way. 
 To use it you should do the following easy three steps:
 
-Create simple meta_search and will_paginate controller action as usual and add ".datatables" format
+Create simple meta_search and will_paginate (optionally) controller action as usual and add ".datatables" format
 
   respond_to :html, :datatables
   
@@ -44,13 +44,23 @@ Create Jsonify view with column values for columns listed in aoColumns. See exam
 
 This gem uses:
 * meta_search for nice search and sort request syntax mapping
-* will_paginate for nice pagination request syntax mapping
 * jsonify for simple output generation 
 
+This gem provides integration with:
+* will_paginate for nice pagination request syntax mapping
+
 Gem works only with rails 3.1.
 
 Gem includes datatables library and fnSetFilteringDelay plugin so you haven't include it by yourself.
 
+== Pagination
+
+Simple_datatables is compatible with will_paginate. Datatables will provide you "page" and "per_page" request params.
+
+If you do not use pagination do not forget to save search result to some variable with meta_search relation method:
+
+  @products = Product.search(params[:search]).relation
+
 == Search for all fields
 
 Note that fulltext search will work only with text fields due to meta_search restrictions. To prevent errors use bSearchable: false for non-text columns in aoColumns field.

data/app/views/layouts/application.datatables.jsonify

@@ -1,10 +1,29 @@
+total_entries = nil
+current_page_entries = 0
+
 instance_variables.each do |vn|
   v = instance_variable_get(vn)
+  next if v.class.name.nil?
+  if v.class.name.start_with?("MetaSearch::Searches") and v.respond_to?('size')
+    current_page_entries = v.size
+  end
+  if v.class.name.start_with?("ActiveRecord::Relation") and v.respond_to?('size')
+    current_page_entries = v.size
+  end
+  if v.class.name.start_with?("Array") and v.respond_to?('size') and (current_page_entries == 0)
+    current_page_entries = v.size
+  end
   if v.respond_to?('total_entries')
-    json.iTotalRecords v.size
-    json.iTotalDisplayRecords v.total_entries
+    total_entries = v.total_entries
+    current_page_entries = v.size
+    break
   end
 end
+
+total_entries = current_page_entries if total_entries.nil?
+
+json.iTotalRecords current_page_entries
+json.iTotalDisplayRecords total_entries
 json.sEcho params["sEcho"].to_i
 json.aaData do
   json.ingest! yield

data/lib/simple_datatables/engine.rb

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'rails'
-require 'will_paginate'
 require 'jsonify-rails'
 require 'meta_search'
 

data/lib/simple_datatables/version.rb

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

data/simple_datatables.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "rails", ">=3.1.0.rc8"
-  s.add_dependency "will_paginate", "~>3.0.0"
   s.add_dependency "meta_search", '~>1.1.0.pre2'
   s.add_dependency "jsonify-rails"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_datatables
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-30 00:00:00.000000000Z
+date: 2011-09-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &24603420 !ruby/object:Gem::Requirement
+  requirement: &31780128 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,10 @@ dependencies:
         version: 3.1.0.rc8
   type: :runtime
   prerelease: false
-  version_requirements: *24603420
-- !ruby/object:Gem::Dependency
-  name: will_paginate
-  requirement: &24603120 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *24603120
+  version_requirements: *31780128
 - !ruby/object:Gem::Dependency
   name: meta_search
-  requirement: &24602844 !ruby/object:Gem::Requirement
+  requirement: &31779408 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +32,10 @@ dependencies:
         version: 1.1.0.pre2
   type: :runtime
   prerelease: false
-  version_requirements: *24602844
+  version_requirements: *31779408
 - !ruby/object:Gem::Dependency
   name: jsonify-rails
-  requirement: &24602628 !ruby/object:Gem::Requirement
+  requirement: &31778484 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24602628
+  version_requirements: *31778484
 description: Simple datatables to rails mapping using meta_search, will_paginage and
   jsonify
 email: