effective_resources 2.7.11 → 2.7.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d337f18fe69722ae972a31d8027af508b555b6542496e626d7793dacec6f2a17
-  data.tar.gz: 44cb8d6fce0394a2dee68cd4731e3aea349d9edf2a8eed46026afe26e76838a0
+  metadata.gz: 52098eedae0bfee156714b0ad5e2d2a209e542d56256f3d5104d8d1d63c7a97c
+  data.tar.gz: ddc812ec61b5bb6c959013074cbd91e08af99df211892511228760cb4555c5df
 SHA512:
-  metadata.gz: 45c1f94eba3ba91769fb8b6e356333405e2dd826e6ab14657abe7feaeec9635ce05f75554929ac140ad295d3759180dd04aa208adfe67bae6fcb8d70ee5a489c
-  data.tar.gz: a324bf7e82198921d34b19f341c8e36bb72ff4225dd7b9bbd6b94d4e30cf6d8aa131fc69700c6da6fc4d2ceb45efd784e9bcf50d64f2d095d526c6c672591416
+  metadata.gz: c5dae027cd6b7cb940b321f35e8119c3ec26f7f6fef5e1cdbd5a9ff7e9ef6bdf114fc18fe939a872f6beb7885b41edd0eaacb86e43309e35bd8d39ab0a6f5ba7
+  data.tar.gz: 3cd24f5cfef41bb50f513cb592be063eb03975aa6e208d0c46b73f42dd722860b370cb218f7f83840deee84d92f5fa1da976182cacc9d85e926dc985e4c172b6

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

@@ -341,7 +341,7 @@ module Effective
 
         case operation
           when :eq then relation.where("#{sql_column} = ?", term)
-          when :matches then relation.where("#{sql_column} #{ilike} ?", "%#{term}%")
+          when :matches then search_columns_by_ilike_term(relation, term, columns: name)
           when :not_eq then relation.where(attribute.not_eq(term))
           when :does_not_match then relation.where(attribute.does_not_match("%#{term}%"))
           when :starts_with then relation.where(attribute.matches("#{term}%"))
@@ -383,12 +383,37 @@ module Effective
         end
 
         return relation.none() if columns.blank?
+        search_columns_by_ilike_term(relation, value, columns: columns, fuzzy: fuzzy)
+      end
+
+      private
 
-        fuzzy = true unless fuzzy == false
+      def search_columns_by_ilike_term(collection, value, columns:, fuzzy: nil)
+        return collection if value.blank?
 
-        # Retval
-        searched = relation
-        terms = value.split(' ') - [nil, '']
+        raise('unsupported OR and AND syntax') if value.include?(' OR ') && value.include?(' AND ')
+        raise('expected columns') unless columns.present?
+
+        terms = []
+        join = ''
+
+        if value.include?(' OR ')
+          terms = value.split(' OR ')
+          join = ' OR '
+        elsif value.include?(' AND ')
+          terms = value.split(' AND ')
+          join = ' AND '
+        else
+          terms = value.split(' ')
+          join = ' OR '
+        end
+
+        terms = (terms - [nil, '', ' ']).map(&:strip)
+        columns = Array(columns)
+        fuzzy = true if fuzzy.nil?
+
+        # Do the search
+        searched = collection
 
         terms.each do |term|
           conditions = (
@@ -397,16 +422,14 @@ module Effective
             else
               columns.map { |name| "#{sql_column(name)} = :term" }
             end
-          ).join(' OR ')
+          ).join(join)
 
-          searched = searched.where(conditions, fuzzy: "%#{term}%", term: term)
+          searched = collection.where(conditions, fuzzy: "%#{term}%", term: term)
         end
 
         searched
       end
 
-      private
-
       def order_by_associated_conditions(association, sort: nil, direction: :asc, limit: nil)
         resource = Effective::Resource.new(association)
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.7.11'.freeze
+  VERSION = '2.7.12'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.7.11
+  version: 2.7.12
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-11 00:00:00.000000000 Z
+date: 2023-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails