From b83f3645c0e2a962720942f54bc258531632593e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Wed, 9 Oct 2013 20:10:21 -0300
Subject: Make valid_options a class method

---
 activerecord/lib/active_record/associations/builder/association.rb    | 4 ++--
 activerecord/lib/active_record/associations/builder/belongs_to.rb     | 2 +-
 .../lib/active_record/associations/builder/collection_association.rb  | 2 +-
 activerecord/lib/active_record/associations/builder/has_many.rb       | 2 +-
 activerecord/lib/active_record/associations/builder/has_one.rb        | 2 +-
 .../lib/active_record/associations/builder/singular_association.rb    | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'activerecord/lib/active_record/associations')

diff --git a/activerecord/lib/active_record/associations/builder/association.rb b/activerecord/lib/active_record/associations/builder/association.rb
index 3f63326b16..d5fd9d7aa6 100644
--- a/activerecord/lib/active_record/associations/builder/association.rb
+++ b/activerecord/lib/active_record/associations/builder/association.rb
@@ -60,12 +60,12 @@ module ActiveRecord::Associations::Builder
       raise NotImplementedError
     end
 
-    def valid_options
+    def self.valid_options(options)
       VALID_OPTIONS + Association.extensions.flat_map(&:valid_options)
     end
 
     def validate_options
-      options.assert_valid_keys(valid_options)
+      options.assert_valid_keys(self.class.valid_options(options))
     end
 
     def self.define_extensions(model, name)
diff --git a/activerecord/lib/active_record/associations/builder/belongs_to.rb b/activerecord/lib/active_record/associations/builder/belongs_to.rb
index c0b1847f33..38034f6bc6 100644
--- a/activerecord/lib/active_record/associations/builder/belongs_to.rb
+++ b/activerecord/lib/active_record/associations/builder/belongs_to.rb
@@ -4,7 +4,7 @@ module ActiveRecord::Associations::Builder
       :belongs_to
     end
 
-    def valid_options
+    def self.valid_options(options)
       super + [:foreign_type, :polymorphic, :touch]
     end
 
diff --git a/activerecord/lib/active_record/associations/builder/collection_association.rb b/activerecord/lib/active_record/associations/builder/collection_association.rb
index 70548bd277..c8b1873531 100644
--- a/activerecord/lib/active_record/associations/builder/collection_association.rb
+++ b/activerecord/lib/active_record/associations/builder/collection_association.rb
@@ -7,7 +7,7 @@ module ActiveRecord::Associations::Builder
 
     CALLBACKS = [:before_add, :after_add, :before_remove, :after_remove]
 
-    def valid_options
+    def self.valid_options(options)
       super + [:table_name, :before_add,
                :after_add, :before_remove, :after_remove, :extend]
     end
diff --git a/activerecord/lib/active_record/associations/builder/has_many.rb b/activerecord/lib/active_record/associations/builder/has_many.rb
index 7909b93622..bdbbb61ada 100644
--- a/activerecord/lib/active_record/associations/builder/has_many.rb
+++ b/activerecord/lib/active_record/associations/builder/has_many.rb
@@ -4,7 +4,7 @@ module ActiveRecord::Associations::Builder
       :has_many
     end
 
-    def valid_options
+    def self.valid_options(options)
       super + [:primary_key, :dependent, :as, :through, :source, :source_type, :inverse_of, :counter_cache]
     end
 
diff --git a/activerecord/lib/active_record/associations/builder/has_one.rb b/activerecord/lib/active_record/associations/builder/has_one.rb
index f359efd496..49940d5f2e 100644
--- a/activerecord/lib/active_record/associations/builder/has_one.rb
+++ b/activerecord/lib/active_record/associations/builder/has_one.rb
@@ -4,7 +4,7 @@ module ActiveRecord::Associations::Builder
       :has_one
     end
 
-    def valid_options
+    def self.valid_options(options)
       valid = super + [:order, :as]
       valid += [:through, :source, :source_type] if options[:through]
       valid
diff --git a/activerecord/lib/active_record/associations/builder/singular_association.rb b/activerecord/lib/active_record/associations/builder/singular_association.rb
index 9a25980be8..2a4b1c441f 100644
--- a/activerecord/lib/active_record/associations/builder/singular_association.rb
+++ b/activerecord/lib/active_record/associations/builder/singular_association.rb
@@ -2,7 +2,7 @@
 
 module ActiveRecord::Associations::Builder
   class SingularAssociation < Association #:nodoc:
-    def valid_options
+    def self.valid_options(options)
       super + [:remote, :dependent, :counter_cache, :primary_key, :inverse_of]
     end
 
-- 
cgit v1.2.3