Skip to content
Browse files

Make assert_valid_keys slightly more lenient

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2166 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 7dbf051 commit 558331596fbf9139ef529b14d50c6e258e63fb67 @dhh dhh committed
View
4 activesupport/lib/active_support/core_ext/hash/keys.rb
@@ -43,8 +43,8 @@ def symbolize_keys!
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
View
2 activesupport/test/core_ext/hash_ext_test.rb
@@ -96,10 +96,12 @@ def test_indifferent_writing
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

0 comments on commit 5583315

Please sign in to comment.
Something went wrong with that request. Please try again.