data_tables 0.1.7 → 0.1.9

data/.gitignore

@@ -0,0 +1 @@
+rdoc

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format doc

data/Gemfile

@@ -0,0 +1,13 @@
+source 'https://rubygems.org'
+gemspec
+
+
+
+group :development, :test do
+  gem 'rspec'
+  gem 'guard-rspec'
+  gem 'rb-inotify', '~> 0.9'
+  gem 'tire'
+  gem 'ohm'
+  gem 'activerecord'
+end

data/Gemfile.lock

@@ -0,0 +1,90 @@
+PATH
+  remote: .
+  specs:
+    data_tables (0.1.9)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (3.2.12)
+      activesupport (= 3.2.12)
+      builder (~> 3.0.0)
+    activerecord (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.12)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    ansi (1.4.3)
+    arel (3.0.2)
+    builder (3.0.4)
+    coderay (1.0.9)
+    diff-lcs (1.2.1)
+    ffi (1.7.0)
+    formatador (0.2.4)
+    guard (1.7.0)
+      formatador (>= 0.2.4)
+      listen (>= 0.6.0)
+      lumberjack (>= 1.0.2)
+      pry (>= 0.9.10)
+      thor (>= 0.14.6)
+    guard-rspec (2.5.3)
+      guard (>= 1.1)
+      rspec (~> 2.11)
+    hashr (0.0.22)
+    i18n (0.6.1)
+    listen (0.7.3)
+    lumberjack (1.0.3)
+    method_source (0.8.1)
+    mime-types (1.22)
+    multi_json (1.6.1)
+    nest (1.1.2)
+      redis
+    ohm (1.3.1)
+      nest (~> 1.0)
+      redis
+      scrivener (~> 0.0.3)
+    pry (0.9.12)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rake (10.0.4)
+    rb-inotify (0.9.0)
+      ffi (>= 0.5.0)
+    redis (3.0.3)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
+    scrivener (0.0.3)
+    slop (3.4.4)
+    thor (0.18.1)
+    tire (0.5.7)
+      activemodel (>= 3.0)
+      activesupport
+      ansi
+      hashr (~> 0.0.19)
+      multi_json (~> 1.3)
+      rake
+      rest-client (~> 1.6)
+    tzinfo (0.3.37)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord
+  data_tables!
+  guard-rspec
+  ohm
+  rb-inotify (~> 0.9)
+  rspec
+  tire

data/Guardfile

@@ -0,0 +1,25 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+  watch(%r{spec/models/(.+)\.rb$})  { "spec" }
+
+  # Rails example
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+
+  # Capybara features specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/features/#{m[1]}_spec.rb" }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+end
+

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2010 [name of plugin creator]
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README

@@ -0,0 +1,89 @@
+Datatables
+==========
+
+Rails plugin for adding JQuery DataTables to your application.
+
+DataTables: http://datatables.net/index
+
+Requirements:
+
+JQuery, JQuery UI, and the DataTables JQuery plugin
+
+For Ohm Support:
+  redis, Ohm, Lunar
+
+Features:
+
+Easy definition of a table for an ActiveRecord and Ohm model.
+Supports pagination.
+
+
+TODO
+=======
+
+Add tests.
+Add sorting.
+
+
+Example
+=======
+
+In your controller, set up a datatables source. This is how the data is pulled from the server and returned with AJAX.
+
+Initializer
+============
+ActionView::Base.send :include, DataTablesHelper
+ActionController::Base.send :include, DataTablesController
+
+Controller
+===========
+
+datatables_source :users_source, :user, :columns => [
+  :username, :fullname, {:name => "updated_at", :eval => 'obj.updated_at.getlocal.rfc2822'},
+  {:name => "Options", :method => :user_options_column}], :numResults => 10
+
+This defines a table, named users_source, for the User model.
+
+The columns are (in order):
+
+username, fullname, updated_at, and options
+
+There are two special ways to display the data for a column/row.
+
+eval:
+
+Evaluates a string, "obj" is an instance of your model in the table (in this case, a User object).
+
+
+method:
+
+Calls a method in your controller with the instance of your model as the parameter.
+
+When defining a method for a column, an example method in your controller would be:
+
+def user_options_column(user)
+  "<a href=\"#{url_for :action => 'view', :id => user.id}\">View User</a>"
+end
+
+
+Routes
+=========
+
+Because DataTables uses AJAX to load the data in the table, you must define a route to it. The first parameter of datatables_source is a *named route*. The rails plugin uses this to link the HTML for your DataTable.
+
+Example
+=========
+
+map.users_source '/datatables/user', :controller => :user, :action => :users_source
+
+
+Displaying the table
+=========================
+
+Displaying a table is probably the easiest part. In a view for your controller, you just do the following:
+
+<%= datatables :users_source %>
+
+
+Copyright (c) 2010 Chris Moos, released under the MIT license
+Copyright (c) 2012 Duane Compton, released under the MIT license

data/Rakefile

@@ -0,0 +1,23 @@
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+desc 'Default: run unit tests.'
+task :default => :test
+
+desc 'Test the datatables plugin.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
+desc 'Generate documentation for the datatables plugin.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'Datatables'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/data_tables.gemspec

@@ -0,0 +1,20 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name        = 'data_tables'
+  s.version     = '0.1.9'
+  s.date        = Time.now.strftime("%Y-%m-%d")
+  s.summary     = "Rails friendly interface into DataTables"
+  s.description = "DataTables for Rails"
+  s.authors     = ["Duane Compton", "Calvin Bascom", "Yi Su", "Chris Moos", "Adrian Mejia"]
+  s.email       = 'Duane.Compton@gmail.com'
+  s.homepage    = 'http://rubygems.org/gems/data_tables'
+  s.platform    = Gem::Platform::RUBY
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.require_paths = ["lib"]
+
+  s.add_development_dependency 'rspec', '~> 2.10'
+end
+

data/lib/data_tables.rb

@@ -1,4 +1,5 @@
 require "data_tables/data_tables_helper"
+
 module DataTablesController
   def self.included(cls)
     cls.extend(ClassMethods)
@@ -44,38 +45,103 @@ module DataTablesController
       named_scope = options[:named_scope]
       named_scope_args = options[:named_scope_args]
       except = options[:except]
+      es_block = options[:es_block]
 
+      #
+      # ------- Ohm ----------- #
+      #
       if modelCls < Ohm::Model
         define_method action.to_sym do
+          logger.debug "[tire] (datatable:#{__LINE__}) #{action.to_sym} #{modelCls} < Ohm::Model"
+
           if scope == :domain
             domain = ActiveRecord::Base.connection.schema_search_path.to_s.split(",")[0]
             return if domain.nil?
           end
           search_condition = params[:sSearch].blank? ? nil : params[:sSearch].to_s
-          records = scope == :domain ? modelCls.find(:domain => domain) : modelCls.all
-          if except
-            except.each do |f|
-              records = records.except(f[0].to_sym => f[1])
-            end
-          end
-          total_records = records.size
+
           sort_column = params[:iSortCol_0].to_i
           sort_column = 1 if sort_column == 0
           current_page = (params[:iDisplayStart].to_i/params[:iDisplayLength].to_i rescue 0) + 1
-          objects = nil
-          if search_condition.nil?
-            if Gem.loaded_specs['ohm'].version == Gem::Version.create('0.1.5')
-              objects = records.sort_by(columns[sort_column][:name].to_sym,
-                                        :order => "ALPHA " + params[:sSortDir_0].capitalize,
-                                        :start => params[:iDisplayStart].to_i,
-                                        :limit => params[:iDisplayLength].to_i)
+          per_page = params[:iDisplayLength] || 10
+          per_page = per_page.to_i
+          sort_dir = params[:sSortDir_0] || 'desc'
+          column_name_sym = columns[sort_column][:name].to_sym
+
+          objects = []
+          total_display_records = 0
+          total_records = 0
+
+          if defined? Tire
+            #
+            # ----------- Elasticsearch/Tire for Ohm ----------- #
+            #
+            elastic_index_name = "#{Tire::Model::Search.index_prefix}#{modelCls.to_s.underscore}"
+            logger.debug "*** (datatable:#{__LINE__}) Using tire for search #{modelCls} (#{elastic_index_name})"
+
+            search_condition = elasticsearch_sanitation(search_condition, except)
+            just_excepts = except ? elasticsearch_sanitation(nil, except) : "*"
+            logger.debug "*** search_condition = #{search_condition}; sort by #{column_name_sym}:#{sort_dir}; domain=`#{domain.inspect}'"
+
+            retried = 0
+            if Tire.index(elastic_index_name){exists?}.response.code != 404
+              begin
+                controller_instance = self
+                results = Tire.search(elastic_index_name) do
+                  # retry #2 exclude search terms (and sorting) from search query
+                  if retried < 2
+                    query { string search_condition }
+                  else
+                    query { string just_excepts }
+                  end
+
+                  # retry #1 exclude sorting from search query
+                  sort{ by column_name_sym, sort_dir } if retried < 1
+
+                  filter(:term, domain: domain) unless domain.blank?
+                  if es_block.is_a?(Symbol)
+                    controller_instance.send(es_block, self)
+                  else
+                    es_block.call(self) if es_block.respond_to?(:call)
+                  end
+                  from (current_page-1) * per_page
+                  size per_page
+                end.results
+
+                objects = results.map{ |r| modelCls[r._id] }.compact
+                total_display_records = results.total
+
+
+                total_records = Tire.search(elastic_index_name, search_type: 'count') do
+                  query { string just_excepts }
+                  filter(:term, domain: domain) unless domain.blank?
+                  es_block.call(self) if es_block.respond_to?(:call)
+                end.results.total
+              rescue Tire::Search::SearchRequestFailed => e
+                if retried < 2
+                  retried += 1
+                  logger.info "Will retry(#{retried}) again because #{e.inspect}"
+                  retry
+                end
+                logger.info "*** ERROR: Tire::Search::SearchRequestFailed => #{e.inspect}"
+              end
             else
-              objects = records.sort_by(columns[sort_column][:name].to_sym,
-                                        :order => "ALPHA " + params[:sSortDir_0].capitalize,
-                                        :limit => [params[:iDisplayStart].to_i, params[:iDisplayLength].to_i])
+              logger.debug "Index #{elastic_index_name} does not exists yet in ES."
             end
-            total_display_records = total_records
           else
+            #
+            # -------- Redis/Lunar search --------------- #
+            #
+            logger.debug "*** (datatable:#{__LINE__}) Using Redis/Lunar for search #{modelCls} (#{elastic_index_name})"
+            records = scope == :domain ? modelCls.find(:domain => domain) : modelCls.all
+            if except
+              except.each do |f|
+                records = records.except(f[0].to_sym => f[1])
+              end
+            end
+            total_records = records.size
+
+            logger.debug "*** (datatable:#{__LINE__}) NOT using tire for search"
             options = {}
             domain_id = domain.split("_")[1].to_i if scope == :domain
             options[:domain] = domain_id .. domain_id if scope == :domain
@@ -92,7 +158,9 @@ module DataTablesController
                                      :order => "ALPHA " + params[:sSortDir_0].capitalize,
                                      :limit => [params[:iDisplayStart].to_i, params[:iDisplayLength].to_i])
             end
+            # -------- Redis/Lunar search --------------- #
           end
+
           data = objects.collect do |instance|
             columns.collect { |column| datatables_instance_get_value(instance, column) }
           end
@@ -101,74 +169,150 @@ module DataTablesController
             :aaData => data,
             :sEcho => params[:sEcho].to_i}.to_json
         end
-      else
+      # ------- /Ohm ----------- #
+      else # Non-ohm models
         # add_search_option will determine whether the search text is empty or not
         init_conditions = conditions.clone
         add_search_option = false
-        define_method action.to_sym do
-          condition_local = ''
-          unless params[:sSearch].blank?
-            sort_column_id = params[:iSortCol_0].to_i
-            sort_column_id = 1 if sort_column_id == 0
-            sort_column = columns[sort_column_id]
-            if sort_column && sort_column.has_key?(:attribute)
-              condstr = params[:sSearch].gsub(/_/, '\\\\_').gsub(/%/, '\\\\%')
-              condition_local = "(text(#{sort_column[:name]}) ILIKE '#{condstr}%')"
+
+        if modelCls.ancestors.any?{|ancestor| ancestor.name == "Tire::Model::Search"}
+          #
+          # ------- Elasticsearch ----------- #
+          #
+          define_method action.to_sym do
+            domain_name = ActiveRecord::Base.connection.schema_search_path.to_s.split(",")[0]
+            logger.debug "*** Using ElasticSearch for #{modelCls.name}"
+            objects =  []
+
+            condstr = ""
+            unless params[:sSearch].blank?
+              sort_column_id = params[:iSortCol_0].to_i
+              sort_column_id = 1 if sort_column_id == 0
+              sort_column = columns[sort_column_id]
+              if sort_column && sort_column.has_key?(:attribute)
+                condstr = params[:sSearch].gsub(/_/, '\\\\_').gsub(/%/, '\\\\%')
+              end
+            end
+
+            sort_column = params[:iSortCol_0].to_i
+            current_page = (params[:iDisplayStart].to_i/params[:iDisplayLength].to_i rescue 0)+1
+            per_page = params[:iDisplayLength] || 10
+            column_name = columns[sort_column][:name] || 'message'
+            sort_dir = params[:sSortDir_0] || 'desc'
+
+            condstr = elasticsearch_sanitation(condstr, except)
+
+            begin
+              query = Proc.new do
+                query { string(condstr) }
+                filter(:term, domain: domain_name) unless domain_name.blank?
+                es_block.call(self) if es_block.respond_to?(:call)
+              end
+
+              results = modelCls.search(page: current_page,
+                                        per_page: per_page,
+                                        sort: "#{column_name}:#{sort_dir}",
+                                        &query)
+              objects = results.to_a
+              total_display_records = results.total
+              total_records = modelCls.search(search_type: 'count') do
+                filter(:term, domain: domain_name) unless domain_name.blank?
+                es_block.call(self) if es_block.respond_to?(:call)
+              end.total
+            rescue Tire::Search::SearchRequestFailed => e
+              logger.debug "[Tire::Search::SearchRequestFailed] #{e.inspect}\n#{e.backtrace.join("\n")}"
+              objects = []
+              total_display_records = 0
+              total_records = 0
             end
+
+            data = objects.collect do |instance|
+              columns.collect { |column| datatables_instance_get_value(instance, column) }
+            end
+
+            render :text => {:iTotalRecords => total_records,
+              :iTotalDisplayRecords => total_display_records,
+              :aaData => data,
+              :sEcho => params[:sEcho].to_i}.to_json
           end
+          # ------- /Elasticsearch ----------- #
+        else
+          #
+          # ------- Postgres ----------- #
+          #
+          logger.debug "(datatable) #{action.to_sym} #{modelCls} < ActiveRecord"
 
-          # We just need one conditions string for search at a time.  Every time we input
-          # something else in the search bar we will pop the previous search condition
-          # string and push the new string.
-          if condition_local != ''
-            if add_search_option == false
-              conditions << condition_local
-              add_search_option = true
-            else
-              if conditions != []
-                conditions.pop
+          define_method action.to_sym do
+            condition_local = ''
+            unless params[:sSearch].blank?
+              sort_column_id = params[:iSortCol_0].to_i
+              sort_column_id = 1 if sort_column_id == 0
+              sort_column = columns[sort_column_id]
+              condstr = params[:sSearch].strip.gsub(/_/, '\\\\_').gsub(/%/, '\\\\%')
+
+              search_columns = options[:columns].map{|e| e.class == Symbol ? e : nil }.compact
+              condition_local = search_columns.map do |column_name|
+                " ((text(#{column_name}) ILIKE '%#{condstr}%')) "
+              end.compact.join(" OR ")
+              condition_local = " ( #{condition_local} ) " unless condition_local.blank?
+            end
+
+            # We just need one conditions string for search at a time.  Every time we input
+            # something else in the search bar we will pop the previous search condition
+            # string and push the new string.
+            if condition_local != ''
+              if add_search_option == false
                 conditions << condition_local
+                add_search_option = true
+              else
+                if conditions != []
+                  conditions.pop
+                  conditions << condition_local
+                end
               end
