Simplify required "ActionView compliant" API

2 files changed, 8 insertions, 4 deletions

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 45184f58fb..5915337dd2 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -228,6 +228,12 @@ module ActionView #:nodoc:
       end
     end
 
+    def self.for_controller(controller)
+      new(controller.class.view_paths, {}, controller).tap do |view|
+        view.helpers.include(controller._helpers) if controller.respond_to?(:_helpers)
+      end
+    end
+
     def initialize(view_paths = [], assigns_for_first_render = {}, controller = nil, formats = nil)#:nodoc:
       @formats = formats || [:html]
       @assigns = assigns_for_first_render.each { |key, value| instance_variable_set("@#{key}", value) }
diff --git a/actionpack/lib/action_view/render/partials.rb b/actionpack/lib/action_view/render/partials.rb
index a80ffe3c20..ccb14d513a 100644
--- a/actionpack/lib/action_view/render/partials.rb
+++ b/actionpack/lib/action_view/render/partials.rb
@@ -259,7 +259,7 @@ module ActionView
           
           _set_locals(object, locals, template, options)
           
-          self._partial = template
+          options[:_template] = template
           
           _render_template(template, locals)
         end
@@ -278,7 +278,7 @@ module ActionView
         locals = (options[:locals] ||= {})
         index, @_partial_path = 0, nil
         collection.map do |object|
-          template = passed_template || begin
+          options[:_template] = template = passed_template || begin
             _partial_path = 
               ActionController::RecordIdentifier.partial_path(object, controller_path)
             template = _pick_partial_template(_partial_path)
@@ -289,8 +289,6 @@ module ActionView
           
           index += 1
           
-          self._partial = template
-          
           _render_template(template, locals)
         end.join(spacer)
       end