Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Scaffolding generates new routing dsl examples

  • Loading branch information...
commit 0fec53f243079a60df817cab55100a136fafc1c9 1 parent f9d570b
Joshua Peek josh authored
57 railties/lib/rails/generators/rails/app/templates/config/routes.rb
View
@@ -1,43 +1,60 @@
ActionController::Routing::Routes.draw do |map|
- # The priority is based upon order of creation: first created -> highest priority.
+ # The priority is based upon order of creation:
+ # first created -> highest priority.
# Sample of regular route:
- # map.connect 'products/:id', :controller => 'catalog', :action => 'view'
+ # match 'products/:id', :to => 'catalog#view'
# Keep in mind you can assign values other than :controller and :action
# Sample of named route:
- # map.purchase 'products/:id/purchase', :controller => 'catalog', :action => 'purchase'
+ # match 'products/:id/purchase', :to => 'catalog#purchase', :as => :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
+ # resources :products
# Sample resource route with options:
- # map.resources :products, :member => { :short => :get, :toggle => :post }, :collection => { :sold => :get }
+ # resources :products do
+ # member do
+ # get :short
+ # post :toggle
+ # end
+ #
+ # collection do
+ # get :sold
+ # end
+ # end
# Sample resource route with sub-resources:
- # map.resources :products, :has_many => [ :comments, :sales ], :has_one => :seller
-
+ # resources :products do
+ # resources :comments, :sales
+ # resource :seller
+ # end
+
# Sample resource route with more complex sub-resources
- # map.resources :products do |products|
- # products.resources :comments
- # products.resources :sales, :collection => { :recent => :get }
+ # resources :products do
+ # resources :comments
+ # resources :sales do
+ # get :recent, :on => :collection
+ # end
# end
# Sample resource route within a namespace:
- # map.namespace :admin do |admin|
- # # Directs /admin/products/* to Admin::ProductsController (app/controllers/admin/products_controller.rb)
- # admin.resources :products
+ # namespace :admin do
+ # # Directs /admin/products/* to Admin::ProductsController
+ # # (app/controllers/admin/products_controller.rb)
+ # resources :products
# end
- # You can have the root of your site routed with map.root -- just remember to delete public/index.html.
- # map.root :controller => "welcome"
+ # You can have the root of your site routed with map.root

I think you want this to read something like "You can have the root of your site routed with 'root :to => /url'. But I'm sure you want to change the map.root from the example if you are going with the new dsl. Btw, I really like the new dsl.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
+ # just remember to delete public/index.html.
+ # root :to => "welcome"
# See how all your routes lay out with "rake routes"
- # Install the default routes as the lowest priority.
- # Note: These default routes make all actions in every controller accessible via GET requests. You should
- # consider removing or commenting them out if you're using named routes and resources.
- map.connect ':controller/:action/:id'
- map.connect ':controller/:action/:id.:format'
+ # Install the default route as the lowest priority.
+ # Note: The default route make all actions in every controller accessible
+ # via GET requests. You should consider removing or commenting it out if
+ # you're using named routes and resources.
+ match ':controller(/:action(/:id(.:format)))'
end
2  railties/lib/rails/generators/rails/resource/resource_generator.rb
View
@@ -16,7 +16,7 @@ class ResourceGenerator < ModelGenerator #metagenerator
class_option :singleton, :type => :boolean, :desc => "Supply to create a singleton controller"
def add_resource_route
- route "map.resource#{:s unless options[:singleton]} :#{pluralize?(file_name)}"
+ route "resource#{:s unless options[:singleton]} :#{pluralize?(file_name)}"
end
protected
2  railties/lib/rails/generators/rails/scaffold/USAGE
View
@@ -17,7 +17,7 @@ Description:
For example, 'scaffold post title:string body:text published:boolean'
gives you a model with those three attributes, a controller that handles
the create/show/update/destroy, forms to create and edit your posts, and
- an index that lists them all, as well as a map.resources :posts
+ an index that lists them all, as well as a resources :posts
declaration in config/routes.rb.
If you want to remove all the generated files, run
2  railties/test/fixtures/plugins/engines/engine/config/routes.rb
View
@@ -1,3 +1,3 @@
ActionController::Routing::Routes.draw do |map|
- map.connect '/engine', :controller => "engine"
+ match '/engine', :to => "engine"
end
2  railties/test/generators/actions_test.rb
View
@@ -171,7 +171,7 @@ def test_freeze_is_deprecated
def test_route_should_add_data_to_the_routes_block_in_config_routes
run_generator
- route_command = "map.route '/login', :controller => 'sessions', :action => 'new'"
+ route_command = "route '/login', :controller => 'sessions', :action => 'new'"
action :route, route_command
assert_file 'config/routes.rb', /#{Regexp.escape(route_command)}/
end
6 railties/test/generators/resource_generator_test.rb
View
@@ -62,7 +62,7 @@ def test_resource_routes_are_added
run_generator
assert_file "config/routes.rb" do |route|
- assert_match /map\.resources :accounts$/, route
+ assert_match /resources :accounts$/, route
end
end
@@ -70,7 +70,7 @@ def test_singleton_resource
run_generator ["account", "--singleton"]
assert_file "config/routes.rb" do |route|
- assert_match /map\.resource :account$/, route
+ assert_match /resource :account$/, route
end
end
@@ -93,7 +93,7 @@ def test_route_is_removed_on_revoke
run_generator ["account"], :behavior => :revoke
assert_file "config/routes.rb" do |route|
- assert_no_match /map\.resources :accounts$/, route
+ assert_no_match /resources :accounts$/, route
end
end
4 railties/test/generators/scaffold_generator_test.rb
View
@@ -25,7 +25,7 @@ def test_scaffold_on_invoke
# Route
assert_file "config/routes.rb" do |route|
- assert_match /map\.resources :product_lines$/, route
+ assert_match /resources :product_lines$/, route
end
# Controller
@@ -99,7 +99,7 @@ def test_scaffold_on_revoke
# Route
assert_file "config/routes.rb" do |route|
- assert_no_match /map\.resources :product_lines$/, route
+ assert_no_match /resources :product_lines$/, route
end
# Controller
2  railties/test/rails_info_controller_test.rb
View
@@ -16,7 +16,7 @@ class InfoControllerTest < ActionController::TestCase
def setup
ActionController::Routing::Routes.draw do |map|
- map.connect ':controller/:action/:id'
+ match ':controller/:action'
end
@controller.stubs(:consider_all_requests_local => false, :local_request? => true)
end

1 comment on commit 0fec53f

jonathanh

I think you want this to read something like "You can have the root of your site routed with 'root :to => /url'. But I'm sure you want to change the map.root from the example if you are going with the new dsl. Btw, I really like the new dsl.

jonathanh

Looks like you changed this with rev. b2ef6d1. I should have read all the commits before commenting. Please disregard my previous comment.

Please sign in to comment.
Something went wrong with that request. Please try again.