From 08a6b5753ed65244c793bab455c26454ab1a1dc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hrvoje=20=C5=A0imi=C4=87?= Date: Sat, 14 Jul 2012 15:21:30 +0200 Subject: move method for dependent option check --- activerecord/lib/active_record/associations/builder/belongs_to.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'activerecord/lib/active_record/associations/builder/belongs_to.rb') diff --git a/activerecord/lib/active_record/associations/builder/belongs_to.rb b/activerecord/lib/active_record/associations/builder/belongs_to.rb index 4bef996297..277bec6f72 100644 --- a/activerecord/lib/active_record/associations/builder/belongs_to.rb +++ b/activerecord/lib/active_record/associations/builder/belongs_to.rb @@ -73,9 +73,8 @@ module ActiveRecord::Associations::Builder def configure_dependency if options[:dependent] - unless options[:dependent].in?([:destroy, :delete]) - raise ArgumentError, "The :dependent option expects either :destroy or :delete (#{options[:dependent].inspect})" - end + + check_dependent_valid [:destroy, :delete] method_name = "belongs_to_dependent_#{options[:dependent]}_for_#{name}" model.send(:class_eval, <<-eoruby, __FILE__, __LINE__ + 1) @@ -85,6 +84,7 @@ module ActiveRecord::Associations::Builder end eoruby model.after_destroy method_name + end end end -- cgit v1.2.3