Ticket #8558: improve_named_routes_with_nested_resources_and_actions.patch

test/controller/resources_test.rb

@@ -100 +100 @@
-    end
-  end
-
-
+p
-    with_restful_routing :messages, :comments, :path_prefix => '/thread/:thread_id' do
-      assert_simply_restful_for :messages, :path_prefix => 'thread/5/', :options => { :thread_id => '5' }
-      assert_simply_restful_for :comments, :path_prefix => 'thread/5/', :options => { :thread_id => '5' }
@@ -113 +113 @@
-    end
-  end
-
-
-
-
-
+
+
-
-{ :rss => :get }.merge(actions)
+actions
-      assert_restful_routes_for :messages do |options|
-        assert_routing rss_path, options.merge(rss_options)
-
-        actions.each do |action, method|
-          assert_recognizes(options.merge(:action => action), :path => "/messages/#{action}", :method => method)
-        end
-      end
-
-      assert_restful_named_routes_for :messages do |options|
-        assert_named_route rss_path, :rss_messages_path, rss_options
-        actions.keys.each do |action|
-          assert_named_route "/messages/#{action}", "#{action}_messages_path", :action => action
-        end
@@ -136 +131 @@
-    end
-  end
-
+  def test_with_collection_actions_and_name_prefix
+    actions = { 'a' => :get, 'b' => :put, 'c' => :post, 'd' => :delete }
+  
+    with_restful_routing :messages, :path_prefix => '/threads/:thread_id', :name_prefix => "thread_", :collection => actions do
+      assert_restful_routes_for :messages, :path_prefix => 'threads/1/', :name_prefix => 'thread_', :options => { :thread_id => '1' } do |options|
+        actions.each do |action, method|
+          assert_recognizes(options.merge(:action => action), :path => "/threads/1/messages/#{action}", :method => method)
+        end
+      end
+  
+      assert_restful_named_routes_for :messages, :path_prefix => 'threads/1/', :name_prefix => 'thread_', :options => { :thread_id => '1' } do |options|
+        # These were present before http://dev.rubyonrails.org/ticket/8251, and should
+        # be deprecated and ultimately removed.
+        actions.keys.each do |action|
+          assert_named_route "/threads/1/messages/#{action}", "thread_#{action}_messages_path", :action => action
+        end
+  
+        # These are added for http://dev.rubyonrails.org/ticket/8251, and result in supporting
+        # two possible names for each of these routes. Recommend deprecating and ultimately
+        # removing the the old names for same routes above.
+        actions.keys.each do |action|
+          assert_named_route "/threads/1/messages/#{action}", "#{action}_thread_messages_path", :action => action
+        end
+      end
+    end
+  end
+
+  def test_with_collection_action_and_name_prefix_and_formatted
+    actions = { 'a' => :get, 'b' => :put, 'c' => :post, 'd' => :delete }
+  
+    with_restful_routing :messages, :path_prefix => '/threads/:thread_id', :name_prefix => "thread_", :collection => actions do
+      assert_restful_routes_for :messages, :path_prefix => 'threads/1/', :name_prefix => 'thread_', :options => { :thread_id => '1' } do |options|
+        actions.each do |action, method|
+          assert_recognizes(options.merge(:action => action, :format => 'xml'), :path => "/threads/1/messages/#{action}.xml", :method => method)
+        end
+      end
+  
+      assert_restful_named_routes_for :messages, :path_prefix => 'threads/1/', :name_prefix => 'thread_', :options => { :thread_id => '1' } do |options|
+        # These were present before http://dev.rubyonrails.org/ticket/8251, and should
+        # be deprecated and ultimately removed.
+        (actions.keys).each do |action|
+          assert_named_route "/threads/1/messages/#{action}.xml", "formatted_thread_#{action}_messages_path", :action => action, :format => 'xml'
+        end
+  
+        # These are added for http://dev.rubyonrails.org/ticket/8251, and result in supporting
+        # two possible names for each of these routes. Recommend deprecating and ultimately
+        # removing the the old names for same routes above.
+        actions.keys.each do |action|;
+          assert_named_route "/threads/1/messages/#{action}.xml", "formatted_#{action}_thread_messages_path", :action => action, :format => 'xml'
+        end
+      end
+    end
+  end
+
-  def test_with_member_action
-    [:put, :post].each do |method|
-      with_restful_routing :messages, :member => { :mark => method } do
@@ -183 +232 @@
-      end
-    end
-  end
+  
+  def test_with_new_action_with_name_prefix
+    with_restful_routing :messages, :new => { :preview => :post }, :path_prefix => '/threads/:thread_id', :name_prefix => 'thread_' do
+      preview_options = {:action => 'preview', :thread_id => '1'}
+      preview_path    = "/threads/1/messages/new/preview"
+      assert_restful_routes_for :messages, :path_prefix => 'threads/1/', :name_prefix => 'thread_', :options => { :thread_id => '1' } do |options|
+        assert_recognizes(options.merge(preview_options), :path => preview_path, :method => :post)
+      end
-
+      assert_restful_named_routes_for :messages, :path_prefix => 'threads/1/', :name_prefix => 'thread_', :options => { :thread_id => '1' } do |options|
+
+        # These were present before http://dev.rubyonrails.org/ticket/8251, and should
+        # be deprecated and ultimately removed.
+        assert_named_route preview_path, :thread_preview_new_message_path, preview_options
+
+        # These are added for http://dev.rubyonrails.org/ticket/8251, and result in supporting
+        # two possible names for each of these routes. Recommend deprecating and ultimately
+        # removing the the old names for same routes above.
+        assert_named_route preview_path, :preview_new_thread_message_path, preview_options
+      end
+    end
+  end
+  
+  def test_with_formatted_new_action_with_name_prefix
+    with_restful_routing :messages, :new => { :preview => :post }, :path_prefix => '/threads/:thread_id', :name_prefix => 'thread_' do
+      preview_options = {:action => 'preview', :thread_id => '1', :format => 'xml'}
+      preview_path    = "/threads/1/messages/new/preview.xml"
+      assert_restful_routes_for :messages, :path_prefix => 'threads/1/', :name_prefix => 'thread_', :options => { :thread_id => '1' } do |options|
+        assert_recognizes(options.merge(preview_options), :path => preview_path, :method => :post)
+      end
+
+        # These were present before http://dev.rubyonrails.org/ticket/8251, and should
+        # be deprecated and ultimately removed.
+        assert_restful_named_routes_for :messages, :path_prefix => 'threads/1/', :name_prefix => 'thread_', :options => { :thread_id => '1' } do |options|        assert_named_route preview_path, :formatted_thread_preview_new_message_path, preview_options
+
+        # These are added for http://dev.rubyonrails.org/ticket/8251, and result in supporting
+        # two possible names for each of these routes. Recommend deprecating and ultimately
+        # removing the the old names for same routes above.
+        assert_named_route preview_path, :formatted_preview_new_thread_message_path, preview_options
+      end
+    end
+  end
+  
-  def test_override_new_method
-    with_restful_routing :messages do
-      assert_restful_routes_for :messages do |options|
@@ -244 +335 @@
-    end
-  end
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-  def test_should_create_singleton_resource_routes
-    with_singleton_resources :account do
@@ -541 +640 @@
-
-      full_prefix = "/#{options[:path_prefix]}#{controller_name}"
-      name_prefix = options[:name_prefix]
+      
+      assert_named_route "#{full_prefix}",            "#{name_prefix}#{controller_name}_path",              options[:options]
+      assert_named_route "#{full_prefix}.xml",        "formatted_#{name_prefix}#{controller_name}_path",    options[:options].merge(            :format => 'xml')
+      assert_named_route "#{full_prefix}/1",          "#{name_prefix}#{singular_name}_path",                options[:options].merge(:id => '1')
+      assert_named_route "#{full_prefix}/1.xml",      "formatted_#{name_prefix}#{singular_name}_path",      options[:options].merge(:id => '1', :format => 'xml')
-
-
+
+
-      assert_named_route "#{full_prefix}/new",        "#{name_prefix}new_#{singular_name}_path",            options[:options]
-1",          "#{name_prefix}#{singular_name}_path",                options[:options].merge(:id => '1
+new.xml",    "formatted_#{name_prefix}new_#{singular_name}_path",  options[:options].merge(            :format => 'xml
-      assert_named_route "#{full_prefix}/1/edit",     "#{name_prefix}edit_#{singular_name}_path",           options[:options].merge(:id => '1')
-      assert_named_route "#{full_prefix}.xml",        "formatted_#{name_prefix}#{controller_name}_path",    options[:options].merge(            :format => 'xml')
-      assert_named_route "#{full_prefix}/new.xml",    "formatted_#{name_prefix}new_#{singular_name}_path",  options[:options].merge(            :format => 'xml')
-      assert_named_route "#{full_prefix}/1.xml",      "formatted_#{name_prefix}#{singular_name}_path",      options[:options].merge(:id => '1', :format => 'xml')
-      assert_named_route "#{full_prefix}/1/edit.xml", "formatted_#{name_prefix}edit_#{singular_name}_path", options[:options].merge(:id => '1', :format => 'xml')
+
+      # These are added for http://dev.rubyonrails.org/ticket/8251, and result in supporting
+      # two possible names for each of these routes. Recommend deprecating and ultimately
+      # removing the the old names for same routes above.
+      assert_named_route "#{full_prefix}/new",        "new_#{name_prefix}#{singular_name}_path",            options[:options]
+      assert_named_route "#{full_prefix}/new.xml",    "formatted_new_#{name_prefix}#{singular_name}_path",  options[:options].merge(            :format => 'xml')
+      assert_named_route "#{full_prefix}/1/edit",     "edit_#{name_prefix}#{singular_name}_path",           options[:options].merge(:id => '1')
+      assert_named_route "#{full_prefix}/1/edit.xml", "formatted_edit_#{name_prefix}#{singular_name}_path", options[:options].merge(:id => '1', :format => 'xml')
+
-      yield options[:options] if block_given?
-    end
-
@@ -600 +711 @@
-      name_prefix = options[:name_prefix]
-
-      assert_named_route "#{full_path}",          "#{name_prefix}#{singleton_name}_path",                options[:options]
+      assert_named_route "#{full_path}.xml",      "formatted_#{name_prefix}#{singleton_name}_path",      options[:options].merge(:format => 'xml')
+
+      # These were present before http://dev.rubyonrails.org/ticket/8251, and should
+      # be deprecated and ultimately removed.
-      assert_named_route "#{full_path}/new",      "#{name_prefix}new_#{singleton_name}_path",            options[:options]
+      assert_named_route "#{full_path}/new.xml",  "formatted_#{name_prefix}new_#{singleton_name}_path",  options[:options].merge(:format => 'xml')
-      assert_named_route "#{full_path}/edit",     "#{name_prefix}edit_#{singleton_name}_path",           options[:options]
-      assert_named_route "#{full_path}.xml",      "formatted_#{name_prefix}#{singleton_name}_path",      options[:options].merge(:format => 'xml')
-      assert_named_route "#{full_path}/new.xml",  "formatted_#{name_prefix}new_#{singleton_name}_path",  options[:options].merge(:format => 'xml')
-      assert_named_route "#{full_path}/edit.xml", "formatted_#{name_prefix}edit_#{singleton_name}_path", options[:options].merge(:format => 'xml')
+
+      # These are added for http://dev.rubyonrails.org/ticket/8251, and result in supporting
+      # two possible names for each of these routes. Recommend deprecating and ultimately
+      # removing the the old names for same routes above.
+      assert_named_route "#{full_path}/new",      "new_#{name_prefix}#{singleton_name}_path",            options[:options]
+      assert_named_route "#{full_path}/new.xml",  "formatted_new_#{name_prefix}#{singleton_name}_path",  options[:options].merge(:format => 'xml')
+      assert_named_route "#{full_path}/edit",     "edit_#{name_prefix}#{singleton_name}_path",           options[:options]
+      assert_named_route "#{full_path}/edit.xml", "formatted_edit_#{name_prefix}#{singleton_name}_path", options[:options].merge(:format => 'xml')
-    end
-
-    def assert_named_route(expected, route, options)

lib/action_controller/resources.rb

@@ -415 +415 @@
-        resource.collection_methods.each do |method, actions|
-          actions.each do |action|
-            action_options = action_options_for(action, resource, method)
+
+            # These were present before http://dev.rubyonrails.org/ticket/8251, and should
+            # be deprecated and ultimately removed.
-            map.named_route("#{resource.name_prefix}#{action}_#{resource.plural}", "#{resource.path}/#{action}", action_options)
-            map.named_route("formatted_#{resource.name_prefix}#{action}_#{resource.plural}", "#{resource.path}/#{action}.:format", action_options)
+
+            # These are added for http://dev.rubyonrails.org/ticket/8251, and result in supporting
+            # two possible names for each of these routes. Recommend deprecating and ultimately
+            # removing the the old names for same routes above.
+            map.named_route("#{action}_#{resource.name_prefix}#{resource.plural}", "#{resource.path}/#{action}", action_options)
+            map.named_route("formatted_#{action}_#{resource.name_prefix}#{resource.plural}", "#{resource.path}/#{action}.:format", action_options)
-          end
-        end
-      end
@@ -442 +451 @@
-          actions.each do |action|
-            action_options = action_options_for(action, resource, method)
-            if action == :new
+
+              # These were present before http://dev.rubyonrails.org/ticket/8251, and should
+              # be deprecated and ultimately removed.
-              map.named_route("#{resource.name_prefix}new_#{resource.singular}", resource.new_path, action_options)
-              map.named_route("formatted_#{resource.name_prefix}new_#{resource.singular}", "#{resource.new_path}.:format", action_options)
+
+              # These are added for http://dev.rubyonrails.org/ticket/8251, and result in supporting
+              # two possible names for each of these routes. Recommend deprecating and ultimately
+              # removing the the old names for same routes above.
+              map.named_route("new_#{resource.name_prefix}#{resource.singular}", resource.new_path, action_options)
+              map.named_route("formatted_new_#{resource.name_prefix}#{resource.singular}", "#{resource.new_path}.:format", action_options)
-            else
+              # These were present before http://dev.rubyonrails.org/ticket/8251, and should
+              # be deprecated and ultimately removed.
-              map.named_route("#{resource.name_prefix}#{action}_new_#{resource.singular}", "#{resource.new_path}/#{action}", action_options)
-              map.named_route("formatted_#{resource.name_prefix}#{action}_new_#{resource.singular}", "#{resource.new_path}/#{action}.:format", action_options)
+
+              # These are added for http://dev.rubyonrails.org/ticket/8251, and result in supporting
+              # two possible names for each of these routes. Recommend deprecating and ultimately
+              # removing the the old names for same routes above.
+              map.named_route("#{action}_new_#{resource.name_prefix}#{resource.singular}", "#{resource.new_path}/#{action}", action_options)
+              map.named_route("formatted_#{action}_new_#{resource.name_prefix}#{resource.singular}", "#{resource.new_path}/#{action}.:format", action_options)
-            end
-          end
-        end
@@ -456 +482 @@
-        resource.member_methods.each do |method, actions|
-          actions.each do |action|
-            action_options = action_options_for(action, resource, method)
+
+            # These were present before http://dev.rubyonrails.org/ticket/8251, and should
+            # be deprecated and ultimately removed.
-            map.named_route("#{resource.name_prefix}#{action}_#{resource.singular}", "#{resource.member_path}/#{action}", action_options)
-            map.named_route("formatted_#{resource.name_prefix}#{action}_#{resource.singular}", "#{resource.member_path}/#{action}.:format",action_options)
+
+            # These are added for http://dev.rubyonrails.org/ticket/8251, and result in supporting
+            # two possible names for each of these routes. Recommend deprecating and ultimately
+            # removing the the old names for same routes above.
+            map.named_route("#{action}_#{resource.name_prefix}#{resource.singular}", "#{resource.member_path}/#{action}", action_options)
+            map.named_route("formatted_#{action}_#{resource.name_prefix}#{resource.singular}", "#{resource.member_path}/#{action}.:format",action_options)
-          end
-        end
-