Merge branch 'reset_audited_user_when_yield_raises_exception' of http…

…s:https://github.com/flugsio/audited into flugsio-reset_audited_user_when_yield_raises_exception

* 'reset_audited_user_when_yield_raises_exception' of https://github.com/flugsio/audited:
  Reset audited_user when yield raises exception

lib/audited/audit.rb

@@ -29,12 +29,9 @@ def audited_classes
  # for background operations that require audit information.
  def as_user(user, &block)
  Thread.current[:audited_user] = user
-
- yieldval = yield
-
+ yield
+ ensure
  Thread.current[:audited_user] = nil
-
- yieldval
  end
 
  # @private

spec/audited/adapters/active_record/audit_spec.rb

@@ -185,6 +185,15 @@ class Models::ActiveRecord::CustomUserSubclass < Models::ActiveRecord::CustomUse
  end.should == 42
  end
 
+ it "should reset audited_user when the yield block raises an exception" do
+ expect {
+ Audited.audit_class.as_user('foo') do
+ raise StandardError
+ end
+ }.to raise_exception
+ Thread.current[:audited_user].should be_nil
+ end
+
  end
 
  describe "mass assignment" do

spec/audited/adapters/mongo_mapper/audit_spec.rb

@@ -188,6 +188,15 @@ class Models::MongoMapper::CustomUserSubclass < Models::MongoMapper::CustomUser
  end.should == 42
  end
 
+ it "should reset audited_user when the yield block raises an exception" do
+ expect {
+ Audited.audit_class.as_user('foo') do
+ raise StandardError
+ end
+ }.to raise_exception
+ Thread.current[:audited_user].should be_nil
+ end
+
  end
 
 end