effective_datatables 3.0.15 → 3.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0a7e266b00b4bc168dbf066d2be5a0b5a3d00a8
-  data.tar.gz: b5b54094cdf557a848a0466c27bdb4efce57d210
+  metadata.gz: a36c56e15a3e3c9d57862183dc41ed61dfa7be69
+  data.tar.gz: 38ada5d0f882aabd61510b21d2153bd0708ee437
 SHA512:
-  metadata.gz: 680dc369209e29efcdbce860039d2f6f9108c033f182cdcead1e3834df7cd50a6a105f548132decac8049bb16e229a08269f1089814455f04d13d49d9d9f9b90
-  data.tar.gz: baeb9a1a4428b1acf8eb6493fe7e63a54a4c71316177adead6b9513ac78f900c692b4808b617ba0caa89a925e226e41b0df3045091493208918fce17a78075c6
+  metadata.gz: 6d0cfc1d01e242b7b5afe8b74b6c27d1cafc24fcf8bec8f1de0e13295ca9ae3f005e5dd9a5cb5c2d04f8d96ba9b8fc01b34592662dc74a46317a489f1cd59d61
+  data.tar.gz: 3379dbd9030d211d3f21d72a7c8db65ffb5746e506a6d9497b5d6b30eda3b78408ba00c546c17a4e3679929c9a7d7efc385a69c6cffb2fcee955263795472185

data/app/models/effective/datatable_value_tool.rb

@@ -73,7 +73,7 @@ module Effective
 
       fuzzy = column[:search][:fuzzy]
       term = Effective::Attribute.new(column[:as]).parse(value, name: column[:name])
-      term_downcased = term.downcase if fuzzy && term.kind_of?(String)
+      term_downcased = term.to_s.downcase
       macros = Effective::Resource.new('').macros
 
       if term == 'nil'
@@ -104,21 +104,21 @@ module Effective
             row[index] == term
           end
         when *macros, :resource
-          Array(row[index]).any? do |resource|
-            if column[:as] != :resource
-              resource = resource.send(column[:name])
-            end
+          resources = Array(column[:as] == :resource ? row[index] : row[index].send(column[:name]))
+          terms = Array(term)
 
-            matched = false
+          resources.any? do |resource|
+            terms.any? do |term|
+              matched = false
 
-            if term.kind_of?(Integer) && resource.respond_to?(:id)
-              matched ||= (resource.id == term || resource.to_param == term)
-            elsif term.kind_of?(Array) && resource.respond_to?(:id)
-              matched ||= term.any? { |term| resource.id == term || resource.to_param == term || resource.to_param == value }
-            end
+              if term.kind_of?(Integer) && resource.respond_to?(:to_param)
+                matched = (resource.id == term || resource.to_param == term)
+              end
 
-            matched ||= (fuzzy ? resource.to_s.downcase.include?(term_downcased) : resource.to_s == term)
+              matched ||= (fuzzy ? resource.to_s.downcase.include?(term.to_s.downcase) : resource.to_s == term)
+            end
           end
+
         else  # :string, :text, :email
           if fuzzy
             row[index].to_s.downcase.include?(term_downcased)

data/app/models/effective/effective_datatable/resource.rb

@@ -19,7 +19,7 @@ module Effective
         if active_record_collection?
           columns.each do |name, opts|
             opts[:as] ||= resource.sql_type(name)
-            opts[:sql_column] = (resource.sql_column(name) || false) if opts[:sql_column].nil?
+            opts[:sql_column] = resource.sql_column(name) if opts[:sql_column].nil?
 
             case opts[:as]
             when *resource.macros

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '3.0.15'.freeze
+  VERSION = '3.0.16'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 3.0.15
+  version: 3.0.16
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-06 00:00:00.000000000 Z
+date: 2017-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails