From 6a8dcc8a5bd9e8510c75d7a88a1072d88067aaa9 Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis@37signals.com>
Date: Tue, 26 Sep 2006 22:45:09 +0000
Subject: Make sure map.resources(:things, :new => { :new => :any }) correctly
 sets /things/new to be accessible by any method rather than creating another
 resource at /things/new;new

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5195 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 actionpack/lib/action_controller/resources.rb | 13 ++++++++-----
 actionpack/test/controller/resources_test.rb  | 28 ++++++++++++++++++++++-----
 2 files changed, 31 insertions(+), 10 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/resources.rb b/actionpack/lib/action_controller/resources.rb
index 3fc9c326b4..b2174b3c9a 100644
--- a/actionpack/lib/action_controller/resources.rb
+++ b/actionpack/lib/action_controller/resources.rb
@@ -46,6 +46,7 @@ module ActionController
         
         def add_default_actions
           add_default_action(member_methods, :get, :edit)
+          add_default_action(new_methods, :get, :new)
         end
 
         def set_prefixes
@@ -253,13 +254,15 @@ module ActionController
         resource.new_methods.each do |method, actions|
           route_options = requirements_for(method)
           actions.each do |action|
-            map.named_route("#{resource.name_prefix}#{action}_new_#{resource.singular}", "#{resource.new_path};#{action}", route_options.merge(:action => action.to_s))
-            map.named_route("formatted_#{resource.name_prefix}#{action}_new_#{resource.singular}", "#{resource.new_path}.:format;#{action}", route_options.merge(:action => action.to_s))
+            if action == :new
+              map.named_route("#{resource.name_prefix}new_#{resource.singular}", resource.new_path, route_options.merge(:action => "new"))
+              map.named_route("formatted_#{resource.name_prefix}new_#{resource.singular}", "#{resource.new_path}.:format", route_options.merge(:action => "new"))
+            else
+              map.named_route("#{resource.name_prefix}#{action}_new_#{resource.singular}", "#{resource.new_path};#{action}", route_options.merge(:action => action.to_s))
+              map.named_route("formatted_#{resource.name_prefix}#{action}_new_#{resource.singular}", "#{resource.new_path}.:format;#{action}", route_options.merge(:action => action.to_s))
+            end
           end
         end
-
-        map.named_route("#{resource.name_prefix}new_#{resource.singular}", resource.new_path, :action => "new", :conditions => { :method => :get })
-        map.named_route("formatted_#{resource.name_prefix}new_#{resource.singular}", "#{resource.new_path}.:format", :action => "new", :conditions => { :method => :get })
       end
       
       def map_member_actions(map, resource)
diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb
index b2ee7823c9..32b554604d 100644
--- a/actionpack/test/controller/resources_test.rb
+++ b/actionpack/test/controller/resources_test.rb
@@ -17,11 +17,11 @@ class ResourcesTest < Test::Unit::TestCase
       :member     => { :rss => :get, :atom => :get, :upload => :post, :fix => :post },
       :new        => { :preview => :get, :draft => :get })
 
-    assert_resource_methods [:rss],               resource, :collection, :get
-    assert_resource_methods [:csv, :reorder],     resource, :collection, :post
-    assert_resource_methods [:edit, :rss, :atom], resource, :member,     :get
-    assert_resource_methods [:upload, :fix],      resource, :member,     :post
-    assert_resource_methods [:preview, :draft],   resource, :new,        :get
+    assert_resource_methods [:rss],                   resource, :collection, :get
+    assert_resource_methods [:csv, :reorder],         resource, :collection, :post
+    assert_resource_methods [:edit, :rss, :atom],     resource, :member,     :get
+    assert_resource_methods [:upload, :fix],          resource, :member,     :post
+    assert_resource_methods [:new, :preview, :draft], resource, :new,        :get
   end
 
   def test_default_restful_routes
@@ -122,6 +122,24 @@ class ResourcesTest < Test::Unit::TestCase
     end
   end
 
+  def test_override_new_method
+    with_restful_routing :messages do
+      assert_restful_routes_for :messages do |options|
+        assert_recognizes(options.merge(:action => "new"), :path => "/messages/new", :method => :get)
+        assert_raises(ActionController::RoutingError) do
+          ActionController::Routing::Routes.recognize_path("/messages/new", :method => :post)
+        end
+      end
+    end
+
+    with_restful_routing :messages, :new => { :new => :any } do
+      assert_restful_routes_for :messages do |options|
+        assert_recognizes(options.merge(:action => "new"), :path => "/messages/new", :method => :post)
+        assert_recognizes(options.merge(:action => "new"), :path => "/messages/new", :method => :get)
+      end
+    end
+  end
+
   def test_nested_restful_routes
     with_routing do |set|
       set.draw do |map|
-- 
cgit v1.2.3