effective_resources 2.19.8 → 2.19.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e07e4841376e727004fa9089f33c259e564acc03061b485eca87ede10ff42fd1
-  data.tar.gz: ea0a6fc7a9babf63988157f30893cefb186ea20d04d009b233b7c1269aed2591
+  metadata.gz: dcc082069435ea9d5601f7d80eb676c1cbba2f63372659236151412c00f8feea
+  data.tar.gz: bed63eedbeb63602746e0e186d84d6f56c2635415ce9eff19a6e33e69aeb973a
 SHA512:
-  metadata.gz: 409ac230ffdcae4195e61f1a969b7a2b945305fbeca00b9f18848750c80dc51469fcb638a2ebfc74d4c07d59216893a599891fec8aa8d643ea5bf3770f146446
-  data.tar.gz: 906f2e460fc11e521b9ba8338eab206ae66784c1baa3c37fd3f8bff66ba0866b08ef3377e9e696b070770e7366e507e6bc59fdcb0e61b1b0cd93fc5bdab562d5
+  metadata.gz: 60329f1197ae967e67df7cf12eb1e9be25d6074a8a8e8993fbfb29275e3deeeabb2fcca589f8d50c6278d7b9e54d2ebed8e29413c1f209f78501dddaa66d9f25
+  data.tar.gz: eadc102a68f6b214bce5664c04f0a4a5ad51c435b12f040d760a94e5667f6ed86522770c48b4456dd6638769e5385b3c934068c6ca21bd27886992d39e9c9c2c

data/app/controllers/concerns/effective/crud_controller/paths.rb

@@ -72,10 +72,22 @@ module Effective
       def referer_redirect_path
         url = request.referer.to_s
 
-        return if (resource && resource.respond_to?(:destroyed?) && resource.destroyed? && url.include?("/#{resource.to_param}"))
+        # Referer may not always be present
+        return if url.blank?
+
+        # Don't redirect back to this resource's show or edit page
+        if resource.try(:destroyed?)
+          to_param = (resource.to_param || resource.try(:token) || resource.try(:slug) || resource.id) # to_param is nil sometimes
+          return if to_param.present? && url.include?("/#{to_param}")
+        end
+
+        # Don't redirect back if we're on duplicate action
         return if url.include?('duplicate_id=')
-        return unless (Rails.application.routes.recognize_path(URI(url).path) rescue false)
 
+        # Don't redirect unless we recognize the url
+        return unless (Rails.application.routes.recognize_path(url) rescue false) || (Rails.application.routes.recognize_path(URI(url).path) rescue false)
+
+        # Redirect to this recognized url
         url
       end
 

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/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.19.8'.freeze
+  VERSION = '2.19.10'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.19.8
+  version: 2.19.10
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-08 00:00:00.000000000 Z
+date: 2024-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -288,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: Make any controller an effective resource controller.