data_tables 0.1.9 → 0.1.10

data/data_tables.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'data_tables'
-  s.version     = '0.1.9'
+  s.version     = '0.1.10'
   s.date        = Time.now.strftime("%Y-%m-%d")
   s.summary     = "Rails friendly interface into DataTables"
   s.description = "DataTables for Rails"

data/lib/data_tables.rb

@@ -44,7 +44,7 @@ module DataTablesController
       scope = options[:scope] || :domain
       named_scope = options[:named_scope]
       named_scope_args = options[:named_scope_args]
-      except = options[:except]
+      except = options[:except] || []
       es_block = options[:es_block]
 
       #
@@ -79,20 +79,23 @@ module DataTablesController
             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 }
+                  query do
+                    boolean do
+                      if search_condition && retried < 2
+                        must { match :_all, search_condition, type: 'phrase_prefix' }
+                      else
+                        must { all }
+                      end
+
+                      except.each do |expt|
+                        must_not { term expt[0].to_sym, expt[1].to_s }
+                      end
+                    end
                   end
 
                   # retry #1 exclude sorting from search query
@@ -111,9 +114,15 @@ module DataTablesController
                 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 }
+                  query do
+                    boolean do
+                      must { all }
+                      except.each do |expt|
+                        must_not { term expt[0].to_sym, expt[1].to_s }
+                      end
+                    end
+                  end
                   filter(:term, domain: domain) unless domain.blank?
                   es_block.call(self) if es_block.respond_to?(:call)
                 end.results.total
@@ -181,10 +190,10 @@ module DataTablesController
           #
           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}"
+            logger.debug "*** (datatables:#{__LINE__}) Using ElasticSearch for #{modelCls.name}"
             objects =  []
 
-            condstr = ""
+            condstr = nil
             unless params[:sSearch].blank?
               sort_column_id = params[:iSortCol_0].to_i
               sort_column_id = 1 if sort_column_id == 0
@@ -200,11 +209,20 @@ module DataTablesController
             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) }
+                query do
+                  boolean do
+                    if condstr
+                      must { match :_all, condstr, type: 'phrase_prefix' }
+                    else
+                      must { all }
+                    end
+                    except.each do |expt|
+                      must_not { term expt[0].to_sym, expt[1].to_s }
+                    end
+                  end 
+                end
                 filter(:term, domain: domain_name) unless domain_name.blank?
                 es_block.call(self) if es_block.respond_to?(:call)
               end
@@ -355,18 +373,6 @@ 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

@@ -7,6 +7,12 @@ module DataTablesHelper
     options[:bServerSide] = true unless options.has_key?(:bServerSide)
     options[:bAutoWidth] = false unless options.has_key?(:bAutoWidth)
     options[:bStateSave] = true unless options.has_key?(:bStateSave)
+    options[:sScrollY] = "200px"
+    options[:sScrollX] = '100%'
+    options[:bScrollCollapse] = true
+    options[:bDeferRender] = true
+    options[:bScrollInfinite] = true
+    options[:iDisplayLength] = 100
     options[:oColVis] ||= {}
     options[:bFilter] = true
     options[:oColVis][:aiExclude] ||= []
@@ -22,6 +28,25 @@ module DataTablesHelper
       }
     }"
 
+    options[:fnServerData] ||= "function ( sSource, aoData, fnCallback ) {
+      var init_sSearch = $('#init_sSearch');
+      if(init_sSearch != undefined && init_sSearch.val() != '' && init_sSearch.size() != 0) {
+        $('.dataTables_filter input').val(init_sSearch.val());
+        aoData.push( { name:'sSearch', value: init_sSearch.val() });
+        $('#init_sSearch').remove();
+      }
+      $.ajax( {
+                'dataType': 'json',
+                'url': sSource,
+                'data': aoData,
+                'success': fnCallback
+                });
+      }"
+
+    options[:fnDrawCallback] = "function() {
+      change_scrollY();
+    }"
+      
     sdom = options[:bFilter] ? '<"#datatables_search_hint">lfrtip' : 'lrtip'
     sdom = "C<\"clear\">" + sdom if options[:oColVis]
     sdom = 'T' + sdom if options[:oTableTools]
@@ -71,6 +96,28 @@ $(document).ready(function() {
         } );
 
 });
+
+  function change_scrollY() {
+    resize_column_width();
+    h = $('##{source}').height();
+    if( h > $(window).height() *55/100 )
+    {
+      $('.dataTables_scrollBody').css('height', ($(window).height() *55/100));
+    }
+    else
+    {
+      $('.dataTables_scrollBody').css('height', h+20);
+    }
+  }
+  
+  function resize_column_width() {
+    $('.dataTables_scrollHeadInner').width('100%');
+    $('.dataTable').width('100%');
+    $('##{datatable[:action]}').dataTable().fnAdjustColumnSizing(false);
+  }
+
+  $(window).resize(change_scrollY);
+
 </script>
 <table id=\"#{datatable[:action]}\" #{html_opts}>
 <thead>

metadata

@@ -2,7 +2,7 @@
 name: data_tables
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Duane Compton
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-03 00:00:00.000000000 Z
+date: 2013-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :development