From 3c27b6ee7e34a3ee2e73c3e77f7a13c60b53c3d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Wed, 9 Oct 2013 20:15:00 -0300 Subject: Make validate_options a class method --- activerecord/lib/active_record/associations/builder/association.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/activerecord/lib/active_record/associations/builder/association.rb b/activerecord/lib/active_record/associations/builder/association.rb index d5fd9d7aa6..c731d3a080 100644 --- a/activerecord/lib/active_record/associations/builder/association.rb +++ b/activerecord/lib/active_record/associations/builder/association.rb @@ -45,7 +45,7 @@ module ActiveRecord::Associations::Builder @scope = scope @options = options - validate_options + self.class.validate_options(options) if scope && scope.arity == 0 @scope = proc { instance_exec(&scope) } @@ -64,8 +64,8 @@ module ActiveRecord::Associations::Builder VALID_OPTIONS + Association.extensions.flat_map(&:valid_options) end - def validate_options - options.assert_valid_keys(self.class.valid_options(options)) + def self.validate_options(options) + options.assert_valid_keys(valid_options(options)) end def self.define_extensions(model, name) -- cgit v1.2.3