effective_resources 2.19.7 → 2.19.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 755f35cecf11e51a68cc1a998a6f14ffcb60fc7f790b19989c569d7015f7082a
-  data.tar.gz: 28c81ad69b69c2ded6d458fde80921453777745d58d5828c81b411add7e3ac76
+  metadata.gz: a64aa8daa41dc12a1702ee128d8a972ec46a005f616f2091f9821075c817f9c7
+  data.tar.gz: c59a857b8b39855a74bfda837b59c259d92b192081c9af65947ad22de202d074
 SHA512:
-  metadata.gz: f734ba1bb834a8337d0ca537db43576f8290ed067653405394a8784110e137f10d885436c706c368452265282d78932cfa7824dff2b1f7f196298c06fc29ac0a
-  data.tar.gz: dee4966d4485ccfac7daecc4afb41cc77571d696298c5f075334de9b27b6ec11496f361ecee3528335801a3b81a09d8172b941bf3c403dda958118629693baa6
+  metadata.gz: 71b49bf9d7152eeee999e1fffec4020355274f140c6c6e3bc4757cc8c69716808816bff5bf96b8332028ddedbf8ef24633616ea827118154bd7935aa0804a83a
+  data.tar.gz: 1ff8ec49ce929e048e9582134447046c03448c7d0a2d0fb794c6024e83a03d705a9193a63336bd6fd7d4b0e64f1e08e44ceb2f54de281c175f3de0cb344170ac

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/controllers/concerns/effective/impersonation_controller/destroy.rb

@@ -3,12 +3,12 @@ module Effective
     module Destroy
 
       def destroy
-        # Reset impersonation
-        session[:impersonation_user_id] = nil
-        session[:impersonation_original_path] = nil
-
         # Edge case where the current_user is blank. Weird session data.
         if current_user.blank?
+          # Reset impersonation
+          session[:impersonation_user_id] = nil
+          session[:impersonation_original_path] = nil
+
           redirect_to(root_path) and return
         end
 
@@ -16,6 +16,10 @@ module Effective
         @user = current_user.class.find(session[:impersonation_user_id])
         redirect_path = after_destroy_impersonate_path_for(@user)
 
+        # Reset impersonation
+        session[:impersonation_user_id] = nil
+        session[:impersonation_original_path] = nil
+
         expire_data_after_sign_in!
         warden.session_serializer.store(@user, Devise::Mapping.find_scope!(@user))
 

data/lib/effective_resources/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.19.7
+  version: 2.19.9
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-08 00:00:00.000000000 Z
+date: 2024-03-06 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.