From 80e1f730a264a1875e2866cdff4b70b440f36159 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Tue, 24 Aug 2010 16:56:51 -0300 Subject: Allow format to be skipped. This is used internally by mount. --- actionpack/lib/action_dispatch/routing/mapper.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'actionpack/lib/action_dispatch/routing') diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index f3cbba243c..9aa34e7ba5 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -87,7 +87,10 @@ module ActionDispatch @options.reverse_merge!(:controller => /.+?/) end - if path.include?(":format") + if @options[:format] == false + @options.delete(:format) + path + elsif path.include?(":format") path else "#{path}(.:format)" @@ -244,7 +247,7 @@ module ActionDispatch raise "A rack application must be specified" unless path - match(path, options.merge(:to => app, :anchor => false)) + match(path, options.merge(:to => app, :anchor => false, :format => false)) self end -- cgit v1.2.3