add benchmark helper that works in erb

3 files changed, 39 insertions, 3 deletions

diff --git a/actionpack/lib/action_view/helpers.rb b/actionpack/lib/action_view/helpers.rb
index 262e0f1010..f2a3a494bc 100644
--- a/actionpack/lib/action_view/helpers.rb
+++ b/actionpack/lib/action_view/helpers.rb
@@ -1,5 +1,3 @@
-require 'active_support/benchmarkable'
-
 module ActionView #:nodoc:
   module Helpers #:nodoc:
     extend ActiveSupport::Autoload
@@ -7,6 +5,7 @@ module ActionView #:nodoc:
     autoload :ActiveModelHelper
     autoload :AssetTagHelper
     autoload :AtomFeedHelper
+    autoload :BenchmarkHelper
     autoload :CacheHelper
     autoload :CaptureHelper
     autoload :ControllerHelper
@@ -33,10 +32,10 @@ module ActionView #:nodoc:
       extend SanitizeHelper::ClassMethods
     end
 
-    include ActiveSupport::Benchmarkable
     include ActiveModelHelper
     include AssetTagHelper
     include AtomFeedHelper
+    include BenchmarkHelper
     include CacheHelper
     include CaptureHelper
     include ControllerHelper
diff --git a/actionpack/lib/action_view/helpers/benchmark_helper.rb b/actionpack/lib/action_view/helpers/benchmark_helper.rb
new file mode 100644
index 0000000000..dfdd5a786d
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/benchmark_helper.rb
@@ -0,0 +1,13 @@
+require 'active_support/benchmarkable'
+
+module ActionView
+  module Helpers
+    module BenchmarkHelper
+      include ActiveSupport::Benchmarkable
+
+      def benchmark(*)
+        capture { super }
+      end
+    end
+  end
+end
diff --git a/actionpack/test/template/benchmark_helper_test.rb b/actionpack/test/template/benchmark_helper_test.rb
new file mode 100644
index 0000000000..1bdda22959
--- /dev/null
+++ b/actionpack/test/template/benchmark_helper_test.rb
@@ -0,0 +1,24 @@
+require 'abstract_unit'
+require 'stringio'
+
+class BenchmarkHelperTest < ActionView::TestCase
+  include RenderERBUtils
+  tests ActionView::Helpers::BenchmarkHelper
+
+  def test_output_in_erb
+    output   = render_erb("Hello <%= benchmark do %>world<% end %>")
+    expected = 'Hello world'
+    assert_equal expected, output
+  end
+
+  def test_returns_value_from_block
+    assert_equal 'test', benchmark { 'test' }
+  end
+
+  def test_default_message
+    log = StringIO.new
+    self.stubs(:logger).returns(Logger.new(log))
+    benchmark {}
+    assert_match(log.rewind && log.read, /Benchmarking \(\d+.\d+ms\)/)
+  end
+end