effective_resources 2.7.10 → 2.7.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48aa19d02843bf4a42426c3de84b791ec707d0784b1d3275f75348fd3795fb17
-  data.tar.gz: 8f31b8917443d4543992e41bbdf5c894591f02ae2b339d46d20994e97da5e1db
+  metadata.gz: 52098eedae0bfee156714b0ad5e2d2a209e542d56256f3d5104d8d1d63c7a97c
+  data.tar.gz: ddc812ec61b5bb6c959013074cbd91e08af99df211892511228760cb4555c5df
 SHA512:
-  metadata.gz: f32a15406d2171eb4ec61801a8d124e17041d60be2004ca20c53dfb852ef15e2fec4cfd036cf1ddeafbdbaa1944c8dc5838fff95b1823be5594a2726b1fc7632
-  data.tar.gz: a582b22c7d231788aeb012d6a38fd0606af01f0b14bbc6ed1efaf285d7c1407cab8f71e31c6a1e1d1a0f2fa9da8e19e192e5f80f17c92b388a94e8807792f25d
+  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}%"))
@@ -350,6 +350,13 @@ module Effective
           when :gteq then relation.where(attribute.gteq(term))
           when :lt then relation.where(attribute.lt(term))
           when :lteq then relation.where(attribute.lteq(term))
+          when :days_ago_eq
+            date = (Time.zone.now - (term.to_i).days)
+            relation.where("#{sql_column} >= ? AND #{sql_column} <= ?", date.beginning_of_day, date.end_of_day)
+          when :days_ago_lteq # 30 days or less ago.
+            relation.where("#{sql_column} >= ?", Time.zone.now - (term.to_i).days)
+          when :days_ago_gteq # 30 days or more ago
+            relation.where("#{sql_column} <= ?", Time.zone.now - (term.to_i).days)
           else raise("Unexpected operation: #{operation}")
         end
       end
@@ -376,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 = (
@@ -390,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.10'.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.10
+  version: 2.7.12
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-09 00:00:00.000000000 Z
+date: 2023-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails