Ticket #8558: fix_resource_route_names.stable.diff

actionpack/test/controller/resources_test.rb

@@ -63 +63 @@
-    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' }
@@ -312 +312 @@
-    end
-  end
-
+  def test_resource_action_separator
+    with_routing do |set|
+      set.draw do |map|
+        map.resources :messages, :collection => {:search => :get}, :new => {:preview => :any}, :name_prefix => 'thread_', :path_prefix => '/threads/:thread_id'
+        map.resource :account, :member => {:login => :get}, :new => {:preview => :any}, :name_prefix => 'admin_', :path_prefix => '/admin'
+      end
+      
+      action_separator = ActionController::Base.resource_action_separator
+      
+      assert_simply_restful_for :messages, :name_prefix => 'thread_', :path_prefix => 'threads/1/', :options => { :thread_id => '1' }
+      assert_named_route "/threads/1/messages#{action_separator}search", "search_thread_messages_path", {}
+      assert_named_route "/threads/1/messages/new", "new_thread_message_path", {}
+      assert_named_route "/threads/1/messages/new#{action_separator}preview", "preview_new_thread_message_path", {}
+      assert_singleton_restful_for :account, :name_prefix => 'admin_', :path_prefix => 'admin/'
+      assert_named_route "/admin/account#{action_separator}login", "login_admin_account_path", {}
+      assert_named_route "/admin/account/new", "new_admin_account_path", {}
+      assert_named_route "/admin/account/new#{action_separator}preview", "preview_new_admin_account_path", {}
+    end
+  end
+
+  def test_new_style_named_routes_for_resource
+    with_routing do |set|
+      set.draw do |map|
+        map.resources :messages, :collection => {:search => :get}, :new => {:preview => :any}, :name_prefix => 'thread_', :path_prefix => '/threads/:thread_id'
+      end
+      assert_simply_restful_for :messages, :name_prefix => 'thread_', :path_prefix => 'threads/1/', :options => { :thread_id => '1' }
+      assert_named_route "/threads/1/messages;search", "search_thread_messages_path", {}
+      assert_named_route "/threads/1/messages/new", "new_thread_message_path", {}
+      assert_named_route "/threads/1/messages/new;preview", "preview_new_thread_message_path", {}
+    end
+  end
+
+  def test_new_style_named_routes_for_singleton_resource
+    with_routing do |set|
+      set.draw do |map|
+        map.resource :account, :member => {:login => :get}, :new => {:preview => :any}, :name_prefix => 'admin_', :path_prefix => '/admin'
+      end
+      assert_singleton_restful_for :account, :name_prefix => 'admin_', :path_prefix => 'admin/'
+      assert_named_route "/admin/account;login", "login_admin_account_path", {}
+      assert_named_route "/admin/account/new", "new_admin_account_path", {}
+      assert_named_route "/admin/account/new;preview", "preview_new_admin_account_path", {}
+    end
+  end
+
+  def test_should_add_deprecated_named_routes_for_resource
+    with_routing do |set|
+      set.draw do |map|
+        map.resources :messages, :collection => {:search => :get}, :new => {:preview => :any}, :name_prefix => 'thread_', :path_prefix => '/threads/:thread_id'
+      end
+      assert_simply_restful_for :messages, :name_prefix => 'thread_', :path_prefix => 'threads/1/', :options => { :thread_id => '1' }
+      assert_deprecated do
+        assert_named_route "/threads/1/messages;search", "thread_search_messages_path", {}
+        assert_named_route "/threads/1/messages/new", "thread_new_message_path", {}
+        assert_named_route "/threads/1/messages/new;preview", "thread_preview_new_message_path", {}
+      end
+    end
+  end
+
+  def test_should_add_deprecated_named_routes_for_singleton_resource
+    with_routing do |set|
+      set.draw do |map|
+        map.resource :account, :member => {:login => :get}, :new => {:preview => :any}, :name_prefix => 'admin_', :path_prefix => '/admin'
+      end
+      assert_singleton_restful_for :account, :name_prefix => 'admin_', :path_prefix => 'admin/'
+      assert_deprecated do
+        assert_named_route "/admin/account;login", "admin_login_account_path", {}
+        assert_named_route "/admin/account/new", "admin_new_account_path", {}
+        assert_named_route "/admin/account/new;preview", "admin_preview_new_account_path", {}
+      end
+    end
+  end
+
-  protected
-    def with_restful_routing(*args)
-      with_routing do |set|
@@ -345 +417 @@
-      member_path                = "#{collection_path}/1"
-      new_path                   = "#{collection_path}/new"
-      edit_member_path           = "#{member_path};edit"
-.xml;edit
+;edit.xml
-
-      with_options(options[:options]) do |controller|
-        controller.assert_routing collection_path,            :action => 'index'
@@ -395 +467 @@
-      name_prefix = options[:name_prefix]
-
-      assert_named_route "#{full_prefix}",            "#{name_prefix}#{controller_name}_path",              options[:options]
-#{name_prefix}new_
+new_#{name_prefix}
-      assert_named_route "#{full_prefix}/1",          "#{name_prefix}#{singular_name}_path",                options[:options].merge(:id => '1')
-#{name_prefix}edit_
+edit_#{name_prefix}
-      assert_named_route "#{full_prefix}.xml",        "formatted_#{name_prefix}#{controller_name}_path",    options[:options].merge(            :format => 'xml')
-#{name_prefix}new_
+new_#{name_prefix}
-      assert_named_route "#{full_prefix}/1.xml",      "formatted_#{name_prefix}#{singular_name}_path",      options[:options].merge(:id => '1', :format => 'xml')
-.xml;edit", "formatted_#{name_prefix}edit_
+;edit.xml", "formatted_edit_#{name_prefix}
-      yield options[:options] if block_given?
-    end
-
@@ -411 +483 @@
-      full_path           = "/#{options[:path_prefix]}#{singleton_name}"
-      new_path            = "#{full_path}/new"
-      edit_path           = "#{full_path};edit"
-.xml;edit
+;edit.xml
-
-      with_options options[:options] do |controller|
-        controller.assert_routing full_path,           :action => 'show'
@@ -448 +520 @@
-      options[:options].delete :action
-
-      full_path = "/#{options[:path_prefix]}#{singleton_name}"
+      full_name = "#{options[:name_prefix]}#{singleton_name}"
-
-singleton
-singleton
-singleton
-singleton
-singleton
-.xml;edit", "formatted_edit_#{singleton
+full
+full
+full
+full
+full
+;edit.xml", "formatted_edit_#{full
-    end
-
-    def assert_named_route(expected, route, options)

