Permalink
Browse files

drying up more code in associations.rb

Signed-off-by: wycats <wycats@gmail.com>
  • Loading branch information...
1 parent 939291e commit a424f199a9143e7ea451ba6f5e7dc54eb6103988 @tenderlove tenderlove committed with wycats Mar 7, 2010
Showing with 11 additions and 17 deletions.
  1. +11 −17 activerecord/lib/active_record/associations.rb
@@ -1561,24 +1561,18 @@ def configure_dependency_for_has_one(reflection)
def configure_dependency_for_belongs_to(reflection)
if reflection.options.include?(:dependent)
- case reflection.options[:dependent]
- when :destroy
- method_name = "belongs_to_dependent_destroy_for_#{reflection.name}".to_sym
- define_method(method_name) do
- association = send(reflection.name)
- association.destroy unless association.nil?
- end
- after_destroy method_name
- when :delete
- method_name = "belongs_to_dependent_delete_for_#{reflection.name}".to_sym
- define_method(method_name) do
- association = send(reflection.name)
- association.delete unless association.nil?
- end
- after_destroy method_name
- else
- raise ArgumentError, "The :dependent option expects either :destroy or :delete (#{reflection.options[:dependent].inspect})"
+ name = reflection.options[:dependent]
+
+ unless [:destroy, :delete].include?(name)
+ raise ArgumentError, "The :dependent option expects either :destroy or :delete (#{reflection.options[:dependent].inspect})"
+ end
+
+ method_name = :"belongs_to_dependent_#{name}_for_#{reflection.name}"
+ define_method(method_name) do
+ association = send(reflection.name)
+ association.destroy unless association.nil?
end
+ after_destroy method_name
end
end

0 comments on commit a424f19

Please sign in to comment.