Make sure that without_locking reverts AR::Base.lock_optimistically t…

…o its old value even if the given block raises an exception.

lib/acts_as_versioned.rb

@@ -471,9 +471,11 @@ def without_revision(&block)
           def without_locking(&block)
             current = ActiveRecord::Base.lock_optimistically
             ActiveRecord::Base.lock_optimistically = false if current
-            result = block.call
-            ActiveRecord::Base.lock_optimistically = true if current
-            result
+            begin
+              block.call
+            ensure
+              ActiveRecord::Base.lock_optimistically = true if current
+            end
           end
         end
       end

test/versioned_test.rb

@@ -342,4 +342,29 @@ def test_if_changed_does_not_create_new_version_if_unlisted_column_is_changed
     assert landmarks(:washington).changed?
     assert !landmarks(:washington).altered?
   end
+
+  def test_without_locking_temporarily_disables_optimistic_locking
+    enabled1 = false
+    block_called = false
+
+    ActiveRecord::Base.lock_optimistically = true
+    LockedPage.without_locking do
+      enabled1 = ActiveRecord::Base.lock_optimistically
+      block_called = true
+    end
+    enabled2 = ActiveRecord::Base.lock_optimistically
+
+    assert block_called
+    assert !enabled1
+    assert enabled2
+  end
+
+  def test_without_locking_reverts_optimistic_locking_settings_if_block_raises_exception
+    assert_raises(RuntimeError) do
+      LockedPage.without_locking do
+        raise RuntimeError, "oh noes"
+      end
+    end
+    assert ActiveRecord::Base.lock_optimistically
+  end
 end