Merge pull request #1 from marcreynolds/mr-adjust-notifications-unsubscription-934

Change value used in call to unsubscribe

Author: lipanski

lib/sql_spy.rb

@@ -37,11 +37,16 @@ def call(_name, start, finish, _message_id, values)
   end
 
   def self.track
+
     tracker = Tracker.new
 
-    ActiveSupport::Notifications.subscribe("sql.active_record", tracker)
-    yield
-    ActiveSupport::Notifications.unsubscribe(tracker)
+    subscriber = ActiveSupport::Notifications.subscribe("sql.active_record", tracker)
+
+    begin
+      yield
+    ensure
+      ActiveSupport::Notifications.unsubscribe(subscriber)
+    end
 
     tracker.queries
   end

test/sql_spy_test.rb

@@ -143,4 +143,20 @@ def test_execute_raw_sql
     refute query.update?
     refute query.delete?
   end
+
+  def test_unsubscribe_on_error
+    mock = MiniTest::Mock.new
+    mock.expect(:call, true, [Object])
+    ActiveSupport::Notifications.stub(:unsubscribe, mock) do
+      begin
+        queries = SqlSpy.track do
+          raise "error in block"
+        end
+      rescue => e
+        assert_equal("error in block", e.message)
+      end
+    end
+
+    mock.verify
+  end
 end