1 files changed, 37 insertions, 37 deletions

diff --git a/actionpack/lib/action_view/partial_template.rb b/actionpack/lib/action_view/partial_template.rb
index 0b374db888..b271a73388 100644
--- a/actionpack/lib/action_view/partial_template.rb
+++ b/actionpack/lib/action_view/partial_template.rb
@@ -1,70 +1,70 @@
 module ActionView #:nodoc:
   class PartialTemplate < Template #:nodoc:
-    
     attr_reader :variable_name, :object
-    
+
     def initialize(view, partial_path, object = nil, locals = {})
-      @path, @variable_name = extract_partial_name_and_path(view, partial_path)
+      @view_controller = view.controller if view.respond_to?(:controller)
+      set_path_and_variable_name!(partial_path)
       super(view, @path, true, locals)
       add_object_to_local_assigns!(object)
 
       # This is needed here in order to compile template with knowledge of 'counter'
-      initialize_counter
-      
+      initialize_counter!
+
       # Prepare early. This is a performance optimization for partial collections
       prepare!
     end
-    
+
     def render
       ActionController::Base.benchmark("Rendered #{@path}", Logger::DEBUG, false) do
         @handler.render(self)
       end
     end
-    
+
     def render_member(object)
       @locals[:object] = @locals[@variable_name] = object
-      
+
       template = render_template
       @locals[@counter_name] += 1
       @locals.delete(@variable_name)
       @locals.delete(:object)
-      
+
       template
     end
-    
+
     def counter=(num)
       @locals[@counter_name] = num
     end
 
     private
+      def add_object_to_local_assigns!(object)
+        @locals[:object] ||=
+          @locals[@variable_name] ||=
+            if object.is_a?(ActionView::Base::ObjectWrapper)
+              object.value
+            else
+              object
+            end || @view_controller.instance_variable_get("@#{variable_name}")
+      end
 
-    def add_object_to_local_assigns!(object)
-      @locals[:object] ||=
-        @locals[@variable_name] ||=
-          if object.is_a?(ActionView::Base::ObjectWrapper)
-            object.value
-          else
-            object
-          end || @view.controller.instance_variable_get("@#{variable_name}")
-    end
-    
-    def extract_partial_name_and_path(view, partial_path)
-      path, partial_name = partial_pieces(view, partial_path)
-      [File.join(path, "_#{partial_name}"), partial_name.split('/').last.split('.').first.to_sym] 
-    end
-    
-    def partial_pieces(view, partial_path)
-      if partial_path.include?('/')
-        return File.dirname(partial_path), File.basename(partial_path)
-      else
-        return view.controller.class.controller_path, partial_path
+      def set_path_and_variable_name!(partial_path)
+        if partial_path.include?('/')
+          @variable_name = File.basename(partial_path)
+          @path = "#{File.dirname(partial_path)}/_#{@variable_name}"
+        elsif @view_controller
+          @variable_name = partial_path
+          @path = "#{@view_controller.class.controller_path}/_#{@variable_name}"
+        else
+          @variable_name = partial_path
+          @path = "_#{@variable_name}"
+        end
+
+        @variable_name = @variable_name.sub(/\..*$/, '').to_sym
+      end
+
+      def initialize_counter!
+        @counter_name ||= "#{@variable_name}_counter".to_sym
+        @locals[@counter_name] = 0
       end
-    end
-    
-    def initialize_counter
-      @counter_name ||= "#{@variable_name}_counter".to_sym
-      @locals[@counter_name] = 0
-    end
-    
   end
 end