aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/routing/mapper.rb
Commit message (Collapse)AuthorAgeFilesLines
* adds URL to the body generated by the redirect macro in the routes mapper as ↵Xavier Noria2010-08-091-1/+4
| | | | per the RFC, extracts common test pattern into a test macro, adds a test to cover the :status option
* Fixes a regression caused by having mapping options controller and action as ↵Santiago Pastorino2010-07-121-1/+4
| | | | | | blank Signed-off-by: José Valim <jose.valim@gmail.com>
* Routes should respect namespace even if action is a regexp and just ↵José Valim2010-07-121-34/+29
| | | | controller is given to to.
* When a dynamic :controller segment is present in the path add a Regexp ↵Andrew White2010-07-071-6/+19
| | | | | | | | | | | constraint that allow matching on multiple path segments. Using a namespace block isn't compatible with dynamic routes so we raise an ArgumentError if we detect a :module present in the scope. [#5052 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Refactor handling of :only and :except options. The rules are:Andrew White2010-07-061-26/+46
| | | | | | | | | | | 1. Don't inherit when specified as an option on a resource 2. Don't push into scope when specified as an option on a resource 2. Resources pull in :only or :except options from scope 3. Either :only or :except in nested scope overwrites parent scope [#5048 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Recognize should also work with route is wrapped in a constraint.José Valim2010-07-061-0/+2
|
* Refactor resource options and scoping. Resource classes are now only ↵Andrew White2010-07-041-99/+64
| | | | | | responsible for controlling how they are named. All other options passed to resources are pushed out to the scope. Signed-off-by: José Valim <jose.valim@gmail.com>
* Fixes for "router" and "routes" terminologyWincent Colaiuta2010-07-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit f7ba614c2db improved the internal consistency of the different means of accessing routes, but it introduced some problems at the level of code comments and user-visible strings. This commit applies fixes on three levels: Firstly, we remove or replace grammatically invalid constructs such as "a routes" or "a particular routes". Secondly, we make sure that we always use "the router DSL" or "the router syntax", because this has always been the official terminology. Finally, we make sure that we only use "routes" when referring to the application-specific set of routes that are defined in the "config/routes.rb" file, we use "router" when referring on a more abstract level to "the code in Rails used to handle routing", and we use "routing" when we need an adjective to apply to nouns such as "url_helpers. Again this is consistent with historical practice and other places in the documentation. Note that this is not a sweep over the entire codebase to ensure consistent usage of language; it is just a revision of the changes introduced in commit f7ba614c2db. Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: José Valim <jose.valim@gmail.com>
* Fix routes with :controller segment when namespaced [#5034 state:resolved]José Valim2010-07-021-1/+1
|
* Unify routes naming by renaming router to routesPiotr Sarnacki2010-07-021-1/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* A couple enhancements to the router:José Valim2010-06-301-27/+48
| | | | | | | | * Allow to use the get :symbol shortcut outside resources scopes as well; * Fix a bug where :action was not being picked from given options; * Giving :as option inside a resource now changes just the relative name instead of the full name;
* Clean up the logic to specify the name and path for action a bit.José Valim2010-06-301-87/+51
|
* Merge :constraints from scope into resource options [#2694 state:resolved]Andrew White2010-06-281-4/+6
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Support optional static segements as well [#4832 state:resolved]Andrew White2010-06-261-1/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Fixed normalize_path in Routing::Mapper to handle optional prefix segments ↵Paul Barry2010-06-261-1/+1
| | | | | | with static and dynamic parts Signed-off-by: José Valim <jose.valim@gmail.com>
* Don't force pluralization of controller name when defining a resource [#4980 ↵Andrew White2010-06-261-1/+9
| | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Fix namespaced redirects [#4389 state:resolved]Andrew White2010-06-241-1/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Add the :path option to match routes when given as symbols. This is ↵Carlos Antonio da Silva2010-06-231-9/+8
| | | | | | | | | | specially useful in http helpers for generating routes in scenarios like: resources :users, :path => 'usuarios' do get :search, :on => :collection, :path => 'pesquisar' end Signed-off-by: José Valim <jose.valim@gmail.com>
* Provive resources_path_names helpers in the router.José Valim2010-06-231-0/+4
|
* Stop filling the blocks scope array with nil.José Valim2010-06-221-1/+3
|
* Allow namespace accept options in routes [#4936 state:resolved]Carlos Antonio da Silva2010-06-221-3/+5
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Deprecate :name_prefix in the new router DSL.José Valim2010-06-221-20/+22
|
* Don't use module to work out shallow name prefix and path as it may not ↵Andrew White2010-06-201-9/+17
| | | | | | accurately reflect the actual namespace [#4899 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Accept an object for :constraints option [#4904 state:resolved]Andrew White2010-06-201-1/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Custom resource routes should be scopedAndrew White2010-06-191-7/+36
| | | | | | [#3765] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* fix for :shallow in router not generating helpers for create, update, and ↵Josh Kalderimis2010-06-181-4/+3
| | | | | | | | destroy actions when :only or :except are used [#4900 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Add shallow routing option to new router [#3765 status:committed]Andrew White2010-06-171-156/+248
| | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* Add more cases to previous commit [#4394 state:resolved]José Valim2010-06-081-1/+1
|
* Make sure namespaces are nested within resourcesJan De Poorter2010-06-081-0/+8
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Revert "Add shallow routes to the new router" for now. Needs more work.David Heinemeier Hansson2010-06-081-26/+3
| | | | This reverts commit 67a60ee314f53abcde78f8ecd2a1f7c9ef8264e1.
* Fix resources ignoring scope optionsAndrew White2010-06-081-0/+2
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Add support for actions on a new resource to the new routing DSL [#4328 ↵Andrew White2010-06-081-27/+70
| | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Add shallow routes to the new router [Closes #3765]Diego Carrion2010-06-071-3/+26
|
* member on resource should not expect an ID.José Valim2010-06-071-3/+1
|
* Router accepts member routes on resource. [#4624 state:resolved]Rizwan Reza2010-06-061-5/+14
|
* Allow root to be given in the resources scope without need to specify :on => ↵José Valim2010-05-171-0/+5
| | | | collection.
* Remove only formats in shortcuts and do it just once.José Valim2010-04-201-4/+5
|
* added shorthand support for routes like /projects/status(.:format)Diego Carrion2010-04-171-3/+3
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Fix a bug in url generation for generic routes.José Valim2010-04-121-2/+9
|
* Ensure match path, :controller => name works as expected.José Valim2010-04-121-2/+4
|
* Make namespace work with options[:to] [#4351 state:committed]Santiago Pastorino2010-04-111-0/+8
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Revert "Revert "Use path_names, not resource_path_names, consistently""wycats2010-04-101-6/+6
| | | This reverts commit d3ec4b1ba6528a081f5124fd71cc026b1f8abe9c.
* Revert "Use path_names, not resource_path_names, consistently"José Valim2010-04-101-6/+6
| | | | | Breaks tests on Ruby 1.8.7. This reverts commit 13bbf98d85029fd4e3563ac46413c7b72625bc25.
* Use path_names, not resource_path_names, consistentlywycats2010-04-101-6/+6
|
* Dial back from 'namespace :controller => ...' to 'scope :module => ...'Jeremy Kemper2010-04-091-17/+5
|
* Routes can be selectively namespaced by path or controller moduleJeremy Kemper2010-04-091-2/+15
|
* Reapply redirect {|params, request| } with passing tests this timewycats2010-04-041-1/+5
|
* Revert "Pass in the request as an optional second parameter to redirect"Jeremy Kemper2010-04-041-1/+1
| | | | | | Was not tested. This reverts commit a8c3c71af161e7d4263ad489ca2f6601bc02a9bb.
* Pass in the request as an optional second parameter to redirectwycats2010-04-031-1/+1
|
* * Change the object used in routing constraints to be an instance ofwycats2010-04-031-6/+7
| | | | | | | | | | | ActionDispatch::Request rather than Rack::Request. * Changed ActionDispatch::Request#method to return a String, to be compatible with the Rack::Request superclass. * Changed ActionDispatch::Request#method to return the original method in the case of methodoverride and #request_method not to, to be compatible with Rack::Request