actionpack/lib/action_controller/base.rb

@@ -292 +292 @@
-    # Turn on +ignore_missing_templates+ if you want to unit test actions without making the associated templates.
-    cattr_accessor :ignore_missing_templates
-
+    # Controls the resource action separator
+    @@resource_action_separator = ";"
+    cattr_accessor :resource_action_separator
+
-    # Holds the request object that's primarily used to get environment variables through access like
-    # <tt>request.env["REQUEST_URI"]</tt>.
-    attr_internal :request

actionpack/lib/action_controller/resources.rb

@@ -16 +16 @@
-        add_default_actions
-        set_prefixes
-      end
-
+
-      def controller
-        @controller ||= (options[:controller] || plural).to_s
-      end
-
+
-      def path
-        @path ||= "#{path_prefix}/#{plural}"
-      end
-
+
-      def new_path
-        @new_path ||= "#{path}/new"
-      end
-
+
-      def member_path
-        @member_path ||= "#{path}/:id"
-      end
-
+
-      def nesting_path_prefix
-        @nesting_path_prefix ||= "#{path}/:#{singular}_id"
-      end
-
+
+
+
+
+
-      protected
-        def arrange_actions
-          @collection_methods = arrange_actions_by_methods(options.delete(:collection))
@@ -324 +328 @@
-        resource.collection_methods.each do |method, actions|
-          actions.each do |action|
-            action_options = action_options_for(action, resource, method)
-
-
+
+
+
+
+
+
+
+
-          end
-        end
-      end
@@ -351 +361 @@
-          actions.each do |action|
-            action_options = action_options_for(action, resource, method)
-            if action == :new
-
-
+
+
+
+
+
+
+
+
+
-            else
-
-
+
+
+
+
+
+
+
+
+
-            end
-          end
-        end
@@ -365 +389 @@
-        resource.member_methods.each do |method, actions|
-          actions.each do |action|
-            action_options = action_options_for(action, resource, method)
-
-
+
+
+
+
+
+
+
+
+
-          end
-        end
-

actionpack/lib/action_controller/routing.rb

@@ -989 +989 @@
-        def named_route(name, path, options = {})
-          @set.add_named_route(name, path, options)
-        end
+        
+        def deprecated_named_route(name, deprecated_name, options = {})
+          @set.add_deprecated_named_route(name, deprecated_name)
+        end
-
-        # Added deprecation notice for anyone who already added a named route called "root".
-        # It'll be used as a shortcut for map.connect '' in Rails 2.0.
@@ -1019 +1023 @@
-        def clear!
-          @routes = {}
-          @helpers = []
-
+
-          @module ||= Module.new
-          @module.instance_methods.each do |selector|
-            @module.send :remove_method, selector
@@ -1055 +1059 @@
-        def install(destinations = [ActionController::Base, ActionView::Base])
-          Array(destinations).each { |dest| dest.send :include, @module }
-        end
+        
+        def define_deprecated_named_route_methods(name, deprecated_name)
-
+          [:url, :path].each do |kind|
+            @module.send :module_eval, <<-end_eval # We use module_eval to avoid leaks
+
+              def #{url_helper_name(deprecated_name, kind)}(*args)
+
+                ActiveSupport::Deprecation.warn(
+                  'The named route "#{url_helper_name(deprecated_name, kind)}" uses a format that has been deprecated. ' +
+                  'You should use "#{url_helper_name(name, kind)}" instead.', caller
+                )
+
+                send :#{url_helper_name(name, kind)}, *args
+
+              end
+
+              def #{hash_access_name(deprecated_name, kind)}(*args)
+
+                ActiveSupport::Deprecation.warn(
+                  'The named route "#{hash_access_name(deprecated_name, kind)}" uses a format that has been deprecated. ' +
+                  'You should use "#{hash_access_name(name, kind)}" instead.', caller
+                )
+
+                send :#{hash_access_name(name, kind)}, *args
+
+              end
+
+            end_eval
+          end
+
+        end
+
-        private
-          def url_helper_name(name, kind = :url)
-            :"#{name}_#{kind}"
@@ -1177 +1213 @@
-      def add_named_route(name, path, options = {})
-        named_routes[name] = add_route(path, options)
-      end
+      
+      def add_deprecated_named_route(name, deprecated_name)
+        named_routes.define_deprecated_named_route_methods(name, deprecated_name)
+      end
-  
-      def options_as_params(options)
-        # If an explicit :controller was given, always make :action explicit