Always evaluate views against an ActionView::Base

Methods created by views should always be evaluated against an AV::Base
instance.  This way we can extract and refactor things in to classes.

1 files changed, 6 insertions, 4 deletions

diff --git a/actionview/lib/action_view/template/handlers/erb/erubi.rb b/actionview/lib/action_view/template/handlers/erb/erubi.rb
index d379d7ec12..d0e87e6e7f 100644
--- a/actionview/lib/action_view/template/handlers/erb/erubi.rb
+++ b/actionview/lib/action_view/template/handlers/erb/erubi.rb
@@ -22,10 +22,12 @@ module ActionView
           end
 
           def evaluate(action_view_erb_handler_context)
-            pr = eval("proc { #{@src} }", binding, @filename || "(erubi)")
-            # Double assignment to eliminate -w warnings
-            output_buffer = output_buffer = ActionView::OutputBuffer.new
-            action_view_erb_handler_context.instance_eval(&pr)
+            src = @src
+            view = Class.new(ActionView::Base) {
+              include action_view_erb_handler_context._routes.url_helpers
+              class_eval("define_method(:_template) { |local_assigns, output_buffer| #{src} }", @filename || "(erubi)", 0)
+            }.new(action_view_erb_handler_context)
+            view.run(:_template, {}, ActionView::OutputBuffer.new)
           end
 
         private