aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/journey/route.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2017-03-22 00:51:29 -0700
committerGitHub <noreply@github.com>2017-03-22 00:51:29 -0700
commit34fe2a4fc778d18b7fe6bdf3629c1481bee789b9 (patch)
treea32f89a9b2db8272a788d63eb41a94964fa18204 /actionpack/lib/action_dispatch/journey/route.rb
parentafbbcf24d791362a65c7f29b739c73a5b09e3816 (diff)
parent1c6747999a74eac84d4e30d698f59c16e0309d64 (diff)
downloadrails-34fe2a4fc778d18b7fe6bdf3629c1481bee789b9.tar.gz
rails-34fe2a4fc778d18b7fe6bdf3629c1481bee789b9.tar.bz2
rails-34fe2a4fc778d18b7fe6bdf3629c1481bee789b9.zip
Merge pull request #28394 from shime/docs-action-dispatch
[docs] fix ActionDispatch documentation
Diffstat (limited to 'actionpack/lib/action_dispatch/journey/route.rb')
-rw-r--r--actionpack/lib/action_dispatch/journey/route.rb9
1 files changed, 8 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/journey/route.rb b/actionpack/lib/action_dispatch/journey/route.rb
index 927fd369c4..7bc15aa6b3 100644
--- a/actionpack/lib/action_dispatch/journey/route.rb
+++ b/actionpack/lib/action_dispatch/journey/route.rb
@@ -89,8 +89,15 @@ module ActionDispatch
end
end
+ # Needed for `rails routes`. Picks up succinctly defined requirements
+ # for a route, for example route
+ #
+ # get 'photo/:id', :controller => 'photos', :action => 'show',
+ # :id => /[A-Z]\d{5}/
+ #
+ # will have {:controller=>"photos", :action=>"show", :id=>/[A-Z]\d{5}/}
+ # as requirements.
def requirements
- # needed for rails `rails routes`
@defaults.merge(path.requirements).delete_if { |_, v|
/.+?/ == v
}