Ticket #10818: add_alias_key_to_route_options.patch

actionpack/test/controller/routing_test.rb

@@ -1781 +1781 @@
-    Object.send(:remove_const, :PeopleController)
-  end
-  
+  def test_recognize_with_alias_in_conditions
+    Object.const_set(:PeopleController, Class.new)
+  
+    set.draw do |map|
+      map.people  "/people",  :controller => 'people', :action => "index", :conditions => { :method => :get }
+      map.persons '/persons', :alias => :people
+      map.root                :alias => :people
+    end
+  
+    request.path = "/people"
+    request.method = :get
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("people", request.path_parameters[:controller])
+    assert_equal("index", request.path_parameters[:action])
+  
+    request.path = "/persons"
+    request.method = :get
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("people", request.path_parameters[:controller])
+    assert_equal("index", request.path_parameters[:action])
+  
+    request.path = "/"
+    request.method = :get
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("people", request.path_parameters[:controller])
+    assert_equal("index", request.path_parameters[:action])
+  ensure
+    Object.send(:remove_const, :PeopleController)
+  end
+
-  def test_typo_recognition
-    Object.const_set(:ArticlesController, Class.new)
-

actionpack/lib/action_controller/routing.rb

@@ -168 +168 @@
-  #   # provides named routes for show, delete, and edit
-  #   link_to @article.title, show_path(:id => @article.id)
-  #
+  # == Route aliasing
+  # 
+  # You can use the <tt>:alias</tt> key to reuse a given set of parameters
+  # for multiple named routes, as well as for the route URL.
+  #
+  # Example:
+  #   # In routes.rb
+  #   map.new_session 'sessions/new', :controller => 'sessions', :action => 'new'
+  #   map.login       'login',        :alias => :login
+  #   
+  #   # would recognize both /sessions/new and /login as
+  #   params = { :controller => 'sessions', :action => 'index' }
+  #
+  # You can also use the <tt>:alias</tt> key with map.root
+  #
+  #   # In routes.rb
+  #   map.new_session 'sessions/new', :controller => 'sessions', :action => 'new'
+  #   map.root                        :alias => :new_session
+  #
-  # == Pretty URLs
-  #
-  # Routes can generate pretty URLs. For example:
@@ -1304 +1323 @@
-      end
-
-      def add_named_route(name, path, options = {})
+        if source_route_name = options.delete(:alias)
+          if source_route = named_routes.routes[source_route_name]
+            options = source_route.defaults.merge({ :conditions => source_route.conditions })
+          end
+        end
+        
-        # TODO - is options EVER used?
-        name = options[:name_prefix] + name.to_s if options[:name_prefix]
-        named_routes[name.to_sym] = add_route(path, options)