aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/routing
Commit message (Collapse)AuthorAgeFilesLines
...
* pull up path parsingAaron Patterson2015-08-141-10/+6
| | | | | `add_route` needs the AST, so rather than shove it in a hash and delete later, lets move parsing up the stack so we can pass down later
* stop adding path_info to the conditions hashAaron Patterson2015-08-142-2/+0
| | | | we don't need to keep adding it and deleting if from hashes.
* pull up path normalization.Aaron Patterson2015-08-141-18/+18
| | | | | Eventually I want to pull up AST generation so that we don't have to add it to the `conditions` hash.
* `build_path` doesn't need the path variable anymoreAaron Patterson2015-08-131-2/+2
| | | | | It just constructs a Path::Pattern object with the AST that it already has
* remove StrexpAaron Patterson2015-08-131-7/+1
| | | | | This was a useless object. We can just directly construct a Path::Pattern object without a Strexp object.
* pass anchor directly to `Pattern`Aaron Patterson2015-08-131-3/+2
| | | | | the caller already has it, there is no reason to pack it in to an object and just throw that object away.
* we already have access to the AST, so just use itAaron Patterson2015-08-131-3/+3
|
* remove default arguments that aren't usedAaron Patterson2015-08-131-1/+1
| | | | | we always pass all parameters, so there is no reason to provide default arguments.
* pull up options_constrants extractionAaron Patterson2015-08-131-16/+15
|
* remove `as`Aaron Patterson2015-08-131-8/+7
| | | | the caller already has access to `as`, so we can stop passing it around.
* remove anchor from mappingAaron Patterson2015-08-131-8/+7
| | | | | | the same value that is extracted from the options hash earlier is returned, so we don't need to pass it in in the first place. The caller already has the data, so stop passing it around.
* pull `anchor` extraction upAaron Patterson2015-08-131-17/+16
| | | | | this way we don't have to mutate the options hash so far away from where the user passed it in
* raise if `anchor` is passed to `scope`Aaron Patterson2015-08-131-0/+4
| | | | | | The `anchor` parameter [is overridden](https://github.com/rails/rails/blob/b4b4a611d0eb9aa1c640c5f521c6a43bf2a65bab/actionpack/lib/action_dispatch/routing/mapper.rb#L1528) unless it is directly passed to `match`, so setting it in a scope must be a mistake.
* remove the `add_request_method` methodAaron Patterson2015-08-121-7/+3
| | | | | I didn't like this method because it mutates the parameters. Now that the method is so small, just push it up to `initialize`
* remove side effects in `normalize_defaults`Aaron Patterson2015-08-121-8/+3
| | | | | now the `@defaults` variable doesn't need to be set before calling `normalize_defaults`
* remove unnecessary deletesAaron Patterson2015-08-121-4/+0
| | | | | | | These three options are stored in the `scope` chain outside of the options hash. If they are in the options hash, then someone passed them in to `match` and they don't really do anything. So lets remove the code.
* pull `format` out of the options hashAaron Patterson2015-08-121-11/+10
| | | | | remove `format` from the options hash in the scope chain so that we don't need to remove it later
* pull `formatted` up the stackAaron Patterson2015-08-121-14/+13
| | | | this reduces the number of times we have to mutate the options hash.
* store `via` outside the options hashAaron Patterson2015-08-121-3/+6
| | | | | Now we don't have to manually remove this from the options hash since the scope stores it outside of "options"
* don't mutate the caller's variablesAaron Patterson2015-08-121-14/+15
| | | | | | | Remove the `options` reader from `Resource` because nobody needs to see that hash. Also remove mutations on the options hash in `apply_common_behavior_for` because leaving the side effects in that method makes it difficult to understand what is going on in the caller.
* store `:only` and `:except` outside the normal options hashAaron Patterson2015-08-121-9/+8
| | | | | | these two keys have a different merge strategy, and they also just get removed from the options hash later in the code. If we store them in a separate place, then we don't need to remove them later
* add a method to `Scope` for getting mapping optionsAaron Patterson2015-08-121-2/+8
| | | | | Eventually we don't want to expose the "options" hash from scope, only read values from it. Lets start by adding a reader method.
* pull via checking up to via extractionAaron Patterson2015-08-121-11/+15
| | | | | now we don't need to construct a Mapping object just to get an ArgumentError if there is no `via` parameter provided.
* pull `via` all the way out of `add_route`Aaron Patterson2015-08-121-11/+12
|
* fix via handling when it's in a scopeAaron Patterson2015-08-121-1/+1
|
* pull `via` extraction upAaron Patterson2015-08-121-5/+6
| | | | | | We're going to try pulling this up further, and check `via` validity sooner. This way we don't have to do a bunch of processing on `options` hashes only to find out that the route is incorrect
* simplify `split_constraints`Aaron Patterson2015-08-121-12/+11
| | | | | If we do the Regexp verification in a second method, then the `split_constraints` method gets much easier.
* remove side effects from `normalize_format`Aaron Patterson2015-08-121-9/+13
|
* switch === to case / whenAaron Patterson2015-08-121-3/+4
|
* make `split_constraints` more functional.Aaron Patterson2015-08-121-14/+13
| | | | | | I don't want `split_constraints` to mutate any instance variables. That way it's easier to move the method around and understand what it does (it has no side effects)
* 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.