aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
* | | drop object allocation during routes setupAaron Patterson2015-08-172-44/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit introduces a functional Path AST visitor and implements `each` on the AST in terms of the functional visitor. The functional visitor doesn't maintain state, so we only need to allocate one of them. Given this benchmark route file: ```ruby require 'action_pack' require 'action_dispatch' route_set = ActionDispatch::Routing::RouteSet.new routes = ActionDispatch::Routing::Mapper.new route_set ObjectSpace::AllocationTracer.setup(%i{path line type}) result = ObjectSpace::AllocationTracer.trace do 500.times{|i| routes.resource :omglol } end result.find_all { |k,v| k.first =~ /git\/rails/ }.sort_by { |k,v| v.first }.each { |k,v| p k => v } ``` node.rb line 17 was in our top 3 allocation spot: ``` {["/Users/aaron/git/rails/actionpack/lib/action_dispatch/journey/nodes/node.rb", 17, :T_OBJECT]=>[31526, 0, 28329, 0, 2, 1123160]} {["/Users/aaron/git/rails/actionpack/lib/action_dispatch/routing/mapper.rb", 2080, :T_IMEMO]=>[34002, 0, 30563, 0, 2, 1211480]} {["/Users/aaron/git/rails/actionpack/lib/action_dispatch/routing/mapper.rb", 2071, :T_IMEMO]=>[121934, 1, 109608, 0, 7, 4344400]} ``` This commit eliminates allocations at that place.
* | | avoid is_a? checksAaron Patterson2015-08-172-2/+4
| | | | | | | | | | | | add another predicate method so we can avoid is_a checks
* | | pull RegexpOffsets in to a methodAaron Patterson2015-08-171-27/+14
| | | | | | | | | | | | we don't really need this visitor
* | | `required_defaults` is always passed in, remove conditionalAaron Patterson2015-08-171-1/+1
| | | | | | | | | | | | | | | Routes are always constructed with a list of required_defaults, so there's no need to check whether or not it's nil
* | | Fix master buildMarcin Olichwirowicz2015-08-171-0/+1
| | |
* | | use predicate methods to avoid is_a? checksAaron Patterson2015-08-172-1/+3
| | | | | | | | | | | | | | | we may want to change the name of the class at some point, so it's better to use a predicate
* | | default pattern to use a joined stringAaron Patterson2015-08-174-16/+20
| | | | | | | | | | | | | | | The string we create is almost always the same, so rather than joining all the time, lets join once, then reuse that string everywhere.
* | | Merge pull request #21252 from rodzyn/improve_params_parserRafael Mendonça França2015-08-171-2/+11
|\ \ \ | | | | | | | | Improve params parser
| * | | Cleanup ActionDispatch:ParamsParserMarcin Olichwirowicz2015-08-171-2/+11
| | | |
* | | | [skip ci] Fix minor typoJon Atack2015-08-171-1/+1
| | | |
* | | | move route allocation to a factory method on the mapping objectAaron Patterson2015-08-152-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | I would like to change the signature of the Route constructor. Since the mapping object has all the data required to construct a Route object, move the allocation to a factory method.
* | | | use the mapper to build the routing tableAaron Patterson2015-08-152-231/+103
| | | | | | | | | | | | | | | | | | | | | | | | We should build the routes using the user facing API which is `Mapper`. This frees up the library internals to change as we see fit. IOW we shouldn't be testing internals.
* | | | only process `via` onceAaron Patterson2015-08-151-5/+3
|/ / / | | | | | | | | | | | | we can directly turn it in to a regular expression here, so we don't need to test its value twice
* | | Refactor how assign_parameters sets generated_path & query_string_keyseileencodes2015-08-151-8/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is part of a larger refactoring on controller tests. We needed to move these methods here so that we could get rid of the `|| key == :action || key == :controller` in `assign_parameters`. We know this is ugly and intend to fix it but for now `generate_extras` needs to be used in the two methods to access the path and the query_string_keys. We're adding `:controller` and `:action` to the `query_string_keys` because we always need a controller and action. If someone passed `action` or `controller` in in there test they are unambigious - we know they have to go into the query params.
* | | Initialize symbols instead of mapping to_sym on the set of stringsMarcin Olichwirowicz2015-08-151-2/+2
| | |
* | | only keep one hash of named routesAaron Patterson2015-08-145-19/+18
| | | | | | | | | | | | | | | The outer router object already keeps a hash of named routes, so we should just use that.
* | | rm add_route2Aaron Patterson2015-08-144-49/+53
| | | | | | | | | | | | | | | refactor the tests with a backwards compatible method call so we can rm add_route2 from the journey router
* | | pass pass the mapping object down the add_route stackAaron Patterson2015-08-144-56/+73
| | | | | | | | | | | | | | | then we can let the mapping object derive stuff that the Route object needs.
* | | pass the mapping object to build_routeAaron Patterson2015-08-143-26/+15
| | | | | | | | | | | | | | | now that we aren't doing options manipulations, we can just pass the mapping object down and read values from it.
* | | remove `process_path`Aaron Patterson2015-08-141-6/+2
| | | | | | | | | | | | | | | since we've extracted the `to` initialization, there's no need for `process_path`
* | | explicitly return nil from `get_to_from_path`Aaron Patterson2015-08-141-3/+3
| | | | | | | | | | | | | | | | | | if `to` was initialized, this method would return, so we can eliminate the to ||= in the conditional. Finally, let's return a nil in the else block so that it's explicit that this method can return nil
* | | extract method on determining :to from the pathAaron Patterson2015-08-141-5/+9
| | | | | | | | | | | | Eventually we'll pull this up and delete `process_path`.
* | | deprecate passing a string for both the beginning path and :path optionAaron Patterson2015-08-142-2/+20
| | |
* | | rm path_params methodAaron Patterson2015-08-141-5/+1
| | | | | | | | | | | | | | | | | | We don't need a method for something like this. I want to pull this up the stack as well and move the module + :controller ArgumentError up the stack as well
* | | extract method on wildcard path parameter handlingAaron Patterson2015-08-141-6/+11
| | |
* | | pass the path ast downAaron Patterson2015-08-143-6/+4
| | | | | | | | | | | | | | | now we don't need to add it to a hash and delete it from the hash later just to pass it around
* | | pull up path parsingAaron Patterson2015-08-143-11/+12
| | | | | | | | | | | | | | | `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
* | | use predicate methods instead of hard coding verb stringsAaron Patterson2015-08-143-7/+7
| | | | | | | | | | | | | | | also change the feeler to subclass AD::Request so that it has all the methods that Request has
* | | remove hard coded regular expressionAaron Patterson2015-08-142-1/+5
| | |
* | | implement `requirements` in terms of routesAaron Patterson2015-08-141-1/+1
| | |
* | | implement the `asts` method in terms of paths / patternsAaron Patterson2015-08-141-12/+11
| | | | | | | | | | | | Eventually I want to eliminate the FakeSet test class
* | | extract ast finding to a methodAaron Patterson2015-08-141-9/+13
| | | | | | | | | | | | | | | I'm going to reimplement this using route objects, so it will be easier if we just change ast access to go through a method rather than hashes
* | | stop adding path_info to the conditions hashAaron Patterson2015-08-143-11/+9
| | | | | | | | | | | | 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-138-115/+73
| | | | | | | | | | | | | | | 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-137-50/+47
| | | | | | | | | | | | | | | 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-132-17/+16
| | |
* | | remove `as`Aaron Patterson2015-08-132-9/+8
| | | | | | | | | | | | the caller already has access to `as`, so we can stop passing it around.
* | | remove anchor from mappingAaron Patterson2015-08-132-9/+8
| | | | | | | | | | | | | | | | | | 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-132-18/+17
| | | | | | | | | | | | | | | 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-132-0/+13
| | | | | | | | | | | | | | | | | | 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-122-15/+23
| | | | | | | | | | | | this reduces the number of times we have to mutate the options hash.
* | | add a regression test for scoped `format` paramsAaron Patterson2015-08-121-0/+11
| | | | | | | | | | | | This just ensures that `format` is applied to things inside the scope
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 15:22:49 +0000