Merge pull request #6859 from bogdan/deprecate_monkey_patch

AS::Callbacks: deprecate monkey patch code

3 files changed, 19 insertions, 0 deletions

diff --git a/actionpack/action_pack_url_generator.rb b/actionpack/action_pack_url_generator.rb
new file mode 120000
index 0000000000..0bb3e85e86
--- /dev/null
+++ b/actionpack/action_pack_url_generator.rb
@@ -0,0 +1 @@
+/home/bogdan/makabu/my/benchmarks/action_pack_url_generator.rb
\ No newline at end of file
diff --git a/actionpack/lib/action_controller/caching/sweeping.rb b/actionpack/lib/action_controller/caching/sweeping.rb
index cc1fa23935..39da15e26a 100644
--- a/actionpack/lib/action_controller/caching/sweeping.rb
+++ b/actionpack/lib/action_controller/caching/sweeping.rb
@@ -72,6 +72,12 @@ module ActionController #:nodoc:
           self.controller = nil
         end
 
+        def around(controller)
+          before(controller)
+          yield
+          after(controller)
+        end
+
         protected
           # gets the action cache path for the given options.
           def action_path_for(options)
diff --git a/actionpack/test/controller/filters_test.rb b/actionpack/test/controller/filters_test.rb
index ef7fbca675..b9cb93f0f4 100644
--- a/actionpack/test/controller/filters_test.rb
+++ b/actionpack/test/controller/filters_test.rb
@@ -326,6 +326,12 @@ class FilterTest < ActionController::TestCase
       controller.instance_variable_set(:"@after_ran", true)
       controller.class.execution_log << " after aroundfilter " if controller.respond_to? :execution_log
     end
+
+    def around(controller)
+      before(controller)
+      yield
+      after(controller)
+    end
   end
 
   class AppendedAroundFilter
@@ -336,6 +342,12 @@ class FilterTest < ActionController::TestCase
     def after(controller)
       controller.class.execution_log << " after appended aroundfilter "
     end
+
+    def around(controller)
+      before(controller)
+      yield
+      after(controller)
+    end
   end
 
   class AuditController < ActionController::Base