aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorErik Michaels-Ober <sferik@gmail.com>2011-07-25 11:37:25 -0700
committerXavier Noria <fxn@hashref.com>2011-08-13 16:22:15 -0700
commit710c5eaf2f7766885d7c8f448de8b3b3ff8929f6 (patch)
tree75fe1e1b14ed060f579587bf827488aac8bfdc4b /actionpack/lib/action_dispatch
parent5b5b22acb5b652a802f2ce36979d452cd1bf52a4 (diff)
downloadrails-710c5eaf2f7766885d7c8f448de8b3b3ff8929f6.tar.gz
rails-710c5eaf2f7766885d7c8f448de8b3b3ff8929f6.tar.bz2
rails-710c5eaf2f7766885d7c8f448de8b3b3ff8929f6.zip
Allow a route to have :format => true
When format is true, it is mandatory (as opposed to :format => false). This is currently not possible with resource routes, which automatically make format optional by default.
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 1331f67a78..003bc1dc2c 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -119,6 +119,8 @@ module ActionDispatch
path
elsif path.include?(":format") || path.end_with?('/')
path
+ elsif @options[:format] == true
+ "#{path}.:format"
else
"#{path}(.:format)"
end