diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-08-01 11:49:15 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-08-01 11:49:31 -0700 |
commit | f7f422f1b3a5ee4eec90f71cb7ad3f5cdeb8957f (patch) | |
tree | 474e57106baf51c5b8dfa1d54ceeb909b0022a10 | |
parent | 1dcd18703cbce1a8bdad32b2d45b1c152983d8ea (diff) | |
download | rails-f7f422f1b3a5ee4eec90f71cb7ad3f5cdeb8957f.tar.gz rails-f7f422f1b3a5ee4eec90f71cb7ad3f5cdeb8957f.tar.bz2 rails-f7f422f1b3a5ee4eec90f71cb7ad3f5cdeb8957f.zip |
remove `valid_options` class method
-rw-r--r-- | activerecord/lib/active_record/associations/builder/association.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/associations/builder/association.rb b/activerecord/lib/active_record/associations/builder/association.rb index 926b6d21cd..bdde25bd38 100644 --- a/activerecord/lib/active_record/associations/builder/association.rb +++ b/activerecord/lib/active_record/associations/builder/association.rb @@ -13,12 +13,11 @@ module ActiveRecord::Associations::Builder class Association #:nodoc: class << self - attr_accessor :valid_options attr_accessor :extensions end + self.extensions = [] - self.valid_options = [:class_name, :foreign_key, :validate] - self.extensions = [] + VALID_OPTIONS = [:class_name, :foreign_key, :validate] attr_reader :name, :scope, :options @@ -61,7 +60,7 @@ module ActiveRecord::Associations::Builder end def valid_options - Association.valid_options + Association.extensions.flat_map(&:valid_options) + VALID_OPTIONS + Association.extensions.flat_map(&:valid_options) end def validate_options |