From 0439769324ef889e5e353caacb92a025a8ce2629 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 9 Sep 2005 08:32:47 +0000 Subject: Refactored away all the legacy validate_options calls and replaced them with Hash#assert_valid_keys git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2167 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/aggregations.rb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'activerecord/lib/active_record/aggregations.rb') diff --git a/activerecord/lib/active_record/aggregations.rb b/activerecord/lib/active_record/aggregations.rb index 208dc35321..29cf5c3925 100644 --- a/activerecord/lib/active_record/aggregations.rb +++ b/activerecord/lib/active_record/aggregations.rb @@ -120,7 +120,7 @@ module ActiveRecord # composed_of :address, :mapping => [ %w(address_street street), %w(address_city city) ] # composed_of :gps_location def composed_of(part_id, options = {}) - validate_options([ :class_name, :mapping ], options.keys) + options.assert_valid_keys(:class_name, :mapping) name = part_id.id2name class_name = options[:class_name] || name_to_class_name(name) @@ -131,12 +131,6 @@ module ActiveRecord end private - # Raises an exception if an invalid option has been specified to prevent misspellings from slipping through - def validate_options(valid_option_keys, supplied_option_keys) - unknown_option_keys = supplied_option_keys - valid_option_keys - raise(ActiveRecordError, "Unknown options: #{unknown_option_keys}") unless unknown_option_keys.empty? - end - def name_to_class_name(name) name.capitalize.gsub(/_(.)/) { |s| $1.capitalize } end -- cgit v1.2.3