effective_trash 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9af7c36500a43728404435cf41766d2b49835ded249048d04302eb99f76e55aa
-  data.tar.gz: 5e943b5ddf135a9bd2c93bf4c7e1e05e3cb3a20996b53d4afe2e64f271729b7b
+  metadata.gz: e396467b51605c57556e6709d570c9b842a854e70d4b2a438095ae27c6588ce4
+  data.tar.gz: 4564fe2452cb161287809d21da658a66014aa155e0af8a99f069019edf6e8c70
 SHA512:
-  metadata.gz: 75c2bce4d510729ac5a54d584dc8ef645d6fde9d819014d1ac346190a453a4a37c696a3493751481f43461b616df5597088c5400c14dd45f096753d5a296c9a8
-  data.tar.gz: b3050933b150df392b026c14312b5b063c0579442e682d2794d27af924bc5aa53f82990f24d79a6becacc0f3e3188c41d80f8ab40f0cb72fc308a55f4754c3c0
+  metadata.gz: 2a96ee36e53a801f9c126e61f63bac62ee9d063017aa870892f56257d80ceb3e4a5ab929694a82a9be86c6f05b09143e7bf0358444062dcb80350d62946bd385
+  data.tar.gz: a2f6b828a1c74e64eb2e361fdf33f19a5492c925295f459a21f7c72be839352a379b36291fdf17b7a6ef9516a13e63b96ba29c1678838046bf824d81ac71778c

data/README.md

@@ -46,7 +46,7 @@ and to your contoller:
 
 ```ruby
 class ApplicationController < ActionController::Base
-  before_action :set_effective_trash_current_user
+  around_action :set_effective_trash_current_user
 end
 ```
 
@@ -114,4 +114,3 @@ MIT License.  Copyright [Code and Effect Inc.](http://www.codeandeffect.com/)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Bonus points for test coverage
 6. Create new Pull Request
-

data/lib/effective_trash/set_current_user.rb

@@ -3,13 +3,18 @@ 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
         EffectiveTrash.current_user = current_user
+
+        if block_given?
+          retval = yield
+          EffectiveTrash.current_user = nil
+          retval
+        end
       end
 
     end
   end
 end
-

data/lib/effective_trash/version.rb

@@ -1,3 +1,3 @@
 module EffectiveTrash
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.4.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_trash
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Code and Effect