0
@@ -33,11 +33,17 @@ module ActionController
0
 
0
     # Returns plural/singular for a record or class. Example:
0
     #
0
-    #   partial_path(post)   # => "posts/post"
0
-    #   partial_path(Person) # => "people/person"
0
-    def partial_path(record_or_class)
0
+    #   partial_path(post)                   # => "posts/post"
0
+    #   partial_path(Person)                 # => "people/person"
0
+    #   partial_path(Person, "admin/games")  # => "admin/people/person"
0
+    def partial_path(record_or_class, controller_path = nil)
0
       klass = class_from_record_or_class(record_or_class)
0
-      "#{klass.name.tableize}/#{klass.name.demodulize.underscore}"
0
+
0
+      if controller_path && controller_path.include?("/")
0
+        "#{File.dirname(controller_path)}/#{klass.name.tableize}/#{klass.name.demodulize.underscore}"
0
+      else
0
+        "#{klass.name.tableize}/#{klass.name.demodulize.underscore}"
0
+      end
0
     end
0
 
0
     # The DOM class convention is to use the singular form of an object or class. Examples:

0
@@ -119,7 +119,7 @@ module ActionView
0
             ""
0
           end
0
         else
0
-          render_partial(ActionController::RecordIdentifier.partial_path(partial_path), partial_path, local_assigns)
0
+          render_partial(ActionController::RecordIdentifier.partial_path(partial_path, controller.class.controller_path), partial_path, local_assigns)
0
         end
0
       end
0
 
0
@@ -147,7 +147,7 @@ module ActionView
0
         templates = Hash.new
0
         i = 0
0
         collection.map do |element|
0
-          partial_path = ActionController::RecordIdentifier.partial_path(element)
0
+          partial_path = ActionController::RecordIdentifier.partial_path(element, controller.class.controller_path)
0
           template = templates[partial_path] ||= ActionView::PartialTemplate.new(self, partial_path, nil, local_assigns)
0
           template.counter = i
0
           i += 1

0
@@ -1,49 +1,49 @@
0
 require 'active_record_unit'
0
 
0
-class RenderPartialWithRecordIdentificationTest < ActiveRecordTestCase
0
-  fixtures :developers, :projects, :developers_projects, :topics, :replies, :companies, :mascots
0
+class RenderPartialWithRecordIdentificationController < ActionController::Base
0
+  def render_with_has_many_and_belongs_to_association
0
+    @developer = Developer.find(1)
0
+    render :partial => @developer.projects
0
+  end
0
 
0
-  class RenderPartialWithRecordIdentificationController < ActionController::Base
0
-    def render_with_has_many_and_belongs_to_association
0
-      @developer = Developer.find(1)
0
-      render :partial => @developer.projects
0
-    end
0
-    
0
-    def render_with_has_many_association
0
-      @topic = Topic.find(1)
0
-      render :partial => @topic.replies
0
-    end
0
-    
0
-    def render_with_named_scope
0
-      render :partial => Reply.base
0
-    end
0
-    
0
-    def render_with_has_many_through_association
0
-      @developer = Developer.find(:first)
0
-      render :partial => @developer.topics
0
-    end
0
-    
0
-    def render_with_has_one_association
0
-      @company = Company.find(1)
0
-      render :partial => @company.mascot
0
-    end
0
-    
0
-    def render_with_belongs_to_association
0
-      @reply = Reply.find(1)
0
-      render :partial => @reply.topic
0
-    end
0
-    
0
-    def render_with_record
0
-      @developer = Developer.find(:first)
0
-      render :partial => @developer
0
-    end
0
-    
0
-    def render_with_record_collection
0
-      @developers = Developer.find(:all)
0
-      render :partial => @developers
0
-    end
0
+  def render_with_has_many_association
0
+    @topic = Topic.find(1)
0
+    render :partial => @topic.replies
0
+  end
0
+
0
+  def render_with_named_scope
0
+    render :partial => Reply.base
0
+  end
0
+
0
+  def render_with_has_many_through_association
0
+    @developer = Developer.find(:first)
0
+    render :partial => @developer.topics
0
+  end
0
+
0
+  def render_with_has_one_association
0
+    @company = Company.find(1)
0
+    render :partial => @company.mascot
0
+  end
0
+
0
+  def render_with_belongs_to_association
0
+    @reply = Reply.find(1)
0
+    render :partial => @reply.topic
0
   end
