aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/routing/mapper.rb
Commit message (Collapse)AuthorAgeFilesLines
...
* make `constraints` more functionalAaron Patterson2015-08-121-8/+10
| | | | | I don't want to rely on mutating ivars. This gives me more freedom when refactoring
* only call `split_constraints` onceAaron Patterson2015-08-111-4/+4
|
* only do is_a? checks on `options_constraints` onceAaron Patterson2015-08-111-16/+9
| | | | we don't need to do it so many times.
* Mapping instances don't need `scope` anymoreAaron Patterson2015-08-111-3/+3
|
* pull scope[:constraints] upAaron Patterson2015-08-111-5/+4
| | | | Now we only need to call `split_constraints` possibly twice!
* pull :format up a little bitAaron Patterson2015-08-111-3/+5
| | | | | apparently `format` can also come from the scope options, so we need to extract it there too.
* pull `to` upAaron Patterson2015-08-111-18/+19
| | | | | this way we don't have to insert / delete it from the options hash so many times.
* push scope access up for modulesAaron Patterson2015-08-111-3/+3
| | | | | eventually we'll remove the need to access `scope` inside the Mapping object.
* path is never nilAaron Patterson2015-08-111-1/+1
|
* split options hash and pass values downAaron Patterson2015-08-111-3/+5
| | | | | | `using_match_shorthand?` doesn't need to know that an options hash exists. Also use this opportunity to make the boolean logic a little more sane
* pull option duping upAaron Patterson2015-08-111-7/+6
|
* split paths by typeAaron Patterson2015-08-111-16/+27
| | | | | this simplifies the "downstream" logic since we know we'll only be dealing with one particular type
* one fewer hash mutationAaron Patterson2015-08-111-3/+3
|
* push option decomposition up a bit moreAaron Patterson2015-08-111-4/+4
| | | | | I think we can find the original place where `action` is added to the options hash now.
* push `action` option extraction up one frame.Aaron Patterson2015-08-111-3/+5
|
* pull up the "options.delete(:controller)" logicAaron Patterson2015-08-111-12/+14
| | | | | | we want to try to pull this logic up to where the user actually passed in "controller" so that it's close to the related call. That way when we're down the stack, we don't need to wonder "why are we doing this?"
* Tiny documentation fixes [ci skip]Robin Dupret2015-08-111-2/+2
|
* Only use path if the key is not presentRafael Mendonça França2015-08-101-1/+1
| | | | | There are some cases where :path is nil on option and we should respect that.
* try to pass fewer options to `scope`Aaron Patterson2015-08-101-2/+3
| | | | We already know how to handle `path`, so lets just handle it on our own.
* always cast `name` to a symbol, and never to_s itAaron Patterson2015-08-101-2/+1
| | | | | | | All callers of `action_path` interpolate the return value in to a string, so there is no need for the method to to_s it. to_sym on a symbol will return the same symbol, though I think `action_path` may always be called with a symbol so this might not be necessary.
* pull path conditional upAaron Patterson2015-08-101-4/+6
| | | | we only need to check for `path` once.
* pull `defaults` extraction up the stack.Aaron Patterson2015-08-101-2/+6
| | | | Now we can see where `defaults` options originate
* avoid calling `scope` on `defaults` methodsAaron Patterson2015-08-101-3/+6
|
* let the `controller` method push / pop the stackAaron Patterson2015-08-101-11/+5
| | | | | since `controller` and `controller_scope` were the same, just combine them
* remove another call to `scope`Aaron Patterson2015-08-101-3/+4
|
* remove dead codeAaron Patterson2015-08-101-12/+0
| | | | | This method isn't used internally, isn't tested, isn't documented. We should delete it.
* avoid is_a? callsAaron Patterson2015-08-101-1/+5
| | | | | add a predicate method so that we can avoid is_a? calls on the resource object.
* avoid another call to `scope`Aaron Patterson2015-08-101-1/+1
| | | | | calling `scope` isn't cheap, so try to call cheaper methods that do the same thing for those particular parameters (in this case `path_scope`)
* push `with_scope_level` up so resource_scope doesn't knowAaron Patterson2015-08-101-25/+27
| | | | | `resource_scope` should just put resource scopes on the stack, and doesn't need to know what a `scope_level` is.
* reuse the same frame so we don't need a singleton hashAaron Patterson2015-08-101-2/+1
| | | | | We just want to augment the scope level, not the frame itself, so just copy the frame to the new scope object.
* add a null node at the top of the stackAaron Patterson2015-08-101-13/+9
| | | | this gives us an easier way to iterate the stack
* remove `@nesting` ivarAaron Patterson2015-08-101-9/+21
| | | | | The same information is stored in the `@scope` linked list, so just get it from there.
* pass `shallow` in to the resource constructorAaron Patterson2015-08-101-10/+5
| | | | this lets us remove the setter and make the Resource object Read-Only
* we have the resource on the stack, so just use itAaron Patterson2015-08-101-1/+1
| | | | | We don't need to ask `scope` for the resource because we already have it right here.
* Name the argument according with its jobRafael Mendonça França2015-08-091-2/+2
| | | | Related with dc1b937db780155089fce522f03d340e62f5df36
* push `scope` calls up one frameAaron Patterson2015-08-091-5/+13
| | | | | | eliminates calling `scope` in one method, pushes the other calls up one frame. This goes a little way towards eliminating the internal calls to `scope`.
* remove useless hashAaron Patterson2015-08-081-2/+2
| | | | we don't really need this hash.
* stop calling `scope` internallyAaron Patterson2015-08-081-7/+23
| | | | | | | we need to get a grip on what `scope` actually does. This commit removes some of the internal calls to `scope`. Eventually we should add public facing methods that provide the API that `scope` is trying to accomplish.
* Remove `defaults` hash from `Dispatcher`Aaron Patterson2015-08-081-2/+2
| | | | | | | `Dispatcher` doesn't need to hold on to the defaults hash. It only used the hash to determine whether or not it should raise an exception if there is a name error. We can pass that in further up the stack and alleviate Dispatcher from knowing about that hash.
* eliminate runtime conditionalAaron Patterson2015-08-081-10/+9
| | | | | | We know in advance whether the object is a dispatcher or not, so we can configure the Constraints object with a strategy that will call the right method.
* remove the setter from `Scope`Aaron Patterson2015-08-081-4/+0
| | | | it isn't used.
* [ci skip]yui-knk2015-08-011-0/+15
| | | | | | | | | | | Add descriptions about `ActiveRecord::Base#to_param` to * `ActionDispatch::Routing::Base#match` * Overriding Named Route Parameters (guide) When passes `:param` to route definision, always `to_param` method of related model is overridden to constructe an URL by passing these model instance to named_helper.
* Remove unnecessary `dup` from Mapper `add_route`Roque Pinel2015-07-011-1/+1
| | | | | | | The `dup` was introduced by c4106d0c08954b0761726e0015ec601b7bc7ea4b to work around a frozen key. Nowadays, the string is already being duplicated by the `tr` in `options[:action] ||= action.tr('-', '_')` and later joined into a new string in `name_for_action`.
* Routes resources avoid :new and :edit endpoints if api_only is enabledJorge Bejar2015-06-111-6/+19
|
* match method doc fix [ci skip]Mehmet Emin İNAÇ2015-05-301-3/+6
| | | | | | match method without setting `:via` option has been deprecated fix minor typo
* [ci skip] match without via is now deprecatedYoong Kang Lim2015-05-301-1/+1
|
* Use ruby 1.9 lambda syntax in documentations [ci skip]Mehmet Emin İNAÇ2015-05-031-3/+3
|
* Merge pull request #19700 from tancnle/trivial-shallow-nesting-depth-countRafael Mendonça França2015-04-081-1/+1
|\ | | | | A shorter and more concise version of select..size
| * A shorter and more concise version of select..sizeTan Le2015-04-091-1/+1
| |
* | Improve shorthand matching for routesbrainopia2015-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shorthand route match is when controller and action are taken literally from path. E.g. get '/foo/bar' # => will use 'foo#bar' as endpoint get '/foo/bar/baz' # => will use 'foo/bar#baz' as endpoint Not any path with level two or more of nesting can be used as shortcut. If path contains any characters outside of /[\w-]/ then it can't be used as such. This commit ensures that invalid shortcuts aren't used. ':controller/:action/postfix' - is an example of invalid shortcut that was previosly matched and led to exception: "ArgumentError - ':controller/:action' is not a supported controller name"