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

Tweak RoutingError message to show option diffs, not just missing named route significant keys. [Rick Olson]

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4756 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Rick Olson
2006-08-13 18:00:08 +00:00
parent 84bacf99d6
commit c963f8e955
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/CHANGELOG
View File

@@ -1,5 +1,7 @@
*SVN*
* Tweak RoutingError message to show option diffs, not just missing named route significant keys. [Rick Olson]
* Invoke method_missing directly on hidden actions. Closes #3030. [Nicholas Seckar]
* Require Tempfile explicitly for TestUploadedFile due to changes in class auto loading. [Rick Olson]

4
actionpack/lib/action_controller/routing.rb
View File

@@ -1007,8 +1007,8 @@ module ActionController
merged = recall.merge(options)
if named_route
path = named_route.generate(options, merged, expire_on)
raise RoutingError, "#{named_route_name}_url failed to generate from #{options.inspect}, missing: #{(named_route.significant_keys - options.keys).inspect}" if path.nil?
path = named_route.generate(options, merged, expire_on)
raise RoutingError, "#{named_route_name}_url failed to generate from #{options.inspect}, expected: #{named_route.requirements.inspect}, diff: #{named_route.requirements.diff(options).inspect}" if path.nil?
return path
else
merged[:action] ||= 'index'