aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/routing
Commit message (Collapse)AuthorAgeFilesLines
...
* remove dead codeAaron Patterson2014-05-121-12/+0
|
* only test `persisted?` on the record onceAaron Patterson2014-05-121-3/+7
| | | | | also avoid the case of calling `persisted?` on something that doesn't respond to it
* only send options if there are any optionsAaron Patterson2014-05-121-5/+7
|
* remove should_pop variableAaron Patterson2014-05-121-4/+1
|
* only pop records when we get an arrayAaron Patterson2014-05-121-6/+7
|
* remove unnecessary array allocationsCoraline Ada Ehmke + Aaron Patterson2014-05-121-5/+1
|
* simplified route method name generationCoraline Ada Ehmke + Aaron Patterson2014-05-121-27/+17
|
* small refactoringCoraline Ada Ehmke + Aaron Patterson2014-05-121-6/+2
|
* pulling helpermethods up before refactoringCoraline Ada Ehmke + Aaron Patterson2014-05-121-20/+46
|
* push all is_a tests up, always pass options to the named routeAaron Patterson2014-05-121-28/+27
|
* pull nil checks upAaron Patterson2014-05-121-3/+5
|
* skip another Array is_a checkAaron Patterson2014-05-121-4/+6
|
* only do the Array is_a check onceAaron Patterson2014-05-121-4/+3
|
* we always convert this variable to a list, so we can remove the unconversionAaron Patterson2014-05-121-1/+0
|
* record as a hash is not possible, so rm branchAaron Patterson2014-05-121-2/+0
|
* stop popping in build_named_route_callAaron Patterson2014-05-121-4/+3
|
* remove extract_record since we have extracted the listAaron Patterson2014-05-121-12/+1
|
* always pass a list to build_named_route_callAaron Patterson2014-05-121-10/+19
|
* add a test for passing two models to the polymorphic_url methodAaron Patterson2014-05-121-1/+1
|
* reduce conditionals in url_forAaron Patterson2014-05-121-3/+6
|
* extract route key translation to a method and reuse itAaron Patterson2014-05-121-17/+14
|
* make the module version quack the same as the instanceAaron Patterson2014-05-121-3/+10
| | | | this way we can stop checking respond_to on every call.
* Hash#except is expensive and this is a hotspot, so use a dup + deleteAaron Patterson2014-05-121-1/+2
|
* Do not use short-circuit returnRafael Mendonça França2014-05-041-2/+3
|
* Merge pull request #11166 from xavier/callable_constraint_verificationRafael Mendonça França2014-05-041-0/+7
|\ | | | | | | | | | | | | Callable route constraint verification Conflicts: actionpack/CHANGELOG.md
| * Verify that route constraints respond to the expected messages instead of ↵Xavier Defrang2013-06-281-0/+7
| | | | | | | | silently failing to enforce the constraint
* | Use #include? instead of #any?, make it simplerAkshay Vishnoi2014-05-031-1/+1
| |
* | passing a nil in the polymorphic array is not supported. remove nils before ↵Aaron Patterson2014-05-021-0/+4
| | | | | | | | you call the method
* | passing a nil should always raise an ArgumentErrorAaron Patterson2014-05-021-1/+0
| |
* | Tiny follow up to #14915 [ci skip]Robin Dupret2014-05-021-19/+18
| |
* | only add the optiosn if they are not emptyAaron Patterson2014-05-011-1/+3
| | | | | | | | | | | | I think this is wrong, but it gets the build passing for now. We should always add options, but we need to make more guarantees about how the underlying url helper is called
* | always pass options to the _url methodAaron Patterson2014-05-011-3/+1
| |
* | never merge url options in to the first data hashAaron Patterson2014-05-011-1/+1
| | | | | | | | | | if you want options, don't mix them with the first hash, just pass them all in with the second hash
* | Merge pull request #14915 from juanpastas/patch-1Rafael Mendonça França2014-05-011-20/+37
|\ \ | | | | | | Update mapper.rb
| * | [skip ci] Document: required `via` option in `match` routing method.Juan David Pastas2014-04-301-20/+37
| | |
* | | avoid calling extract_record multiple timesAaron Patterson2014-04-301-3/+2
| | |
* | | eliminate conditional when sending the named route methodAaron Patterson2014-04-301-2/+4
|/ /
* | Make URL escaping more consistentAndrew White2014-04-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Escape '%' characters in URLs - only unescaped data should be passed to URL helpers 2. Add an `escape_segment` helper to `Router::Utils` that escapes '/' characters 3. Use `escape_segment` rather than `escape_fragment` in optimized URL generation 4. Use `escape_segment` rather than `escape_path` in URL generation For point 4 there are two exceptions. Firstly, when a route uses wildcard segments (e.g. *foo) then we use `escape_path` as the value may contain '/' characters. This means that wildcard routes can't be optimized. Secondly, if a `:controller` segment is used in the path then this uses `escape_path` as the controller may be namespaced. Fixes #14629, #14636 and #14070.
* | Only make deeply nested routes shallow when parent is shallowAndrew White2014-04-111-1/+14
| | | | | | | | | | | | | | | | | | | | Since `:shallow` may be set at any point in the resource nesting we should only make the new and collection routes shallow when the parent is shallow. This is a bit of a hack but until the mapper is refactored to an object graph instead of a hash of merged values it's the best we can do. Fixes #14684.
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-03-291-0/+4
|\ \
| * | Mention required glob param name in match docs for mapperEarl St Sauver2014-03-201-0/+4
| | | | | | | | | | | | | | | | | | | | | THe match documentation doesn't mention any requirement of the parameter name requirement for matches. However, including a bare glob character without a variable assignment causes a parse error.
* | | Use nested_scope? not shallow? to determine whether to copy optionsAndrew White2014-03-161-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | The method `shallow?` returns false if the parent resource is a singleton so we need to check if we're not inside a nested scope before copying the :path and :as options to their shallow equivalents. Fixes #14388.
* | | Copy shallow options from normal options when using scopeAndrew White2014-03-081-1/+2
| | | | | | | | | | | | | | | | | | If the options :shallow_prefix and :shallow_path are not set in the scope options then copy them from the normal :as and :path options if they are set.
* | | Pull namespace defaults out of the options hashAndrew White2014-03-081-3/+10
| | | | | | | | | | | | | | | | | | | | | If a developer has specified either :path or :as in the options hash then these should be used as the defaults for :shallow_path and :shallow_prefix. Fixes #14241.
* | | Only use shallow nested scope when depth is > 1Andrew White2014-03-081-20/+23
| | | | | | | | | | | | | | | | | | | | | | | | By tracking the depth of resource nesting we can push the need for nested shallow scoping to only those routes that are nested more than one deep. This allows us to keep the fix for #12498 and fix the regression in #14224. Fixes #14224.
* | | Move setting :scope_level_resource to resource_scopeAndrew White2014-03-081-7/+7
|/ / | | | | | | | | | | | | | | Originally with_scope_level was exclusively for managing scope levels with resources, however it is now used for other things so it makes more sense to move the responsibility for setting the :scope_level_resource to the resource_scope method. This eliminates repeatedly setting it to the same resource as each resource method scope is evaluated.
* | Set the :shallow_path as each scope is generatedAndrew White2014-02-091-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we set :shallow_path when shallow is called it can result in incorrect paths if the resource is inside a namespace because namespace itself sets the :shallow_path option to the namespace path. We fix this by removing the :shallow_path option from shallow as that should only be turning shallow routes on and not otherwise affecting the scope. To do this we need to treat the :shallow option to resources differently to other scope options and move it to before the nested block is called. This change also has the positive side effect of making the behavior of the :shallow option consistent with the shallow method. Fixes #12498.
* | Transform dashes to underscores in resource route namesByron Bischoff2014-01-251-4/+4
| | | | | | | | Fixes #13824
* | Fix `rake routes` error when `Rails::Engine` with empty routes is mounted; ↵Maurizio De Santis2014-01-241-3/+3
| | | | | | | | | | | | fixes rails/rails#13810 Squash
* | Automatically convert dashes to underscores in shorthand routesMikko Johansson2014-01-201-0/+1
| |