aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/routing/route.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-11-26 02:05:53 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2008-11-26 02:05:53 -0800
commit133c349b0af1c46d26f83c19e6b583062db931e4 (patch)
tree7b4a02ea90b09a2ad90ae013d5880e56e397611c /actionpack/lib/action_controller/routing/route.rb
parenta88094fd7a19a4b2d5c5b5044b10146e6c5c7245 (diff)
parentfef6c32afe2276dffa0347e25808a86e7a101af1 (diff)
downloadrails-133c349b0af1c46d26f83c19e6b583062db931e4.tar.gz
rails-133c349b0af1c46d26f83c19e6b583062db931e4.tar.bz2
rails-133c349b0af1c46d26f83c19e6b583062db931e4.zip
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/routing/route.rb')
-rw-r--r--actionpack/lib/action_controller/routing/route.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/routing/route.rb b/actionpack/lib/action_controller/routing/route.rb
index 91c89fe16b..e2077edad8 100644
--- a/actionpack/lib/action_controller/routing/route.rb
+++ b/actionpack/lib/action_controller/routing/route.rb
@@ -35,6 +35,11 @@ module ActionController
segment.key if segment.respond_to? :key
end.compact
end
+
+ def required_segment_keys
+ required_segments = segments.select {|seg| (!seg.optional? && !seg.is_a?(DividerSegment)) || seg.is_a?(PathSegment) }
+ required_segments.collect { |seg| seg.key if seg.respond_to?(:key)}.compact
+ end
# Build a query string from the keys of the given hash. If +only_keys+
# is given (as an array), only the keys indicated will be used to build