0
-  RenderPartialWithRecordIdentificationController.view_paths = [ File.dirname(__FILE__) + "/../fixtures/" ]
0
+
0
+  def render_with_record
0
+    @developer = Developer.find(:first)
0
+    render :partial => @developer
0
+  end
0
+
0
+  def render_with_record_collection
0
+    @developers = Developer.find(:all)
0
+    render :partial => @developers
0
+  end
0
+end
0
+RenderPartialWithRecordIdentificationController.view_paths = [ File.dirname(__FILE__) + "/../fixtures/" ]
0
+
0
+class RenderPartialWithRecordIdentificationTest < ActiveRecordTestCase
0
+  fixtures :developers, :projects, :developers_projects, :topics, :replies, :companies, :mascots
0
   
0
   def setup
0
     @controller = RenderPartialWithRecordIdentificationController.new
0
@@ -84,3 +84,108 @@ class RenderPartialWithRecordIdentificationTest < ActiveRecordTestCase
0
     assert_equal mascot.name, @response.body
0
   end
0
 end
0
+
0
+class RenderPartialWithRecordIdentificationController < ActionController::Base
0
+  def render_with_has_many_and_belongs_to_association
0
+    @developer = Developer.find(1)
0
+    render :partial => @developer.projects
0
+  end
0
+
0
+  def render_with_has_many_association
0
+    @topic = Topic.find(1)
0
+    render :partial => @topic.replies
0
+  end
0
+
0
+  def render_with_has_many_through_association
0
+    @developer = Developer.find(:first)
0
+    render :partial => @developer.topics
0
+  end
0
+
0
+  def render_with_belongs_to_association
0
+    @reply = Reply.find(1)
0
+    render :partial => @reply.topic
0
+  end
0
+
0
+  def render_with_record
0
+    @developer = Developer.find(:first)
0
+    render :partial => @developer
0
+  end
0
+
0
+  def render_with_record_collection
0
+    @developers = Developer.find(:all)
0
+    render :partial => @developers
0
+  end
0
+end
0
+RenderPartialWithRecordIdentificationController.view_paths = [ File.dirname(__FILE__) + "/../fixtures/" ]
0
+
0
+class Game < Struct.new(:name, :id)
0
+  def to_param
0
+    id.to_s
0
+  end
0
+end
0
+
0
+module Fun
0
+  class NestedController < ActionController::Base
0
+    def render_with_record_in_nested_controller
0
+      render :partial => Game.new("Pong")
0
+    end
0
+
0
+    def render_with_record_collection_in_nested_controller
0
+      render :partial => [ Game.new("Pong"), Game.new("Tank") ]
0
+    end
0
+  end
0
+  NestedController.view_paths = [ File.dirname(__FILE__) + "/../fixtures/" ]
0
+
0
+  module Serious
0
+    class NestedDeeperController < ActionController::Base
0
+      def render_with_record_in_deeper_nested_controller
0
+        render :partial => Game.new("Chess")
0
+      end
0
+
0
+      def render_with_record_collection_in_deeper_nested_controller
0
+        render :partial => [ Game.new("Chess"), Game.new("Sudoku"), Game.new("Solitaire") ]
0
+      end
0
+    end
0
+    NestedDeeperController.view_paths = [ File.dirname(__FILE__) + "/../fixtures/" ]
0
+  end
0
+end
0
+
0
+class RenderPartialWithRecordIdentificationAndNestedControllersTest < ActiveRecordTestCase
0
+  def setup
0
+    @controller = Fun::NestedController.new
0
+    @request    = ActionController::TestRequest.new
0
+    @response   = ActionController::TestResponse.new
0
+    super
0
+  end
0
+
0
+  def test_render_with_record_in_nested_controller
0
+    get :render_with_record_in_nested_controller
0
+    assert_template 'fun/games/_game'
0
+  end
0
+
0
+  def test_render_with_record_collection_in_nested_controller
0
+    get :render_with_record_collection_in_nested_controller
0
+    assert_template 'fun/games/_game'
0
+  end
0
+
0
+end
0
+
0
+class RenderPartialWithRecordIdentificationAndNestedDeeperControllersTest < ActiveRecordTestCase
0
+  def setup
0
+    @controller = Fun::Serious::NestedDeeperController.new
0
+    @request    = ActionController::TestRequest.new
0
+    @response   = ActionController::TestResponse.new
0
+    super
0
+  end
0
+
0
+  def test_render_with_record_in_deeper_nested_controller
0
+    get :render_with_record_in_deeper_nested_controller
0
+    assert_template 'fun/serious/games/_game'
0
+  end
0
+
0
+  def test_render_with_record_collection_in_deeper_nested_controller
0
+    get :render_with_record_collection_in_deeper_nested_controller
0
+    assert_template 'fun/serious/games/_game'
0
+  end
0
+
0
+end
0
\ No newline at end of file

