incline 0.2.22 → 0.2.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a1e49384b7901f87a814ee60d71b0851ddc7f7b
-  data.tar.gz: 111391691fad01b40f655ee7cef3a998c1863068
+  metadata.gz: 8e361fba9f1b1198c39aac4dc2a24d7f61dee689
+  data.tar.gz: 88d60394ae9ff47ae5517aba022e1e0890f57fcb
 SHA512:
-  metadata.gz: 6fa77414d22418a5866ee05c1a3a6b4361ff2a4a48dfa889a63599999afb355503e492911e338f895490492ad132f02cc948c53eed0ac8917ef54a10fe37521b
-  data.tar.gz: c64ce83ca35c5132ba98e5e46f615327bddf7f00dbf4f523b510b7a0fe53118cbd97fafb66825124d08881a8fefbaeb5ced2dfb93a109891132a5287ed73f736
+  metadata.gz: 55f9e505070563fcb301328bfe2acb09490cdce9e726287ba1aa60a91072f89cc5ce09d526020500b586eb01dc79004a445e731408b9bda4812d564d352f1d81
+  data.tar.gz: e9e9006297346b190372be28398058cc9f5c5d08a62f53ad471d56946dbe9de1229b8950cc4d99ad29dae854c15f197d9c9a99233be8e38fd266471c378f16bd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    incline (0.2.22)
+    incline (0.2.23)
       ansi (~> 1.5.0)
       bcrypt
       bootstrap-sass
@@ -58,7 +58,7 @@ GEM
       tzinfo (~> 1.1)
     ansi (1.5.0)
     arel (6.0.4)
-    autoprefixer-rails (7.1.5)
+    autoprefixer-rails (7.1.6)
       execjs
     bcrypt (3.1.11)
     bootstrap-sass (3.3.7)

data/lib/incline/data_tables_request.rb

@@ -209,13 +209,19 @@ module Incline
 
       dataset = load_records(relation, false)
       return -1 if dataset.blank?
+      
+      first_item = dataset.first
+      klass = first_item.class
+      
+      id_field = klass.respond_to?('primary_key')       ? klass.primary_key   : nil
+      id_field ||= first_item.respond_to?('id')         ? 'id'                : nil
 
-      return -1 unless dataset.first.respond_to?(:id)
+      return -1 unless id_field
       if locate_id.is_a?(::Numeric)
-        dataset.index{|item| item.id == locate_id} || -1
+        dataset.index{|item| item.send(id_field) == locate_id} || -1
       else
         loc_id = locate_id.to_s.downcase
-        dataset.index{|item| item.id.to_s.downcase == loc_id} || -1
+        dataset.index{|item| item.send(id_field).to_s.downcase == loc_id} || -1
       end
       
     end
@@ -240,15 +246,19 @@ module Incline
         # store the unfiltered count.
         @config[:records_total] = relation.count
 
-        # If any of these is true, then filtering must be done locally in our code.
-        filter_local = (
-            # main search is a regex.
-            search.is_a?(::Regexp) ||
-            # one or more column searches is a regex.
-            columns.select{|c| c[:search].is_a?(::Regexp)}.any? ||
-            # one or more searchable columns is not in the database model.
-            columns.reject {|c| !c[:searchable] || relation.model.column_names.include?(c[:name].to_s)}.any?
-        )
+        # If we have search parameters and any of the search parameters is a regular expression or 
+        # one or more columns being searched is not a database column, then filtering must be done
+        # locally.
+        filter_local =
+            !(search.blank? && columns.reject{|c| c[:search].blank? }.blank?) &&
+                (
+                    # main search is a regex.
+                    search.is_a?(::Regexp) ||
+                    # one or more column searches is a regex.
+                    columns.select{|c| c[:search].is_a?(::Regexp)}.any? ||
+                    # one or more searchable columns is not in the database model
+                    columns.reject {|c| !c[:searchable] || relation.model.column_names.include?(c[:name].to_s) }.any?
+                )
 
         Incline::Log::debug "Filtering will be done #{filter_local ? 'application' : 'database'}-side."
 

data/lib/incline/version.rb

@@ -1,3 +1,3 @@
 module Incline
-  VERSION = "0.2.22"
+  VERSION = "0.2.23"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: incline
 version: !ruby/object:Gem::Version
-  version: 0.2.22
+  version: 0.2.23
 platform: ruby
 authors:
 - Beau Barker
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-24 00:00:00.000000000 Z
+date: 2017-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails