Update Datatables and support for kaminari

.gitignore

@@ -2,3 +2,8 @@ pkg/*
 *.gem
 .bundle
 *.swp
+
+vendor/assets/javascripts/.DS_Store
+.DS_Store
+vendor/.DS_Store
+vendor/assets/.DS_Store

Gemfile.lock

@@ -1,111 +1,107 @@
 PATH
   remote: .
   specs:
-    simple_datatables (0.1)
-      meta_search
-      rails (~> 3.1.0.rc5)
-      will_paginate (~> 3.0.pre2)
-
-PATH
-  remote: jsonify-rails
-  specs:
-    jsonify-rails (0.0.6)
-      actionpack (~> 3.1.0.rc4)
-      jsonify
+    rails-datatables (0.3.0)
+      jsonify-rails
+      meta_search (~> 1.1.0)
+      rails (~> 3.1.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.0.rc5)
-      actionpack (= 3.1.0.rc5)
+    actionmailer (3.1.1)
+      actionpack (= 3.1.1)
       mail (~> 2.3.0)
-    actionpack (3.1.0.rc5)
-      activemodel (= 3.1.0.rc5)
-      activesupport (= 3.1.0.rc5)
+    actionpack (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
-      rack (~> 1.3.1)
-      rack-cache (~> 1.0.2)
-      rack-mount (~> 0.8.1)
-      rack-test (~> 0.6.0)
-      sprockets (~> 2.0.0.beta.12)
-    activemodel (3.1.0.rc5)
-      activesupport (= 3.1.0.rc5)
-      bcrypt-ruby (~> 2.1.4)
+      rack (~> 1.3.2)
+      rack-cache (~> 1.1)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.2)
+    activemodel (3.1.1)
+      activesupport (= 3.1.1)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.0.rc5)
-      activemodel (= 3.1.0.rc5)
-      activesupport (= 3.1.0.rc5)
-      arel (~> 2.1.4)
+    activerecord (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+      arel (~> 2.2.1)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.0.rc5)
-      activemodel (= 3.1.0.rc5)
-      activesupport (= 3.1.0.rc5)
-    activesupport (3.1.0.rc5)
+    activeresource (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+    activesupport (3.1.1)
       multi_json (~> 1.0)
-    arel (2.1.4)
-    bcrypt-ruby (2.1.4-x86-mingw32)
+    arel (2.2.1)
     builder (3.0.0)
     erubis (2.7.0)
-    hike (1.2.0)
+    hike (1.2.1)
     i18n (0.6.0)
-    jsonify (0.1.0)
+    json (1.6.1)
+    jsonify (0.2.0)
+    jsonify-rails (0.2.0)
+      actionpack
+      jsonify (>= 0.2.0)
     mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    meta_search (0.5.4)
-      actionpack (>= 3.0.0.beta4)
-      activerecord (>= 3.0.0.beta4)
-      activesupport (>= 3.0.0.beta4)
-      arel (>= 0.4.0)
-    mime-types (1.16)
-    multi_json (1.0.3)
-    polyglot (0.3.2)
-    rack (1.3.2)
-    rack-cache (1.0.2)
+    meta_search (1.1.1)
+      actionpack (~> 3.1.0)
+      activerecord (~> 3.1.0)
+      activesupport (~> 3.1.0)
+      polyamorous (~> 0.5.0)
+    mime-types (1.17.2)
+    multi_json (1.0.4)
+    polyamorous (0.5.0)
+      activerecord (~> 3.0)
+    polyglot (0.3.3)
+    rack (1.3.5)
+    rack-cache (1.1)
       rack (>= 0.4)
-    rack-mount (0.8.1)
+    rack-mount (0.8.3)
       rack (>= 1.0.0)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.0.rc5)
-      actionmailer (= 3.1.0.rc5)
-      actionpack (= 3.1.0.rc5)
-      activerecord (= 3.1.0.rc5)
-      activeresource (= 3.1.0.rc5)
-      activesupport (= 3.1.0.rc5)
+    rails (3.1.1)
+      actionmailer (= 3.1.1)
+      actionpack (= 3.1.1)
+      activerecord (= 3.1.1)
+      activeresource (= 3.1.1)
+      activesupport (= 3.1.1)
       bundler (~> 1.0)
-      railties (= 3.1.0.rc5)
-    railties (3.1.0.rc5)
-      actionpack (= 3.1.0.rc5)
-      activesupport (= 3.1.0.rc5)
+      railties (= 3.1.1)
+    railties (3.1.1)
+      actionpack (= 3.1.1)
+      activesupport (= 3.1.1)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
-    rake (0.9.2)
-    rdoc (3.9.1)
-    sprockets (2.0.0.beta.13)
+    rake (0.9.2.2)
+    rdoc (3.11)
+      json (~> 1.4)
+    sprockets (2.0.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     thor (0.14.6)
-    tilt (1.3.2)
+    tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.29)
-    will_paginate (3.0.pre4)
+    tzinfo (0.3.31)
 
 PLATFORMS
   ruby
   x86-mingw32
 
 DEPENDENCIES
-  jsonify-rails!
-  simple_datatables!
+  rails-datatables!

README.rdoc

@@ -1,16 +1,18 @@
-= Simple Datatables
+= Simple Datatables for Kaminari
+
+This fork works with kaminari gem!
 
 Connects two awesome plugins - Datatables for Jquery and Meta Search together for Rails 3.1
 
 == Install
 
 Add the following to your Gemfile to install simple datatables:
 
-  gem 'simple_datatables'
+  gem 'rails_datatables'
 
 After bundle install add this line to rails 3.1 assets pipeline and restart server:
 
-  //= require simple_datatables
+  //= require rails_datatables
 
 Installation completed.
 
@@ -24,12 +26,12 @@ 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 (optionally) controller action as usual and add ".datatables" format
+Create simple meta_search and kaminari (optionally) controller action as usual and add ".datatables" format
 
   respond_to :html, :datatables
 
   def search
-    @products = Product.search(params[:search]).paginate(:page => params[:page], :per_page=>params[:per_page])
+    @products = Product.search(params[:search]).page(params[:page]).per(params[:per_page])
     respond_with @products
   end
 
@@ -48,14 +50,15 @@ This gem uses:
 
 This gem provides integration with:
 * will_paginate for nice pagination request syntax mapping
+* kaminari for pagination as well it works with both so choose either one not both.
 
 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.
+Rails-Datatables is compatible with Kaminari AND 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:
 

app/views/layouts/application.datatables.jsonify

@@ -19,7 +19,11 @@ instance_variables.each do |vn|
     break;
   end
 
-  if v.respond_to?('total_entries')
+  if v.respond_to?('total_count')
+    total_entries = v.total_count
+    current_page_entries = v.size
+    break
+  elsif v.respond_to?('total_entries')
     total_entries = v.total_entries
     current_page_entries = v.size
     break

lib/simple_datatables.rb → lib/rails_datatables.rb

@@ -2,8 +2,8 @@
 
 Mime::Type.register "application/json", :datatables
 
-module SimpleDatatables
+module RailsDatatables
   module Rails
-    require 'simple_datatables/engine'
+    require 'rails_datatables/engine'
   end
 end

lib/simple_datatables/engine.rb → lib/rails_datatables/engine.rb

@@ -3,7 +3,7 @@
 require 'jsonify-rails'
 require 'meta_search'
 
-module SimpleDatatables
+module RailsDatatables
   module Rails
     class Engine < ::Rails::Engine
     end

lib/rails_datatables/version.rb

@@ -0,0 +1,3 @@
+module RailsDatatables
+  VERSION = "0.3.0"
+end

rails_datatables.gemspec

@@ -0,0 +1,23 @@
+$:.push File.expand_path("../lib", __FILE__)
+require "rails_datatables/version"
+
+Gem::Specification.new do |s|
+  s.name        = "rails_datatables"
+  s.version     = RailsDatatables::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Grigory", "Zack"]
+  s.email       = ["sakchai@artellectual.com"]
+  s.homepage    = "http://github.com/artellectual/rails-datatables"
+  s.summary     = %q{Rails datatables to rails mapping using meta_search, will_paginage / Kaminari and jsonify}
+  s.description = %q{Rails datatables to rails mapping using meta_search, will_paginage / Kaminari and jsonify}
+
+  s.rubyforge_project = "data_table"
+
+  s.files         = `git ls-files`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_dependency "rails", [">= 3.1.0","< 4.0.0"]
+  s.add_dependency "meta_search", '~> 1.1.0'
+  s.add_dependency "jsonify-rails"
+end