-            end
-          else
-            if add_search_option == true
-              if conditions != []
-                conditions.pop
-                add_search_option = false
+            else
+              if add_search_option == true
+                if conditions != []
+                  conditions.pop
+                  add_search_option = false
+                end
               end
             end
-          end
 
-          if named_scope
-            args = named_scope_args ? Array(self.send(named_scope_args)) : []
-            total_records = modelCls.send(named_scope, *args).count :conditions => init_conditions.join(" AND ")
-            total_display_records = modelCls.send(named_scope, *args).count :conditions => conditions.join(" AND ")
-          else
-            total_records = modelCls.count :conditions => init_conditions.join(" AND ")
-            total_display_records = modelCls.count :conditions => conditions.join(" AND ")
-          end
-          sort_column = params[:iSortCol_0].to_i
-          sort_column = 1 if sort_column == 0
-          current_page = (params[:iDisplayStart].to_i/params[:iDisplayLength].to_i rescue 0)+1
-          if named_scope
-              objects = modelCls.send(named_scope, *args).paginate(:page => current_page,
-                                          :order => "#{columns[sort_column][:name]} #{params[:sSortDir_0]}",
-                                          :conditions => conditions.join(" AND "),
-                                          :per_page => params[:iDisplayLength])
-          else
-              objects = modelCls.paginate(:page => current_page,
-                                          :order => "#{columns[sort_column][:name]} #{params[:sSortDir_0]}",
-                                          :conditions => conditions.join(" AND "),
-                                          :per_page => params[:iDisplayLength])
-          end
-          #logger.info("------conditions is #{conditions}")
-          data = objects.collect do |instance|
-            columns.collect { |column| datatables_instance_get_value(instance, column) }
+            if named_scope
+              args = named_scope_args ? Array(self.send(named_scope_args)) : []
+              total_records = modelCls.send(named_scope, *args).count :conditions => init_conditions.join(" AND ")
+              total_display_records = modelCls.send(named_scope, *args).count :conditions => conditions.join(" AND ")
+            else
+              total_records = modelCls.count :conditions => init_conditions.join(" AND ")
+              total_display_records = modelCls.count :conditions => conditions.join(" AND ")
+            end
+            sort_column = params[:iSortCol_0].to_i
+            sort_column = 1 if sort_column == 0
+            current_page = (params[:iDisplayStart].to_i/params[:iDisplayLength].to_i rescue 0)+1
+            if named_scope
+                objects = modelCls.send(named_scope, *args).paginate(:page => current_page,
+                                            :order => "#{columns[sort_column][:name]} #{params[:sSortDir_0]}",
+                                            :conditions => conditions.join(" AND "),
+                                            :per_page => params[:iDisplayLength])
+            else
+                objects = modelCls.paginate(:page => current_page,
+                                            :order => "#{columns[sort_column][:name]} #{params[:sSortDir_0]}",
+                                            :conditions => conditions.join(" AND "),
+                                            :per_page => params[:iDisplayLength])
+            end
+            #logger.info("------conditions is #{conditions}")
+            data = objects.collect do |instance|
+              columns.collect { |column| datatables_instance_get_value(instance, column) }
+            end
+            render :text => {:iTotalRecords => total_records,
+              :iTotalDisplayRecords => total_display_records,
+              :aaData => data,
+              :sEcho => params[:sEcho].to_i}.to_json
+            #
+            # ------- /Postgres ----------- #
+            #
           end
-          render :text => {:iTotalRecords => total_records,
-            :iTotalDisplayRecords => total_display_records,
-            :aaData => data,
-            :sEcho => params[:sEcho].to_i}.to_json
         end
       end
     end
@@ -184,7 +328,7 @@ module DataTablesController
         if column.kind_of? Symbol # a column from the database, we don't need to do anything
           columns << {:name => column, :attribute => column}
         elsif column.kind_of? Hash
-	  col_hash = { :name => column[:name], :special => column }
+    col_hash = { :name => column[:name], :special => column }
           col_hash[:attribute] = column[:attribute] if column[:attribute]
           columns << col_hash
         end
@@ -211,6 +355,18 @@ module DataTablesController
     end
   end
 
