diff options
author | Nicholas Seckar <nseckar@gmail.com> | 2006-09-07 20:10:14 +0000 |
---|---|---|
committer | Nicholas Seckar <nseckar@gmail.com> | 2006-09-07 20:10:14 +0000 |
commit | 9d9ac01c7ddf1d3af1ee2151e2977d3ee9e48294 (patch) | |
tree | 1cae6a9050fcfbfbaf934a8c4dbe35a0816fdd90 /actionpack/lib | |
parent | 840b5763ffe83ee764aee1e507b731bdc05624fb (diff) | |
download | rails-9d9ac01c7ddf1d3af1ee2151e2977d3ee9e48294.tar.gz rails-9d9ac01c7ddf1d3af1ee2151e2977d3ee9e48294.tar.bz2 rails-9d9ac01c7ddf1d3af1ee2151e2977d3ee9e48294.zip |
Add descriptive messages to the exceptions thrown by cgi_methods. Closes #6091.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5066 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
-rwxr-xr-x | actionpack/lib/action_controller/cgi_ext/cgi_methods.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb b/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb index 6cb38a38f3..16baa5abda 100755 --- a/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb +++ b/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb @@ -156,9 +156,9 @@ class CGIMethods #:nodoc: # Add a container to the stack. # def container(key, klass) - raise TypeError if top.is_a?(Hash) && top.key?(key) && ! top[key].is_a?(klass) + type_conflict! klass, top[key] if top.is_a?(Hash) && top.key?(key) && ! top[key].is_a?(klass) value = bind(key, klass.new) - raise TypeError unless value.is_a?(klass) + type_conflict! klass, value unless value.is_a?(klass) push(value) end @@ -190,5 +190,11 @@ class CGIMethods #:nodoc: return value end + + def type_conflict!(klass, value) + raise TypeError, "Conflicting types for parameter containers + Expected an instance of #{klass}, but found found one of #{value.class}" + end + end end
\ No newline at end of file |