effective_resources 2.7.19 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f3c2935ca26bb5e2275b6d035bc98fa19f6fdb0bb63be57b1f45a7dc6a46a93
-  data.tar.gz: 7a61e1b4d7a7ad0fbd7834fb930f10a1a860699a578f6eaeaf227f2a121173bf
+  metadata.gz: 750ef0ae89d5b6437e046369b0dc46811abfa26ace4559e9448b190c1e255430
+  data.tar.gz: 7ad14d23604419ba975ab11addf2912f7fbcefe40fdaa9764c7782a2c992cc3d
 SHA512:
-  metadata.gz: 0a9c46b85be8c1cec2b70787ac4a8413b2694e574a9b82937faf18ff35b5f1fac015585d16e25a84962a87fce0aed032fa45a9097b56c26c868b30c6844441c0
-  data.tar.gz: 4ed252ae6da3efe34ebca6a5591c5690c33e4d7ee3029f80c695767a66534ec17a623eeb9bf2a1b579e0ee57337be6cfcd3803e9504fd4027406c0ea8fcdf2e2
+  metadata.gz: 6b79973ce6e33a95e792921ecf6cc548fa144b9fb2aa5b550e531f1d7aa613d00e39aa301b71ab802c0e1506c7f31dba6344925e188f2efd3f78a0e071e24efa
+  data.tar.gz: 4bd4b421e3e74108cd95a84cb3283f0740aab2f890532901f5cf0e52b4d4680383c75351612e6d9b59b5cd6f546e844e5d8120ea13c34cc1960cabd503670d6b

data/app/models/effective/resources/relation.rb

@@ -62,6 +62,9 @@ module Effective
         when :string, :text
           relation
             .order(Arel.sql(("ISNULL(#{sql_column}), " if mysql?).to_s + "#{sql_column}='' ASC, #{sql_column} #{sql_direction}" + (" NULLS LAST" if postgres?).to_s))
+        when :date, :datetime
+          relation
+            .order(Arel.sql(("ISNULL(#{sql_column}), " if mysql?).to_s + "#{sql_column} #{sql_direction}" + (" NULLS LAST" if postgres?).to_s))
         else
           relation
             .order(Arel.sql("#{sql_column} #{sql_direction}"))
@@ -410,29 +413,25 @@ module Effective
           join = ' AND '
         else
           terms = value.split(' ')
-          join = ' OR '
+          join = ' AND '
         end
 
         terms = (terms - [nil, '', ' ']).map(&:strip)
         columns = Array(columns)
         fuzzy = true if fuzzy.nil?
 
-        # Do the search
-        searched = collection
-
-        terms.each do |term|
-          conditions = (
-            if fuzzy
-              columns.map { |name| "#{sql_column(name)} #{ilike} :fuzzy" }
-            else
-              columns.map { |name| "#{sql_column(name)} = :term" }
-            end
-          ).join(join)
-
-          searched = collection.where(conditions, fuzzy: "%#{term}%", term: term)
+        terms = terms.inject({}) do |hash, term|
+          hash["term_#{hash.length}".to_sym] = (fuzzy ? "%#{term}%" : term); hash
         end
 
-        searched
+        # Do any of these columns contain all the terms?
+        conditions = columns.map do |name|
+          keys = terms.keys.map { |key| (fuzzy ? "#{sql_column(name)} #{ilike} :#{key}" : "#{sql_column(name)} = :#{key}") }
+          '(' + keys.join(' AND ') + ')'
+        end.join(' OR ')
+
+        # Do the search
+       collection.where(conditions, terms)
       end
 
       def order_by_associated_conditions(association, sort: nil, direction: :asc, limit: nil)

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.7.19'.freeze
+  VERSION = '2.8.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.7.19
+  version: 2.8.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-07 00:00:00.000000000 Z
+date: 2023-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails