effective_datatables 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5356cff7e6d831538a222820ad35adde6b9c28a8
-  data.tar.gz: 273bea0ced295a05ef825e2cfa009670c1a0f682
+  metadata.gz: 2f0b5d8833f49fa08b11c76ee4f49622ff13c72d
+  data.tar.gz: 3b64fb8a94657715b230c1b47976c0c180afaeb4
 SHA512:
-  metadata.gz: 8c0af0da24feda9e04408d4150fd874818d7bf08ecb29f445797e4a06362cb4d9ec454f65163d77a551bfc5af2efb96e23ed0eebb99125a5224fc6883aaafd5d
-  data.tar.gz: 3f6e5cd755c9d9c773ed9c32e9096fc2c5b496a7dfc5ff0c8aec14519e5b2719db57f09c332617566bc2b2f3f8a8968f6854326e073d75d5635a9e8fbea8e36a
+  metadata.gz: 91119ca0ee5f73dfa6bcefd728cf18c9a4e4f0f5ba7522f1b242c4d44f11290d1a25139d7300f59f82e3710a1f8a34284e3a7eeca47800a493d4e91be02a0dc1
+  data.tar.gz: 5caf11ca75774bb2133c8a67343a0b0aadb6f55e4b72b63136ecc459916d173bfe1105b5ae7e17a8b483d83582fd92a91bf8408da50cbc058fb8e2770119e2fa

data/app/models/effective/active_record_datatable_tool.rb

@@ -68,10 +68,10 @@ module Effective
           collection.public_send(sql_op, "#{sql_column} = :term", term: term)
         elsif ['null', 'nil', nil].include?(term)
           collection.public_send(sql_op, "#{sql_column} = :term OR #{sql_column} IS NULL", term: '')
-        elsif table_column[:filter][:fuzzy] != true
-          collection.public_send(sql_op, "#{sql_column} = :term", term: term)
-        else
+        elsif table_column[:filter][:fuzzy]
           collection.public_send(sql_op, "#{sql_column} #{ilike} :term", term: "%#{term}%")
+        else
+          collection.public_send(sql_op, "#{sql_column} = :term", term: term)
         end
       when :belongs_to_polymorphic
         # our key will be something like Post_15, or Event_1

data/app/models/effective/array_datatable_tool.rb

@@ -66,15 +66,13 @@ module Effective
     end
 
     def search_column_with_defaults(collection, table_column, search_term, index)
-      search_term = search_term.downcase
+      search_term = search_term.downcase if table_column[:filter][:fuzzy]
 
       collection.select! do |row|
-        value = row[index].to_s.downcase
-
-        if table_column[:filter][:fuzzy] != true
-          value == search_term
+        if table_column[:filter][:fuzzy]
+          row[index].to_s.downcase.include?(search_term)
         else
-          value.include?(search_term)
+          row[index] == search_term
         end
       end || collection
     end

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

@@ -164,6 +164,11 @@ module Effective
           filter[:as] ||= :select
         end
 
+        # Fuzzy by default throughout
+        unless filter.key?(:fuzzy)
+          filter[:fuzzy] = true
+        end
+
         # Check if this is an aggregate column
         if ['SUM(', 'COUNT(', 'MAX(', 'MIN(', 'AVG('].any? { |str| sql_column.include?(str) }
           filter[:sql_operation] = :having

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '2.4.0'.freeze
+  VERSION = '2.4.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Code and Effect