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

Make assert_valid_keys slightly more lenient

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2166 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson
2005-09-09 08:20:14 +00:00
parent 7dbf051e54
commit 558331596f
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
activesupport/lib/active_support/core_ext/hash/keys.rb
View File

@@ -43,8 +43,8 @@ module ActiveSupport #:nodoc:
alias_method :to_options, :symbolize_keys
alias_method :to_options!, :symbolize_keys!
def assert_valid_keys(valid_keys)
unknown_keys = keys - valid_keys
def assert_valid_keys(*valid_keys)
unknown_keys = keys - [valid_keys].flatten
raise(ArgumentError, "Unknown key(s): #{unknown_keys.join(", ")}") unless unknown_keys.empty?
end
end

2
activesupport/test/core_ext/hash_ext_test.rb
View File

@@ -96,10 +96,12 @@ class HashExtTest < Test::Unit::TestCase
def test_assert_valid_keys
assert_nothing_raised do
{ :failure => "stuff", :funny => "business" }.assert_valid_keys([ :failure, :funny ])
{ :failure => "stuff", :funny => "business" }.assert_valid_keys(:failure, :funny)
end
assert_raises(ArgumentError, "Unknown key(s): failore") do
{ :failore => "stuff", :funny => "business" }.assert_valid_keys([ :failure, :funny ])
{ :failore => "stuff", :funny => "business" }.assert_valid_keys(:failure, :funny)
end
end