Polymorphic routes generates collection URL from model class [#1089 state:resolved]

Signed-off-by: Dan Pickett <dpickett@enlightsolutions.com>
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>

2 files changed, 38 insertions, 0 deletions

diff --git a/actionpack/lib/action_controller/routing/generation/polymorphic_routes.rb b/actionpack/lib/action_controller/routing/generation/polymorphic_routes.rb
index ee44160274..2adf3575a7 100644
--- a/actionpack/lib/action_controller/routing/generation/polymorphic_routes.rb
+++ b/actionpack/lib/action_controller/routing/generation/polymorphic_routes.rb
@@ -50,6 +50,7 @@ module ActionController
     #   polymorphic_url([blog, post]) # => "http://example.com/blogs/1/posts/1"
     #   polymorphic_url([:admin, blog, post]) # => "http://example.com/admin/blogs/1/posts/1"
     #   polymorphic_url([user, :blog, post]) # => "http://example.com/users/1/blog/posts/1"
+    #   polymorphic_url(Comment) # => "http://example.com/comments"
     #
     # ==== Options
     #
@@ -70,6 +71,9 @@ module ActionController
     #   record = Comment.new
     #   polymorphic_url(record)  # same as comments_url()
     #
+    #   # the class of a record will also map to the collection
+    #   polymorphic_url(Comment) # same as comments_url()
+    #
     def polymorphic_url(record_or_hash_or_array, options = {})
       if record_or_hash_or_array.kind_of?(Array)
         record_or_hash_or_array = record_or_hash_or_array.compact
@@ -93,6 +97,9 @@ module ActionController
             (record.respond_to?(:destroyed?) && record.destroyed?)
         args.pop
         :plural
+      elsif record.is_a?(Class)
+        args.pop
+        :plural
       else
         :singular
       end
diff --git a/actionpack/test/activerecord/polymorphic_routes_test.rb b/actionpack/test/activerecord/polymorphic_routes_test.rb
index f001b0dab8..37f1f6dff8 100644
--- a/actionpack/test/activerecord/polymorphic_routes_test.rb
+++ b/actionpack/test/activerecord/polymorphic_routes_test.rb
@@ -45,6 +45,12 @@ class PolymorphicRoutesTest < ActionController::TestCase
       assert_equal "http://example.com/projects/#{@project.id}", polymorphic_url(@project)
     end
   end
+  
+  def test_with_class
+    with_test_routes do
+      assert_equal "http://example.com/projects", polymorphic_url(@project.class)
+    end
+  end
 
   def test_with_new_record
     with_test_routes do 
@@ -144,6 +150,19 @@ class PolymorphicRoutesTest < ActionController::TestCase
     end
   end
   
+  def test_with_nested_class
+    with_test_routes do
+      @project.save
+      assert_equal "http://example.com/projects/#{@project.id}/tasks", polymorphic_url([@project, @task.class])
+    end
+  end
+  
+  def test_class_with_array_and_namespace
+    with_admin_test_routes do 
+      assert_equal "http://example.com/admin/projects", polymorphic_url([:admin, @project.class])
+    end
+  end
+  
   def test_new_with_array_and_namespace
     with_admin_test_routes do 
       assert_equal "http://example.com/admin/projects/new", polymorphic_url([:admin, @project], :action => 'new')
@@ -267,6 +286,12 @@ class PolymorphicRoutesTest < ActionController::TestCase
     end
   end
   
+  def test_with_irregular_plural_class
+    with_test_routes do 
+      assert_equal "http://example.com/taxes", polymorphic_url(@tax.class)
+    end
+  end
+  
   def test_with_irregular_plural_new_record
     with_test_routes do 
       assert_equal "http://example.com/taxes", polymorphic_url(@tax)
@@ -320,6 +345,12 @@ class PolymorphicRoutesTest < ActionController::TestCase
     end
   end
   
+  def test_class_with_irregular_plural_array_and_namespace
+    with_admin_test_routes do 
+      assert_equal "http://example.com/admin/taxes", polymorphic_url([:admin, @tax.class])
+    end
+  end
+  
   def test_unsaved_with_irregular_plural_array_and_namespace
     with_admin_test_routes do 
       assert_equal "http://example.com/admin/taxes", polymorphic_url([:admin, @tax])