Changeset 5671

Timestamp:

12/04/06 00:12:00 (2 years ago)

Author:

david

Message:

Dropped the idea of automatically routing :format for the vanilla routes -- that will be a treat for map.resources. Deprecated the name route root as it'll be used as a shortcut for map.connect in Rails 2.0 (Rails 1.2). Added map.root as an alias for map.connect (Rails 2.0)

Files:

• branches/1-2-pre-release/actionpack/lib/action_controller/routing.rb (modified) (1 diff)
• branches/1-2-pre-release/actionpack/test/controller/routing_test.rb (modified) (4 diffs)
• branches/1-2-pre-release/railties/CHANGELOG (modified) (1 diff)
• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/routing.rb (modified) (1 diff)
• trunk/actionpack/test/controller/routing_test.rb (modified) (4 diffs)
• trunk/railties/configs/routes.rb (modified) (1 diff)

branches/1-2-pre-release/actionpack/lib/action_controller/routing.rb

@@ -979 +979 @@
-          @set.add_named_route(name, path, options)
-        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.
+        def root(*args, &proc)
+          super unless args.length >= 1 && proc.nil?
+          @set.add_named_route("root", *args)
+        end
+        deprecate :root => "(as the the label for a named route) will become a shortcut for map.connect '', so find another name"
-
-        def method_missing(route_name, *args, &proc)

branches/1-2-pre-release/actionpack/test/controller/routing_test.rb

@@ -377 +377 @@
-  def test_named_url_with_no_action_specified
-    rs.draw do |map|
-root
+home
-      map.connect ':controller/:action/:id'
-    end
@@ -385 +385 @@
-    
-    x = setup_for_named_route.new
-root
-root
+home
+home
-  end
-  
@@ -392 +392 @@
-    [{:controller => 'content', :action => 'index'}, {:controller => 'content'}].each do |hash| 
-      rs.draw do |map|
-root
+home
-        map.connect ':controller/:action/:id'
-      end
@@ -1583 +1583 @@
-  end
-
+  def test_deprecation_warning_for_root_route
+    Object.const_set(:PeopleController, Class.new)
+
+    set.draw do |map|
+      assert_deprecated do
+        map.root('', :controller => "people")
+      end    
+    end
+  ensure
+    Object.send(:remove_const, :PeopleController)
+  end
+
-  def test_generate_with_default_action
-    set.draw do |map|

branches/1-2-pre-release/railties/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Deprecated the name route "root" as it'll be used as a shortcut for map.connect '' in Rails 2.0 [DHH]
-
-* Fixed that script/server running against Mongrel should tail the proper log regardless of the environment [DHH]

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Added map.root as an alias for map.connect '' [DHH]
-
-* Added Request#format to return the format used for the request as a mime type. If no format is specified, the first Request#accepts type is used. This means you can stop using respond_to for anything else than responses [DHH]. Examples:

trunk/actionpack/lib/action_controller/routing.rb

@@ -974 +974 @@
-        def connect(path, options = {})
-          @set.add_route(path, options)
+        end
+
+        # Creates a named route called "root" for matching the root level request.
+        def root(options = {})
+          named_route("root", '', options)
-        end
-

trunk/actionpack/test/controller/routing_test.rb

@@ -377 +377 @@
-  def test_named_url_with_no_action_specified
-    rs.draw do |map|
-root
+home
-      map.connect ':controller/:action/:id'
-    end
@@ -385 +385 @@
-    
-    x = setup_for_named_route.new
-root
-root
+home
+home
-  end
-  
@@ -392 +392 @@
-    [{:controller => 'content', :action => 'index'}, {:controller => 'content'}].each do |hash| 
-      rs.draw do |map|
-root
+home
-        map.connect ':controller/:action/:id'
-      end
@@ -1593 +1593 @@
-  end
-
+  def test_root_map
+    Object.const_set(:PeopleController, Class.new)
+
+    set.draw { |map| map.root :controller => "people" }
+
+    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_generate_finds_best_fit
-    set.draw do |map|

trunk/railties/configs/routes.rb

@@ -9 +9 @@
-  # map.purchase 'products/:id/purchase', :controller => 'catalog', :action => 'purchase'
-  # This route can be invoked with purchase_url(:id => product.id)
+  
+  # Sample resource route (maps HTTP verbs to controller actions automatically):
+  # map.resources :products
-
-
+
+
+
+
-  # -- just remember to delete public/index.html.
-connect '',
+root
-
-
-
+
-  map.connect ':controller/service.wsdl', :action => 'wsdl'
-
-  # Install the default route as the lowest priority.
-  map.connect ':controller/:action/:id.:format'
-  map.connect ':controller/:action/:id'
-end