Changeset 8738

Timestamp:

01/26/08 08:41:19 (4 months ago)

Author:

nzkoz

Message:

Make it simpler to make the root route an alias for another route. Closes #10818 [bscofield]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/routing.rb (modified) (1 diff)
• trunk/actionpack/lib/action_controller/routing/route_set.rb (modified) (1 diff)
• trunk/actionpack/test/controller/routing_test.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Make map.root accept a single symbol as an argument to declare an alias.  #10818 [bscofield] 
+
+  e.g.  map.dashboard '/dashboard', :controller=>'dashboard'
+        map.root      :dashboard
-
-* Handle corner case with image_tag when passed 'messed up' image names. #9018 [duncanbeevers, mpalmer]

trunk/actionpack/lib/action_controller/routing.rb

@@ -116 +116 @@
-  #   root_path  # => ''
-  #
+  # You can also specify an already-defined named route in your map.root call:
+  #
+  #   # In routes.rb
+  #   map.new_session :controller => 'sessions', :action => 'new'
+  #   map.root :new_session
+  #
-  # Note: when using +with_options+, the route is simply named after the
-  # method you call on the block parameter rather than map.

trunk/actionpack/lib/action_controller/routing/route_set.rb

@@ -20 +20 @@
-        # Creates a named route called "root" for matching the root level request.
-        def root(options = {})
+          if options.is_a?(Symbol)
+            if source_route = @set.named_routes.routes[options]
+              options = source_route.defaults.merge({ :conditions => source_route.conditions })
+            end
+          end
-          named_route("root", '', options)
-        end

trunk/actionpack/test/controller/routing_test.rb

@@ -1809 +1809 @@
-  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.root   :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 = "/"
+    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)