aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/routing/mapper.rb
Commit message (Collapse)AuthorAgeFilesLines
...
* | invert logic to remove nil? and exclude? checks (use ruby rather than AS ↵Aaron Patterson2014-05-281-6/+6
| | | | | | | | when possible
* | fewer blank? callsAaron Patterson2014-05-281-4/+4
| |
* | reduce action.blank? callsAaron Patterson2014-05-281-4/+6
| |
* | reduce blank? checksAaron Patterson2014-05-281-4/+9
| |
* | extract controller checks to methodsAaron Patterson2014-05-281-19/+26
| |
* | set defaults at the top so we can avoid the ||= testAaron Patterson2014-05-281-6/+9
|/
* rm reset_parameters because we automatically do it from 9ca4839aAaron Patterson2014-05-271-2/+0
|
* call `serve` with the request on dispatchersAaron Patterson2014-05-271-9/+10
|
* constraints class does not need the request class anymoreAaron Patterson2014-05-271-4/+4
|
* give all endpoints a superclassAaron Patterson2014-05-271-17/+13
|
* push is_a check up to where the Constraints object is allocatedAaron Patterson2014-05-261-5/+10
|
* pass the request object to the applicationAaron Patterson2014-05-251-3/+2
|
* pass a request to `matches?` so we can avoid creating excess requestsAaron Patterson2014-05-251-6/+5
|
* Constraints#app should never return another Constraints object, so switch to ↵Aaron Patterson2014-05-251-1/+1
| | | | if statement
* eliminate dispatcher is_a checksAaron Patterson2014-05-241-8/+14
|
* push is_a?(Dispatcher) check in to one placeAaron Patterson2014-05-241-0/+7
|
* Always construct route objects with Constraint objectsAaron Patterson2014-05-241-5/+3
|
* unwrap the constraints object on initialization, eliminate loopsAaron Patterson2014-05-241-0/+9
| | | | | | | Unwrap Constraints objects. I don't actually think it's possible to pass a Constraints object to this constructor, but there were multiple places that kept testing children of this object. I *think* they were just being defensive, but I have no idea.
* Constraints contructor should always return a Constraints objectAaron Patterson2014-05-231-9/+5
| | | | I know, it's crazy.
* default value is never used, so make it requiredAaron Patterson2014-05-231-1/+1
|
* push options decomposition up so we can extractAaron Patterson2014-05-231-20/+13
|
* glob_param is never used, so rmAaron Patterson2014-05-231-1/+1
| | | | | | this also changes the constructor. We don't need to pass more options than "defaults" (whatever defaults are, ugh. probably another hash of stupid stuff).
* use symbol keys for path_parametersAaron Patterson2014-05-221-1/+1
|
* drop || test for cases that do not need itAaron Patterson2014-05-131-1/+3
|
* extend with a module then use define_methodAaron Patterson2014-05-131-7/+4
| | | | no need for redefine_method
* 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
* | Tiny follow up to #14915 [ci skip]Robin Dupret2014-05-021-19/+18
| |
* | [skip ci] Document: required `via` option in `match` routing method.Juan David Pastas2014-04-301-20/+37
| |
* | 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
* | Automatically convert dashes to underscores in shorthand routesMikko Johansson2014-01-201-0/+1
| |
* | Automatically convert dashes to underscores for url helpersAmr Tamimi2014-01-201-1/+2
| |
* | Allow an absolute controller path inside a module scopeAndrew White2014-01-051-2/+6
| | | | | | | | Fixes #12777
* | Fix method redefined warning message in mapper.rbAndrew White2013-12-291-2/+3
| |
* | Fix mounting engines inside a resources blockPiotr Sarnacki2013-12-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a route is mounted inside a resources block, it's automatically prefixed, so a following code: resources :users do mount Blog::Engine => '/blog' end will generate a user_blog path helper. In order to access engine helpers, we also use "mounted_helpers", a list of helpers associated with each mounted engine, so a path to blog's post can be generated using user_blog.post_path(user, post). The problem I'm fixing here is that mount used a raw :as option, without taking nestings into account. As a result, blog was added to a route set as a `user_blog`, but helper was generated for just `blog`. This commit applies the proper logic for defining a helper for a mounted engine nested in resources or resource block. (closes #8533)
* | Merge remote-tracking branch 'docrails/master'Xavier Noria2013-11-241-1/+1
|\ \ | | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/deep_merge.rb activesupport/lib/active_support/core_ext/hash/keys.rb
| * | Change syntax format for example returned valuesPrem Sichanugrist2013-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | According to our guideline, we leave 1 space between `#` and `=>`, so we want `# =>` instead of `#=>`. Thanks to @fxn for the suggestion. [ci skip]
* | | Avoid hash lookups for building an array of required defaultsCarlos Antonio da Silva2013-11-151-2/+3
| | | | | | | | | | | | Only set the value once after it's calculated.
* | | Get rid of useless temp variableCarlos Antonio da Silva2013-11-151-2/+1
| | |
* | | Set values instead of building hashes with single values for mergingCarlos Antonio da Silva2013-11-151-2/+2
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-18 03:22:39 +0000