+  def elasticsearch_sanitation(search_string, except)
+    logger.debug "*** elasticsearch_sanitation.before = `#{search_string}'"
+    search_string = '*' if search_string.blank?
+    search_string.strip!
+    numerical_search = (search_string.split.count > 1) ? "" : "OR *#{search_string.gsub(":","\\:")}*"
+    search_string = "(\"*#{search_string}*\" #{numerical_search}) " unless search_string =~ /(\*|\")/
+    exceptions = except.map { |f|  "NOT #{f[0]}:\"#{f[1]}\""}.join(" AND ") if except
+    search_string += " AND " + exceptions if exceptions
+    logger.debug "*** elasticsearch_sanitation.after = `#{search_string}'"
+    search_string
+  end
+
   # gets the value for a column and row
   def datatables_instance_get_value(instance, column)
     if column[:special]

data/lib/data_tables/data_tables_helper.rb

@@ -8,24 +8,33 @@ module DataTablesHelper
     options[:bAutoWidth] = false unless options.has_key?(:bAutoWidth)
     options[:bStateSave] = true unless options.has_key?(:bStateSave)
     options[:oColVis] ||= {}
+    options[:bFilter] = true
     options[:oColVis][:aiExclude] ||= []
     unless options[:oColVis][:aiExclude].include?(0)
       options[:oColVis][:aiExclude].unshift(0)
     end
 
+    options[:bFilter] = opts[:search] unless opts[:search].nil?
+
     options[:fnInitComplete] ||= "function() {
       if (eval('typeof ' + initDatatablesTable) == 'function') {
         initDatatablesTable('#{source}');
       }
     }"
 
-    sdom = '<"#datatables_search_hint">lfrtip'
+    sdom = options[:bFilter] ? '<"#datatables_search_hint">lfrtip' : 'lrtip'
     sdom = "C<\"clear\">" + sdom if options[:oColVis]
     sdom = 'T' + sdom if options[:oTableTools]
     options[:sDom] ||= sdom
 
+    # Rails.logger.info("*****#{options.inspect}")
+
+    # options[:sDom].delete(:f)
+
     datatable = controller.datatable_source(source)
-    options[:sAjaxSource] = method("#{datatable[:action]}_url".to_sym).call
+    url_query_params = opts[:urlQueryParams] || {}
+    options[:sAjaxSource] = opts[:sAjaxSource] ||
+        method("#{datatable[:action]}_url".to_sym).call(url_query_params)
     columns = datatable[:attrs].keys.collect { |a| "<th>#{a}</th>" }.join
 
     index = 0
@@ -36,7 +45,7 @@ module DataTablesHelper
       index += 1
       memo
     end
