Refactor dependency check validation

Move the logic for validation check to the same method, and cache
dependent option in a variable to reuse inside the dependency
configuration methods instead of relying on the options hash.

1 files changed, 7 insertions, 10 deletions

diff --git a/activerecord/lib/active_record/associations/builder/association.rb b/activerecord/lib/active_record/associations/builder/association.rb
index 4086485ee2..c3f32b5ed9 100644
--- a/activerecord/lib/active_record/associations/builder/association.rb
+++ b/activerecord/lib/active_record/associations/builder/association.rb
@@ -77,17 +77,14 @@ module ActiveRecord::Associations::Builder
         end
       end
 
-      def print_valid_dependent_options(options)
-        options.map {|s| s.to_s.insert 0, ":" }.
-          to_sentence(:words_connector => ", ",
-                      :two_words_connector => ' or ',
-                      :last_word_connector => ' or ')
-      end
+      def check_valid_dependent!(dependent, valid_options)
+        unless valid_options.include?(dependent)
+          valid_options_message = valid_options.map(&:inspect).to_sentence(
+            words_connector: ', ', two_words_connector: ' or ', last_word_connector: ' or ')
 
-      def check_dependent_valid(valid_options)
-        return if valid_options.include?(options[:dependent])
-        raise ArgumentError, "The :dependent option expects either " \
-          "#{print_valid_dependent_options(valid_options)} (#{options[:dependent].inspect})"
+          raise ArgumentError, "The :dependent option expects either " \
+            "#{valid_options_message} (#{dependent.inspect})"
+        end
       end
 
       def dependent_restrict_raises?