diff options
author | Aaron Batalion <aaron@hungrymachine.com> | 2008-11-24 02:24:19 -0500 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-11-26 10:52:05 +0100 |
commit | fef6c32afe2276dffa0347e25808a86e7a101af1 (patch) | |
tree | 42a43392f0e478e7b752bfd885a4e91b08828487 /actionpack/lib/action_controller/routing/segments.rb | |
parent | 6599dd907f87875045005c3754fc7fe75c130c3e (diff) | |
download | rails-fef6c32afe2276dffa0347e25808a86e7a101af1.tar.gz rails-fef6c32afe2276dffa0347e25808a86e7a101af1.tar.bz2 rails-fef6c32afe2276dffa0347e25808a86e7a101af1.zip |
Added optimal formatted routes to rails, deprecating the formatted_* methods, and reducing routes creation by 50% [#1359 state:committed]
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
Diffstat (limited to 'actionpack/lib/action_controller/routing/segments.rb')
-rw-r--r-- | actionpack/lib/action_controller/routing/segments.rb | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/routing/segments.rb b/actionpack/lib/action_controller/routing/segments.rb index f6b03edcca..5dda3d4d00 100644 --- a/actionpack/lib/action_controller/routing/segments.rb +++ b/actionpack/lib/action_controller/routing/segments.rb @@ -308,5 +308,36 @@ module ActionController end end end + + # The OptionalFormatSegment allows for any resource route to have an optional + # :format, which decreases the amount of routes created by 50%. + class OptionalFormatSegment < DynamicSegment + + def initialize(key = nil, options = {}) + super(:format, {:optional => true}.merge(options)) + end + + def interpolation_chunk + "." + super + end + + def regexp_chunk + '(\.[^/?\.]+)?' + end + + def to_s + '(.:format)?' + end + + #the value should not include the period (.) + def match_extraction(next_capture) + %[ + if (m = match[#{next_capture}]) + params[:#{key}] = URI.unescape(m.from(1)) + end + ] + end + end + end end |