triggerable 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d760b055f2a6dca80d03f71a2ab1ac64ae136e46
-  data.tar.gz: 56240570bea8667aa0e539362d50b26553da5db0
+  metadata.gz: 01cc155d845bc2afb7c7eb308113e74819a00d4f
+  data.tar.gz: 81074d512740a11417bc35480d4ffc1e3192dfef
 SHA512:
-  metadata.gz: 41360349dc159a7d3b37685ad102d49c90923d00e913276255fe644b25db32e3d13dfa0b35ab5af03029d4a57a085dd3e04e83bd46cfc2fc8a2170998a2fb107
-  data.tar.gz: 52dcfd7ceadc96185c90d81b6ac7a23441f6ee0cd9d9645354fe55dc26d01f642a30c6d03847a87d08068a23bf6c81febba4c167fae190cac0e91b17db0e08f1
+  metadata.gz: 01af1a6893ed82e2878e57ab66578c6b05f5dae25eb822faf06ba66faf5071af0329b0ab266a306b0ef2b2a4b39b7b0e75d0b40f7f8651009ae4de3efffe70ee
+  data.tar.gz: e0d69053d213d38377dcaa496ded6d51cbc630933f2e623ba79a0d53b384037dc1db94a94b3c657d1d9566f4682b1d2b4ac7bf3dab085c5746d5fa4ac3978b00

data/README.md

@@ -24,7 +24,7 @@ Setup and defining trigger and automation:
 
 ```ruby
 class User < ActiveRecord::Base
-  trigger on: :after_create, if: { receives_sms: true }, do
+  trigger on: :after_create, if: { receives_sms: true } do
     user.send_welcome_sms
   end
 

data/lib/triggerable/actions.rb

@@ -22,9 +22,19 @@ module Triggerable
     def run_for! object, trigger_name
       proc = @block
       object.instance_eval do
-        PaperTrail.whodunnit = trigger_name if defined?(PaperTrail)
-        instance_exec(&proc)
-        PaperTrail.whodunnit = nil if defined?(PaperTrail)
+        change_whodunnit = trigger_name.present? && defined?(PaperTrail)
+        old_whodunnit = nil
+
+        if change_whodunnit
+          old_whodunnit = PaperTrail.whodunnit
+          PaperTrail.whodunnit = trigger_name
+        end
+
+        begin
+          instance_exec(&proc)
+        ensure
+          PaperTrail.whodunnit = old_whodunnit if change_whodunnit
+        end
       end
     end
   end

data/lib/triggerable/version.rb

@@ -1,3 +1,3 @@
 module Triggerable
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: triggerable
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler