aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/routing
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* Remove wrong commentRafael Mendonça França2015-08-091-1/+0
| | | | | This method raises conditionally not always so we should not documment as it always raise.
* Remove the conditional since it is done in the methodRafael Mendonça França2015-08-091-4/+4
|
* Execute the block when the controller doesn't existRafael Mendonça França2015-08-091-0/+1
| | | | | We should return when the contoller key is not present or if the controller doesn't exist and we didn't raised an error.
* 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-082-13/+24
| | | | | | | 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 useless conditionalAaron Patterson2015-08-081-1/+1
| | | | | | `prepare_params!` would raise an exception if `params` wasn't initialized, so it must always be available. Remove the existence conditional from the `controller` method.
* eliminate assignment in conditionalAaron Patterson2015-08-081-1/+3
| | | | | The method we called already has the conditional we need. Just add an else block so that we don't need two tests.
* Remove `defaults` hash from `Dispatcher`Aaron Patterson2015-08-082-9/+9
| | | | | | | `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.
* whitespaceAaron Patterson2015-08-081-3/+3
|
* remove the setter from `Scope`Aaron Patterson2015-08-081-4/+0
| | | | it isn't used.
* Merge pull request #21167 from AaronLasseigne/use_each_keyKasper Timm Hansen2015-08-081-1/+1
|\ | | | | replace each with each_key when only the key is needed
| * replace each with each_key when only the key is neededAaron Lasseigne2015-08-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using each_key is faster and more intention revealing. Calculating ------------------------------------- each 31.378k i/100ms each_key 33.790k i/100ms ------------------------------------------------- each 450.225k (± 7.0%) i/s - 2.259M each_key 494.459k (± 6.3%) i/s - 2.467M Comparison: each_key: 494459.4 i/s each: 450225.1 i/s - 1.10x slower
* | Allow a custom dispatcher to be provided to routing.Xavier Shay2015-08-071-2/+3
| |
* | Move `controller_reference` and `controller_class_names` to protectedXavier Shay2015-08-071-2/+6
| | | | | | | | scope so that they are available to subclasses.
* | the request class is never changed, so just use it directly in the method bodyAaron Patterson2015-08-071-3/+3
|/
* Merge pull request #21061 from yui-knk/refactor/route_setRafael Mendonça França2015-08-061-4/+2
|\ | | | | Remove duplicated `Array#to_param`
| * Remove duplicated `Array#to_param`yui-knk2015-08-011-4/+2
| | | | | | | | | | `Array#to_param` is defind in active_support/core_ext/object/to_query.rb, so we can call `to_param` if value is_a Array.
* | Use #start_with? and #[] for speedBenjamin Quorning2015-08-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While the readability may be slightly worse, the speed improvement is significant: Twice as fast when there's no leading "/" to remove, and over 4 times as fast when there is a leading "/". Benchmark: require 'benchmark/ips' def match(controller) if controller if m = controller.match(/\A\/(?<controller_without_leading_slash>.*)/) m[:controller_without_leading_slash] else controller end end end def start_with(controller) if controller if controller.start_with?('/'.freeze) controller[1..-1] else controller end end end Benchmark.ips do |x| x.report("match") { match("no_leading_slash") } x.report("start_with") { start_with("no_leading_slash") } x.compare! end Benchmark.ips do |x| x.report("match") { match("/a_leading_slash") } x.report("start_with") { start_with("/a_leading_slash") } x.compare! end Result (Ruby 2.2.2): Calculating ------------------------------------- match 70.324k i/100ms start_with 111.264k i/100ms ------------------------------------------------- match 1.468M (± 7.1%) i/s - 7.314M start_with 3.787M (± 3.5%) i/s - 18.915M Comparison: start_with: 3787389.4 i/s match: 1467636.4 i/s - 2.58x slower Calculating ------------------------------------- match 36.694k i/100ms start_with 86.071k i/100ms ------------------------------------------------- match 532.795k (± 4.7%) i/s - 2.679M start_with 2.518M (± 5.8%) i/s - 12.566M Comparison: start_with: 2518366.8 i/s match: 532794.5 i/s - 4.73x slower
* | [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.
* | Avoid hash duplication by skipping mutationschneems2015-07-301-2/+2
| | | | | | | | | | | | If we don't mutate the `recall` hash, then there's no reason to duplicate it. While this change doesn't get rid of that many objects, each hash object it gets rid of was massive. Saves 888 string objects per request, 206,013 bytes (thats 0.2 mb which is kinda a lot).
* | Only allocate new string when neededschneems2015-07-301-1/+7
| | | | | | | | | | | | Instead of calling `sub` on every link_to call for controller, we can detect when the string __needs__ to be allocated and only then create a new string (without the leading slash), otherwise, use the string that is given to us. Saves 888 string objects per request, 35,524 bytes.
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 07:57:36 +0000