0
@@ -57,6 +57,18 @@ class RecordIdentifierTest < Test::Unit::TestCase
0
     assert_equal expected, partial_path(Comment)
0
   end
0
 
0
+  def test_partial_path_with_namespaced_controller_path
0
+    expected = "admin/#{@plural}/#{@singular}"
0
+    assert_equal expected, partial_path(@record, "admin/posts")
0
+    assert_equal expected, partial_path(@klass, "admin/posts")
0
+  end
0
+
0
+  def test_partial_path_with_not_namespaced_controller_path
0
+    expected = "#{@plural}/#{@singular}"
0
+    assert_equal expected, partial_path(@record, "posts")
0
+    assert_equal expected, partial_path(@klass, "posts")
0
+  end
0
+
0
   def test_dom_class
0
     assert_equal @singular, dom_class(@record)
0
   end
0
@@ -100,4 +112,28 @@ class NestedRecordIdentifierTest < RecordIdentifierTest
0
     assert_equal expected, partial_path(@record)
0
     assert_equal expected, partial_path(Comment::Nested)
0
   end
0
+
0
+  def test_partial_path_with_namespaced_controller_path
0
+    expected = "admin/comment/nesteds/nested"
0
+    assert_equal expected, partial_path(@record, "admin/posts")
0
+    assert_equal expected, partial_path(@klass, "admin/posts")
0
+  end
0
+
0
+  def test_partial_path_with_deeper_namespaced_controller_path
0
+    expected = "deeper/admin/comment/nesteds/nested"
0
+    assert_equal expected, partial_path(@record, "deeper/admin/posts")
0
+    assert_equal expected, partial_path(@klass, "deeper/admin/posts")
0
+  end
0
+
0
+  def test_partial_path_with_even_deeper_namespaced_controller_path
0
+    expected = "even/more/deeper/admin/comment/nesteds/nested"
0
+    assert_equal expected, partial_path(@record, "even/more/deeper/admin/posts")
0
+    assert_equal expected, partial_path(@klass, "even/more/deeper/admin/posts")
0
+  end
0
+
0
+  def test_partial_path_with_not_namespaced_controller_path
0
+    expected = "comment/nesteds/nested"
0
+    assert_equal expected, partial_path(@record, "posts")
0
+    assert_equal expected, partial_path(@klass, "posts")
0
+  end
0
 end