github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow format to be skipped. This is used internally by mount.

Browse Source
This commit is contained in:
José Valim
2010-08-24 16:56:51 -03:00
parent 0d7b8f8c83
commit 3a831cb7d6
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
actionpack/lib/action_dispatch/routing/mapper.rb
View File

@@ -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

2
actionpack/test/dispatch/routing_test.rb
View File

@@ -218,7 +218,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
get "thumbnail" => "avatars#thumbnail", :as => :thumbnail, :on => :member
end
resources :invoices do
get "outstanding" => "invoices#outstanding", :as => :outstanding, :on => :collection
get "outstanding" => "invoices#outstanding", :on => :collection
get "overdue", :to => :overdue, :on => :collection
get "print" => "invoices#print", :as => :print, :on => :member
post "preview" => "invoices#preview", :as => :preview, :on => :new