fix yield not working from around filter of observers, fixes Github#329

2 files changed, 27 insertions, 2 deletions

diff --git a/activerecord/lib/active_record/observer.rb b/activerecord/lib/active_record/observer.rb
index 0893d7e337..c723436330 100644
--- a/activerecord/lib/active_record/observer.rb
+++ b/activerecord/lib/active_record/observer.rb
@@ -110,8 +110,8 @@ module ActiveRecord
           next unless respond_to?(callback)
           callback_meth = :"_notify_#{observer_name}_for_#{callback}"
           unless klass.respond_to?(callback_meth)
-            klass.send(:define_method, callback_meth) do
-              observer.send(callback, self)
+            klass.send(:define_method, callback_meth) do |&block|
+              observer.send(callback, self, &block)
             end
             klass.send(callback, callback_meth)
           end
diff --git a/activerecord/test/cases/lifecycle_test.rb b/activerecord/test/cases/lifecycle_test.rb
index 6cd8494c9e..643e949087 100644
--- a/activerecord/test/cases/lifecycle_test.rb
+++ b/activerecord/test/cases/lifecycle_test.rb
@@ -107,6 +107,23 @@ class ValidatedCommentObserver < ActiveRecord::Observer
   end
 end
 
+
+class AroundTopic < Topic
+end
+
+class AroundTopicObserver < ActiveRecord::Observer
+  observe :around_topic
+  def topic_ids
+    @topic_ids ||= []
+  end
+
+  def around_save(topic)
+    topic_ids << topic.id
+    yield(topic)
+    topic_ids << topic.id
+  end
+end
+
 class LifecycleTest < ActiveRecord::TestCase
   fixtures :topics, :developers, :minimalistics
 
@@ -206,6 +223,14 @@ class LifecycleTest < ActiveRecord::TestCase
     assert_equal developer, SalaryChecker.instance.last_saved
   end
 
+  test "around filter from observer should accept block" do
+    observer = AroundTopicObserver.instance
+    topic = AroundTopic.new
+    topic.save
+    assert_nil observer.topic_ids.first
+    assert_not_nil observer.topic_ids.last
+  end
+
   def test_observer_is_called_once
     observer = DeveloperObserver.instance # activate
     observer.calls.clear