Ticket #9742: render_shorthand_with_namespaced_controllers_patch.diff

a/actionpack/lib/action_controller/record_identifier.rb

@@ -33 +33 @@
-
-    # Returns plural/singular for a record or class. Example:
-    #
-
-
-
+
+
+
+
-      klass = class_from_record_or_class(record_or_class)
-
+
+
+
+
+
+
-    end
-
-    # The DOM class convention is to use the singular form of an object or class. Examples:

a/actionpack/lib/action_view/partials.rb

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

a/actionpack/test/activerecord/render_partial_with_record_identification_test.rb

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

a/actionpack/test/controller/record_identifier_test.rb

@@ -56 +56 @@
-    assert_equal expected, partial_path(@record)
-    assert_equal expected, partial_path(Comment)
-  end
+  
+  def test_partial_path_with_namespaced_controller_path
+    expected = "admin/#{@plural}/#{@singular}"
+    assert_equal expected, partial_path(@record, "admin/posts")
+    assert_equal expected, partial_path(@klass, "admin/posts")
+  end
+  
+  def test_partial_path_with_not_namespaced_controller_path
+    expected = "#{@plural}/#{@singular}"
+    assert_equal expected, partial_path(@record, "posts")
+    assert_equal expected, partial_path(@klass, "posts")
+  end
-
-  def test_dom_class
-    assert_equal @singular, dom_class(@record)
@@ -100 +112 @@
-    assert_equal expected, partial_path(@record)
-    assert_equal expected, partial_path(Comment::Nested)
-  end
+  
+  def test_partial_path_with_namespaced_controller_path
+    expected = "admin/comment/nesteds/nested"
+    assert_equal expected, partial_path(@record, "admin/posts")
+    assert_equal expected, partial_path(@klass, "admin/posts")
+  end
+
+  def test_partial_path_with_deeper_namespaced_controller_path
+    expected = "deeper/admin/comment/nesteds/nested"
+    assert_equal expected, partial_path(@record, "deeper/admin/posts")
+    assert_equal expected, partial_path(@klass, "deeper/admin/posts")
+  end
+
+  def test_partial_path_with_even_deeper_namespaced_controller_path
+    expected = "even/more/deeper/admin/comment/nesteds/nested"
+    assert_equal expected, partial_path(@record, "even/more/deeper/admin/posts")
+    assert_equal expected, partial_path(@klass, "even/more/deeper/admin/posts")
+  end
+  
+  def test_partial_path_with_not_namespaced_controller_path
+    expected = "comment/nesteds/nested"
+    assert_equal expected, partial_path(@record, "posts")
+    assert_equal expected, partial_path(@klass, "posts")
+  end
-end