effective_trash 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a74c78184cb3ec900ce2336bd3cc00b2f4db31df0743aae8f0c0e81345cc262e
-  data.tar.gz: 1e79f5bfacebcda566c36b5f11ce271be53e5f975294fb49babd82e349c98f0a
+  metadata.gz: a027f4ee4322f2cf88f285940118622d0e388152bcc5dd05e496d58ac8accc5e
+  data.tar.gz: 69473545481c7a68bb9f38055af0b911b94a5d307215c64a561d2b80913a31bb
 SHA512:
-  metadata.gz: 85d54f6faddf75ef480bd44c6a81c12013aca4ca3f63c81a64f228be7cda2cf8720a6743d2871c0f7d191c70431837ebe07086e3aff5fb0c56f70459219b365b
-  data.tar.gz: 3bc56877b4ec4abd95d7958aa945375c64ff16463b244514c0fef3dd9c2c2210e46a67c14e2a25921c1ad8871e278972fdfac1e8d87fd9aa0aedfa1966f55ccd
+  metadata.gz: 884dc5138ad6decd88bf97d70f12d58d5f0bdd0fc32cbebbfc49ec3240e485bd12f454e8ddd42e9eb9323389f6b77bd0fa17db0e185990d8b3bf0d63c1500dec
+  data.tar.gz: dd6b3e43126f70b9a2cde51b36fbb923d2690b30492bdd511f6ede8ad58c7437231c822bcbaa96562113a7f11b28a2231c9b01ccec64ad31361124e1b75eb317

data/lib/effective_trash/engine.rb

@@ -1,3 +1,5 @@
+require_relative '../../app/models/concerns/acts_as_trashable.rb'
+
 module EffectiveTrash
   class Engine < ::Rails::Engine
     engine_name 'effective_trash'

data/lib/effective_trash/set_current_user.rb

@@ -3,14 +3,15 @@ module EffectiveTrash
     module ActionController
 
       # Add me to your ApplicationController
-      # before_action :set_effective_trash_current_user
+      # around_action :set_effective_trash_current_user
 
       def set_effective_trash_current_user
-        begin
-          EffectiveTrash.current_user = current_user
-          yield
-        ensure
+        EffectiveTrash.current_user = current_user
+
+        if block_given?
+          retval = yield
           EffectiveTrash.current_user = nil
+          retval
         end
       end
 

data/lib/effective_trash/version.rb

@@ -1,3 +1,3 @@
 module EffectiveTrash
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.4.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_trash
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-23 00:00:00.000000000 Z
+date: 2023-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Trash and Restore any Active Record object.