effective_resources 2.19.9 → 2.19.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a64aa8daa41dc12a1702ee128d8a972ec46a005f616f2091f9821075c817f9c7
-  data.tar.gz: c59a857b8b39855a74bfda837b59c259d92b192081c9af65947ad22de202d074
+  metadata.gz: 0fc5b41757668d88d0ae83b6a52f332ad18e645658909bf80c69b3fa47dd3b98
+  data.tar.gz: 55830a5d7d49dfea77885a2741dd06f335f6dbbc6cf80b86beccc39b720e9535
 SHA512:
-  metadata.gz: 71b49bf9d7152eeee999e1fffec4020355274f140c6c6e3bc4757cc8c69716808816bff5bf96b8332028ddedbf8ef24633616ea827118154bd7935aa0804a83a
-  data.tar.gz: 1ff8ec49ce929e048e9582134447046c03448c7d0a2d0fb794c6024e83a03d705a9193a63336bd6fd7d4b0e64f1e08e44ceb2f54de281c175f3de0cb344170ac
+  metadata.gz: ef99fd38dede8d87305ef660a87cc95ea64b9307812d80b7dd14cd2f2b4da7dd5e8532ac2ddf9e39521cdd637ab5027a4c8534bb1a8bc5ee134576a148d16f24
+  data.tar.gz: 7527c0b651f37c1046299286e8165bb4a3670e879227b4be7ce83c6fb3c742eab7876f2c54138f1cd25bad281b13a69d2da5085c3b629d38f3a7d34e5fb07dd7

data/app/helpers/effective_resources_helper.rb

@@ -78,7 +78,9 @@ module EffectiveResourcesHelper
 
     # Assign actions
     # We filter out any actions passed to us that aren't supported
-    actions = if atts.key?(:actions)
+    actions = if atts.key?(:actions) && atts[:actions] == false
+      {}
+    elsif atts.key?(:actions)
       {}.tap do |actions|
         atts[:actions].each do |commit, opts|
           actions[commit] = opts if (effective_resource.actions.include?(opts[:action]) || opts[:path]).present?

data/app/models/concerns/acts_as_email_form.rb

@@ -24,13 +24,15 @@ module ActsAsEmailForm
     attr_accessor :email_form_subject
     attr_accessor :email_form_body
 
-    effective_resource do
-      email_form_action      :string, permitted: true
-      email_form_skip        :boolean, permitted: true
-
-      email_form_from        :string, permitted: true
-      email_form_subject     :string, permitted: true
-      email_form_body        :text, permitted: true
+    if respond_to?(:effective_resource)
+      effective_resource do
+        email_form_action      :string, permitted: true
+        email_form_skip        :boolean, permitted: true
+
+        email_form_from        :string, permitted: true
+        email_form_subject     :string, permitted: true
+        email_form_body        :text, permitted: true
+      end
     end
 
     with_options(if: -> { email_form_action.present? && !email_form_skip? }) do

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

@@ -394,6 +394,7 @@ module Effective
         end
 
         return relation.none() if columns.blank?
+
         search_columns_by_ilike_term(relation, value, columns: columns, fuzzy: fuzzy)
       end
 
@@ -404,42 +405,33 @@ module Effective
 
         value = value.to_s
 
-        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 '
+        # Process search terms
+        terms = if value.include?(' OR ')
+          value.split(' OR ')
         elsif value.include?(' AND ')
-          terms = value.split(' AND ')
-          join = ' AND '
+          value.split(' AND ')
         else
-          terms = value.split(' ')
-          join = ' AND '
+          value.split(' ')
         end
 
         terms = (terms - [nil, '', ' ']).map(&:strip)
-        columns = Array(columns)
-        fuzzy = true if fuzzy.nil?
 
-        terms = terms.inject({}) do |hash, term|
-          hash["term_#{hash.length}".to_sym] = (fuzzy ? "%#{term}%" : term); hash
-        end
-
-        # Do any of these columns contain all the terms?
-        conditions = columns.map do |name|
-          column = (name.to_s.include?('.') ? name : sql_column(name))
-          raise("expected an sql column for #{name}") if column.blank?
+        # Searching these columns with this behaviour
+        fuzzy = true if fuzzy.nil?
+        joiner = value.include?(' OR ') ? :or : :and
 
-          keys = terms.keys.map { |key| (fuzzy ? "#{column} #{ilike} :#{key}" : "#{column} = :#{key}") }
-          '(' + keys.join(' AND ') + ')'
-        end.join(' OR ')
+        # Each term must match some column. Depending on the joiner, each term must match some column
+        terms.map do |term|
+          Array(columns).map do |name| 
+            column = (name.to_s.include?('.') ? name : sql_column(name))
 
-        # Do the search
-       collection.where(conditions, terms)
+            if fuzzy
+              collection.where("#{column} #{ilike} ?", "%#{term}%")
+            else
+              collection.where("#{column} = ?", term)
+            end
+          end.inject(:or)
+        end.inject(joiner)
       end
 
       def order_by_associated_conditions(association, sort: nil, direction: :asc, limit: nil)

data/app/views/effective/resource/_actions.html.haml

@@ -2,5 +2,7 @@
   - action = opts.delete(:action)
   = link_to(label, (effective_resource.action_path(action, resource) || '#'), opts)
 
-= instance_exec(resource, &format_block) if local_assigns[:format_block]
-= yield if block_given?
+- if local_assigns[:format_block] && local_assigns[:datatable]
+  = instance_exec(resource, datatable, &format_block)
+
+= yield(resource) if block_given?

data/app/views/effective/resource/_actions_dropleft.html.haml

@@ -5,5 +5,7 @@
 
     = dropdown_link_to(label, (effective_resource.action_path(action, resource) || '#'), opts)
 
-  = instance_exec(resource, &format_block) if local_assigns[:format_block]
+  - if local_assigns[:format_block] && local_assigns[:datatable]
+    = instance_exec(resource, datatable, &format_block)
+
   = yield(resource) if block_given?

data/app/views/effective/resource/_actions_glyphicons.html.haml

@@ -4,5 +4,7 @@
 
   = glyphicon_to(action, (effective_resource.action_path(action, resource) || '#'), opts)
 
-= instance_exec(resource, &format_block) if local_assigns[:format_block]
+- if local_assigns[:format_block] && local_assigns[:datatable]
+  = instance_exec(resource, datatable, &format_block)
+
 = yield(resource) if block_given?

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.19.9'.freeze
+  VERSION = '2.19.11'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.19.9
+  version: 2.19.11
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-06 00:00:00.000000000 Z
+date: 2024-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails