aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/routing/mapper.rb
Commit message (Collapse)AuthorAgeFilesLines
* Add missing requireSantiago Pastorino2013-07-021-0/+1
|
* Fix shorthand routes where controller and action are in the scopeAndrew White2013-06-251-0/+8
| | | | | | | | | | | Merge `:action` from routing scope and assign endpoint if both `:controller` and `:action` are present. The endpoint assignment only occurs if there is no `:to` present in the options hash so should only affect routes using the shorthand syntax (i.e. endpoint is inferred from the the path). Fixes #9856 Backport of 37b4276
* remove unused path_without_format variableKornelius Kalnbach2013-03-031-2/+0
| | | Was forgotten in a72dab0.
* determine the match shorthand target early.Yves Senn2013-02-221-9/+12
| | | | | | | | | Backport #9361. Closes #7554. This patch determines the `controller#action` directly in the `match` method when the shorthand syntax is used. this prevents problems with namespaces and scopes.
* Duplicate possible frozen string from routeAndrew White2013-01-211-2/+3
| | | | | | | | | | | | | Ruby 1.9 freezes Hash string keys by default so where a route is defined like this: get 'search' => 'search' then the Mapper will derive the action from the key. This blows up later when the action is added to the parameters hash and the encoding is forced. Closes #3429
* backport, handle trailing slash with enginesYves Senn2012-11-081-1/+1
| | | | this is a backport of #8115 to fix #7842
* Revert "Merge pull request #7668 from Draiken/fix_issue_6497"Rafael Mendonça França2012-11-021-1/+1
| | | | | | | | | This reverts commit 61d5d2d8a97fd289b81991cd79dca3112e7ca135. Conflicts: actionpack/CHANGELOG.md REASON: This added a backward incompatible change.
* Merge pull request #7789 from senny/7777_resource_functions_modify_optionsRafael Mendonça França2012-10-011-2/+2
| | | | resource and resources do no longer modify passed options
* Merge pull request #7668 from Draiken/fix_issue_6497Rafael Mendonça França2012-09-191-1/+1
| | | | | | Removing to_shorthand to fix #6497 Conflicts: actionpack/CHANGELOG.md
* Add support for optional root segments containing slashesAndrew White2012-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optional segments with a root scope need to have the leading slash outside of the parentheses, otherwise the generated url will be empty. However if the route has non-optional elements then the leading slash needs to remain inside the parentheses otherwise the generated url will have two leading slashes, e.g: Blog::Application.routes.draw do get '/(:category)', :to => 'posts#index', :as => :root get '/(:category)/author/:name', :to => 'posts#author', :as => :author end $ rake routes root GET /(:category)(.:format) posts#index author GET (/:category)/author/:name(.:format) posts#author This change adds support for optional segments that contain a slash, allowing support for urls like /page/2 for the root path, e.g: Blog::Application.routes.draw do get '/(page/:page)', :to => 'posts#index', :as => :root end $ rake routes root GET /(page/:page)(.:format) posts#index Fixes #7073 (cherry picked from commit d8745decaf59aad32aa2f09abdba99b8d0e48b31)
* Reset the request parameters after a constraints checkAndrew White2012-05-031-0/+2
| | | | | | | | | | | | | | A callable object passed as a constraint for a route may access the request parameters as part of its check. This causes the combined parameters hash to be cached in the environment hash. If the constraint fails then any subsequent access of the request parameters will be against that stale hash. To fix this we delete the cache after every call to `matches?`. This may have a negative performance impact if the contraint wraps a large number of routes as the parameters hash is built by merging GET, POST and path parameters. Fixes #2510. (cherry picked from commit 56030506563352944fed12a6bb4793bb2462094b)
* Fix typo in match :to docsJustin Woodbridge2012-02-251-1/+1
|
* Documented about using :path option for resourcesKevin Moore2011-12-291-0/+7
|
* Correctly display rack apps with dynamic constraints in RoutesInspectorPiotr Sarnacki2011-12-261-1/+1
| | | | | | | | | | | | | If you used dynamic constraint like that: scope :constraint => MyConstraint.new do mount RackApp => "/foo" end routes were not displayed correctly when using `rake routes`. This commit fixes it. If you want nice display of dynamic constraints in `rake routes` output, please just override to_s method in your constraint's class.
* Do not raise an exception if an invalid route was generated automatically.José Valim2011-12-161-3/+11
|
* Fixing incorrect documentation Aviv Ben-Yosef2011-11-301-2/+2
| | | `path_names` can only be used for affecting `new` and `edit`
* Revert "copy options keys to the right place so that undo will work correctly"Aaron Patterson2011-11-191-4/+10
| | | | This reverts commit 3178cc9a80262d3bf7754f3507ef60243b46634f.
* Warning removed for shadowing variableArun Agrawal2011-11-191-1/+1
|
* copy options keys to the right place so that undo will work correctlyAaron Patterson2011-11-181-10/+4
|
* no need for type checkingAaron Patterson2011-11-181-1/+1
|
* cleaning up variable names to match method parameter namesAaron Patterson2011-11-181-6/+8
|
* stop doing is_a? checks on the resource typeAaron Patterson2011-11-181-4/+4
|
* move constants to methods since nothing else is using themAaron Patterson2011-11-181-6/+5
|
* pushing hash validation upAaron Patterson2011-11-181-13/+14
|
* breaking match down to smaller methodsAaron Patterson2011-11-181-19/+22
|
* some refactoring of the match methodAaron Patterson2011-11-181-25/+17
|
* Fix small typos in routing docsAlexey Vakhov2011-11-031-1/+3
|
* Fix typo in constraints method documentationAlexey Vakhov2011-11-011-1/+1
|
* Adds missing closing regex slashes.mjy2011-10-251-2/+2
|
* allow shorthand routes with nested optional parametersDiego Carrion2011-10-101-3/+3
|
* removing backwards compatibility moduleAaron Patterson2011-09-121-3/+3
|
* partially expand the parameters to `match`Aaron Patterson2011-09-121-3/+3
|
* Merge pull request #2577 from rails-noob/masterSantiago Pastorino2011-09-061-1/+3
|\ | | | | Fix double slash at start of paths when mounting an engine at the root.
| * Fix bug #2579.rails-noob2011-09-061-1/+3
| | | | | | | | Avoids double slash at start of paths when mounting an engine at the root.
* | if ... nil? is more expensive than unlessMilan Dobrota2011-09-041-1/+1
| |
* | Fix name of parent resource params when declaring nested resources at routesCarlos Paramio2011-09-011-6/+6
|/
* Merge pull request #2327 from cesario/patch-1José Valim2011-07-281-1/+0
|\ | | | | We don't need to require erb here.
| * We don't need to require erb here.Franck Verrot2011-07-281-1/+0
| |
* | Merge pull request #2330 from thedarkone/resources-router-fixJosé Valim2011-07-281-8/+7
|\ \ | |/ |/| Inline resources router fix
| * Make use of the inherited initializer.thedarkone2011-07-281-3/+2
| |
| * There is no need to be destructive with the passed-in options.thedarkone2011-07-281-6/+6
| | | | | | | | This fixes a bug that is caused by Resource/SingletonResource mangling resource options when using inline "multi"-resource declarations.
* | simplify conditionals by assuming hash values will never be `false`Aaron Patterson2011-07-261-10/+2
| |
* | use regular ruby rather than clever rubyAaron Patterson2011-07-261-3/+3
| |
* | fixing wildcard path matching when wildcard is inside parenthesisAaron Patterson2011-07-261-1/+1
| |
* | Allow a route to have :format => trueErik Michaels-Ober2011-07-251-0/+2
| | | | | | | | | | | | When format is true, it is mandatory (as opposed to :format => false). This is currently not possible with resource routes, which automatically make format optional by default.
* | Ensure the constraints block is only applied to the correct routeDave Rogers2011-07-251-6/+5
|/ | | | | addresses issue #1907 - any routes that follow a route with a constraints block are inheriting the previous route's constraints.
* Better formatting of route requirements in rake:routes.Hendy Tanata2011-07-161-7/+7
| | | | | | | | | | Previously it was: {:controller=>"photos", :action=>"show", :id=>/[A-Z]\d{5}/} Now it becomes: photos#show {:id=>/[A-Z]\d{5}/}
* Removed warning while running test with ruby 1.9.2bagwanpankaj2011-06-141-1/+1
|
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-111-3/+3
|\
| * shallow_path example updatedganesh2011-06-101-3/+3
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 08:54:52 +0000