-    options[:aaSorting] = [[first_searchable_column_index, 'asc']]
+    options[:aaSorting] ||= [[first_searchable_column_index, 'asc']]
     options[:aoColumnDefs] ||= []
     options[:aoColumnDefs].unshift({
                                      :aTargets => targets,

data/spec/data_tables_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe 'data_tables' do
+  before :each do
+    if DEBUG
+      ExceptOptionController.any_instance.stub_chain(:logger, :debug){ |*args| puts args.first }
+      ExceptOptionController.any_instance.stub_chain(:logger, :info){ |*args| puts args.first }
+    else
+      ExceptOptionController.any_instance.stub(:logger).and_return(double("Logger").as_null_object)
+    end
+    ExceptOptionController.any_instance.stub(:params).and_return({})
+    ExceptOptionController.any_instance.stub(:render)
+    ActiveRecord::Base.stub_chain(:connection, :schema_search_path).and_return("public")
+  end
+
+  def save_elasticsearch(index_name, data)
+    Tire.index(index_name) do
+      create unless exists?
+      data.each do |datum|
+        store datum
+      end
+      refresh
+    end
+  end
+
+  let(:instance){ExceptOptionController.new.dummy_class_source}
+  let(:index_name){ "#{Tire::Model::Search.index_prefix}dummy_class" }
+
+  context "Redis Models" do
+    context "with ElasticSearch" do
+      {"iTotalDisplayRecords" => 2, "iTotalRecords" => 2}.each do |k,v|
+        it "respects datatables' except to calculate #{k} (#{v})" do
+          # create index
+          data = [{ id: 5002, name: 'not_valid', domain: 'public' },
+                  { id: 561, name: 'Native AP VLAN', domain: 'public' },
+                  { id: 56, name: 'valid', domain: 'public' }]
+          save_elasticsearch(index_name, data)
+
+          ExceptOptionController.any_instance.should_receive(:render) do |*args|
+            arg = JSON.parse(args.first[:text])
+            arg[k].should == v
+          end
+          instance
+        end
+      end
+    end
+  end
+  context "Elastic Search Models" do
+  end
+  context "Postgres Models" do
+  end
+end

data/spec/models/condition_model.rb

@@ -0,0 +1,25 @@
+class DummyClass < Ohm::Model
+end
+
+class ConditionModel
+  include DataTablesController
+  datatables_source(:dummy_class_source, :dummy_class,
+                  :columns => [
+                               {:name => "Actions",
+                                 :method => :datatables_actions_column},
+                               :name, :vlan, :cidr
+                              ],
+                  :conditions => ['id!=5002',"name!= 'Native AP VLAN'"])
+end
+
+class ExceptOptionController
+  include DataTablesController
+    datatables_source(:dummy_class_source, :dummy_class,
+                    :columns => [
+                                 {:name => "Actions",
+                                   :method => :datatables_actions_column},
+                                 :name, :state, :cidr, :vlan,
+                                 {:name =>"Access Points",
+                                   :method => :location_statuses_accesspoint_list}
+                                ],:except => [['name','Native AP VLAN']])
+end

data/spec/spec_helper.rb

@@ -0,0 +1,24 @@
+require 'rubygems'
+require 'bundler/setup'
+require 'ohm'
+require 'tire'
+require 'active_record'
+
+APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__) + '/..'))
+Dir[File.join(APP_ROOT, "lib/*.rb")].each {|f| require f}
+Dir[File.join(APP_ROOT, "lib/data_tables/*.rb")].each {|f| require f}
+Dir[File.join(APP_ROOT, "spec/models/*.rb")].each {|f| require f}
+
+DEBUG = false
+
+Tire.configure { logger STDOUT } if DEBUG
+Tire::Model::Search.index_prefix('test_datatable_')
+
+RSpec.configure do |config|
+  config.before(:each) do
+    Tire.index("#{Tire::Model::Search.index_prefix}*"){delete}
+  end
+  config.after(:each) do
+    #Tire.index("#{Tire::Model::Search.index_prefix}*"){delete}
+  end
+end

data/tasks/datatables_tasks.rake

@@ -0,0 +1,4 @@
+# desc "Explaining what the task does"
+# task :datatables do
+#   # Task goes here
+# end

data/test/datatables_test.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class DatatablesTest < ActiveSupport::TestCase
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,3 @@
+require 'rubygems'
+require 'active_support'
+require 'active_support/test_case'

metadata

@@ -2,26 +2,58 @@
 name: data_tables
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - Duane Compton
 - Calvin Bascom
 - Yi Su
 - Chris Moos
+- Adrian Mejia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-10 00:00:00.000000000 Z
-dependencies: []
-description: Originally a plugin
+date: 2013-07-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  type: :development
+  name: rspec
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.10'
+    none: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.10'
+    none: false
+description: DataTables for Rails
 email: Duane.Compton@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
+- .rspec
+- Gemfile
+- Gemfile.lock
+- Guardfile
+- MIT-LICENSE
+- README
+- Rakefile
+- data_tables.gemspec
 - lib/data_tables.rb
 - lib/data_tables/data_tables_helper.rb
+- spec/data_tables_spec.rb
+- spec/models/condition_model.rb
+- spec/spec_helper.rb
+- tasks/datatables_tasks.rake
+- test/datatables_test.rb
+- test/test_helper.rb
 homepage: http://rubygems.org/gems/data_tables
 licenses: []
 post_install_message: 
@@ -46,4 +78,9 @@ rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Rails friendly interface into DataTables
-test_files: []
+test_files:
+- spec/data_tables_spec.rb
+- spec/models/condition_model.rb
+- spec/spec_helper.rb
+- test/datatables_test.rb
+- test/test_helper.rb